[v5,16/20] Boot Linux Console Test for ppc64 + pseries: use power8 CPU model
diff mbox series

Message ID 20190312171824.5134-17-crosa@redhat.com
State New
Headers show
Series
  • Acceptance Tests: target architecture support
Related show

Commit Message

Cleber Rosa March 12, 2019, 5:18 p.m. UTC
Because of the changes in da874d90a, the Fedora 29 kernel doesn't
boot with the modified version of the Power9 CPU.  Let's set the
power8 CPU instead.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
CC: Cédric Le Goater <clg@kaod.org>
CC: David Gibson <david@gibson.dropbear.id.au>
---
 tests/acceptance/boot_linux_console.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Cédric Le Goater March 12, 2019, 8:46 p.m. UTC | #1
On 3/12/19 6:18 PM, Cleber Rosa wrote:
> Because of the changes in da874d90a, the Fedora 29 kernel doesn't
> boot with the modified version of the Power9 CPU.  Let's set the
> power8 CPU instead.
> 
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> CC: Cédric Le Goater <clg@kaod.org>
> CC: David Gibson <david@gibson.dropbear.id.au>

Looks fine to me as POWER9 support still lacks a skiboot update.

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

Thanks,

C.

> ---
>  tests/acceptance/boot_linux_console.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
> index edc7722abe..50ced6549b 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -149,7 +149,8 @@ class BootLinuxConsole(Test):
>          self.vm.set_console()
>          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
>          self.vm.add_args('-kernel', kernel_path,
> -                         '-append', kernel_command_line)
> +                         '-append', kernel_command_line,
> +                         '-cpu', 'power8')
>          self.vm.launch()
>          console_pattern = 'Kernel command line: %s' % kernel_command_line
>          self.wait_for_console_pattern(console_pattern)
>
David Gibson March 12, 2019, 11:25 p.m. UTC | #2
On Tue, Mar 12, 2019 at 01:18:20PM -0400, Cleber Rosa wrote:
> Because of the changes in da874d90a, the Fedora 29 kernel doesn't
> boot with the modified version of the Power9 CPU.  Let's set the
> power8 CPU instead.
> 
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> CC: Cédric Le Goater <clg@kaod.org>
> CC: David Gibson <david@gibson.dropbear.id.au>

Nack.

Fedora *should* boot with Power9 on a pseries machine type, which I
think is what you're using here.  We need to fix that bug, rather than
cover it up.

> ---
>  tests/acceptance/boot_linux_console.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
> index edc7722abe..50ced6549b 100644
> --- a/tests/acceptance/boot_linux_console.py
> +++ b/tests/acceptance/boot_linux_console.py
> @@ -149,7 +149,8 @@ class BootLinuxConsole(Test):
>          self.vm.set_console()
>          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
>          self.vm.add_args('-kernel', kernel_path,
> -                         '-append', kernel_command_line)
> +                         '-append', kernel_command_line,
> +                         '-cpu', 'power8')
>          self.vm.launch()
>          console_pattern = 'Kernel command line: %s' % kernel_command_line
>          self.wait_for_console_pattern(console_pattern)
David Gibson March 12, 2019, 11:25 p.m. UTC | #3
On Tue, Mar 12, 2019 at 09:46:14PM +0100, Cédric Le Goater wrote:
> On 3/12/19 6:18 PM, Cleber Rosa wrote:
> > Because of the changes in da874d90a, the Fedora 29 kernel doesn't
> > boot with the modified version of the Power9 CPU.  Let's set the
> > power8 CPU instead.
> > 
> > Signed-off-by: Cleber Rosa <crosa@redhat.com>
> > CC: Cédric Le Goater <clg@kaod.org>
> > CC: David Gibson <david@gibson.dropbear.id.au>
> 
> Looks fine to me as POWER9 support still lacks a skiboot update.

AFAICT this is about a pseries boot, not a powernv boot.

