parisc: superio: do not use PCI resources before pci_enable_device()
in [Kernel]
|
Prev: CRED: Fix __task_cred()'s lockdep check and banner comment
Next: ftrace: pass KBUILD_CFLAGS to record_mcount.pl
From: James Bottomley on 3 Aug 2010 12:20 On Tue, 2010-08-03 at 19:44 +0400, Kulikov Vasiliy wrote: > drivers/parisc/superio.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c > index f7806d8..c8a36a2 100644 > --- a/drivers/parisc/superio.c > +++ b/drivers/parisc/superio.c > @@ -169,8 +169,6 @@ superio_init(struct pci_dev *pcidev) > /* ...then properly fixup the USB to point at suckyio PIC */ > sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); > > - printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > - pci_name(pdev), pdev->irq); > > pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); > sio->sp1_base &= ~1; > @@ -204,6 +202,9 @@ superio_init(struct pci_dev *pcidev) > ret = pci_enable_device(pdev); > BUG_ON(ret < 0); /* not too much we can do about this... */ > > + printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > + pci_name(pdev), pdev->irq); > + > /* > * Next project is programming the onboard interrupt controllers. > * PDC hasn't done this for us, since it's using polled I/O. This really makes no sense; we want the information printed before we start all the discovery prints, not after. I assume lots of initialisers want this too, so it looks particularly silly not to have pci_name() returning the correct value until enable time. If this is just the name initially assigned may change, this definitely isn't true for parisc, and even for other things, it would be better to print something than nothing. James -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: James Bottomley on 3 Aug 2010 12:40 On Tue, 2010-08-03 at 20:35 +0400, Vasiliy Kulikov wrote: > On Tue, Aug 03, 2010 at 11:11 -0500, James Bottomley wrote: > > On Tue, 2010-08-03 at 19:44 +0400, Kulikov Vasiliy wrote: > > > drivers/parisc/superio.c | 5 +++-- > > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c > > > index f7806d8..c8a36a2 100644 > > > --- a/drivers/parisc/superio.c > > > +++ b/drivers/parisc/superio.c > > > @@ -169,8 +169,6 @@ superio_init(struct pci_dev *pcidev) > > > /* ...then properly fixup the USB to point at suckyio PIC */ > > > sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); > > > > > > - printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > > - pci_name(pdev), pdev->irq); > > > > > > pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); > > > sio->sp1_base &= ~1; > > > @@ -204,6 +202,9 @@ superio_init(struct pci_dev *pcidev) > > > ret = pci_enable_device(pdev); > > > BUG_ON(ret < 0); /* not too much we can do about this... */ > > > > > > + printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > > + pci_name(pdev), pdev->irq); > > > + > > > /* > > > * Next project is programming the onboard interrupt controllers. > > > * PDC hasn't done this for us, since it's using polled I/O. > > > > This really makes no sense; we want the information printed before we > > start all the discovery prints, not after. > > Right, I missed it. > > > I assume lots of > > initialisers want this too, so it looks particularly silly not to have > > pci_name() returning the correct value until enable time. > > > > If this is just the name initially assigned may change, this definitely > > isn't true for parisc, and even for other things, it would be better to > > print something than nothing. > > Not name, but pdev-irq. I was not searching for pci_name() as you can > see in coccinelle script :) > > As it is only printing wrong value, the worst case is fooling user that > reads logs. > > > Is it OK to move pci_enable_device() just before this printk()? Not really ... we need the device set up before it gets enabled. If it's only the irq, then just leave it ... the name is more important and an uninitialised IRQ returns -1 which is a reasonable signal of not being set up yet ... but I think you'll find it will be pre setup on all platforms. However, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 3 Aug 2010 12:40 On Tue, 03 Aug 2010 11:11:20 -0500 James Bottomley <James.Bottomley(a)HansenPartnership.com> wrote: > On Tue, 2010-08-03 at 19:44 +0400, Kulikov Vasiliy wrote: > > drivers/parisc/superio.c | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c > > index f7806d8..c8a36a2 100644 > > --- a/drivers/parisc/superio.c > > +++ b/drivers/parisc/superio.c > > @@ -169,8 +169,6 @@ superio_init(struct pci_dev *pcidev) > > /* ...then properly fixup the USB to point at suckyio PIC */ > > sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); > > > > - printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > - pci_name(pdev), pdev->irq); > > > > pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); > > sio->sp1_base &= ~1; > > @@ -204,6 +202,9 @@ superio_init(struct pci_dev *pcidev) > > ret = pci_enable_device(pdev); > > BUG_ON(ret < 0); /* not too much we can do about this... */ > > > > + printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > + pci_name(pdev), pdev->irq); > > + > > /* > > * Next project is programming the onboard interrupt controllers. > > * PDC hasn't done this for us, since it's using polled I/O. > > This really makes no sense; we want the information printed before we > start all the discovery prints, not after. I assume lots of > initialisers want this too, so it looks particularly silly not to have > pci_name() returning the correct value until enable time. > > If this is just the name initially assigned may change, this definitely > isn't true for parisc, and even for other things, it would be better to > print something than nothing. Right. Some of these "enable before use" patches are ok, for example in some cases the IRQ may not be fully set up or resources may not be enabled, so re-ordering things makes sense. But just printing these values at init time should be harmless. So perhaps a smarter static check script is in order. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Vasiliy Kulikov on 3 Aug 2010 12:40
On Tue, Aug 03, 2010 at 11:11 -0500, James Bottomley wrote: > On Tue, 2010-08-03 at 19:44 +0400, Kulikov Vasiliy wrote: > > drivers/parisc/superio.c | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c > > index f7806d8..c8a36a2 100644 > > --- a/drivers/parisc/superio.c > > +++ b/drivers/parisc/superio.c > > @@ -169,8 +169,6 @@ superio_init(struct pci_dev *pcidev) > > /* ...then properly fixup the USB to point at suckyio PIC */ > > sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev); > > > > - printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > - pci_name(pdev), pdev->irq); > > > > pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base); > > sio->sp1_base &= ~1; > > @@ -204,6 +202,9 @@ superio_init(struct pci_dev *pcidev) > > ret = pci_enable_device(pdev); > > BUG_ON(ret < 0); /* not too much we can do about this... */ > > > > + printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n", > > + pci_name(pdev), pdev->irq); > > + > > /* > > * Next project is programming the onboard interrupt controllers. > > * PDC hasn't done this for us, since it's using polled I/O. > > This really makes no sense; we want the information printed before we > start all the discovery prints, not after. Right, I missed it. > I assume lots of > initialisers want this too, so it looks particularly silly not to have > pci_name() returning the correct value until enable time. > > If this is just the name initially assigned may change, this definitely > isn't true for parisc, and even for other things, it would be better to > print something than nothing. Not name, but pdev-irq. I was not searching for pci_name() as you can see in coccinelle script :) As it is only printing wrong value, the worst case is fooling user that reads logs. Is it OK to move pci_enable_device() just before this printk()? > > James > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |