mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ppc/pnv_xscom: Move sysbus_mmio_map() call within pnv_xscom_init()

Browse Source 
In order to make the next commit trivial, move sysbus_init_mmio()
calls just before the corresponding sysbus_mmio_map() calls.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20231019131647.19690-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-18 09:49:06 +02:00
parent 90ac3862ff
commit 326f7acb81
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/ppc/pnv.c
View File

@ -1249,8 +1249,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)
assert(chip8->xics); assert(chip8->xics);
/* XSCOM bridge is first */ /* XSCOM bridge is first */
pnv_xscom_init(chip, PNV_XSCOM_SIZE); pnv_xscom_init(chip, PNV_XSCOM_SIZE, PNV_XSCOM_BASE(chip));
sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV_XSCOM_BASE(chip));
pcc->parent_realize(dev, &local_err); pcc->parent_realize(dev, &local_err);
if (local_err) { if (local_err) {
@ -1508,8 +1507,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
/* XSCOM bridge is first */ /* XSCOM bridge is first */
pnv_xscom_init(chip, PNV9_XSCOM_SIZE); pnv_xscom_init(chip, PNV9_XSCOM_SIZE, PNV9_XSCOM_BASE(chip));
sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV9_XSCOM_BASE(chip));
pcc->parent_realize(dev, &local_err); pcc->parent_realize(dev, &local_err);
if (local_err) { if (local_err) {
@ -1719,8 +1717,7 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
/* XSCOM bridge is first */ /* XSCOM bridge is first */
pnv_xscom_init(chip, PNV10_XSCOM_SIZE); pnv_xscom_init(chip, PNV10_XSCOM_SIZE, PNV10_XSCOM_BASE(chip));
sysbus_mmio_map(SYS_BUS_DEVICE(chip), 0, PNV10_XSCOM_BASE(chip));
pcc->parent_realize(dev, &local_err); pcc->parent_realize(dev, &local_err);
if (local_err) { if (local_err) {

3
hw/ppc/pnv_xscom.c
View File

@ -221,7 +221,7 @@ const MemoryRegionOps pnv_xscom_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
void pnv_xscom_init(PnvChip *chip, uint64_t size) void pnv_xscom_init(PnvChip *chip, uint64_t size, hwaddr addr)
{ {
SysBusDevice *sbd = SYS_BUS_DEVICE(chip); SysBusDevice *sbd = SYS_BUS_DEVICE(chip);
char *name; char *name;
@ -230,6 +230,7 @@ void pnv_xscom_init(PnvChip *chip, uint64_t size)
memory_region_init_io(&chip->xscom_mmio, OBJECT(chip), &pnv_xscom_ops, memory_region_init_io(&chip->xscom_mmio, OBJECT(chip), &pnv_xscom_ops,
chip, name, size); chip, name, size);
sysbus_init_mmio(sbd, &chip->xscom_mmio); sysbus_init_mmio(sbd, &chip->xscom_mmio);
sysbus_mmio_map(sbd, 0, addr);
memory_region_init(&chip->xscom, OBJECT(chip), name, size); memory_region_init(&chip->xscom, OBJECT(chip), name, size);
address_space_init(&chip->xscom_as, &chip->xscom, name); address_space_init(&chip->xscom_as, &chip->xscom, name);

2
include/hw/ppc/pnv_xscom.h
View File

@ -170,7 +170,7 @@ struct PnvXScomInterfaceClass {
#define PNV10_XSCOM_PEC_PCI_BASE 0x8010800 /* index goes upwards ... */ #define PNV10_XSCOM_PEC_PCI_BASE 0x8010800 /* index goes upwards ... */
#define PNV10_XSCOM_PEC_PCI_SIZE 0x200 #define PNV10_XSCOM_PEC_PCI_SIZE 0x200
void pnv_xscom_init(PnvChip *chip, uint64_t size); void pnv_xscom_init(PnvChip *chip, uint64_t size, hwaddr addr);
int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset, int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
uint64_t xscom_base, uint64_t xscom_size, uint64_t xscom_base, uint64_t xscom_size,
const char *compat, int compat_size); const char *compat, int compat_size);