ppc/pnv: Introduce a LPC FW memory region attribute to map the PNOR
This to map the PNOR from the machine init handler directly and finish the cleanup of the LPC model. Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20210126171059.307867-8-clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
8304ab7905
commit
032c226bc6
11
hw/ppc/pnv.c
11
hw/ppc/pnv.c
|
@ -871,6 +871,14 @@ static void pnv_init(MachineState *machine)
|
||||||
pnv_ipmi_bt_init(pnv->isa_bus, pnv->bmc, 10);
|
pnv_ipmi_bt_init(pnv->isa_bus, pnv->bmc, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The PNOR is mapped on the LPC FW address space by the BMC.
|
||||||
|
* Since we can not reach the remote BMC machine with LPC memops,
|
||||||
|
* map it always for now.
|
||||||
|
*/
|
||||||
|
memory_region_add_subregion(pnv->chips[0]->fw_mr, PNOR_SPI_OFFSET,
|
||||||
|
&pnv->pnor->mmio);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OpenPOWER systems use a IPMI SEL Event message to notify the
|
* OpenPOWER systems use a IPMI SEL Event message to notify the
|
||||||
* host to powerdown
|
* host to powerdown
|
||||||
|
@ -1150,6 +1158,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)
|
||||||
qdev_realize(DEVICE(&chip8->lpc), NULL, &error_fatal);
|
qdev_realize(DEVICE(&chip8->lpc), NULL, &error_fatal);
|
||||||
pnv_xscom_add_subregion(chip, PNV_XSCOM_LPC_BASE, &chip8->lpc.xscom_regs);
|
pnv_xscom_add_subregion(chip, PNV_XSCOM_LPC_BASE, &chip8->lpc.xscom_regs);
|
||||||
|
|
||||||
|
chip->fw_mr = &chip8->lpc.isa_fw;
|
||||||
chip->dt_isa_nodename = g_strdup_printf("/xscom@%" PRIx64 "/isa@%x",
|
chip->dt_isa_nodename = g_strdup_printf("/xscom@%" PRIx64 "/isa@%x",
|
||||||
(uint64_t) PNV_XSCOM_BASE(chip),
|
(uint64_t) PNV_XSCOM_BASE(chip),
|
||||||
PNV_XSCOM_LPC_BASE);
|
PNV_XSCOM_LPC_BASE);
|
||||||
|
@ -1479,6 +1488,7 @@ static void pnv_chip_power9_realize(DeviceState *dev, Error **errp)
|
||||||
memory_region_add_subregion(get_system_memory(), PNV9_LPCM_BASE(chip),
|
memory_region_add_subregion(get_system_memory(), PNV9_LPCM_BASE(chip),
|
||||||
&chip9->lpc.xscom_regs);
|
&chip9->lpc.xscom_regs);
|
||||||
|
|
||||||
|
chip->fw_mr = &chip9->lpc.isa_fw;
|
||||||
chip->dt_isa_nodename = g_strdup_printf("/lpcm-opb@%" PRIx64 "/lpc@0",
|
chip->dt_isa_nodename = g_strdup_printf("/lpcm-opb@%" PRIx64 "/lpc@0",
|
||||||
(uint64_t) PNV9_LPCM_BASE(chip));
|
(uint64_t) PNV9_LPCM_BASE(chip));
|
||||||
|
|
||||||
|
@ -1592,6 +1602,7 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
|
||||||
memory_region_add_subregion(get_system_memory(), PNV10_LPCM_BASE(chip),
|
memory_region_add_subregion(get_system_memory(), PNV10_LPCM_BASE(chip),
|
||||||
&chip10->lpc.xscom_regs);
|
&chip10->lpc.xscom_regs);
|
||||||
|
|
||||||
|
chip->fw_mr = &chip10->lpc.isa_fw;
|
||||||
chip->dt_isa_nodename = g_strdup_printf("/lpcm-opb@%" PRIx64 "/lpc@0",
|
chip->dt_isa_nodename = g_strdup_printf("/lpcm-opb@%" PRIx64 "/lpc@0",
|
||||||
(uint64_t) PNV10_LPCM_BASE(chip));
|
(uint64_t) PNV10_LPCM_BASE(chip));
|
||||||
}
|
}
|
||||||
|
|
|
@ -824,7 +824,6 @@ ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp)
|
||||||
ISABus *isa_bus;
|
ISABus *isa_bus;
|
||||||
qemu_irq *irqs;
|
qemu_irq *irqs;
|
||||||
qemu_irq_handler handler;
|
qemu_irq_handler handler;
|
||||||
PnvMachineState *pnv = PNV_MACHINE(qdev_get_machine());
|
|
||||||
|
|
||||||
/* let isa_bus_new() create its own bridge on SysBus otherwise
|
/* let isa_bus_new() create its own bridge on SysBus otherwise
|
||||||
* devices specified on the command line won't find the bus and
|
* devices specified on the command line won't find the bus and
|
||||||
|
@ -850,11 +849,5 @@ ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp)
|
||||||
|
|
||||||
isa_bus_irqs(isa_bus, irqs);
|
isa_bus_irqs(isa_bus, irqs);
|
||||||
|
|
||||||
/*
|
|
||||||
* TODO: Map PNOR on the LPC FW address space on demand ?
|
|
||||||
*/
|
|
||||||
memory_region_add_subregion(&lpc->isa_fw, PNOR_SPI_OFFSET,
|
|
||||||
&pnv->pnor->mmio);
|
|
||||||
|
|
||||||
return isa_bus;
|
return isa_bus;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ struct PnvChip {
|
||||||
MemoryRegion xscom;
|
MemoryRegion xscom;
|
||||||
AddressSpace xscom_as;
|
AddressSpace xscom_as;
|
||||||
|
|
||||||
|
MemoryRegion *fw_mr;
|
||||||
gchar *dt_isa_nodename;
|
gchar *dt_isa_nodename;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue