From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zc3LT-0003LO-5u for qemu-devel@nongnu.org; Tue, 15 Sep 2015 23:25:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zc3LQ-0007dv-8u for qemu-devel@nongnu.org; Tue, 15 Sep 2015 23:25:19 -0400 Date: Wed, 16 Sep 2015 12:58:37 +1000 From: David Gibson Message-ID: <20150916025837.GX2547@voom.fritz.box> References: <1442352899-19991-1-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dZJOqldIUwtPuZvk" Content-Disposition: inline In-Reply-To: <1442352899-19991-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH] spapr_pci: fix device tree props for MSI/MSI-X List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Nikunj A Dadhania , qemu-stable@nongnu.org --dZJOqldIUwtPuZvk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 15, 2015 at 04:34:59PM -0500, Michael Roth wrote: > PAPR requires ibm,req#msi and ibm,req#msi-x to be present in the > device node to define the number of msi/msi-x interrupts the device > supports, respectively. >=20 > Currently we have ibm,req#msi-x hardcoded to a non-sensical constant > that happens to be 2, and are missing ibm,req#msi entirely. The result > of that is that msi-x capable devices get limited to 2 msi-x > interrupts (which can impact performance), and msi-only devices likely > wouldn't work at all. Additionally, if devices expect a minimum that > exceeds 2, the guest driver may fail to load entirely. >=20 > SLOF still owns the generation of these properties at boot-time > (although other device properties have since been offloaded to QEMU), > but for hotplugged devices we rely on the values generated by QEMU > and thus hit the limitations above. >=20 > Fix this by generating these properties in QEMU as expected by guests. >=20 > In the future it may make sense to modify SLOF to pass through these > values directly as we do with other props since we're duplicating SLOF > code. >=20 > Cc: qemu-ppc@nongnu.org > Cc: qemu-stable@nongnu.org > Cc: David Gibson > Cc: Nikunj A Dadhania > Signed-off-by: Michael Roth Applied to spapr-next, thanks. > --- > hw/ppc/spapr_pci.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 2782856..8e9edff 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -1012,6 +1012,7 @@ static int spapr_populate_pci_child_dt(PCIDevice *d= ev, void *fdt, int offset, > int pci_status, err; > char *buf =3D NULL; > uint32_t drc_index =3D spapr_phb_get_pci_drc_index(sphb, dev); > + uint32_t max_msi, max_msix; > =20 > if (pci_default_read_config(dev, PCI_HEADER_TYPE, 1) =3D=3D > PCI_HEADER_TYPE_BRIDGE) { > @@ -1092,8 +1093,15 @@ static int spapr_populate_pci_child_dt(PCIDevice *= dev, void *fdt, int offset, > RESOURCE_CELLS_ADDRESS)); > _FDT(fdt_setprop_cell(fdt, offset, "#size-cells", > RESOURCE_CELLS_SIZE)); > - _FDT(fdt_setprop_cell(fdt, offset, "ibm,req#msi-x", > - RESOURCE_CELLS_SIZE)); > + > + max_msi =3D msi_nr_vectors_allocated(dev); > + if (max_msi) { > + _FDT(fdt_setprop_cell(fdt, offset, "ibm,req#msi", max_msi)); > + } > + max_msix =3D dev->msix_entries_nr; > + if (max_msix) { > + _FDT(fdt_setprop_cell(fdt, offset, "ibm,req#msi-x", max_msix)); > + } > =20 > populate_resource_props(dev, &rp); > _FDT(fdt_setprop(fdt, offset, "reg", (uint8_t *)rp.reg, rp.reg_len)); --=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 --dZJOqldIUwtPuZvk Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJV+NrdAAoJEGw4ysog2bOSIgwQALVgjNbl0yAOefx7kSwSoX3N EplD6K7vWQpAwM/ArBxFH4r1KCprYsF0wYGPTvTrwrk5TNC+yvFuf09lkalo9Mya HXcTt1lEer+xZ8t2RUCOMn3RaZEFZsoXVh8AsNctOKF5feshdpJUj+AaNXjQdoqc xt+LRnuCPEK4jvBufUZ3y7QDHe2Tix0vxSYcDi6hYfshw8aYwaDUJcuYP4i+aZRY E9TGkjHOvtAjx5W9VnJePCxveOnPcTWWLuMcKV579J8v6Lr964yOg7ppWgYvufG8 rEySe6xGgRbFGE2/wJnTimKZh8cVxj3YK7c+IFYDhRWhIv2F3hgX8LyPtOiklJo5 246W1x3ZkccDG7dlGr1AWTL5O11ZxbRZin09elR3jKMqjcOiY5GSs8XPeh1fOxXJ 1ZJw23GRoh1RFViJFJN6r8SQDt8wfJkTavA8yOHBbNNAfGu6JyYen1G+QtU1sU5B mi3bzGl2Ym5VmJWg1oh3TBJ5opQKlYJPgrVQWvuAESucJ4meni+2iRpi8qQq8JTA 8dlYeOd8FbOg9RHrhN81BB/FAngO+RuaqAK3ctYYxWAxjMvOVXW3DJugV50P2fbP DyXvL4oLPeRSWdiwTBLPHT7QPrj00kD/J20bki5sY/VeWHbChFJsZY0k0c3S7DfE glvVn4haRBgnpBpsj2D0 =bsr0 -----END PGP SIGNATURE----- --dZJOqldIUwtPuZvk--