Commit ce14710f authored by Markus Armbruster's avatar Markus Armbruster
Browse files

pflash: Clean up after commit 368a354f, part 2 



Our pflash devices are simplistically modelled has having
"num-blocks" sectors of equal size "sector-length".  Real hardware
commonly has sectors of different sizes.  How our "sector-length"
property is related to the physical device's multiple sector sizes
is unclear.

Helper functions pflash_cfi01_register() and pflash_cfi02_register()
create a pflash device, set properties including "sector-length" and
"num-blocks", and realize.  They take parameters @size, @sector_len
and @nb_blocs.

QOMification left parameter @size unused.  Obviously, @size should
match @sector_len and @nb_blocs, i.e. size == sector_len * nb_blocs.
All callers satisfy this.

Remove @nb_blocs and compute it from @size and @sector_len.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20190308094610.21210-16-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 940d5b13

hw/arm/collie.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * GNU GPL, version 2 or (at your option) any later version.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/hw.h"

#include "hw/sysbus.h"

#include "hw/boards.h"
@@ -37,12 +38,12 @@ static void collie_init(MachineState *machine) 
    dinfo = drive_get(IF_PFLASH, 0, 0);

    pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,

                    dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);



    dinfo = drive_get(IF_PFLASH, 0, 1);

    pflash_cfi01_register(SA_CS1, "collie.fl2", 0x02000000,

                    dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                    (64 * 1024), 512, 4, 0x00, 0x00, 0x00, 0x00, 0);

                    64 * KiB, 4, 0x00, 0x00, 0x00, 0x00, 0);



    sysbus_create_simple("scoop", 0x40800000, NULL);

hw/arm/digic_boards.c

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, 


    pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE,

                          NULL, FLASH_K8P3215UQB_SECTOR_SIZE,

                          FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_SIZE,

                          DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE,

                          4,

                          0x00EC, 0x007E, 0x0003, 0x0001,

hw/arm/gumstix.c

+2 −4
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static void connex_init(MachineState *machine) 
#endif

    if (!pflash_cfi01_register(0x00000000, "connext.rom", connex_rom,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                               sector_len, connex_rom / sector_len,

                               2, 0, 0, 0, 0, be)) {

                               sector_len, 2, 0, 0, 0, 0, be)) {

        error_report("Error registering flash memory");

        exit(1);

    }
@@ -111,8 +110,7 @@ static void verdex_init(MachineState *machine) 
#endif

    if (!pflash_cfi01_register(0x00000000, "verdex.rom", verdex_rom,

                               dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,

                               sector_len, verdex_rom / sector_len,

                               2, 0, 0, 0, 0, be)) {

                               sector_len, 2, 0, 0, 0, 0, be)) {

        error_report("Error registering flash memory");

        exit(1);

    }

hw/arm/mainstone.c

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, 
                                   i ? "mainstone.flash1" : "mainstone.flash0",

                                   MAINSTONE_FLASH,

                                   blk_by_legacy_dinfo(dinfo),

                                   sector_len, MAINSTONE_FLASH / sector_len,

                                   4, 0, 0, 0, 0, be)) {

                                   sector_len, 4, 0, 0, 0, 0, be)) {

            error_report("Error registering flash memory");

            exit(1);

        }

hw/arm/musicpal.c

+2 −2
Original line number Diff line number Diff line
@@ -1637,14 +1637,14 @@ static void musicpal_init(MachineState *machine) 
#ifdef TARGET_WORDS_BIGENDIAN

        pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,

                              "musicpal.flash", flash_size,

                              blk, 0x10000, (flash_size + 0xffff) >> 16,

                              blk, 0x10000,

                              MP_FLASH_SIZE_MAX / flash_size,

                              2, 0x00BF, 0x236D, 0x0000, 0x0000,

                              0x5555, 0x2AAA, 1);

#else

        pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX,

                              "musicpal.flash", flash_size,

                              blk, 0x10000, (flash_size + 0xffff) >> 16,

                              blk, 0x10000,

                              MP_FLASH_SIZE_MAX / flash_size,

                              2, 0x00BF, 0x236D, 0x0000, 0x0000,

                              0x5555, 0x2AAA, 0);