Re: [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs

[Igor Mammedov]

On Thu, 15 Feb 2018 13:17:50 +
Peter Maydell  wrote:

> On 15 February 2018 at 13:04, Philippe Mathieu-Daudé  wrote:
> > Hi Peter,
> >
> > On 02/15/2018 08:29 AM, Peter Maydell wrote:  
> >> On 2 February 2018 at 00:42, Alistair Francis
> >>  wrote:  
> >>> List all possible valid CPU options.
> >>>
> >>> Signed-off-by: Alistair Francis 
> >>> Reviewed-by: Philippe Mathieu-Daudé 
> >>> ---
> >>>
> >>> V5:
> >>>  - Use cpu_model names
> >>> V4:
> >>>  - Remove spaces
> >>> V3:
> >>>  - Add static property
> >>> V2:
> >>>  - Fix the indentation
> >>>
> >>>  hw/arm/raspi.c | 7 +++
> >>>  1 file changed, 7 insertions(+)
> >>>
> >>> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> >>> index cd5fa8c3dc..745a880726 100644
> >>> --- a/hw/arm/raspi.c
> >>> +++ b/hw/arm/raspi.c
> >>> @@ -158,6 +158,11 @@ static void raspi2_init(MachineState *machine)
> >>>  setup_boot(machine, 2, machine->ram_size - vcram_size);
> >>>  }
> >>>
> >>> +static const char *raspi2_valid_cpus[] = {
> >>> +"cortex-a7",
> >>> +NULL
> >>> +};  
> >>
> >> Is this definitely right? Looking at the code, the raspi2 board
> >> creates a TYPE_BCM2836, and that creates cortex-a15 CPUs...  
> >
> > The BCM2836 use a cortex-a7 but this cpu was not available at the time
> > of this commit (bad5623690b) and was added later in dcf578ed8ce "The A7
> > is very similar to the A15."
> >
> > I can prepare a patch for it to apply before this series.  
> 
> I noticed after I'd written that comment that patch 3 in this
> series does exactly the change to cortex-a7...
anyways this series, needs not to depend MachineState::cpu_model,
removal of which is queued in Eduardo's tree.

It seems we can't find consensus on how to deal with cpu_model names
in boards code [1/6].

> 
> thanks
> -- PMM

Re: [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs

[Peter Maydell]

On 15 February 2018 at 13:04, Philippe Mathieu-Daudé  wrote:
> Hi Peter,
>
> On 02/15/2018 08:29 AM, Peter Maydell wrote:
>> On 2 February 2018 at 00:42, Alistair Francis
>>  wrote:
>>> List all possible valid CPU options.
>>>
>>> Signed-off-by: Alistair Francis 
>>> Reviewed-by: Philippe Mathieu-Daudé 
>>> ---
>>>
>>> V5:
>>>  - Use cpu_model names
>>> V4:
>>>  - Remove spaces
>>> V3:
>>>  - Add static property
>>> V2:
>>>  - Fix the indentation
>>>
>>>  hw/arm/raspi.c | 7 +++
>>>  1 file changed, 7 insertions(+)
>>>
>>> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
>>> index cd5fa8c3dc..745a880726 100644
>>> --- a/hw/arm/raspi.c
>>> +++ b/hw/arm/raspi.c
>>> @@ -158,6 +158,11 @@ static void raspi2_init(MachineState *machine)
>>>  setup_boot(machine, 2, machine->ram_size - vcram_size);
>>>  }
>>>
>>> +static const char *raspi2_valid_cpus[] = {
>>> +"cortex-a7",
>>> +NULL
>>> +};
>>
>> Is this definitely right? Looking at the code, the raspi2 board
>> creates a TYPE_BCM2836, and that creates cortex-a15 CPUs...
>
> The BCM2836 use a cortex-a7 but this cpu was not available at the time
> of this commit (bad5623690b) and was added later in dcf578ed8ce "The A7
> is very similar to the A15."
>
> I can prepare a patch for it to apply before this series.

I noticed after I'd written that comment that patch 3 in this
series does exactly the change to cortex-a7...

thanks
-- PMM

Re: [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs

[Philippe Mathieu-Daudé]

Hi Peter,

On 02/15/2018 08:29 AM, Peter Maydell wrote:
> On 2 February 2018 at 00:42, Alistair Francis
>  wrote:
>> List all possible valid CPU options.
>>
>> Signed-off-by: Alistair Francis 
>> Reviewed-by: Philippe Mathieu-Daudé 
>> ---
>>
>> V5:
>>  - Use cpu_model names
>> V4:
>>  - Remove spaces
>> V3:
>>  - Add static property
>> V2:
>>  - Fix the indentation
>>
>>  hw/arm/raspi.c | 7 +++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
>> index cd5fa8c3dc..745a880726 100644
>> --- a/hw/arm/raspi.c
>> +++ b/hw/arm/raspi.c
>> @@ -158,6 +158,11 @@ static void raspi2_init(MachineState *machine)
>>  setup_boot(machine, 2, machine->ram_size - vcram_size);
>>  }
>>
>> +static const char *raspi2_valid_cpus[] = {
>> +"cortex-a7",
>> +NULL
>> +};
> 
> Is this definitely right? Looking at the code, the raspi2 board
> creates a TYPE_BCM2836, and that creates cortex-a15 CPUs...

The BCM2836 use a cortex-a7 but this cpu was not available at the time
of this commit (bad5623690b) and was added later in dcf578ed8ce "The A7
is very similar to the A15."

I can prepare a patch for it to apply before this series.

> 
> thanks
> -- PMM
> 

Re: [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs

[Peter Maydell]

On 2 February 2018 at 00:42, Alistair Francis
 wrote:
> List all possible valid CPU options.
>
> Signed-off-by: Alistair Francis 
> Reviewed-by: Philippe Mathieu-Daudé 
> ---
>
> V5:
>  - Use cpu_model names
> V4:
>  - Remove spaces
> V3:
>  - Add static property
> V2:
>  - Fix the indentation
>
>  hw/arm/raspi.c | 7 +++
>  1 file changed, 7 insertions(+)
>
> diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
> index cd5fa8c3dc..745a880726 100644
> --- a/hw/arm/raspi.c
> +++ b/hw/arm/raspi.c
> @@ -158,6 +158,11 @@ static void raspi2_init(MachineState *machine)
>  setup_boot(machine, 2, machine->ram_size - vcram_size);
>  }
>
> +static const char *raspi2_valid_cpus[] = {
> +"cortex-a7",
> +NULL
> +};

Is this definitely right? Looking at the code, the raspi2 board
creates a TYPE_BCM2836, and that creates cortex-a15 CPUs...

thanks
-- PMM

[Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs

[Alistair Francis]

List all possible valid CPU options.

Signed-off-by: Alistair Francis 
Reviewed-by: Philippe Mathieu-Daudé 
---

V5:
 - Use cpu_model names
V4:
 - Remove spaces
V3:
 - Add static property
V2:
 - Fix the indentation

 hw/arm/raspi.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index cd5fa8c3dc..745a880726 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -158,6 +158,11 @@ static void raspi2_init(MachineState *machine)
 setup_boot(machine, 2, machine->ram_size - vcram_size);
 }
 
+static const char *raspi2_valid_cpus[] = {
+"cortex-a7",
+NULL
+};
+
 static void raspi2_machine_init(MachineClass *mc)
 {
 mc->desc = "Raspberry Pi 2";
@@ -171,5 +176,7 @@ static void raspi2_machine_init(MachineClass *mc)
 mc->default_cpus = BCM2836_NCPUS;
 mc->default_ram_size = 1024 * 1024 * 1024;
 mc->ignore_memory_transaction_failures = true;
+mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
+mc->valid_cpu_types = raspi2_valid_cpus;
 };
 DEFINE_MACHINE("raspi2", raspi2_machine_init)
-- 
2.14.1