[PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Rick Altherr]

openbmc/openbmc commit 1ed6fe335cda50cf60b7afddbe530077a1b25d27 includes
the initrd in the kernel image.  Update the flash layout used by OpenBMC
dts accordingly.  This is required for OpenBMC's kernel update mechanism
to work as the kernel image now exceeds the size of the original kernel
partition.

Signed-off-by: Rick Altherr <raltherr@google.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
index 65095a40a203..4bcfd1bf8dc5 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
@@ -12,13 +12,9 @@
 					label = "u-boot-env";
 				};
 				kernel@80000 {
-					reg = < 0x80000 0x280000 >;
+					reg = < 0x80000 0x440000 >;
 					label = "kernel";
 				};
-				initramfs@300000 {
-					reg = < 0x300000 0x1c0000 >;
-					label = "initramfs";
-				};
 				rofs@0c0000 {
 					reg = < 0x4c0000 0x1740000 >;
 					label = "rofs";
-- 
2.11.0.483.g087da7b7c-goog

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Joel Stanley]

On Wed, Feb 1, 2017 at 5:09 AM, Rick Altherr via openbmc
<openbmc@lists.ozlabs.org> wrote:
> openbmc/openbmc commit 1ed6fe335cda50cf60b7afddbe530077a1b25d27 includes
> the initrd in the kernel image.  Update the flash layout used by OpenBMC
> dts accordingly.  This is required for OpenBMC's kernel update mechanism
> to work as the kernel image now exceeds the size of the original kernel
> partition.

Brad, Patrick: This change will mean new kernels can't boot on old
flash layouts, and vice versa.

All users will need to do a full-flash update to move to this version,
and a full flash update to downgrade.

Are we ok to proceed?

Cheers,

Joel

>
> Signed-off-by: Rick Altherr <raltherr@google.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> index 65095a40a203..4bcfd1bf8dc5 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
> @@ -12,13 +12,9 @@
>                                         label = "u-boot-env";
>                                 };
>                                 kernel@80000 {
> -                                       reg = < 0x80000 0x280000 >;
> +                                       reg = < 0x80000 0x440000 >;
>                                         label = "kernel";
>                                 };
> -                               initramfs@300000 {
> -                                       reg = < 0x300000 0x1c0000 >;
> -                                       label = "initramfs";
> -                               };
>                                 rofs@0c0000 {
>                                         reg = < 0x4c0000 0x1740000 >;
>                                         label = "rofs";
> --
> 2.11.0.483.g087da7b7c-goog
>
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Andrew Geissler]

On Thu, Feb 2, 2017 at 6:51 PM, Joel Stanley <joel@jms.id.au> wrote:
> On Wed, Feb 1, 2017 at 5:09 AM, Rick Altherr via openbmc
> <openbmc@lists.ozlabs.org> wrote:
>> openbmc/openbmc commit 1ed6fe335cda50cf60b7afddbe530077a1b25d27 includes
>> the initrd in the kernel image.  Update the flash layout used by OpenBMC
>> dts accordingly.  This is required for OpenBMC's kernel update mechanism
>> to work as the kernel image now exceeds the size of the original kernel
>> partition.
>
> Brad, Patrick: This change will mean new kernels can't boot on old
> flash layouts, and vice versa.
>
> All users will need to do a full-flash update to move to this version,
> and a full flash update to downgrade.
>
> Are we ok to proceed?

Ack, we just went through this with the last update and all hit
https://github.com/openbmc/openbmc/issues/1030.  It was pretty
disruptive for all of us in the lab needing to pull the chips and
manually flash each.  This is would be fine if we can just flash the
<system>.all.tar and all works ok, but that was not what we found in
https://github.com/openbmc/openbmc/issues/1030.

> Cheers,
>
> Joel
>
>>
>> Signed-off-by: Rick Altherr <raltherr@google.com>
>> ---
>>  arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 6 +-----
>>  1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>> index 65095a40a203..4bcfd1bf8dc5 100644
>> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>> @@ -12,13 +12,9 @@
>>                                         label = "u-boot-env";
>>                                 };
>>                                 kernel@80000 {
>> -                                       reg = < 0x80000 0x280000 >;
>> +                                       reg = < 0x80000 0x440000 >;
>>                                         label = "kernel";
>>                                 };
>> -                               initramfs@300000 {
>> -                                       reg = < 0x300000 0x1c0000 >;
>> -                                       label = "initramfs";
>> -                               };
>>                                 rofs@0c0000 {
>>                                         reg = < 0x4c0000 0x1740000 >;
>>                                         label = "rofs";
>> --
>> 2.11.0.483.g087da7b7c-goog
>>
>> _______________________________________________
>> openbmc mailing list
>> openbmc@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/openbmc
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Brad Bishop]

I’m not suggesting one way or the other as far as how to proceed but I don’t
think pulling chips is ever necessary.  You can always netboot and flash the
entire image image that way.

> On Feb 3, 2017, at 11:36 AM, Andrew Geissler <geissonator@gmail.com> wrote:
> 
> On Thu, Feb 2, 2017 at 6:51 PM, Joel Stanley <joel@jms.id.au> wrote:
>> On Wed, Feb 1, 2017 at 5:09 AM, Rick Altherr via openbmc
>> <openbmc@lists.ozlabs.org> wrote:
>>> openbmc/openbmc commit 1ed6fe335cda50cf60b7afddbe530077a1b25d27 includes
>>> the initrd in the kernel image.  Update the flash layout used by OpenBMC
>>> dts accordingly.  This is required for OpenBMC's kernel update mechanism
>>> to work as the kernel image now exceeds the size of the original kernel
>>> partition.
>> 
>> Brad, Patrick: This change will mean new kernels can't boot on old
>> flash layouts, and vice versa.
>> 
>> All users will need to do a full-flash update to move to this version,
>> and a full flash update to downgrade.
>> 
>> Are we ok to proceed?
> 
> Ack, we just went through this with the last update and all hit
> https://github.com/openbmc/openbmc/issues/1030.  It was pretty
> disruptive for all of us in the lab needing to pull the chips and
> manually flash each.  This is would be fine if we can just flash the
> <system>.all.tar and all works ok, but that was not what we found in
> https://github.com/openbmc/openbmc/issues/1030.
> 
>> Cheers,
>> 
>> Joel
>> 
>>> 
>>> Signed-off-by: Rick Altherr <raltherr@google.com>
>>> ---
>>> arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 6 +-----
>>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>> 
>>> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>>> index 65095a40a203..4bcfd1bf8dc5 100644
>>> --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>>> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi
>>> @@ -12,13 +12,9 @@
>>>                                        label = "u-boot-env";
>>>                                };
>>>                                kernel@80000 {
>>> -                                       reg = < 0x80000 0x280000 >;
>>> +                                       reg = < 0x80000 0x440000 >;
>>>                                        label = "kernel";
>>>                                };
>>> -                               initramfs@300000 {
>>> -                                       reg = < 0x300000 0x1c0000 >;
>>> -                                       label = "initramfs";
>>> -                               };
>>>                                rofs@0c0000 {
>>>                                        reg = < 0x4c0000 0x1740000 >;
>>>                                        label = "rofs";
>>> --
>>> 2.11.0.483.g087da7b7c-goog
>>> 
>>> _______________________________________________
>>> openbmc mailing list
>>> openbmc@lists.ozlabs.org
>>> https://lists.ozlabs.org/listinfo/openbmc
>> _______________________________________________
>> openbmc mailing list
>> openbmc@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/openbmc
> _______________________________________________
> openbmc mailing list
> openbmc@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Xo Wang]

On Fri, Feb 3, 2017 at 8:44 AM, Brad Bishop <bradleyb@fuzziesquirrel.com> wrote:
> I’m not suggesting one way or the other as far as how to proceed but I don’t
> think pulling chips is ever necessary.  You can always netboot and flash the
> entire image image that way.
>

The hack we've been using for whole-image updates here on non-netboot
BMCs is to use flashcp/dd of=mtdblock0/pflash to erase and program the
BMC flash, then assert the hotswap reset GPIO.

It saves a bit of time rebooting and is reliable, but feels dirty every time.

xo

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Joel Stanley]

On Thu, Feb 9, 2017 at 9:36 AM, Xo Wang via openbmc
<openbmc@lists.ozlabs.org> wrote:
> On Fri, Feb 3, 2017 at 8:44 AM, Brad Bishop <bradleyb@fuzziesquirrel.com> wrote:
>> I’m not suggesting one way or the other as far as how to proceed but I don’t
>> think pulling chips is ever necessary.  You can always netboot and flash the
>> entire image image that way.
>>
>
> The hack we've been using for whole-image updates here on non-netboot
> BMCs is to use flashcp/dd of=mtdblock0/pflash to erase and program the
> BMC flash, then assert the hotswap reset GPIO.
>
> It saves a bit of time rebooting and is reliable, but feels dirty every time.

I was waiting for some more acks but it's been a week now so time is up.

I will merge this change today.

Cheers,

Joel

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

On Thu, Feb 09, 2017 at 10:43:11AM +1030, Joel Stanley wrote:
> I was waiting for some more acks but it's been a week now so time is up.
> 
> I will merge this change today.
> 
> Cheers,
> 
> Joel

I've been out on vacation for a week so just seeing this.  We have to
make this change anyhow, but we should probably discuss what the upgrade
options are before we bump the kernel pointer in openbmc/openbmc.

-- 
Patrick Williams

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH linux] dts: aspeed: merge initrd into kernel in flash layout

[Patrick Williams]

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]

On Fri, Feb 03, 2017 at 10:36:39AM -0600, Andrew Geissler wrote:
> Ack, we just went through this with the last update and all hit
> https://github.com/openbmc/openbmc/issues/1030.  It was pretty
> disruptive for all of us in the lab needing to pull the chips and
> manually flash each.  This is would be fine if we can just flash the
> <system>.all.tar and all works ok, but that was not what we found in
> https://github.com/openbmc/openbmc/issues/1030.

In the issue you referenced, Milton mentioned rewriting the whole flash.
The <system>.all.tar should be that.  Is this simply a problem with the
REST API or manually putting the <system>.all.tar into /run/initramfs
also not work? [1]

[1]: https://github.com/openbmc/docs/blob/master/code-update.md#update-from-the-openbmc-shell

-- 
Patrick Williams

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]