From patchwork Thu Dec 8 03:02:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pankaj Dubey X-Patchwork-Id: 9465657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E627E60459 for ; Thu, 8 Dec 2016 03:02:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C419828555 for ; Thu, 8 Dec 2016 03:02:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B65D22856E; Thu, 8 Dec 2016 03:02:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25FAA28555 for ; Thu, 8 Dec 2016 03:02:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEowS-0006Bm-Eg; Thu, 08 Dec 2016 03:00:16 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEowN-0005PK-5j for linux-arm-kernel@lists.infradead.org; Thu, 08 Dec 2016 03:00:12 +0000 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OHU01I29IZH29D0@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 08 Dec 2016 11:59:47 +0900 (KST) X-AuditID: cbfee61b-f796f6d000004092-af-5848cca32a0b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id E5.52.16530.3ACC8485; Thu, 8 Dec 2016 11:59:47 +0900 (KST) Received: from pankaj.sisodomain.com ([107.108.83.125]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OHU00IIAIZI3Z40@mmp2.samsung.com>; Thu, 08 Dec 2016 11:59:47 +0900 (KST) From: Pankaj Dubey To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [RESEND-PATCH] ARM: EXYNOS: remove smp hook from machine descriptor Date: Thu, 08 Dec 2016 08:32:15 +0530 Message-id: <1481166135-1588-1-git-send-email-pankaj.dubey@samsung.com> X-Mailer: git-send-email 2.7.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsVy+t9jQd3FZzwiDM49kLT4O+kYu8X8I+dY Ld68XcNk0f/4NbPF+fMb2C02Pb7GajHj/D4mi0Vbv7BbdCxjdOD0+P1rEqPHplWdbB6bl9R7 bOm/y+7Rt2UVo8fnTXIBbFFuNhmpiSmpRQqpecn5KZl56bZKoSFuuhZKCnmJuam2ShG6viFB SgpliTmlQJ6RARpwcA5wD1bSt0twy7g8tZWl4ItexcwLN1gbGJvVuxg5OSQETCSeHVjDDmGL SVy4t56ti5GLQ0hgFqPEvy872SGcn4wSt6Z/ZAOpYhPQlXjyfi5zFyMHh4hApsSJfVwgNcwC fYwSpy/PZgGpERbwkVj1GKKeRUBV4sLjBrA4r4C7RMvRY2wQ2+Qkbp7rZJ7AyL2AkWEVo0Rq QXJBcVJ6rlFearlecWJucWleul5yfu4mRnD4PpPewXh4l/shRgEORiUeXoetHhFCrIllxZW5 hxglOJiVRHhfnQIK8aYkVlalFuXHF5XmpBYfYjQFOmAis5Rocj4wtvJK4g1NzE3MjQ0szC0t TYyUxHkbZz8LFxJITyxJzU5NLUgtgulj4uCUamDU6M8T7FU3MspXt/4eZdulcHiy05Y/d+pZ Tyz4bih+WGWboF3QrvK0zLt7tO+4HpqwbYmDW4WHpb1j/qyDaj/ywxYYzs/dyPZVdPY9X/UI vp2X+rSzV5vsclpSbF/VeZEn4WmmYMSHrINmMb+Dg4JC7sw6O7WsfYHy9sMdLDrrq+6EHy2+ 6KnEUpyRaKjFXFScCADXlZ3mdQIAAA== X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161207_190011_421187_DD00D54F X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, Pankaj Dubey , krzk@kernel.org, javier@osg.samsung.com, thomas.ab@samsung.com, kgene@kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use CPU_METHOD_OF_DECLARE() for smp_ops instead of using it via machine descriptor. Signed-off-by: Pankaj Dubey --- Resending as I missed to include samsung mailing list. arch/arm/boot/dts/exynos3250.dtsi | 1 + arch/arm/boot/dts/exynos4210.dtsi | 1 + arch/arm/boot/dts/exynos4212.dtsi | 1 + arch/arm/boot/dts/exynos4412.dtsi | 1 + arch/arm/boot/dts/exynos5250.dtsi | 1 + arch/arm/boot/dts/exynos5260.dtsi | 1 + arch/arm/boot/dts/exynos5410.dtsi | 1 + arch/arm/boot/dts/exynos5420-cpus.dtsi | 1 + arch/arm/boot/dts/exynos5422-cpus.dtsi | 1 + arch/arm/boot/dts/exynos5440.dtsi | 1 + arch/arm/mach-exynos/common.h | 2 -- arch/arm/mach-exynos/exynos.c | 1 - arch/arm/mach-exynos/platsmp.c | 2 ++ 13 files changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index ba17ee1..f28f669 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -53,6 +53,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index 7f3a18c..6dfd98d 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -35,6 +35,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@900 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index 5389011..3e8982e 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi @@ -25,6 +25,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@A00 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 40beede..faf2fb8 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -25,6 +25,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@A00 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index b6d7444..580897c 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -52,6 +52,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi index 5818718..1af6e76 100644 --- a/arch/arm/boot/dts/exynos5260.dtsi +++ b/arch/arm/boot/dts/exynos5260.dtsi @@ -32,6 +32,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index 2b6adaf..b092cdc 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -33,6 +33,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5420-cpus.dtsi b/arch/arm/boot/dts/exynos5420-cpus.dtsi index 5c052d7..a587704 100644 --- a/arch/arm/boot/dts/exynos5420-cpus.dtsi +++ b/arch/arm/boot/dts/exynos5420-cpus.dtsi @@ -24,6 +24,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@0 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5422-cpus.dtsi b/arch/arm/boot/dts/exynos5422-cpus.dtsi index bf3c6f1..7fcdfd0 100644 --- a/arch/arm/boot/dts/exynos5422-cpus.dtsi +++ b/arch/arm/boot/dts/exynos5422-cpus.dtsi @@ -23,6 +23,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu0: cpu@100 { device_type = "cpu"; diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi index 2a2e570..0a958e8 100644 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi @@ -50,6 +50,7 @@ cpus { #address-cells = <1>; #size-cells = <0>; + enable-method = "samsung,exynos-smp"; cpu@0 { device_type = "cpu"; diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index fb12d11..051e1ab 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -143,8 +143,6 @@ static inline void exynos_pm_init(void) {} extern void exynos_cpu_resume(void); extern void exynos_cpu_resume_ns(void); -extern const struct smp_operations exynos_smp_ops; - extern void exynos_cpu_power_down(int cpu); extern void exynos_cpu_power_up(int cpu); extern int exynos_cpu_power_state(int cpu); diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c index fa08ef9..f0a766e 100644 --- a/arch/arm/mach-exynos/exynos.c +++ b/arch/arm/mach-exynos/exynos.c @@ -211,7 +211,6 @@ DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)") /* Maintainer: Kukjin Kim */ .l2c_aux_val = 0x3c400001, .l2c_aux_mask = 0xc20fffff, - .smp = smp_ops(exynos_smp_ops), .map_io = exynos_init_io, .init_early = exynos_firmware_init, .init_irq = exynos_init_irq, diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 94405c7..43eec10 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -474,3 +474,5 @@ const struct smp_operations exynos_smp_ops __initconst = { .cpu_die = exynos_cpu_die, #endif }; + +CPU_METHOD_OF_DECLARE(exynos_smp, "samsung,exynos-smp", &exynos_smp_ops);