On Thu, Mar 07, 2019 at 11:35:46PM +0100, Cédric Le Goater wrote: > To improve OPAL/skiboot support. We don't need to strictly model these > XSCOM accesses. > > Signed-off-by: Cédric Le Goater Applied, thanks. > --- > hw/ppc/pnv_xscom.c | 33 +++++++++++++++++++++++++++------ > 1 file changed, 27 insertions(+), 6 deletions(-) > > diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c > index 46fae41f32b0..c285ef514e88 100644 > --- a/hw/ppc/pnv_xscom.c > +++ b/hw/ppc/pnv_xscom.c > @@ -64,11 +64,21 @@ static uint64_t xscom_read_default(PnvChip *chip, uint32_t pcba) > switch (pcba) { > case 0xf000f: > return PNV_CHIP_GET_CLASS(chip)->chip_cfam_id; > + case 0x18002: /* ECID2 */ > + return 0; > + > case 0x1010c00: /* PIBAM FIR */ > case 0x1010c03: /* PIBAM FIR MASK */ > - case 0x2020007: /* ADU stuff */ > - case 0x2020009: /* ADU stuff */ > - case 0x202000f: /* ADU stuff */ > + > + /* P9 xscom reset */ > + case 0x0090018: /* Receive status reg */ > + case 0x0090012: /* log register */ > + case 0x0090013: /* error register */ > + > + /* P8 xscom reset */ > + case 0x2020007: /* ADU stuff, log register */ > + case 0x2020009: /* ADU stuff, error register */ > + case 0x202000f: /* ADU stuff, receive status register*/ > return 0; > case 0x2013f00: /* PBA stuff */ > case 0x2013f01: /* PBA stuff */ > @@ -100,9 +110,20 @@ static bool xscom_write_default(PnvChip *chip, uint32_t pcba, uint64_t val) > case 0x1010c03: /* PIBAM FIR MASK */ > case 0x1010c04: /* PIBAM FIR MASK */ > case 0x1010c05: /* PIBAM FIR MASK */ > - case 0x2020007: /* ADU stuff */ > - case 0x2020009: /* ADU stuff */ > - case 0x202000f: /* ADU stuff */ > + /* P9 xscom reset */ > + case 0x0090018: /* Receive status reg */ > + case 0x0090012: /* log register */ > + case 0x0090013: /* error register */ > + > + /* P8 xscom reset */ > + case 0x2020007: /* ADU stuff, log register */ > + case 0x2020009: /* ADU stuff, error register */ > + case 0x202000f: /* ADU stuff, receive status register*/ > + > + case 0x2013028: /* CAPP stuff */ > + case 0x201302a: /* CAPP stuff */ > + case 0x2013801: /* CAPP stuff */ > + case 0x2013802: /* CAPP stuff */ > return true; > default: > return false; -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson