From patchwork Tue Apr 2 16:12:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 161633 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1931955jan; Tue, 2 Apr 2019 09:13:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiQGm/foPZl0YmRrvNIl5A9+8yK4ekKjbvJEIDefZpYHKg6b1zgkVVeALZIHPKAQEZQNmJ X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr62600079pls.40.1554221626444; Tue, 02 Apr 2019 09:13:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554221626; cv=none; d=google.com; s=arc-20160816; b=uURnrrgW+AIL/xiWCoTODF3DgeA+Kz2i1QCHXvKzFUpuW2CnjSMG8yUn1gyIqNOpc8 xcSosODDFPzPfJ7i6AfZ4JcCO5ANMbOv3fzTIFQ29YEVTSZtr0Zz9X5Hcivxu0Jzd3fg gGTIryIuOrtgshOa8U3oPMgWw/cRkVVlo+DyVbsUja0Rph8AiW/+mENtakvUurCgbGF0 jJxvw1u1/khxpcBgvMYIBvw0iZN9OW1eTUcZQp1y1xTetEfGX5ug84btkcyt+rXM4HQX bwpF8Q7WNSPrDCiLPFbUBDvGpL97ub46H1sjssIwkvDTAS1LOwgGnhtyzgaYoeGV7HGA NY2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=5XdVUklbAk1BF8gxDGmA3aa53/CL+l4UqAw0sFP3uO4=; b=LquA34QybS4bu77SVhFSyI+Qhb32g9TCNs2Q+WUct74BZeYqBLf7fd83/VOD1eRNxO FT+djH1+N5OjPr6sWfdorLe09PxX4LIUqK61NvA6IeGtt4c30SWBakD71ISQvi+qenrd joBGrhMbjDFSpl08wdY30TS5Phd1J9xwpFgzCBMyDFL6A8L7H/RREwVxe0rvT3ZUXb5N CyR8llkrpkvmhmUGImD1ybPEkc+5gPPmkQFBGl2II+NcuajUpB0FRT41ct0MSTjfGckr 3vxYJIMIPIOfsd4rGWtlb8SXPLFdzoYmnDe/kMHHSE04myv65xLNqSV7j8qH9e5LijiC oHjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g3oRH+Vq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n18si11628790pgb.91.2019.04.02.09.13.46; Tue, 02 Apr 2019 09:13:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g3oRH+Vq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730810AbfDBQNo (ORCPT + 31 others); Tue, 2 Apr 2019 12:13:44 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54079 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730293AbfDBQNj (ORCPT ); Tue, 2 Apr 2019 12:13:39 -0400 Received: by mail-wm1-f67.google.com with SMTP id q16so4044025wmj.3 for ; Tue, 02 Apr 2019 09:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5XdVUklbAk1BF8gxDGmA3aa53/CL+l4UqAw0sFP3uO4=; b=g3oRH+Vq/frBheTx1xc9MH7m0cQzUi96P2+u8jTFxAuuwEtbxJzdzCOYa8loyP6qwx i1+QiyTmOfy52e1YRRMx4vIEFacX/QHc+WZLsmxsmF5CEqQrRIajzCdAZGEAgOGTsEmU IDH+Z7w8bthdKw9JLgAnAmo2ZE7v9UniIwPTpBRZ6A8XYHwwu7uyyu7Dz6o8+DafQe5F eK80qoHRBMAhO7gJpd4n5DsA+KPa79cGdI1PIcVnt5tI3KdSVoacmhnuNiMpHn7f1yxY sKtX4nmxmqvF7fLH5PVMZRMvz+NaEdedWYqGyjIBqMhmT0jliqEk0m97xRjuqi6RRyLB ZKOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5XdVUklbAk1BF8gxDGmA3aa53/CL+l4UqAw0sFP3uO4=; b=VrUh+YAaT8Tw1/0ltKCVlj60LRTL1Ggm/wywpHvBOHepHx6UlJgYsPBZj38VIHEyOm vZBULUTccS6zW6MTQ6V3Zouqvp52IWyJsi4tJpRkL9UvkHexVmCh8QBmMpZgfW2hwIX0 RvJk+WoQsrViOCtkQMEDVp6yaxitCWED1i1DAdC27GejFrzcaUWZU3L+6AufdT8uB0uk 4LkecFbnB3Fvuvh3OIw5trZZmX11drzrIdMO8aEPI2GW6fmwByLsSRAZciMHwwR/zII9 w1EDdSUcWgncaRE16jWNkz/bL1cUxvar9QQVlwOYlwWaw2rzSvpniIMDWuG3PWjIqQsB uUFQ== X-Gm-Message-State: APjAAAUsRQJc6HH6IP7lS7GhLoXMv+p6m1X2kIbFMaMVl952WLbeHjPX WOlGr+/dANvvHK/pjFTX7BYXqIF5wucjKQ== X-Received: by 2002:a1c:7008:: with SMTP id l8mr4147149wmc.49.1554221617399; Tue, 02 Apr 2019 09:13:37 -0700 (PDT) Received: from mai.imgcgcw.net (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id a126sm17054999wmh.4.2019.04.02.09.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:13:36 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH 3/7] thermal/drivers/core: Add init section table for self-encapsulation Date: Tue, 2 Apr 2019 18:12:46 +0200 Message-Id: <20190402161256.11044-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190402161256.11044-1-daniel.lezcano@linaro.org> References: <20190402161256.11044-1-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently the governors are declared in their respective files but they export their [un]register functions which in turn call the [un]register the governors core's functions. That implies a cyclic dependency which is not desirable. There is a way to self-encapsulate the governors by letting them to declare themselves in a __init section table. Define the table in the asm generic linker description like the other tables and provide the specific macros to deal with. Signed-off-by: Daniel Lezcano --- drivers/thermal/thermal_core.h | 16 ++++++++++++++++ include/asm-generic/vmlinux.lds.h | 11 +++++++++++ 2 files changed, 27 insertions(+) -- 2.17.1 Acked-by: Arnd Bergmann diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index 0df190ed82a7..28d18083e969 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -15,6 +15,22 @@ /* Initial state of a cooling device during binding */ #define THERMAL_NO_TARGET -1UL +/* Init section thermal table */ +extern struct thermal_governor * __governor_thermal_table[]; +extern struct thermal_governor * __governor_thermal_table_end[]; + +#define THERMAL_TABLE_ENTRY(table, name) \ + static typeof(name) * __thermal_table_entry_##name \ + __used __section(__##table##_thermal_table) \ + = &name; + +#define THERMAL_GOVERNOR_DECLARE(name) THERMAL_TABLE_ENTRY(governor, name) + +#define for_each_governor_table(__governor) \ + for (__governor = __governor_thermal_table; \ + __governor < __governor_thermal_table_end; \ + __governor++) + /* * This structure is used to describe the behavior of * a certain cooling device on a certain trip point diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f8f6f04c4453..9893a3ed242a 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -239,6 +239,16 @@ #define ACPI_PROBE_TABLE(name) #endif +#ifdef CONFIG_THERMAL +#define THERMAL_TABLE(name) \ + . = ALIGN(8); \ + __##name##_thermal_table = .; \ + KEEP(*(__##name##_thermal_table)) \ + __##name##_thermal_table_end = .; +#else +#define THERMAL_TABLE(name) +#endif + #define KERNEL_DTB() \ STRUCT_ALIGN(); \ __dtb_start = .; \ @@ -609,6 +619,7 @@ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(timer) \ + THERMAL_TABLE(governor) \ EARLYCON_TABLE() \ LSM_TABLE()