mbox series

[PULL,SUBSYSTEM,qemu-pseries] pseries: Update SLOF firmware image

Message ID 20211114005111.515543-1-aik@ozlabs.ru
State New
Headers show
Series [PULL,SUBSYSTEM,qemu-pseries] pseries: Update SLOF firmware image | expand

Pull-request

git@github.com:aik/qemu.git tags/qemu-slof-20211112

Message

Alexey Kardashevskiy Nov. 14, 2021, 12:51 a.m. UTC
The following changes since commit d139786e1b3d67991e6cb49a8a59bb2182350285:

  ppc/mmu_helper.c: do not truncate 'ea' in booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)

are available in the Git repository at:

  git@github.com:aik/qemu.git tags/qemu-slof-20211112

for you to fetch changes up to 73944a4bf4ab259b489af8128b4aec525484d642:

  pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)

----------------------------------------------------------------
Alexey Kardashevskiy (1):
      pseries: Update SLOF firmware image

 pc-bios/README   |   2 +-
 pc-bios/slof.bin | Bin 991744 -> 991920 bytes
 roms/SLOF        |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)


*** Note: this is not for master, this is for pseries

This has really just one fix from Stefan, the rest is housekeeping.

The full changelog is:

Alexey Kardashevskiy (3):
      Revert "make: Define default rule for .c when V=1 or V=2"
      js2x: Fix compile and cleanup
      version: update to 20211112

Stefan Berger (1):
      tcgbios: Disable platform hierarchy in case of failure

Thomas Huth (8):
      Mention the CR vs. LF problem in the documentation
      slof/fs/accept: Replace TABs with spaces
      Fix the URL to the Linux kernel coding style
      lib/libc/README.txt: Fix "cannel" typo
      travis.yml: Fix keywords
      travis.yml: Update to Focal Fossa
      travis.yml: Compile-test the qemu build
      Silence some trivial compiler warning in the js2x code

Comments

Cédric Le Goater Nov. 16, 2021, 4:46 p.m. UTC | #1
On 11/14/21 01:51, Alexey Kardashevskiy wrote:
> The following changes since commit d139786e1b3d67991e6cb49a8a59bb2182350285:
> 
>    ppc/mmu_helper.c: do not truncate 'ea' in booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
> 
> are available in the Git repository at:
> 
>    git@github.com:aik/qemu.git tags/qemu-slof-20211112
> 
> for you to fetch changes up to 73944a4bf4ab259b489af8128b4aec525484d642:
> 
>    pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
> 
> ----------------------------------------------------------------
> Alexey Kardashevskiy (1):
>        pseries: Update SLOF firmware image
> 
>   pc-bios/README   |   2 +-
>   pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>   roms/SLOF        |   2 +-
>   3 files changed, 2 insertions(+), 2 deletions(-)

Queued for 7.0.

Thanks,

C.
Philippe Mathieu-Daudé Nov. 16, 2021, 5:12 p.m. UTC | #2
On 11/16/21 17:46, Cédric Le Goater wrote:
> On 11/14/21 01:51, Alexey Kardashevskiy wrote:
>> The following changes since commit
>> d139786e1b3d67991e6cb49a8a59bb2182350285:
>>
>>    ppc/mmu_helper.c: do not truncate 'ea' in
>> booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
>>
>> are available in the Git repository at:
>>
>>    git@github.com:aik/qemu.git tags/qemu-slof-20211112
>>
>> for you to fetch changes up to 73944a4bf4ab259b489af8128b4aec525484d642:
>>
>>    pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
>>
>> ----------------------------------------------------------------
>> Alexey Kardashevskiy (1):
>>        pseries: Update SLOF firmware image
>>
>>   pc-bios/README   |   2 +-
>>   pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>>   roms/SLOF        |   2 +-
>>   3 files changed, 2 insertions(+), 2 deletions(-)
> 
> Queued for 7.0.

I am not sure this is a good idea, as this will make bisection
painful over the release tag.

