From: Olof Johansson <olof@lixom.net>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/9] ARM: dts: uniphier: rework UniPhier System Bus nodes
Date: Wed, 24 Feb 2016 16:26:41 -0800 [thread overview]
Message-ID: <20160225002641.GC10126@localhost> (raw)
In-Reply-To: <1455588911-9827-3-git-send-email-yamada.masahiro@socionext.com>
Hi,
On Tue, Feb 16, 2016 at 11:15:04AM +0900, Masahiro Yamada wrote:
> diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
> index e1cfc1d..b53a8d9 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_BOOT_RSV2 0x208
>
> static void __iomem *uniphier_smp_rom_boot_rsv2;
> static unsigned int uniphier_smp_max_cpus;
> @@ -98,15 +98,14 @@ 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");
> - ret = of_address_to_resource(np, 1, &res);
> + np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
> + ret = of_address_to_resource(np, 0, &res);
> if (ret) {
> - pr_err("failed to get resource of system-bus-controller\n");
> + pr_err("failed to get resource of uniphier-smpctrl\n");
> return ret;
> }
>
> - rom_rsv2_phys = res.start + UNIPHIER_SBC_ROM_BOOT_RSV2;
> + rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_BOOT_RSV2;
>
> ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
> if (ret)
The previous binding has already been released. You can update, but your driver
should be able to handle the previous binding.
So, you still need to keep the old code around.
This has the benefit of breaking the dependency between the code change and the
DT change, so you no longer have to change your platform code at the same time
as the DT to avoid regressions.
Please adjust and resend. I'll hold off applying the series until then, so we
don't have a partially applied series.
Thanks!
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/9] ARM: dts: uniphier: rework UniPhier System Bus nodes
Date: Wed, 24 Feb 2016 16:26:41 -0800 [thread overview]
Message-ID: <20160225002641.GC10126@localhost> (raw)
In-Reply-To: <1455588911-9827-3-git-send-email-yamada.masahiro@socionext.com>
Hi,
On Tue, Feb 16, 2016 at 11:15:04AM +0900, Masahiro Yamada wrote:
> diff --git a/arch/arm/mach-uniphier/platsmp.c b/arch/arm/mach-uniphier/platsmp.c
> index e1cfc1d..b53a8d9 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_BOOT_RSV2 0x208
>
> static void __iomem *uniphier_smp_rom_boot_rsv2;
> static unsigned int uniphier_smp_max_cpus;
> @@ -98,15 +98,14 @@ 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");
> - ret = of_address_to_resource(np, 1, &res);
> + np = of_find_compatible_node(NULL, NULL, "socionext,uniphier-smpctrl");
> + ret = of_address_to_resource(np, 0, &res);
> if (ret) {
> - pr_err("failed to get resource of system-bus-controller\n");
> + pr_err("failed to get resource of uniphier-smpctrl\n");
> return ret;
> }
>
> - rom_rsv2_phys = res.start + UNIPHIER_SBC_ROM_BOOT_RSV2;
> + rom_rsv2_phys = res.start + UNIPHIER_SMPCTRL_ROM_BOOT_RSV2;
>
> ret = uniphier_smp_copy_trampoline(rom_rsv2_phys);
> if (ret)
The previous binding has already been released. You can update, but your driver
should be able to handle the previous binding.
So, you still need to keep the old code around.
This has the benefit of breaking the dependency between the code change and the
DT change, so you no longer have to change your platform code at the same time
as the DT to avoid regressions.
Please adjust and resend. I'll hold off applying the series until then, so we
don't have a partially applied series.
Thanks!
-Olof
next prev parent reply other threads:[~2016-02-25 0:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 2:15 [PATCH 0/9] ARM: uniphier: UniPhier updates for Linux 4.6-rc1 Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 1/9] ARM: dts: uniphier: factor out ranges property of support card Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 2/9] ARM: dts: uniphier: rework UniPhier System Bus nodes Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-25 0:26 ` Olof Johansson [this message]
2016-02-25 0:26 ` Olof Johansson
2016-02-25 2:22 ` Masahiro Yamada
2016-02-25 2:22 ` Masahiro Yamada
2016-02-25 7:20 ` Olof Johansson
2016-02-25 7:20 ` Olof Johansson
2016-02-26 7:21 ` Masahiro Yamada
2016-02-26 7:21 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 3/9] ARM: uniphier: add missing of_node_put() Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 4/9] ARM: dts: uniphier: add reference clock nodes Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 5/9] ARM: dts: uniphier: add EEPROM node for ProXstream2 Gentil board Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 6/9] ARM: dts: uniphier: enable I2C channel 2 of " Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 7/9] ARM: dts: uniphier: add PH1-Pro4 Ace board support Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 8/9] ARM: dts: uniphier: add PH1-Pro4 Sanji " Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
2016-02-16 2:15 ` [PATCH 9/9] ARM: dts: uniphier: add @{address} to EEPROM node Masahiro Yamada
2016-02-16 2:15 ` Masahiro Yamada
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=20160225002641.GC10126@localhost \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=yamada.masahiro@socionext.com \
/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: link
Be 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.