[Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Neil Horman]

Patch to clean up the implementation of the GET_INDEX macro in the i386 pci
fixup code so that it uses the PCI_DEVFN macro, rather than re-implements it.

Thanks and Regards
Neil

Signed-off-by: Neil Horman <nhorman@redhat.com>

 fixup.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


--- linux-2.6.git/arch/i386/pci/fixup.c.orig	2005-06-27 09:42:31.000000000 -0400
+++ linux-2.6.git/arch/i386/pci/fixup.c	2005-06-27 09:43:46.000000000 -0400
@@ -253,7 +253,7 @@
 #define MAX_PCIEROOT	6
 static int quirk_aspm_offset[MAX_PCIEROOT << 3];
 
-#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7))
+#define GET_INDEX(a, b) PCI_DEVFN((a - PCI_DEVICE_ID_INTEL_MCH_PA),b)
 
 static int quirk_pcie_aspm_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
 {
-- 
/***************************************************
 *Neil Horman
 *Software Engineer
 *Red Hat, Inc.
 *nhorman@redhat.com
 *gpg keyid: 1024D / 0x92A74FA1
 *http://pgp.mit.edu
 ***************************************************/

Re: [Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Linus Torvalds]

On Mon, 27 Jun 2005, Neil Horman wrote:
>
> Patch to clean up the implementation of the GET_INDEX macro in the i386 pci
> fixup code so that it uses the PCI_DEVFN macro, rather than re-implements it.

This looks wrong:

> -#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7))
> +#define GET_INDEX(a, b) PCI_DEVFN((a - PCI_DEVICE_ID_INTEL_MCH_PA),b)

that first argument looks like it has parentheses at the wrong place, it 
should be

	(a) - PCI_DEVICE_ID_INTEL_MCH_PA

rather than

	(a - PCI_DEVICE_ID_INTEL_MCH_PA)

methinks.

Other than that... Greg?

		Linus

Re: [Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Greg KH]

On Mon, Jun 27, 2005 at 03:19:11PM -0700, Linus Torvalds wrote:
> 
> 
> On Mon, 27 Jun 2005, Neil Horman wrote:
> >
> > Patch to clean up the implementation of the GET_INDEX macro in the i386 pci
> > fixup code so that it uses the PCI_DEVFN macro, rather than re-implements it.
> 
> This looks wrong:
> 
> > -#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7))
> > +#define GET_INDEX(a, b) PCI_DEVFN((a - PCI_DEVICE_ID_INTEL_MCH_PA),b)
> 
> that first argument looks like it has parentheses at the wrong place, it 
> should be
> 
> 	(a) - PCI_DEVICE_ID_INTEL_MCH_PA
> 
> rather than
> 
> 	(a - PCI_DEVICE_ID_INTEL_MCH_PA)
> 
> methinks.
> 
> Other than that... Greg?

I'd like to say yes, but I'll get an ack by the pci express people from
Intel first (PCI_DEVFN masks off bits that might be needed here, don't
really know...)  Also, this is only used for an array index, not a
pci devfn memory access (look at how it is used in the code...)

I'll put it in my tree for now, and let it get testing, I would not
recommend it for yours just yet.

thanks,

greg k-h

Re: [Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Jeff Garzik]

Greg KH wrote:
> On Mon, Jun 27, 2005 at 03:19:11PM -0700, Linus Torvalds wrote:
> 
>>
>>On Mon, 27 Jun 2005, Neil Horman wrote:
>>
>>>Patch to clean up the implementation of the GET_INDEX macro in the i386 pci
>>>fixup code so that it uses the PCI_DEVFN macro, rather than re-implements it.
>>
>>This looks wrong:
>>
>>
>>>-#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7))
>>>+#define GET_INDEX(a, b) PCI_DEVFN((a - PCI_DEVICE_ID_INTEL_MCH_PA),b)
>>
>>that first argument looks like it has parentheses at the wrong place, it 
>>should be
>>
>>	(a) - PCI_DEVICE_ID_INTEL_MCH_PA
>>
>>rather than
>>
>>	(a - PCI_DEVICE_ID_INTEL_MCH_PA)
>>
>>methinks.
>>
>>Other than that... Greg?
> 
> 
> I'd like to say yes, but I'll get an ack by the pci express people from
> Intel first (PCI_DEVFN masks off bits that might be needed here, don't
> really know...)  Also, this is only used for an array index, not a
> pci devfn memory access (look at how it is used in the code...)
> 
> I'll put it in my tree for now, and let it get testing, I would not
> recommend it for yours just yet.

Please let me know, as I suggested this patch to Neil.

It sure seems like the code wants a real PCI devfn, even though it is 
obviously doing a table index.

Comments?

	Jeff

Re: [Patch] Janitorial cleanup of GET_INDEX macro in arch/i386/pci/fixup.c

[Greg KH]

On Tue, Jun 28, 2005 at 01:13:39PM -0400, Jeff Garzik wrote:
> Greg KH wrote:
> >On Mon, Jun 27, 2005 at 03:19:11PM -0700, Linus Torvalds wrote:
> >
> >>
> >>On Mon, 27 Jun 2005, Neil Horman wrote:
> >>
> >>>Patch to clean up the implementation of the GET_INDEX macro in the i386 
> >>>pci
> >>>fixup code so that it uses the PCI_DEVFN macro, rather than 
> >>>re-implements it.
> >>
> >>This looks wrong:
> >>
> >>
> >>>-#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + 
> >>>((b) & 7))
> >>>+#define GET_INDEX(a, b) PCI_DEVFN((a - PCI_DEVICE_ID_INTEL_MCH_PA),b)
> >>
> >>that first argument looks like it has parentheses at the wrong place, it 
> >>should be
> >>
> >>	(a) - PCI_DEVICE_ID_INTEL_MCH_PA
> >>
> >>rather than
> >>
> >>	(a - PCI_DEVICE_ID_INTEL_MCH_PA)
> >>
> >>methinks.
> >>
> >>Other than that... Greg?
> >
> >
> >I'd like to say yes, but I'll get an ack by the pci express people from
> >Intel first (PCI_DEVFN masks off bits that might be needed here, don't
> >really know...)  Also, this is only used for an array index, not a
> >pci devfn memory access (look at how it is used in the code...)
> >
> >I'll put it in my tree for now, and let it get testing, I would not
> >recommend it for yours just yet.
> 
> Please let me know, as I suggested this patch to Neil.
> 
> It sure seems like the code wants a real PCI devfn, even though it is 
> obviously doing a table index.
> 
> Comments?

I told Andrew to drop the patch, as the code does not want a real PCI devfn.

thanks,

greg k-h