From patchwork Wed Jan 28 17:22:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 5734531 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4157DBF440 for ; Thu, 29 Jan 2015 02:10:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64EDA201BB for ; Thu, 29 Jan 2015 02:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6666F20160 for ; Thu, 29 Jan 2015 02:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754996AbbA2CKm (ORCPT ); Wed, 28 Jan 2015 21:10:42 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:45300 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933393AbbA2CKc (ORCPT ); Wed, 28 Jan 2015 21:10:32 -0500 Received: by mail-pa0-f48.google.com with SMTP id ey11so32617895pad.7; Wed, 28 Jan 2015 18:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=esGSQprhmddNXE3j+dxd5folQeomrtaiCY8xKv4rXy0=; b=bOjK9XR85qE8psYFCHAli0yWndeR8alD9SAn+47z8pZCvb5MtxQmjnHsTj1sujDLr2 YLVinSzddtLGvWc1SNJBLBDGDpd+D0EM8pcrT4b8nmwBDAcHjRqNeykY4hoWkuZIBEuC i6pIJ+qi0/OBKwJn0uos0q+nbmQ6UObwW+alw5ht++THr26ihn0vh/qy1IQxf8LGW6kt B/AjndFlgfrlxeV65/R+oWlLy0vh6EH2QQcTmX8A3bg+z5Ah+UqJ8m+Y4YKbCAS69nVt G8okTgpXlBEbhKJTSc43PMKJZj4obutObkfBqSXWMufhct4Br+30ENSUxLxdl6CkNTuo qBMw== X-Received: by 10.70.98.174 with SMTP id ej14mr7353399pdb.37.1422465725823; Wed, 28 Jan 2015 09:22:05 -0800 (PST) Received: from developer.hsd1.ca.comcast.net (c-98-207-105-125.hsd1.ca.comcast.net. [98.207.105.125]) by mx.google.com with ESMTPSA id n3sm5248712pdf.95.2015.01.28.09.22.03 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Wed, 28 Jan 2015 09:22:04 -0800 (PST) Date: Wed, 28 Jan 2015 13:22:11 -0400 From: Eduardo Valentin To: Arnd Bergmann Cc: linux-pm@vger.kernel.org, Viresh Kumar , "Rafael J. Wysocki" , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Kukjin Kim , Zhang Rui Subject: Re: [PATCH 3/3] cpufreq: exynos: allow modular build Message-ID: <20150128172209.GF29600@developer.hsd1.ca.comcast.net> References: <1422451015-390439-1-git-send-email-arnd@arndb.de> <1422451015-390439-4-git-send-email-arnd@arndb.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1422451015-390439-4-git-send-email-arnd@arndb.de> User-Agent: Mutt/1.5.22 (2013-10-16) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Jan 28, 2015 at 02:16:55PM +0100, Arnd Bergmann wrote: > The exynos cpufreq driver code recently gained a dependency on the > cooling code, which may be a loadable module. This breaks an ARM > allmodconfig build: > > drivers/built-in.o: In function `exynos_cpufreq_probe': > :(.text+0x1748e8): undefined reference to `of_cpufreq_cooling_register' > > To avoid this problem, change cpufreq Kconfig to allow the drivers > to be loadable modules as well and enforce a dependency on the > thermal module. Also, export the symbols that are used for communicating > between the three cpu-specific parts of the driver and the main module. > > Signed-off-by: Arnd Bergmann > Fixes: e725d26c4857 ("cpufreq: exynos: Use device tree to determine if cpufreq cooling should be registered") > --- > drivers/cpufreq/Kconfig.arm | 14 +++++++++----- > drivers/cpufreq/exynos-cpufreq.h | 6 +++--- > drivers/cpufreq/exynos4210-cpufreq.c | 1 + > drivers/cpufreq/exynos4x12-cpufreq.c | 1 + > drivers/cpufreq/exynos5250-cpufreq.c | 1 + > 5 files changed, 15 insertions(+), 8 deletions(-) > > diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm > index 0f9a2c3c0e0d..99ac56746ebd 100644 > --- a/drivers/cpufreq/Kconfig.arm > +++ b/drivers/cpufreq/Kconfig.arm > @@ -26,11 +26,12 @@ config ARM_VEXPRESS_SPC_CPUFREQ > > > config ARM_EXYNOS_CPUFREQ > - bool > + tristate > > config ARM_EXYNOS4210_CPUFREQ > - bool "SAMSUNG EXYNOS4210" > + tristate "SAMSUNG EXYNOS4210" > depends on CPU_EXYNOS4210 > + depends on THERMAL > default y > select ARM_EXYNOS_CPUFREQ > help > @@ -40,8 +41,9 @@ config ARM_EXYNOS4210_CPUFREQ > If in doubt, say N. > > config ARM_EXYNOS4X12_CPUFREQ > - bool "SAMSUNG EXYNOS4x12" > + tristate "SAMSUNG EXYNOS4x12" > depends on SOC_EXYNOS4212 || SOC_EXYNOS4412 > + depends on THERMAL > default y > select ARM_EXYNOS_CPUFREQ > help > @@ -51,8 +53,9 @@ config ARM_EXYNOS4X12_CPUFREQ > If in doubt, say N. > > config ARM_EXYNOS5250_CPUFREQ > - bool "SAMSUNG EXYNOS5250" > + tristate "SAMSUNG EXYNOS5250" > depends on SOC_EXYNOS5250 > + depends on THERMAL > default y > select ARM_EXYNOS_CPUFREQ > help > @@ -62,9 +65,10 @@ config ARM_EXYNOS5250_CPUFREQ > If in doubt, say N. > > config ARM_EXYNOS5440_CPUFREQ > - bool "SAMSUNG EXYNOS5440" > + tristate "SAMSUNG EXYNOS5440" > depends on SOC_EXYNOS5440 > depends on HAVE_CLK && OF > + depends on THERMAL > select PM_OPP > default y > help Reading the code briefly, looks like the intention is to separate soc specific code into different files, but they all compose one single driver. Translating into module, I believe it makes sense to build them into a single module, instead of having all of them as separate module. Meaning, only ARM_EXYNOS_CPUFREQ becomes tristate, all the remaining continues bool. And we add the following Makefile change to your patch --- > diff --git a/drivers/cpufreq/exynos-cpufreq.h b/drivers/cpufreq/exynos-cpufreq.h > index 9f2062a7cc02..32a895af4961 100644 > --- a/drivers/cpufreq/exynos-cpufreq.h > +++ b/drivers/cpufreq/exynos-cpufreq.h > @@ -53,7 +53,7 @@ struct exynos_dvfs_info { > void __iomem *cmu_regs; > }; > > -#ifdef CONFIG_ARM_EXYNOS4210_CPUFREQ > +#if IS_ENABLED(CONFIG_ARM_EXYNOS4210_CPUFREQ) > extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *); > #else > static inline int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) > @@ -61,7 +61,7 @@ static inline int exynos4210_cpufreq_init(struct exynos_dvfs_info *info) > return -EOPNOTSUPP; > } > #endif > -#ifdef CONFIG_ARM_EXYNOS4X12_CPUFREQ > +#if IS_ENABLED(CONFIG_ARM_EXYNOS4X12_CPUFREQ) > extern int exynos4x12_cpufreq_init(struct exynos_dvfs_info *); > #else > static inline int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info) > @@ -69,7 +69,7 @@ static inline int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info) > return -EOPNOTSUPP; > } > #endif > -#ifdef CONFIG_ARM_EXYNOS5250_CPUFREQ > +#if IS_ENABLED(CONFIG_ARM_EXYNOS5250_CPUFREQ) > extern int exynos5250_cpufreq_init(struct exynos_dvfs_info *); > #else > static inline int exynos5250_cpufreq_init(struct exynos_dvfs_info *info) > diff --git a/drivers/cpufreq/exynos4210-cpufreq.c b/drivers/cpufreq/exynos4210-cpufreq.c > index 843ec824fd91..4b5de19f0ea2 100644 > --- a/drivers/cpufreq/exynos4210-cpufreq.c > +++ b/drivers/cpufreq/exynos4210-cpufreq.c > @@ -182,3 +182,4 @@ err_moutcore: > pr_debug("%s: failed initialization\n", __func__); > return -EINVAL; > } > +EXPORT_SYMBOL_GPL(exynos4210_cpufreq_init); > diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c > index 9e78a850e29f..d2924e1bc909 100644 > --- a/drivers/cpufreq/exynos4x12-cpufreq.c > +++ b/drivers/cpufreq/exynos4x12-cpufreq.c > @@ -234,3 +234,4 @@ err_moutcore: > pr_debug("%s: failed initialization\n", __func__); > return -EINVAL; > } > +EXPORT_SYMBOL_GPL(exynos4x12_cpufreq_init); > diff --git a/drivers/cpufreq/exynos5250-cpufreq.c b/drivers/cpufreq/exynos5250-cpufreq.c > index 3eafdc7ba787..b2810b839331 100644 > --- a/drivers/cpufreq/exynos5250-cpufreq.c > +++ b/drivers/cpufreq/exynos5250-cpufreq.c > @@ -208,3 +208,4 @@ err_moutcore: > pr_err("%s: failed initialization\n", __func__); > return -EINVAL; > } > +EXPORT_SYMBOL_GPL(exynos5250_cpufreq_init); and certainly we would not need to export such functions anymore > -- > 2.1.0.rc2 > BR, Eduardo diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 0f9a2c3..c3c3cf5 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -26,13 +26,19 @@ config ARM_VEXPRESS_SPC_CPUFREQ config ARM_EXYNOS_CPUFREQ - bool + tristate "SAMSUNG EXYNOS CPUfreq Driver" + depends on THERMAL + default y + help + This adds the CPUFreq driver for Samsung EXYNOS platforms + + If in doubt, say N. config ARM_EXYNOS4210_CPUFREQ bool "SAMSUNG EXYNOS4210" depends on CPU_EXYNOS4210 + depends on ARM_EXYNOS_CPUFREQ default y - select ARM_EXYNOS_CPUFREQ help This adds the CPUFreq driver for Samsung EXYNOS4210 SoC (S5PV310 or S5PC210). @@ -42,8 +48,8 @@ config ARM_EXYNOS4210_CPUFREQ config ARM_EXYNOS4X12_CPUFREQ bool "SAMSUNG EXYNOS4x12" depends on SOC_EXYNOS4212 || SOC_EXYNOS4412 + depends on ARM_EXYNOS_CPUFREQ default y - select ARM_EXYNOS_CPUFREQ help This adds the CPUFreq driver for Samsung EXYNOS4X12 SoC (EXYNOS4212 or EXYNOS4412). @@ -54,7 +60,7 @@ config ARM_EXYNOS5250_CPUFREQ bool "SAMSUNG EXYNOS5250" depends on SOC_EXYNOS5250 default y - select ARM_EXYNOS_CPUFREQ + depends on ARM_EXYNOS_CPUFREQ help This adds the CPUFreq driver for Samsung EXYNOS5250 SoC. diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index b3ca7b0..b26e2bf 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -51,10 +51,11 @@ obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o -obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o -obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o -obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o -obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o +obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += arm-exynos-cpufreq.o +arm-exynos-cpufreq-y := exynos-cpufreq.o +arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o +arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o +arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ) += exynos5440-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o