Alexey, do you mind reposting after v7.0 is released?
Richard Henderson Nov. 16, 2021, 5:28 p.m. UTC | #3
On 11/16/21 6:12 PM, Philippe Mathieu-Daudé wrote:
> On 11/16/21 17:46, Cédric Le Goater wrote:
>> On 11/14/21 01:51, Alexey Kardashevskiy wrote:
>>> The following changes since commit
>>> d139786e1b3d67991e6cb49a8a59bb2182350285:
>>>
>>>     ppc/mmu_helper.c: do not truncate 'ea' in
>>> booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>     git@github.com:aik/qemu.git tags/qemu-slof-20211112
>>>
>>> for you to fetch changes up to 73944a4bf4ab259b489af8128b4aec525484d642:
>>>
>>>     pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
>>>
>>> ----------------------------------------------------------------
>>> Alexey Kardashevskiy (1):
>>>         pseries: Update SLOF firmware image
>>>
>>>    pc-bios/README   |   2 +-
>>>    pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>>>    roms/SLOF        |   2 +-
>>>    3 files changed, 2 insertions(+), 2 deletions(-)
>>
>> Queued for 7.0.
> 
> I am not sure this is a good idea, as this will make bisection
> painful over the release tag.

It is my understanding that Cedric will rebase for the mainline PR.  At least that's how 
David was handling subsystem pulls.


r~
Cédric Le Goater Nov. 16, 2021, 5:30 p.m. UTC | #4
On 11/16/21 18:28, Richard Henderson wrote:
> On 11/16/21 6:12 PM, Philippe Mathieu-Daudé wrote:
>> On 11/16/21 17:46, Cédric Le Goater wrote:
>>> On 11/14/21 01:51, Alexey Kardashevskiy wrote:
>>>> The following changes since commit
>>>> d139786e1b3d67991e6cb49a8a59bb2182350285:
>>>>
>>>>     ppc/mmu_helper.c: do not truncate 'ea' in
>>>> booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>     git@github.com:aik/qemu.git tags/qemu-slof-20211112
>>>>
>>>> for you to fetch changes up to 73944a4bf4ab259b489af8128b4aec525484d642:
>>>>
>>>>     pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
>>>>
>>>> ----------------------------------------------------------------
>>>> Alexey Kardashevskiy (1):
>>>>         pseries: Update SLOF firmware image
>>>>
>>>>    pc-bios/README   |   2 +-
>>>>    pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>>>>    roms/SLOF        |   2 +-
>>>>    3 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> Queued for 7.0.
>>
>> I am not sure this is a good idea, as this will make bisection
>> painful over the release tag.
> 
> It is my understanding that Cedric will rebase for the mainline PR.  
> At least that's how David was handling subsystem pulls.

Yes. I don't plan to send a PR on tree without rebasing. I am just
collecting now.

Thanks,

C.
Philippe Mathieu-Daudé Nov. 16, 2021, 5:57 p.m. UTC | #5
On 11/16/21 18:30, Cédric Le Goater wrote:
> On 11/16/21 18:28, Richard Henderson wrote:
>> On 11/16/21 6:12 PM, Philippe Mathieu-Daudé wrote:
>>> On 11/16/21 17:46, Cédric Le Goater wrote:
>>>> On 11/14/21 01:51, Alexey Kardashevskiy wrote:
>>>>> The following changes since commit
>>>>> d139786e1b3d67991e6cb49a8a59bb2182350285:
>>>>>
>>>>>     ppc/mmu_helper.c: do not truncate 'ea' in
>>>>> booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>>     git@github.com:aik/qemu.git tags/qemu-slof-20211112
>>>>>
>>>>> for you to fetch changes up to
>>>>> 73944a4bf4ab259b489af8128b4aec525484d642:
>>>>>
>>>>>     pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Alexey Kardashevskiy (1):
>>>>>         pseries: Update SLOF firmware image
>>>>>
>>>>>    pc-bios/README   |   2 +-
>>>>>    pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>>>>>    roms/SLOF        |   2 +-
>>>>>    3 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> Queued for 7.0.
>>>
>>> I am not sure this is a good idea, as this will make bisection
>>> painful over the release tag.
>>
>> It is my understanding that Cedric will rebase for the mainline PR. 
>> At least that's how David was handling subsystem pulls.
> 
> Yes. I don't plan to send a PR on tree without rebasing. I am just
> collecting now.

Oh this is not a signed subsystem pull request, so you can rebase, OK.
Cédric Le Goater Nov. 16, 2021, 5:59 p.m. UTC | #6
>>>>> Queued for 7.0.
>>>>
>>>> I am not sure this is a good idea, as this will make bisection
>>>> painful over the release tag.
>>>
>>> It is my understanding that Cedric will rebase for the mainline PR.
>>> At least that's how David was handling subsystem pulls.
>>
>> Yes. I don't plan to send a PR on tree without rebasing. I am just
>> collecting now.
> 
> Oh this is not a signed subsystem pull request, so you can rebase, OK.

I didn't know that. I understand your concern now.

Thanks,

C.
Alexey Kardashevskiy Nov. 16, 2021, 10:48 p.m. UTC | #7
On 17/11/2021 04:28, Richard Henderson wrote:
> On 11/16/21 6:12 PM, Philippe Mathieu-Daudé wrote:
>> On 11/16/21 17:46, Cédric Le Goater wrote:
>>> On 11/14/21 01:51, Alexey Kardashevskiy wrote:
>>>> The following changes since commit
>>>> d139786e1b3d67991e6cb49a8a59bb2182350285:
>>>>
>>>>     ppc/mmu_helper.c: do not truncate 'ea' in
>>>> booke206_invalidate_ea_tlb() (2021-11-11 11:35:13 +0100)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>     git@github.com:aik/qemu.git tags/qemu-slof-20211112
>>>>
>>>> for you to fetch changes up to 
>>>> 73944a4bf4ab259b489af8128b4aec525484d642:
>>>>
>>>>     pseries: Update SLOF firmware image (2021-11-13 14:47:56 +1100)
>>>>
>>>> ----------------------------------------------------------------
>>>> Alexey Kardashevskiy (1):
>>>>         pseries: Update SLOF firmware image
>>>>
>>>>    pc-bios/README   |   2 +-
>>>>    pc-bios/slof.bin | Bin 991744 -> 991920 bytes
>>>>    roms/SLOF        |   2 +-
>>>>    3 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> Queued for 7.0.
>>
>> I am not sure this is a good idea, as this will make bisection
>> painful over the release tag.
> 
> It is my understanding that Cedric will rebase for the mainline PR.  At 
> least that's how David was handling subsystem pulls.

Yup. I am doing SLOF updates this way for ages after diifs became quite 
huge to make mailman barfing on the size, and the "subsystem" in the 
subj was the way to reduce the noise Peter had to respond to :)

btw should I be signing those? I am not now.
Richard Henderson Nov. 17, 2021, 8:39 a.m. UTC | #8
On 11/16/21 11:48 PM, Alexey Kardashevskiy wrote:
> Yup. I am doing SLOF updates this way for ages after diifs became quite huge to make 
> mailman barfing on the size, and the "subsystem" in the subj was the way to reduce the 
> noise Peter had to respond to :)
> 
> btw should I be signing those? I am not now.

You could if you and Cedric want to do so (is it really Alexey sending the sub pr and not 
an impostor with access to the same github account?), but it will not leave a permanent 
record in the mainline history, because the merge object with the signature will be 
removed by any rebase.


r~
Cédric Le Goater Nov. 17, 2021, 8:49 a.m. UTC | #9
On 11/17/21 09:39, Richard Henderson wrote:
> On 11/16/21 11:48 PM, Alexey Kardashevskiy wrote:
>> Yup. I am doing SLOF updates this way for ages after diifs became quite huge to make mailman barfing on the size, and the "subsystem" in the subj was the way to reduce the noise Peter had to respond to :)
>>
>> btw should I be signing those? I am not now.
> 
> You could if you and Cedric want to do so (is it really Alexey sending the sub pr and not an impostor with access to the same github account?), but it will not leave a permanent record in the mainline history, because the merge object with the signature will be removed by any rebase.


Yes. I just noticed that the merge commit is lost :

2021-11-09 15:50 +0100 Christophe Lombard                     o [ppc-7.0] {origin/ppc-7.0} pci-host: Allow extended config space access for PowerNV PHB4 model
2021-11-16 17:39 +0100 Cédric Le Goater                       M─┐ Merge tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0
2021-11-13 14:47 +1100 Alexey Kardashevskiy                   │ o pseries: Update SLOF firmware image
2021-11-12 12:28 +0100 Richard Henderson                      M─│─┐ Merge tag 'pull-ppc-20211112' of https://github.com/legoater/qemu into staging
2021-11-10 17:25 -0300 Daniel Henrique Barboza                │ o─┘ {origin/ppc-for-upstream} {origin/ppc-next} <pull-ppc-20211112> ppc/mmu_helper.c: do not truncate 'ea
...

After rebase :

2021-11-09 15:50 +0100 Christophe Lombard                     o [ppc-7.0] pci-host: Allow extended config space access for PowerNV PHB4 model
2021-11-13 14:47 +1100 Alexey Kardashevskiy                   o pseries: Update SLOF firmware image
2021-11-16 21:07 +0100 Richard Henderson                      o Update version for v6.2.0-rc1 release
2021-11-16 18:55 +0100 Richard Henderson                      M─┐ Merge tag 'pull-nbd-2021-11-16' of https://repo.or.cz/qemu/ericb into staging
...

Alexey's commit appears in the list with only his SoB and we loose :

     Merge tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0

     * tag 'qemu-slof-20211112' of github.com:aik/qemu:
       pseries: Update SLOF firmware image

     Signed-off-by: Cédric Le Goater <clg@kaod.org>

which I find interesting to identify where the SLOF blob is coming from.


Thanks,

C.
Alexey Kardashevskiy Nov. 17, 2021, 11:43 a.m. UTC | #10
On 17/11/2021 19:49, Cédric Le Goater wrote:
> On 11/17/21 09:39, Richard Henderson wrote:
>> On 11/16/21 11:48 PM, Alexey Kardashevskiy wrote:
>>> Yup. I am doing SLOF updates this way for ages after diifs became 
>>> quite huge to make mailman barfing on the size, and the "subsystem" 
>>> in the subj was the way to reduce the noise Peter had to respond to :)
>>>
>>> btw should I be signing those? I am not now.
>>
>> You could if you and Cedric want to do so (is it really Alexey sending 
>> the sub pr and not an impostor with access to the same github 
>> account?), but it will not leave a permanent record in the mainline 
>> history, because the merge object with the signature will be removed 
>> by any rebase.
> 
> 
> Yes. I just noticed that the merge commit is lost :
> 
> 2021-11-09 15:50 +0100 Christophe Lombard                     o 
> [ppc-7.0] {origin/ppc-7.0} pci-host: Allow extended config space access 
> for PowerNV PHB4 model
> 2021-11-16 17:39 +0100 Cédric Le Goater                       M─┐ Merge 
> tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0
> 2021-11-13 14:47 +1100 Alexey Kardashevskiy                   │ o 
> pseries: Update SLOF firmware image
> 2021-11-12 12:28 +0100 Richard Henderson                      M─│─┐ 
> Merge tag 'pull-ppc-20211112' of https://github.com/legoater/qemu into 
> staging
> 2021-11-10 17:25 -0300 Daniel Henrique Barboza                │ o─┘ 
> {origin/ppc-for-upstream} {origin/ppc-next} <pull-ppc-20211112> 
> ppc/mmu_helper.c: do not truncate 'ea
> ...
> 
> After rebase :
> 
> 2021-11-09 15:50 +0100 Christophe Lombard                     o 
> [ppc-7.0] pci-host: Allow extended config space access for PowerNV PHB4 
> model
> 2021-11-13 14:47 +1100 Alexey Kardashevskiy                   o pseries: 
> Update SLOF firmware image
> 2021-11-16 21:07 +0100 Richard Henderson                      o Update 
> version for v6.2.0-rc1 release
> 2021-11-16 18:55 +0100 Richard Henderson                      M─┐ Merge 
> tag 'pull-nbd-2021-11-16' of https://repo.or.cz/qemu/ericb into staging
> ...
> 
> Alexey's commit appears in the list with only his SoB and we loose :
> 
>      Merge tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0
> 
>      * tag 'qemu-slof-20211112' of github.com:aik/qemu:
>        pseries: Update SLOF firmware image
> 
>      Signed-off-by: Cédric Le Goater <clg@kaod.org>
> 
> which I find interesting to identify where the SLOF blob is coming from.


