mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-11 03:24:58 -06:00
ppc/pnv: Add pca9552 to powernv10-rainier for PCIe hotplug power control
The Power Hypervisor code expects to see a pca9552 device connected to the 3rd PNV I2C engine on port 1 at I2C address 0x63 (or left- justified address of 0xC6). This is used by hypervisor code to control PCIe slot power during hotplug events. Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Glenn Miles <milesg@linux.vnet.ibm.com> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
ab8746683c
commit
33467ecb86
3 changed files with 27 additions and 0 deletions
|
@ -32,6 +32,7 @@ config POWERNV
|
||||||
select XIVE
|
select XIVE
|
||||||
select FDT_PPC
|
select FDT_PPC
|
||||||
select PCI_POWERNV
|
select PCI_POWERNV
|
||||||
|
select PCA9552
|
||||||
|
|
||||||
config PPC405
|
config PPC405
|
||||||
bool
|
bool
|
||||||
|
|
25
hw/ppc/pnv.c
25
hw/ppc/pnv.c
|
@ -790,6 +790,7 @@ static void pnv_init(MachineState *machine)
|
||||||
const char *bios_name = machine->firmware ?: FW_FILE_NAME;
|
const char *bios_name = machine->firmware ?: FW_FILE_NAME;
|
||||||
PnvMachineState *pnv = PNV_MACHINE(machine);
|
PnvMachineState *pnv = PNV_MACHINE(machine);
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||||
|
PnvMachineClass *pmc = PNV_MACHINE_GET_CLASS(machine);
|
||||||
char *fw_filename;
|
char *fw_filename;
|
||||||
long fw_size;
|
long fw_size;
|
||||||
uint64_t chip_ram_start = 0;
|
uint64_t chip_ram_start = 0;
|
||||||
|
@ -979,6 +980,13 @@ static void pnv_init(MachineState *machine)
|
||||||
*/
|
*/
|
||||||
pnv->powerdown_notifier.notify = pnv_powerdown_notify;
|
pnv->powerdown_notifier.notify = pnv_powerdown_notify;
|
||||||
qemu_register_powerdown_notifier(&pnv->powerdown_notifier);
|
qemu_register_powerdown_notifier(&pnv->powerdown_notifier);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Create/Connect any machine-specific I2C devices
|
||||||
|
*/
|
||||||
|
if (pmc->i2c_init) {
|
||||||
|
pmc->i2c_init(pnv);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1879,6 +1887,21 @@ static void pnv_chip_power10_realize(DeviceState *dev, Error **errp)
|
||||||
qdev_get_gpio_in(DEVICE(&chip10->psi),
|
qdev_get_gpio_in(DEVICE(&chip10->psi),
|
||||||
PSIHB9_IRQ_SBE_I2C));
|
PSIHB9_IRQ_SBE_I2C));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pnv_rainier_i2c_init(PnvMachineState *pnv)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < pnv->num_chips; i++) {
|
||||||
|
Pnv10Chip *chip10 = PNV10_CHIP(pnv->chips[i]);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Add a PCA9552 I2C device for PCIe hotplug control
|
||||||
|
* to engine 2, bus 1, address 0x63
|
||||||
|
*/
|
||||||
|
i2c_slave_create_simple(chip10->i2c[2].busses[1], "pca9552", 0x63);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t pnv_chip_power10_xscom_pcba(PnvChip *chip, uint64_t addr)
|
static uint32_t pnv_chip_power10_xscom_pcba(PnvChip *chip, uint64_t addr)
|
||||||
|
@ -2286,9 +2309,11 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
|
||||||
static void pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
|
static void pnv_machine_p10_rainier_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
|
PnvMachineClass *pmc = PNV_MACHINE_CLASS(oc);
|
||||||
|
|
||||||
pnv_machine_p10_common_class_init(oc, data);
|
pnv_machine_p10_common_class_init(oc, data);
|
||||||
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10 Rainier";
|
mc->desc = "IBM PowerNV (Non-Virtualized) POWER10 Rainier";
|
||||||
|
pmc->i2c_init = pnv_rainier_i2c_init;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool pnv_machine_get_hb(Object *obj, Error **errp)
|
static bool pnv_machine_get_hb(Object *obj, Error **errp)
|
||||||
|
|
|
@ -76,6 +76,7 @@ struct PnvMachineClass {
|
||||||
int compat_size;
|
int compat_size;
|
||||||
|
|
||||||
void (*dt_power_mgt)(PnvMachineState *pnv, void *fdt);
|
void (*dt_power_mgt)(PnvMachineState *pnv, void *fdt);
|
||||||
|
void (*i2c_init)(PnvMachineState *pnv);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct PnvMachineState {
|
struct PnvMachineState {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue