Re: [PATCH] hw/arm/aspeed: Map the UART5 device unconditionally

[Cédric Le Goater]

On 9/15/20 7:23 PM, Philippe Mathieu-Daudé wrote:
> ping?

It's reviewed : 

  
20200905212415.760452-1-f4bug@amsat.org/">http://patchwork.ozlabs.org/project/qemu-devel/patch/20200905212415.760452-1-f4bug@amsat.org/

I will send a PR when I have more patches.

Thanks,

C. 

> On 9/5/20 11:24 PM, Philippe Mathieu-Daudé wrote:
>> The UART5 is present on the machine regardless there is a
>> character device connected to it. Map it unconditionally.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  hw/arm/aspeed_ast2600.c | 8 +++-----
>>  hw/arm/aspeed_soc.c     | 8 +++-----
>>  2 files changed, 6 insertions(+), 10 deletions(-)
>>
>> diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
>> index 9d95e421435..1450bde7cf2 100644
>> --- a/hw/arm/aspeed_ast2600.c
>> +++ b/hw/arm/aspeed_ast2600.c
>> @@ -325,11 +325,9 @@ static void aspeed_soc_ast2600_realize(DeviceState 
>> *dev, Error **errp)
>>      }
>>  
>>      /* UART - attach an 8250 to the IO space as our UART5 */
>> -    if (serial_hd(0)) {
>> -        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
>> -        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
>> -                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
>> -    }
>> +    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
>> +                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5),
>> +                   38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
>>  
>>      /* I2C */
>>      object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
>> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
>> index 35be126db6f..7eefd54ac07 100644
>> --- a/hw/arm/aspeed_soc.c
>> +++ b/hw/arm/aspeed_soc.c
>> @@ -283,11 +283,9 @@ static void aspeed_soc_realize(DeviceState *dev, Error 
>> **errp)
>>      }
>>  
>>      /* UART - attach an 8250 to the IO space as our UART5 */
>> -    if (serial_hd(0)) {
>> -        qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_DEV_UART5);
>> -        serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
>> -                       uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
>> -    }
>> +    serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2,
>> +                   aspeed_soc_get_irq(s, ASPEED_DEV_UART5), 38400,
>> +                   serial_hd(0), DEVICE_LITTLE_ENDIAN);
>>  
>>      /* I2C */
>>      object_property_set_link(OBJECT(&s->i2c), "dram", OBJECT(s->dram_mr),
>>