From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDLuP-0004QX-Un for qemu-devel@nongnu.org; Mon, 08 Apr 2019 00:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDLuO-0007b0-1u for qemu-devel@nongnu.org; Mon, 08 Apr 2019 00:29:25 -0400 Date: Mon, 8 Apr 2019 13:40:54 +1000 From: David Gibson Message-ID: <20190408034054.GB16627@umbus.fritz.box> References: <155448184292.8446.8225650773162648595.stgit@bahia.lan> <155448184841.8446.13959787238854054119.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="p4qYPpj5QlsIQJ0K" Content-Disposition: inline In-Reply-To: <155448184841.8446.13959787238854054119.stgit@bahia.lan> Subject: Re: [Qemu-devel] [PATCH for-4.1 2/2] spapr: Drop duplicate code in LSI mapping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org --p4qYPpj5QlsIQJ0K Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 05, 2019 at 06:30:48PM +0200, Greg Kurz wrote: > LSI mapping in spapr currently open-codes standard PCI swizzling. It thus > duplicates the code of pci_swizzle_map_irq_fn(). >=20 > Expose the swizzling formula so that it can be used with a slot number > when building the device tree. Simply drop pci_spapr_map_irq() and call > pci_swizzle_map_irq_fn() instead. >=20 > Signed-off-by: Greg Kurz Applied to ppc-for-4.1, thanks. > --- > hw/pci/pci.c | 2 +- > hw/ppc/spapr_pci.c | 24 ++++-------------------- > include/hw/pci/pci.h | 4 ++++ > 3 files changed, 9 insertions(+), 21 deletions(-) >=20 > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 35451c1e9987..bb52bafd8d1c 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1532,7 +1532,7 @@ void pci_device_set_intx_routing_notifier(PCIDevice= *dev, > */ > int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin) > { > - return (pin + PCI_SLOT(pci_dev->devfn)) % PCI_NUM_PINS; > + return pci_swizzle(PCI_SLOT(pci_dev->devfn), pin); > } > =20 > /***********************************************************/ > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index c70688a0dc23..26850d0b94f4 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -719,26 +719,10 @@ param_error_exit: > rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); > } > =20 > -static int pci_spapr_swizzle(int slot, int pin) > -{ > - return (slot + pin) % PCI_NUM_PINS; > -} > - > -static int pci_spapr_map_irq(PCIDevice *pci_dev, int irq_num) > -{ > - /* > - * Here we need to convert pci_dev + irq_num to some unique value > - * which is less than number of IRQs on the specific bus (4). We > - * use standard PCI swizzling, that is (slot number + pin number) > - * % 4. > - */ > - return pci_spapr_swizzle(PCI_SLOT(pci_dev->devfn), irq_num); > -} > - > static void pci_spapr_set_irq(void *opaque, int irq_num, int level) > { > /* > - * Here we use the number returned by pci_spapr_map_irq to find a > + * Here we use the number returned by pci_swizzle_map_irq_fn to find= a > * corresponding qemu_irq. > */ > SpaprPhbState *phb =3D opaque; > @@ -1744,7 +1728,7 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) > &sphb->iowindow); > =20 > bus =3D pci_register_root_bus(dev, NULL, > - pci_spapr_set_irq, pci_spapr_map_irq, sp= hb, > + pci_spapr_set_irq, pci_swizzle_map_irq_f= n, sphb, > &sphb->memspace, &sphb->iospace, > PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_= BUS); > phb->bus =3D bus; > @@ -2236,14 +2220,14 @@ int spapr_populate_pci_dt(SpaprPhbState *phb, uin= t32_t intc_phandle, void *fdt, > } > =20 > /* Build the interrupt-map, this must matches what is done > - * in pci_spapr_map_irq > + * in pci_swizzle_map_irq_fn > */ > _FDT(fdt_setprop(fdt, bus_off, "interrupt-map-mask", > &interrupt_map_mask, sizeof(interrupt_map_mask))); > for (i =3D 0; i < PCI_SLOT_MAX; i++) { > for (j =3D 0; j < PCI_NUM_PINS; j++) { > uint32_t *irqmap =3D interrupt_map[i*PCI_NUM_PINS + j]; > - int lsi_num =3D pci_spapr_swizzle(i, j); > + int lsi_num =3D pci_swizzle(i, j); > =20 > irqmap[0] =3D cpu_to_be32(b_ddddd(i)|b_fff(0)); > irqmap[1] =3D 0; > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index d87f5f93e9cd..033b2145d98c 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -411,6 +411,10 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_ir= q, pci_map_irq_fn map_irq, > void pci_bus_irqs_cleanup(PCIBus *bus); > int pci_bus_get_irq_level(PCIBus *bus, int irq_num); > /* 0 <=3D pin <=3D 3 0 =3D INTA, 1 =3D INTB, 2 =3D INTC, 3 =3D INTD */ > +static inline int pci_swizzle(int slot, int pin) > +{ > + return (slot + pin) % PCI_NUM_PINS; > +} > int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin); > PCIBus *pci_register_root_bus(DeviceState *parent, const char *name, > pci_set_irq_fn set_irq, pci_map_irq_fn map= _irq, >=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 --p4qYPpj5QlsIQJ0K Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlyqwsYACgkQbDjKyiDZ s5IwpxAAppz+IzdjeSeESxLQxOTaahy8VUZMgnB4shRIIm/stPiP8k5CIwiSVr8L p+ZXAlBNTPkg2V1m0Wpo4/lX3Qu9AwM57mG8dfH6xNDKhPFfzeXvSb2v+E28f8kV l/Q8tmiFymGtFzTs1ivi894h+/MosrfNm8fxLNewNPyGji2rQEDFBo8x3DOvUHEK n5OEN2bXvqRkHevVzTlWeXj43EBi8OYIU2vMsW/s9lJdZJB6Ln8kWGyoAuskbf65 8YAqQR5G+1jg3i3Kl4OsRdHNCy1ineYoA2OuiH4w3WqQsxBNuT+ccMQTc5HaICmq snGjti7z4jcPi8RbWNU2M76JCg3ZZjaAfTalLrWBBTlHP7kazcl33aDvEMC+WO0y BDHlKyrmjn6KBghlwuxQ0zI65OwARLZSNo9vKKZE9YveADwt5Exi4N6OnNGOGbhX eFYZHfLLpnMKI2kPJYzMaHJBzqc7BM29CUQqtkGuUrb4LIP9GZZF10gnoiZpzHsa 5+H6YeaqWpb0o6xw5YkieCtU9RnDgb4ItEyfLThYKedGq2/njVTBBGP051EmNLE+ jtr2QDiJ6cGKQvu7niJZKR5bQ4HwBcO8XYIMb0ZOlAkGCO49lIa29Z6lf3AR0wCG KDkqipLlsDudZhfY971EbK2tZiNZ6Rvtxmo1EErs/Z7MbuKciNU= =JQO/ -----END PGP SIGNATURE----- --p4qYPpj5QlsIQJ0K-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72AA4C282CE for ; Mon, 8 Apr 2019 04:34:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22FDA20880 for ; Mon, 8 Apr 2019 04:34:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="jZLtQwsH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22FDA20880 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:47172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDLzB-0007qr-CQ for qemu-devel@archiver.kernel.org; Mon, 08 Apr 2019 00:34:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDLuP-0004QX-Un for qemu-devel@nongnu.org; Mon, 08 Apr 2019 00:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDLuO-0007b0-1u for qemu-devel@nongnu.org; Mon, 08 Apr 2019 00:29:25 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:41821 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hDLuK-0007WU-IQ; Mon, 08 Apr 2019 00:29:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44cy9f5h8gz9sQr; Mon, 8 Apr 2019 14:29:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1554697750; bh=7VMMobTxlVcxrCQQXel9bpYMc7iifbv9++aeD3RNsis=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jZLtQwsHe5g3ru1ptOWU6I2IgaHYiZUsA0s5nArHlYHrRBwz4GlNym+MS+ka3DSvC LWTZqrgWKl5PEo2/VZC5cP+8cqA3gp8z9lqqlLkS8l1BCBOOuzAlPLf/ADoQV8olZ7 rtlKXYhqcYeSMQe2zZPPBrDVuNLkROJgIT1POThc= Date: Mon, 8 Apr 2019 13:40:54 +1000 From: David Gibson To: Greg Kurz Message-ID: <20190408034054.GB16627@umbus.fritz.box> References: <155448184292.8446.8225650773162648595.stgit@bahia.lan> <155448184841.8446.13959787238854054119.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="p4qYPpj5QlsIQJ0K" Content-Disposition: inline In-Reply-To: <155448184841.8446.13959787238854054119.stgit@bahia.lan> User-Agent: Mutt/1.11.3 (2019-02-01) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: Re: [Qemu-devel] [PATCH for-4.1 2/2] spapr: Drop duplicate code in LSI mapping X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190408034054.kVlfBaio-PnpfN3nzNzAObQDjK9w9sqMZhdVVVzD6hw@z> --p4qYPpj5QlsIQJ0K Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 05, 2019 at 06:30:48PM +0200, Greg Kurz wrote: > LSI mapping in spapr currently open-codes standard PCI swizzling. It thus > duplicates the code of pci_swizzle_map_irq_fn(). >=20 > Expose the swizzling formula so that it can be used with a slot number > when building the device tree. Simply drop pci_spapr_map_irq() and call > pci_swizzle_map_irq_fn() instead. >=20 > Signed-off-by: Greg Kurz Applied to ppc-for-4.1, thanks. > --- > hw/pci/pci.c | 2 +- > hw/ppc/spapr_pci.c | 24 ++++-------------------- > include/hw/pci/pci.h | 4 ++++ > 3 files changed, 9 insertions(+), 21 deletions(-) >=20 > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 35451c1e9987..bb52bafd8d1c 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1532,7 +1532,7 @@ void pci_device_set_intx_routing_notifier(PCIDevice= *dev, > */ > int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin) > { > - return (pin + PCI_SLOT(pci_dev->devfn)) % PCI_NUM_PINS; > + return pci_swizzle(PCI_SLOT(pci_dev->devfn), pin); > } > =20 > /***********************************************************/ > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index c70688a0dc23..26850d0b94f4 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -719,26 +719,10 @@ param_error_exit: > rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); > } > =20 > -static int pci_spapr_swizzle(int slot, int pin) > -{ > - return (slot + pin) % PCI_NUM_PINS; > -} > - > -static int pci_spapr_map_irq(PCIDevice *pci_dev, int irq_num) > -{ > - /* > - * Here we need to convert pci_dev + irq_num to some unique value > - * which is less than number of IRQs on the specific bus (4). We > - * use standard PCI swizzling, that is (slot number + pin number) > - * % 4. > - */ > - return pci_spapr_swizzle(PCI_SLOT(pci_dev->devfn), irq_num); > -} > - > static void pci_spapr_set_irq(void *opaque, int irq_num, int level) > { > /* > - * Here we use the number returned by pci_spapr_map_irq to find a > + * Here we use the number returned by pci_swizzle_map_irq_fn to find= a > * corresponding qemu_irq. > */ > SpaprPhbState *phb =3D opaque; > @@ -1744,7 +1728,7 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) > &sphb->iowindow); > =20 > bus =3D pci_register_root_bus(dev, NULL, > - pci_spapr_set_irq, pci_spapr_map_irq, sp= hb, > + pci_spapr_set_irq, pci_swizzle_map_irq_f= n, sphb, > &sphb->memspace, &sphb->iospace, > PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_= BUS); > phb->bus =3D bus; > @@ -2236,14 +2220,14 @@ int spapr_populate_pci_dt(SpaprPhbState *phb, uin= t32_t intc_phandle, void *fdt, > } > =20 > /* Build the interrupt-map, this must matches what is done > - * in pci_spapr_map_irq > + * in pci_swizzle_map_irq_fn > */ > _FDT(fdt_setprop(fdt, bus_off, "interrupt-map-mask", > &interrupt_map_mask, sizeof(interrupt_map_mask))); > for (i =3D 0; i < PCI_SLOT_MAX; i++) { > for (j =3D 0; j < PCI_NUM_PINS; j++) { > uint32_t *irqmap =3D interrupt_map[i*PCI_NUM_PINS + j]; > - int lsi_num =3D pci_spapr_swizzle(i, j); > + int lsi_num =3D pci_swizzle(i, j); > =20 > irqmap[0] =3D cpu_to_be32(b_ddddd(i)|b_fff(0)); > irqmap[1] =3D 0; > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index d87f5f93e9cd..033b2145d98c 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -411,6 +411,10 @@ void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_ir= q, pci_map_irq_fn map_irq, > void pci_bus_irqs_cleanup(PCIBus *bus); > int pci_bus_get_irq_level(PCIBus *bus, int irq_num); > /* 0 <=3D pin <=3D 3 0 =3D INTA, 1 =3D INTB, 2 =3D INTC, 3 =3D INTD */ > +static inline int pci_swizzle(int slot, int pin) > +{ > + return (slot + pin) % PCI_NUM_PINS; > +} > int pci_swizzle_map_irq_fn(PCIDevice *pci_dev, int pin); > PCIBus *pci_register_root_bus(DeviceState *parent, const char *name, > pci_set_irq_fn set_irq, pci_map_irq_fn map= _irq, >=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 --p4qYPpj5QlsIQJ0K Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlyqwsYACgkQbDjKyiDZ s5IwpxAAppz+IzdjeSeESxLQxOTaahy8VUZMgnB4shRIIm/stPiP8k5CIwiSVr8L p+ZXAlBNTPkg2V1m0Wpo4/lX3Qu9AwM57mG8dfH6xNDKhPFfzeXvSb2v+E28f8kV l/Q8tmiFymGtFzTs1ivi894h+/MosrfNm8fxLNewNPyGji2rQEDFBo8x3DOvUHEK n5OEN2bXvqRkHevVzTlWeXj43EBi8OYIU2vMsW/s9lJdZJB6Ln8kWGyoAuskbf65 8YAqQR5G+1jg3i3Kl4OsRdHNCy1ineYoA2OuiH4w3WqQsxBNuT+ccMQTc5HaICmq snGjti7z4jcPi8RbWNU2M76JCg3ZZjaAfTalLrWBBTlHP7kazcl33aDvEMC+WO0y BDHlKyrmjn6KBghlwuxQ0zI65OwARLZSNo9vKKZE9YveADwt5Exi4N6OnNGOGbhX eFYZHfLLpnMKI2kPJYzMaHJBzqc7BM29CUQqtkGuUrb4LIP9GZZF10gnoiZpzHsa 5+H6YeaqWpb0o6xw5YkieCtU9RnDgb4ItEyfLThYKedGq2/njVTBBGP051EmNLE+ jtr2QDiJ6cGKQvu7niJZKR5bQ4HwBcO8XYIMb0ZOlAkGCO49lIa29Z6lf3AR0wCG KDkqipLlsDudZhfY971EbK2tZiNZ6Rvtxmo1EErs/Z7MbuKciNU= =JQO/ -----END PGP SIGNATURE----- --p4qYPpj5QlsIQJ0K--