From: Masahiro Yamada <yamada.masahiro@socionext.com> To: arm@kernel.org Cc: Masahiro Yamada <yamada.masahiro@socionext.com>, Russell King <linux@arm.linux.org.uk>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: uniphier: rework SMP code to support new System Bus binding Date: Fri, 26 Feb 2016 16:16:08 +0900 [thread overview] Message-ID: <1456470968-7900-3-git-send-email-yamada.masahiro@socionext.com> (raw) In-Reply-To: <1456470968-7900-1-git-send-email-yamada.masahiro@socionext.com> During the review process of the UniPhier System Bus driver (drivers/bus/uniphier.c), the current binding of the System Bus Controller turned out to be no good. In order to use the driver, some nodes in the device trees must be tweaked. It would also have impacts on the SMP code because the SMP related registers are located in the System Bus Controller block. This commit reworks the smp_operations to support the new binding, but still supports the old binding, too. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/mach-uniphier/platsmp.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c index 8d988f5..6914135 100644 --- a/arch/arm/mach-uniphier/platsmp.c +++ b/arch/arm/mach-uniphier/platsmp.c @@ -30,7 +30,7 @@ * The secondary CPUs check this register from the boot ROM for the jump * destination. After that, it can be reused as a scratch register. */ -#define UNIPHIER_SBC_ROM_BOOT_RSV2 0x1208 +#define UNIPHIER_SMPCTRL_ROM_RSV2 0x208 static void __iomem *uniphier_smp_rom_boot_rsv2; static unsigned int uniphier_smp_max_cpus; @@ -98,17 +98,24 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus) phys_addr_t rom_rsv2_phys; int ret; - np = of_find_compatible_node(NULL, NULL, - "socionext,uniphier-system-bus-controller"); + np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl"); of_node_put(np); - ret = of_address_to_resource(np, 1, &res); - if (ret) { - pr_err("failed to get resource of system-bus-controller\n"); - return ret; + ret = of_address_to_resource(np, 0, &res); + if (!ret) { + rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2; + } else { + /* try old binding too */ + np = of_find_compatible_node(NULL, NULL, + "socionext,uniphier-system-bus-controller"); + of_node_put(np); + ret = of_address_to_resource(np, 1, &res); + if (ret) { + pr_err("failed to get resource of SMP control\n"); + return ret; + } + rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2; } - rom_rsv2_phys = res.start + UNIPHIER_SBC_ROM_BOOT_RSV2; - ret = uniphier_smp_copy_trampoline(rom_rsv2_phys); if (ret) return ret; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: yamada.masahiro@socionext.com (Masahiro Yamada) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: uniphier: rework SMP code to support new System Bus binding Date: Fri, 26 Feb 2016 16:16:08 +0900 [thread overview] Message-ID: <1456470968-7900-3-git-send-email-yamada.masahiro@socionext.com> (raw) In-Reply-To: <1456470968-7900-1-git-send-email-yamada.masahiro@socionext.com> During the review process of the UniPhier System Bus driver (drivers/bus/uniphier.c), the current binding of the System Bus Controller turned out to be no good. In order to use the driver, some nodes in the device trees must be tweaked. It would also have impacts on the SMP code because the SMP related registers are located in the System Bus Controller block. This commit reworks the smp_operations to support the new binding, but still supports the old binding, too. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/arm/mach-uniphier/platsmp.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c index 8d988f5..6914135 100644 --- a/arch/arm/mach-uniphier/platsmp.c +++ b/arch/arm/mach-uniphier/platsmp.c @@ -30,7 +30,7 @@ * The secondary CPUs check this register from the boot ROM for the jump * destination. After that, it can be reused as a scratch register. */ -#define UNIPHIER_SBC_ROM_BOOT_RSV2 0x1208 +#define UNIPHIER_SMPCTRL_ROM_RSV2 0x208 static void __iomem *uniphier_smp_rom_boot_rsv2; static unsigned int uniphier_smp_max_cpus; @@ -98,17 +98,24 @@ static int __init uniphier_smp_prepare_trampoline(unsigned int max_cpus) phys_addr_t rom_rsv2_phys; int ret; - np = of_find_compatible_node(NULL, NULL, - "socionext,uniphier-system-bus-controller"); + np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl"); of_node_put(np); - ret = of_address_to_resource(np, 1, &res); - if (ret) { - pr_err("failed to get resource of system-bus-controller\n"); - return ret; + ret = of_address_to_resource(np, 0, &res); + if (!ret) { + rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_RSV2; + } else { + /* try old binding too */ + np = of_find_compatible_node(NULL, NULL, + "socionext,uniphier-system-bus-controller"); + of_node_put(np); + ret = of_address_to_resource(np, 1, &res); + if (ret) { + pr_err("failed to get resource of SMP control\n"); + return ret; + } + rom_rsv2_phys = res.start + 0x1000 + UNIPHIER_SMPCTRL_ROM_RSV2; } - rom_rsv2_phys = res.start + UNIPHIER_SBC_ROM_BOOT_RSV2; - ret = uniphier_smp_copy_trampoline(rom_rsv2_phys); if (ret) return ret; -- 1.9.1
next prev parent reply other threads:[~2016-02-26 7:16 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-26 7:16 [PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round) Masahiro Yamada 2016-02-26 7:16 ` Masahiro Yamada 2016-02-26 7:16 ` [PATCH 1/2] ARM: uniphier: add missing of_node_put() Masahiro Yamada 2016-02-26 7:16 ` Masahiro Yamada 2016-02-26 7:16 ` Masahiro Yamada [this message] 2016-02-26 7:16 ` [PATCH 2/2] ARM: uniphier: rework SMP code to support new System Bus binding Masahiro Yamada 2016-03-07 9:30 ` [PATCH 0/2] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 (2nd round) Masahiro Yamada 2016-03-07 9:30 ` Masahiro Yamada 2016-03-12 23:42 ` Masahiro Yamada 2016-03-12 23:42 ` Masahiro Yamada 2016-03-15 2:01 ` Masahiro Yamada 2016-03-15 2:01 ` Masahiro Yamada 2016-03-18 16:49 ` Arnd Bergmann 2016-03-18 16:49 ` Arnd Bergmann 2016-03-18 23:49 ` Masahiro Yamada 2016-03-18 23:49 ` Masahiro Yamada 2016-03-21 3:59 ` Masahiro Yamada 2016-03-21 3:59 ` Masahiro Yamada 2016-03-21 9:49 ` Arnd Bergmann 2016-03-21 9:49 ` Arnd Bergmann 2016-03-21 12:39 ` Masahiro Yamada 2016-03-21 12:39 ` Masahiro Yamada 2016-03-21 19:33 ` Arnd Bergmann 2016-03-21 19:33 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1456470968-7900-3-git-send-email-yamada.masahiro@socionext.com \ --to=yamada.masahiro@socionext.com \ --cc=arm@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.