From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buYMy-00053J-Rg for qemu-devel@nongnu.org; Thu, 13 Oct 2016 01:15:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buYMw-00085r-8m for qemu-devel@nongnu.org; Thu, 13 Oct 2016 01:15:51 -0400 Date: Thu, 13 Oct 2016 11:51:18 +1100 From: David Gibson Message-ID: <20161013005118.GI18039@umbus.fritz.box> References: <1475479496-16158-1-git-send-email-clg@kaod.org> <1475479496-16158-8-git-send-email-clg@kaod.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PMULwz+zIGJzpDN9" Content-Disposition: inline In-Reply-To: <1475479496-16158-8-git-send-email-clg@kaod.org> Subject: Re: [Qemu-devel] [PATCH v4 07/20] ppc/pnv: add XSCOM handlers to PnvCore List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?C=E9dric?= Le Goater Cc: qemu-ppc@nongnu.org, Benjamin Herrenschmidt , qemu-devel@nongnu.org --PMULwz+zIGJzpDN9 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Oct 03, 2016 at 09:24:43AM +0200, C=E9dric Le Goater wrote: > Now that we are using real HW ids for the cores in PowerNV chips, we > can route the XSCOM accesses to them. We just need to attach a > specific XSCOM memory region to each core in the appropriate window > for the core number. >=20 > To start with, let's install the DTS (Digital Thermal Sensor) handlers > which should return 38=B0C for each core. >=20 > Signed-off-by: C=E9dric Le Goater > --- >=20 > Changes since v3: >=20 > - moved to new XSCOM model > - kept the write op on the XSCOM memory region for later use >=20 > Changes since v2: >=20 > - added a XSCOM memory region to handle access to the EX core > registers =20 > - extended the PnvCore object with a XSCOM_INTERFACE so that we can > use pnv_xscom_pcba() and pnv_xscom_addr() to handle XSCOM address > translation. >=20 > hw/ppc/pnv.c | 4 ++++ > hw/ppc/pnv_core.c | 50 ++++++++++++++++++++++++++++++++++++++++= ++++++ > include/hw/ppc/pnv_core.h | 2 ++ > include/hw/ppc/pnv_xscom.h | 19 ++++++++++++++++++ > 4 files changed, 75 insertions(+) >=20 > diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c > index 5e19b6880387..ffe245fe59d2 100644 > --- a/hw/ppc/pnv.c > +++ b/hw/ppc/pnv.c > @@ -620,6 +620,10 @@ static void pnv_chip_realize(DeviceState *dev, Error= **errp) > &error_fatal); > object_unref(OBJECT(pnv_core)); > i++; > + > + memory_region_add_subregion(&chip->xscom, > + PNV_XSCOM_EX_CORE_BASE(core_hwid) << 3, > + &PNV_CORE(pnv_core)->xscom_regs); Might be worth adding some convenience functions for doing the various bits of xscom MR juggling, otherwise this looks fine. > } > g_free(typename); > } > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index d37788f142f4..a1c8a14f06b6 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -19,6 +19,7 @@ > #include "qemu/osdep.h" > #include "sysemu/sysemu.h" > #include "qapi/error.h" > +#include "qemu/log.h" > #include "target-ppc/cpu.h" > #include "hw/ppc/ppc.h" > #include "hw/ppc/pnv.h" > @@ -64,6 +65,51 @@ static void powernv_cpu_init(PowerPCCPU *cpu, Error **= errp) > powernv_cpu_reset(cpu); > } > =20 > +/* > + * These values are read by the PowerNV HW monitors under Linux > + */ > +#define PNV_XSCOM_EX_DTS_RESULT0 0x50000 > +#define PNV_XSCOM_EX_DTS_RESULT1 0x50001 > + > +static uint64_t pnv_core_xscom_read(void *opaque, hwaddr addr, > + unsigned int width) > +{ > + uint32_t offset =3D addr >> 3; > + uint64_t val =3D 0; > + > + /* The result should be 38 C */ > + switch (offset) { > + case PNV_XSCOM_EX_DTS_RESULT0: > + val =3D 0x26f024f023f0000ull; > + break; > + case PNV_XSCOM_EX_DTS_RESULT1: > + val =3D 0x24f000000000000ull; > + break; > + default: > + qemu_log_mask(LOG_UNIMP, "Warning: reading reg=3D0x%" HWADDR_PRI= x, > + addr); > + } > + > + return val; > +} > + > +static void pnv_core_xscom_write(void *opaque, hwaddr addr, uint64_t val, > + unsigned int width) > +{ > + qemu_log_mask(LOG_UNIMP, "Warning: writing to reg=3D0x%" HWADDR_PRIx, > + addr); > +} > + > +static const MemoryRegionOps pnv_core_xscom_ops =3D { > + .read =3D pnv_core_xscom_read, > + .write =3D pnv_core_xscom_write, > + .valid.min_access_size =3D 8, > + .valid.max_access_size =3D 8, > + .impl.min_access_size =3D 8, > + .impl.max_access_size =3D 8, > + .endianness =3D DEVICE_BIG_ENDIAN, > +}; > + > static void pnv_core_realize_child(Object *child, Error **errp) > { > Error *local_err =3D NULL; > @@ -119,6 +165,10 @@ static void pnv_core_realize(DeviceState *dev, Error= **errp) > goto err; > } > } > + > + snprintf(name, sizeof(name), "xscom-core.%d", cc->core_id); > + memory_region_init_io(&pc->xscom_regs, OBJECT(dev), &pnv_core_xscom_= ops, > + pc, name, PNV_XSCOM_EX_CORE_SIZE << 3); > return; > =20 > err: > diff --git a/include/hw/ppc/pnv_core.h b/include/hw/ppc/pnv_core.h > index a151e281c017..2955a41c901f 100644 > --- a/include/hw/ppc/pnv_core.h > +++ b/include/hw/ppc/pnv_core.h > @@ -36,6 +36,8 @@ typedef struct PnvCore { > /*< public >*/ > void *threads; > uint32_t pir; > + > + MemoryRegion xscom_regs; > } PnvCore; > =20 > typedef struct PnvCoreClass { > diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h > index f50eb0bc4099..79975a6cbe46 100644 > --- a/include/hw/ppc/pnv_xscom.h > +++ b/include/hw/ppc/pnv_xscom.h > @@ -41,6 +41,25 @@ typedef struct PnvXScomInterfaceClass { > int (*populate)(PnvXScomInterface *dev, void *fdt, int offset); > } PnvXScomInterfaceClass; > =20 > +/* > + * Layout of the XSCOM PCB addresses of EX core 1 > + * > + * GPIO 0x1100xxxx > + * SCOM 0x1101xxxx > + * OHA 0x1102xxxx > + * CLOCK CTL 0x1103xxxx > + * FIR 0x1104xxxx > + * THERM 0x1105xxxx > + * 0x1106xxxx > + * .. > + * 0x110Exxxx > + * PCB SLAVE 0x110Fxxxx > + */ > + > +#define PNV_XSCOM_EX_BASE 0x10000000 > +#define PNV_XSCOM_EX_CORE_BASE(i) (PNV_XSCOM_EX_BASE | (((uint64_t)i) <<= 24)) > +#define PNV_XSCOM_EX_CORE_SIZE 0x100000 > + > extern void pnv_xscom_realize(PnvChip *chip, Error **errp); > extern int pnv_xscom_populate(PnvChip *chip, void *fdt, int offset); > =20 --=20 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 --PMULwz+zIGJzpDN9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX/tqEAAoJEGw4ysog2bOSLvMP/27UVqVWEr14+w4in/uQ74NF pAqn+eAJZdZyQXWzzsHJC6cyOrdS9ge1LcXPwnT2Ug2MSbHrnZHPO4fRLaFp412y EYbVO2ItTA96ltMTc1nqQFf74vKAQL1oGfFuonmH0AyULXLBz065GiB0BgiOo2Kw 7XE9gEucyY+cHPyPsvDJTuaw/6U0PihZdkUAQ/W87CGJv6fA8lQCmtMwnZhDAiIU 8xAjQdP9MWP+3I4Li9guFSc4xXbQqaRHRSKWQJei1IEgKJkRxdUqDG5WTEpYw+cr WoieIF0v0rdcV9w37LJqZ7tonQZX08PjXvyhRw19ki7TiV+1eF7yrzPovVqNkkRF uS8qcbhahe2uun1pZyKRBszamdx7NfDeuNocFvQltUsXFZ9+I6YeSPankfn0JwVA fNg3s5rW/pBf4ihCbcMuc9kSaTrxiPvzYfne1STszS0m7MKiszoK8mD0APbIzUpI GLwb/oBIGMya4vHo2in5dqfaquZS0pR7/eQ4ZXa0mSWaFdwDZ7JbZfCAMBfxMjlr MSr/gr231PdSIv54j042UdtBMPfHNcQpNJqyYcgGvJLkgMCFMz/oiFL4Jn+44LwV MStonUFQQg6cM5/zvYjZCfCJjHwAo6ISRrwW3m6YffIKas0FqG0JHI5mrspYoJwl 6ggyriv0M4hIRIY8MWeH =A/I8 -----END PGP SIGNATURE----- --PMULwz+zIGJzpDN9--