From: Xiangliang Yu <[email protected]>
Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
---
include/linux/pci_ids.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f11c1c2..a80f9e6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1604,6 +1604,7 @@
#define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334
#define PCI_VENDOR_ID_MARVELL 0x11ab
+#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b
#define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
--
1.7.5.4
On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:
> From: Xiangliang Yu <[email protected]>
>
> Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
"PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.
Per the comment at the top of pci_ids.h, we don't add things here
unless they are shared between multiple drivers.
That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h,
mvumi.c, and ahci.c. If you want to unify all those so they all use
same symbol, and define that symbol here in pci_ids.h, that would be
fine with me.
> ---
> include/linux/pci_ids.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index f11c1c2..a80f9e6 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1604,6 +1604,7 @@
> #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334
>
> #define PCI_VENDOR_ID_MARVELL 0x11ab
> +#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b
> #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
> #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
> #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
> --
> 1.7.5.4
>
Hi, Bjorn
I will update mvsas and ahci with the macro, just need more time to test it.
Thanks!
> -----Original Message-----
> From: Bjorn Helgaas [mailto:[email protected]]
> Sent: 2013??3??8?? 0:25
> To: [email protected]
> Cc: [email protected]; [email protected]; Xiangliang Yu
> Subject: Re: [PATCH 1/2] PCI: define macro for marvell vendor ID
>
> On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:
> > From: Xiangliang Yu <[email protected]>
> >
> > Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
>
> "PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.
>
> Per the comment at the top of pci_ids.h, we don't add things here
> unless they are shared between multiple drivers.
>
> That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h,
> mvumi.c, and ahci.c. If you want to unify all those so they all use
> same symbol, and define that symbol here in pci_ids.h, that would be
> fine with me.
>
> > ---
> > include/linux/pci_ids.h | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
> > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> > index f11c1c2..a80f9e6 100644
> > --- a/include/linux/pci_ids.h
> > +++ b/include/linux/pci_ids.h
> > @@ -1604,6 +1604,7 @@
> > #define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334
> >
> > #define PCI_VENDOR_ID_MARVELL 0x11ab
> > +#define PCI_VENDOR_ID_MARVELL_EXT 0x1b4b
> > #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
> > #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
> > #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
> > --
> > 1.7.5.4
> >
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?
On Fri, Mar 8, 2013 at 12:24 AM, Bjorn Helgaas <[email protected]> wrote:
> On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:
>> From: Xiangliang Yu <[email protected]>
>>
>> Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
>
> "PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.
>
> Per the comment at the top of pci_ids.h, we don't add things here
> unless they are shared between multiple drivers.
>
> That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h,
> mvumi.c, and ahci.c. If you want to unify all those so they all use
> same symbol, and define that symbol here in pci_ids.h, that would be
> fine with me.
>
This symbol will also be useful for the quirk that creates iommu
context entries for Marvell devices that use incorrect dma source
tags. I'll update and resend that patch when this change has been
merged.
Thanks
Andrew
On Mon, Mar 11, 2013 at 11:23 PM, Andrew Cooks <[email protected]> wrote:
> On Fri, Mar 8, 2013 at 12:24 AM, Bjorn Helgaas <[email protected]> wrote:
>> On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:
>>> From: Xiangliang Yu <[email protected]>
>>>
>>> Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
>>
>> "PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.
>>
>> Per the comment at the top of pci_ids.h, we don't add things here
>> unless they are shared between multiple drivers.
>>
>> That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h,
>> mvumi.c, and ahci.c. If you want to unify all those so they all use
>> same symbol, and define that symbol here in pci_ids.h, that would be
>> fine with me.
>>
>
> This symbol will also be useful for the quirk that creates iommu
> context entries for Marvell devices that use incorrect dma source
> tags. I'll update and resend that patch when this change has been
> merged.
Andrew -
A new series that includes the 0x1b4b vendor ID change was posted
last night so you may want to follow that:
https://lkml.org/lkml/2013/3/21/12
>
> Thanks
> Andrew
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html