From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dominic Eschweiler Subject: Re: UIO: missing resource mapping Date: Wed, 18 Jul 2012 12:40:47 +0200 Message-ID: <1342608047.4194.0.camel@blech> References: <4FFE7C1F.7080702@gmx.net> <20120712194432.GA2592@local> <20120712231632.GC9317@redhat.com> <1342166955.6607.5.camel@blech> <20120713132223.GA10959@redhat.com> <1342190571.6607.36.camel@blech> <20120713181953.GA11527@redhat.com> <1342462572.17531.18.camel@blech> <20120716215823.GA7879@local> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: "Michael S. Tsirkin" , Andreas Schallenberg , "linux-kernel@vger.kernel.org" , Greg Kroah-Hartman , kvm@vger.kernel.org To: "Hans J. Koch" Return-path: In-Reply-To: <20120716215823.GA7879@local> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Am Montag, den 16.07.2012, 23:58 +0200 schrieb Hans J. Koch: > Try to hack up a patch to add generic BAR mapping to uio_pci_generic.= c > and post it for review. >=20 Here we go ... >=20 Signed-off-by: Dominic Eschweiler diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c index 0bd08ef..e25991e 100644 --- a/drivers/uio/uio_pci_generic.c +++ b/drivers/uio/uio_pci_generic.c @@ -25,10 +25,12 @@ #include #include =20 -#define DRIVER_VERSION "0.01.0" +#define DRIVER_VERSION "0.02.0" #define DRIVER_AUTHOR "Michael S. Tsirkin " #define DRIVER_DESC "Generic UIO driver for PCI 2.3 devices" =20 +#define DRV_NAME "uio_pci_generic" + struct uio_pci_generic_dev { struct uio_info info; struct pci_dev *pdev; @@ -58,6 +60,7 @@ static int __devinit probe(struct pci_dev *pdev, { struct uio_pci_generic_dev *gdev; int err; + int i; =20 err =3D pci_enable_device(pdev); if (err) { @@ -67,8 +70,7 @@ static int __devinit probe(struct pci_dev *pdev, } =20 if (!pdev->irq) { - dev_warn(&pdev->dev, "No IRQ assigned to device: " - "no support for interrupts?\n"); + dev_warn(&pdev->dev, "No IRQ assigned to device: no support for interrupts?\n"); pci_disable_device(pdev); return -ENODEV; } @@ -91,10 +93,31 @@ static int __devinit probe(struct pci_dev *pdev, gdev->info.handler =3D irqhandler; gdev->pdev =3D pdev; =20 + /* request regions */ + err =3D pci_request_regions(pdev, DRV_NAME); + if (err) { + dev_err(&pdev->dev, "Couldn't get PCI resources, aborting\n"); + return err; + } + + /* create attributes for BAR mappings */ + for (i =3D 0; i < PCI_NUM_RESOURCES; i++) { + if (pdev->resource[i].flags && + (pdev->resource[i].flags & IORESOURCE_MEM)) { + gdev->info.mem[i].addr =3D pci_resource_start(pdev, i); + gdev->info.mem[i].size =3D pci_resource_len(pdev, i); + gdev->info.mem[i].internal_addr =3D NULL; + gdev->info.mem[i].memtype =3D UIO_MEM_PHYS; + } + } + if (uio_register_device(&pdev->dev, &gdev->info)) goto err_register; pci_set_drvdata(pdev, gdev); =20 + pr_info("UIO_PCI_GENERIC : initialized new device (%x %x)\n", + pdev->vendor, pdev->device); + return 0; err_register: kfree(gdev); @@ -107,17 +130,21 @@ err_verify: static void remove(struct pci_dev *pdev) { struct uio_pci_generic_dev *gdev =3D pci_get_drvdata(pdev); - uio_unregister_device(&gdev->info); + + pci_release_regions(pdev); pci_disable_device(pdev); kfree(gdev); + + pr_info("UIO_PCI_GENERIC : removed device (%x %x)\n", + pdev->vendor, pdev->device); } =20 static struct pci_driver driver =3D { - .name =3D "uio_pci_generic", + .name =3D DRV_NAME, .id_table =3D NULL, /* only dynamic id's */ - .probe =3D probe, - .remove =3D remove, + .probe =3D probe, + .remove =3D remove, }; =20 static int __init init(void) --=20 Gru=C3=9F Dominic =46rankfurt Institute for Advanced Studies (FIAS) Ruth-Moufang-Stra=C3=9Fe 1 D-60438 Frankfurt am Main Germany Phone: +49 69 79844114