> 
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
> 
> Thanks,
> 
> C.
> 
> > ---
> >  tests/acceptance/boot_linux_console.py | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
> > index edc7722abe..50ced6549b 100644
> > --- a/tests/acceptance/boot_linux_console.py
> > +++ b/tests/acceptance/boot_linux_console.py
> > @@ -149,7 +149,8 @@ class BootLinuxConsole(Test):
> >          self.vm.set_console()
> >          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
> >          self.vm.add_args('-kernel', kernel_path,
> > -                         '-append', kernel_command_line)
> > +                         '-append', kernel_command_line,
> > +                         '-cpu', 'power8')
> >          self.vm.launch()
> >          console_pattern = 'Kernel command line: %s' % kernel_command_line
> >          self.wait_for_console_pattern(console_pattern)
> > 
>
Cleber Rosa March 13, 2019, 12:04 a.m. UTC | #4
On Wed, Mar 13, 2019 at 10:25:27AM +1100, David Gibson wrote:
> On Tue, Mar 12, 2019 at 09:46:14PM +0100, Cédric Le Goater wrote:
> > On 3/12/19 6:18 PM, Cleber Rosa wrote:
> > > Because of the changes in da874d90a, the Fedora 29 kernel doesn't
> > > boot with the modified version of the Power9 CPU.  Let's set the
> > > power8 CPU instead.
> > > 
> > > Signed-off-by: Cleber Rosa <crosa@redhat.com>
> > > CC: Cédric Le Goater <clg@kaod.org>
> > > CC: David Gibson <david@gibson.dropbear.id.au>
> > 
> > Looks fine to me as POWER9 support still lacks a skiboot update.
> 
> AFAICT this is about a pseries boot, not a powernv boot.
>

Yes, it's a pseries machine.

- Cleber.

> > 
> > Reviewed-by: Cédric Le Goater <clg@kaod.org>
> > 
> > Thanks,
> > 
> > C.
> > 
> > > ---
> > >  tests/acceptance/boot_linux_console.py | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
> > > index edc7722abe..50ced6549b 100644
> > > --- a/tests/acceptance/boot_linux_console.py
> > > +++ b/tests/acceptance/boot_linux_console.py
> > > @@ -149,7 +149,8 @@ class BootLinuxConsole(Test):
> > >          self.vm.set_console()
> > >          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
> > >          self.vm.add_args('-kernel', kernel_path,
> > > -                         '-append', kernel_command_line)
> > > +                         '-append', kernel_command_line,
> > > +                         '-cpu', 'power8')
> > >          self.vm.launch()
> > >          console_pattern = 'Kernel command line: %s' % kernel_command_line
> > >          self.wait_for_console_pattern(console_pattern)
> > > 
> > 
> 
> -- 
> David Gibson			| I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
> 				| _way_ _around_!
> http://www.ozlabs.org/~dgibson
Cédric Le Goater March 13, 2019, 6:51 a.m. UTC | #5
On 3/13/19 12:25 AM, David Gibson wrote:
> On Tue, Mar 12, 2019 at 09:46:14PM +0100, Cédric Le Goater wrote:
>> On 3/12/19 6:18 PM, Cleber Rosa wrote:
>>> Because of the changes in da874d90a, the Fedora 29 kernel doesn't
>>> boot with the modified version of the Power9 CPU.  Let's set the
>>> power8 CPU instead.
>>>
>>> Signed-off-by: Cleber Rosa <crosa@redhat.com>
>>> CC: Cédric Le Goater <clg@kaod.org>
>>> CC: David Gibson <david@gibson.dropbear.id.au>
>>
>> Looks fine to me as POWER9 support still lacks a skiboot update.
> 
> AFAICT this is about a pseries boot, not a powernv boot.

yes. I realize that now. I got confused by the other thread. POWER9
should work on pseries. I agree.

C. 

 
>>
>> Reviewed-by: Cédric Le Goater <clg@kaod.org>
>>
>> Thanks,
>>
>> C.
>>
>>> ---
>>>  tests/acceptance/boot_linux_console.py | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
>>> index edc7722abe..50ced6549b 100644
>>> --- a/tests/acceptance/boot_linux_console.py
>>> +++ b/tests/acceptance/boot_linux_console.py
>>> @@ -149,7 +149,8 @@ class BootLinuxConsole(Test):
>>>          self.vm.set_console()
>>>          kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
>>>          self.vm.add_args('-kernel', kernel_path,
>>> -                         '-append', kernel_command_line)
>>> +                         '-append', kernel_command_line,
>>> +                         '-cpu', 'power8')
>>>          self.vm.launch()
>>>          console_pattern = 'Kernel command line: %s' % kernel_command_line
>>>          self.wait_for_console_pattern(console_pattern)
>>>
>>
>

Patch
diff mbox series

diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index edc7722abe..50ced6549b 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -149,7 +149,8 @@  class BootLinuxConsole(Test):
         self.vm.set_console()
         kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE + 'console=hvc0'
         self.vm.add_args('-kernel', kernel_path,
-                         '-append', kernel_command_line)
+                         '-append', kernel_command_line,
+                         '-cpu', 'power8')
         self.vm.launch()
         console_pattern = 'Kernel command line: %s' % kernel_command_line
         self.wait_for_console_pattern(console_pattern)