Patchwork [1/2] PCI: define macro for marvell vendor ID

login
register
mail settings
Submitter yxlraid@gmail.com
Date March 7, 2013, 2:28 p.m.
Message ID <1362666523-9961-1-git-send-email-yxlraid@gmail.com>
Download mbox | patch
Permalink /patch/225861/
State Rejected
Headers show

Comments

yxlraid@gmail.com - March 7, 2013, 2:28 p.m.
From: Xiangliang Yu <yuxiangl@marvell.com>

Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID
---
 include/linux/pci_ids.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Bjorn Helgaas - March 7, 2013, 4:24 p.m.
On Thu, Mar 7, 2013 at 7:28 AM,  <yxlraid@gmail.com> wrote:
> From: Xiangliang Yu <yuxiangl@marvell.com>
>
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Xiangliang Yu - March 8, 2013, 2:22 a.m.
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:bhelgaas@google.com]

> Sent: 2013年3月8日 0:25

> To: yxlraid@gmail.com

> Cc: linux-pci@vger.kernel.org; linux-kernel@vger.kernel.org; Xiangliang Yu

> Subject: Re: [PATCH 1/2] PCI: define macro for marvell vendor ID

> 

> On Thu, Mar 7, 2013 at 7:28 AM,  <yxlraid@gmail.com> wrote:

> > From: Xiangliang Yu <yuxiangl@marvell.com>

> >

> > 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

> >
Andrew Cooks - March 12, 2013, 5:23 a.m.
On Fri, Mar 8, 2013 at 12:24 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> On Thu, Mar 7, 2013 at 7:28 AM,  <yxlraid@gmail.com> wrote:
>> From: Xiangliang Yu <yuxiangl@marvell.com>
>>
>> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Myron Stowe - March 21, 2013, 3:50 p.m.
On Mon, Mar 11, 2013 at 11:23 PM, Andrew Cooks <acooks@gmail.com> wrote:
> On Fri, Mar 8, 2013 at 12:24 AM, Bjorn Helgaas <bhelgaas@google.com> wrote:
>> On Thu, Mar 7, 2013 at 7:28 AM,  <yxlraid@gmail.com> wrote:
>>> From: Xiangliang Yu <yuxiangl@marvell.com>
>>>
>>> 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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