Re: [Qemu-devel] [PATCH v4 13/15] mips_malta: Clean up definition of flash memory size somewhat

[Philippe Mathieu-Daudé]

On 3/8/19 1:32 PM, Philippe Mathieu-Daudé wrote:
> On 3/8/19 10:46 AM, Markus Armbruster wrote:
>> pflash_cfi01_register() takes a size in bytes, a block size in bytes
>> and a number of blocks.  mips_malta_init() passes BIOS_SIZE, 65536,
>> FLASH_SIZE >> 16.  Actually consistent only because BIOS_SIZE (defined
>> in include/hw/mips/bios.h as (4 * MiB)) matches FLASH_SIZE (defined
>> locally as 0x400000).  Confusing all the same.
>>
>> Pass FLASH_SIZE instead of BIOS_SIZE.
>>
>> Cc: Aurelien Jarno <address@hidden>
>> Cc: Aleksandar Rikalo <address@hidden>
>> Signed-off-by: Markus Armbruster <address@hidden>
>> Reviewed-by: Alex Bennée <address@hidden>
>> Reviewed-by: Richard Henderson <address@hidden>
> 
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

Tested-by: Philippe Mathieu-Daudé <address@hidden>

>> ---
>>  hw/mips/mips_malta.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
>> index 4dfe06a1a0..2f20f56458 100644
>> --- a/hw/mips/mips_malta.c
>> +++ b/hw/mips/mips_malta.c
>> @@ -1262,7 +1262,7 @@ void mips_malta_init(MachineState *machine)
>>      /* Load firmware in flash / BIOS. */
>>      dinfo = drive_get(IF_PFLASH, 0, fl_idx);
>>      fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
>> -                               BIOS_SIZE,
>> +                               FLASH_SIZE,
>>                                 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
>>                                 65536, FLASH_SIZE >> 16,
>>                                 4, 0x0000, 0x0000, 0x0000, 0x0000, be);
>>