Well, this is a feature of "git rebase" :) The only reliably treceable 
way I see is storing slof.bin in the SLOF tree.
Philippe Mathieu-Daudé Nov. 17, 2021, 12:01 p.m. UTC | #11
On 11/17/21 09:49, Cédric Le Goater wrote:
> On 11/17/21 09:39, Richard Henderson wrote:
>> On 11/16/21 11:48 PM, Alexey Kardashevskiy wrote:
>>> Yup. I am doing SLOF updates this way for ages after diifs became
>>> quite huge to make mailman barfing on the size, and the "subsystem"
>>> in the subj was the way to reduce the noise Peter had to respond to :)
>>>
>>> btw should I be signing those? I am not now.
>>
>> You could if you and Cedric want to do so (is it really Alexey sending
>> the sub pr and not an impostor with access to the same github
>> account?), but it will not leave a permanent record in the mainline
>> history, because the merge object with the signature will be removed
>> by any rebase.
> 
> 
> Yes. I just noticed that the merge commit is lost :
> 
> 2021-11-09 15:50 +0100 Christophe Lombard                     o
> [ppc-7.0] {origin/ppc-7.0} pci-host: Allow extended config space access
> for PowerNV PHB4 model
> 2021-11-16 17:39 +0100 Cédric Le Goater                       M─┐ Merge
> tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0
> 2021-11-13 14:47 +1100 Alexey Kardashevskiy                   │ o
> pseries: Update SLOF firmware image
> 2021-11-12 12:28 +0100 Richard Henderson                      M─│─┐
> Merge tag 'pull-ppc-20211112' of https://github.com/legoater/qemu into
> staging
> 2021-11-10 17:25 -0300 Daniel Henrique Barboza                │ o─┘
> {origin/ppc-for-upstream} {origin/ppc-next} <pull-ppc-20211112>
> ppc/mmu_helper.c: do not truncate 'ea
> ...
> 
> After rebase :
> 
> 2021-11-09 15:50 +0100 Christophe Lombard                     o
> [ppc-7.0] pci-host: Allow extended config space access for PowerNV PHB4
> model
> 2021-11-13 14:47 +1100 Alexey Kardashevskiy                   o pseries:
> Update SLOF firmware image
> 2021-11-16 21:07 +0100 Richard Henderson                      o Update
> version for v6.2.0-rc1 release
> 2021-11-16 18:55 +0100 Richard Henderson                      M─┐ Merge
> tag 'pull-nbd-2021-11-16' of https://repo.or.cz/qemu/ericb into staging
> ...

No need to rebase if Alexey sends his pullreq once v6.2 is out.

> Alexey's commit appears in the list with only his SoB and we loose :
> 
>     Merge tag 'qemu-slof-20211112' of github.com:aik/qemu into ppc-7.0
> 
>     * tag 'qemu-slof-20211112' of github.com:aik/qemu:
>       pseries: Update SLOF firmware image
> 
>     Signed-off-by: Cédric Le Goater <clg@kaod.org>
> 
> which I find interesting to identify where the SLOF blob is coming from.
> 
> 
> Thanks,
> 
> C.
>
Cédric Le Goater Nov. 18, 2021, 2:42 p.m. UTC | #12
> No need to rebase if Alexey sends his pullreq once v6.2 is out.

Yeah. We might do that Alexey. No hurries.

Thanks,

C.