[PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[Aleksey Makarov]

Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
---
 include/linux/pci_ids.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a..3633cc6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2327,6 +2327,8 @@
 #define PCI_DEVICE_ID_ALTIMA_AC9100	0x03ea
 #define PCI_DEVICE_ID_ALTIMA_AC1003	0x03eb
 
+#define PCI_VENDOR_ID_CAVIUM		0x177d
+
 #define PCI_VENDOR_ID_BELKIN		0x1799
 #define PCI_DEVICE_ID_BELKIN_F5D7010V7	0x701f
 
-- 
2.4.0

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[Bjorn Helgaas]

Hi Aleksey,

On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
<aleksey.makarov@auriga.com> wrote:
> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
> ---
>  include/linux/pci_ids.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e63c02a..3633cc6 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2327,6 +2327,8 @@
>  #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>  #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>
> +#define PCI_VENDOR_ID_CAVIUM           0x177d

Please read the note at the top of include/linux/pci_ids.h.  If this
definition is used in two or more drivers, mention that in the
changelog.  Otherwise, just use the bare hex value or a private
#define in your driver.

Bjorn

>  #define PCI_VENDOR_ID_BELKIN           0x1799
>  #define PCI_DEVICE_ID_BELKIN_F5D7010V7 0x701f
>
> --
> 2.4.0
>

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[David Miller]

From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 16 May 2015 09:49:40 -0500

> Hi Aleksey,
> 
> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
> <aleksey.makarov@auriga.com> wrote:
>> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
>> ---
>>  include/linux/pci_ids.h | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index e63c02a..3633cc6 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2327,6 +2327,8 @@
>>  #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>>  #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>>
>> +#define PCI_VENDOR_ID_CAVIUM           0x177d
> 
> Please read the note at the top of include/linux/pci_ids.h.  If this
> definition is used in two or more drivers, mention that in the
> changelog.  Otherwise, just use the bare hex value or a private
> #define in your driver.

It is referenced from two foo.c files in the same driver.

I don't know what policy we want for situations like that.

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[Bjorn Helgaas]

[+cc Greg]

On Sat, May 16, 2015 at 4:14 PM, David Miller <davem@davemloft.net> wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> Date: Sat, 16 May 2015 09:49:40 -0500
>
>> Hi Aleksey,
>>
>> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
>> <aleksey.makarov@auriga.com> wrote:
>>> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
>>> ---
>>>  include/linux/pci_ids.h | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>> index e63c02a..3633cc6 100644
>>> --- a/include/linux/pci_ids.h
>>> +++ b/include/linux/pci_ids.h
>>> @@ -2327,6 +2327,8 @@
>>>  #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>>>  #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>>>
>>> +#define PCI_VENDOR_ID_CAVIUM           0x177d
>>
>> Please read the note at the top of include/linux/pci_ids.h.  If this
>> definition is used in two or more drivers, mention that in the
>> changelog.  Otherwise, just use the bare hex value or a private
>> #define in your driver.
>
> It is referenced from two foo.c files in the same driver.
>
> I don't know what policy we want for situations like that.

The current policy (1d4a433fc4e9 ("PCI: Document pci_ids.h addition
policy.")) predates me and I don't know the whole rationale.  I can
see that it might reduce backporting pain for distros.

If two foo.c files in the same driver share the PCI ID, they likely
share other things as well, so there's likely a shared .h file where a
private PCI_VENDOR_ID_CAVIUM could go.

But this is a vendor ID (not a device ID), and it seems likely that
there will be other devices from Cavium, so maybe it would make sense
to apply the policy to device IDs, and go ahead and add vendor IDs to
pci_ids.h.

Bjorn

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[David Miller]

From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 18 May 2015 11:35:20 -0500

> [+cc Greg]
> 
> On Sat, May 16, 2015 at 4:14 PM, David Miller <davem@davemloft.net> wrote:
>> From: Bjorn Helgaas <bhelgaas@google.com>
>> Date: Sat, 16 May 2015 09:49:40 -0500
>>
>>> Hi Aleksey,
>>>
>>> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
>>> <aleksey.makarov@auriga.com> wrote:
>>>> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
>>>> ---
>>>>  include/linux/pci_ids.h | 2 ++
>>>>  1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>>> index e63c02a..3633cc6 100644
>>>> --- a/include/linux/pci_ids.h
>>>> +++ b/include/linux/pci_ids.h
>>>> @@ -2327,6 +2327,8 @@
>>>>  #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>>>>  #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>>>>
>>>> +#define PCI_VENDOR_ID_CAVIUM           0x177d
>>>
>>> Please read the note at the top of include/linux/pci_ids.h.  If this
>>> definition is used in two or more drivers, mention that in the
>>> changelog.  Otherwise, just use the bare hex value or a private
>>> #define in your driver.
>>
>> It is referenced from two foo.c files in the same driver.
>>
>> I don't know what policy we want for situations like that.
> 
> The current policy (1d4a433fc4e9 ("PCI: Document pci_ids.h addition
> policy.")) predates me and I don't know the whole rationale.  I can
> see that it might reduce backporting pain for distros.
> 
> If two foo.c files in the same driver share the PCI ID, they likely
> share other things as well, so there's likely a shared .h file where a
> private PCI_VENDOR_ID_CAVIUM could go.
> 
> But this is a vendor ID (not a device ID), and it seems likely that
> there will be other devices from Cavium, so maybe it would make sense
> to apply the policy to device IDs, and go ahead and add vendor IDs to
> pci_ids.h.

That makes sense to me, and therefore this change is probably fine as-is.

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[Bjorn Helgaas]

On Mon, May 18, 2015 at 11:41 AM, David Miller <davem@davemloft.net> wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
> Date: Mon, 18 May 2015 11:35:20 -0500
>
>> [+cc Greg]
>>
>> On Sat, May 16, 2015 at 4:14 PM, David Miller <davem@davemloft.net> wrote:
>>> From: Bjorn Helgaas <bhelgaas@google.com>
>>> Date: Sat, 16 May 2015 09:49:40 -0500
>>>
>>>> Hi Aleksey,
>>>>
>>>> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
>>>> <aleksey.makarov@auriga.com> wrote:
>>>>> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
>>>>> ---
>>>>>  include/linux/pci_ids.h | 2 ++
>>>>>  1 file changed, 2 insertions(+)
>>>>>
>>>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>>>> index e63c02a..3633cc6 100644
>>>>> --- a/include/linux/pci_ids.h
>>>>> +++ b/include/linux/pci_ids.h
>>>>> @@ -2327,6 +2327,8 @@
>>>>>  #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>>>>>  #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>>>>>
>>>>> +#define PCI_VENDOR_ID_CAVIUM           0x177d
>>>>
>>>> Please read the note at the top of include/linux/pci_ids.h.  If this
>>>> definition is used in two or more drivers, mention that in the
>>>> changelog.  Otherwise, just use the bare hex value or a private
>>>> #define in your driver.
>>>
>>> It is referenced from two foo.c files in the same driver.
>>>
>>> I don't know what policy we want for situations like that.
>>
>> The current policy (1d4a433fc4e9 ("PCI: Document pci_ids.h addition
>> policy.")) predates me and I don't know the whole rationale.  I can
>> see that it might reduce backporting pain for distros.
>>
>> If two foo.c files in the same driver share the PCI ID, they likely
>> share other things as well, so there's likely a shared .h file where a
>> private PCI_VENDOR_ID_CAVIUM could go.
>>
>> But this is a vendor ID (not a device ID), and it seems likely that
>> there will be other devices from Cavium, so maybe it would make sense
>> to apply the policy to device IDs, and go ahead and add vendor IDs to
>> pci_ids.h.
>
> That makes sense to me, and therefore this change is probably fine as-is.

OK.  I assume you'll take the whole series, so:

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[David Daney]

On 05/18/2015 10:26 AM, Bjorn Helgaas wrote:
> On Mon, May 18, 2015 at 11:41 AM, David Miller <davem@davemloft.net> wrote:
>> From: Bjorn Helgaas <bhelgaas@google.com>
>> Date: Mon, 18 May 2015 11:35:20 -0500
>>
>>> [+cc Greg]
>>>
>>> On Sat, May 16, 2015 at 4:14 PM, David Miller <davem@davemloft.net> wrote:
>>>> From: Bjorn Helgaas <bhelgaas@google.com>
>>>> Date: Sat, 16 May 2015 09:49:40 -0500
>>>>
>>>>> Hi Aleksey,
>>>>>
>>>>> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov
>>>>> <aleksey.makarov@auriga.com> wrote:
>>>>>> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
>>>>>> ---
>>>>>>   include/linux/pci_ids.h | 2 ++
>>>>>>   1 file changed, 2 insertions(+)
>>>>>>
>>>>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>>>>> index e63c02a..3633cc6 100644
>>>>>> --- a/include/linux/pci_ids.h
>>>>>> +++ b/include/linux/pci_ids.h
>>>>>> @@ -2327,6 +2327,8 @@
>>>>>>   #define PCI_DEVICE_ID_ALTIMA_AC9100    0x03ea
>>>>>>   #define PCI_DEVICE_ID_ALTIMA_AC1003    0x03eb
>>>>>>
>>>>>> +#define PCI_VENDOR_ID_CAVIUM           0x177d
>>>>>
>>>>> Please read the note at the top of include/linux/pci_ids.h.  If this
>>>>> definition is used in two or more drivers, mention that in the
>>>>> changelog.  Otherwise, just use the bare hex value or a private
>>>>> #define in your driver.
>>>>
>>>> It is referenced from two foo.c files in the same driver.
>>>>
>>>> I don't know what policy we want for situations like that.
>>>
>>> The current policy (1d4a433fc4e9 ("PCI: Document pci_ids.h addition
>>> policy.")) predates me and I don't know the whole rationale.  I can
>>> see that it might reduce backporting pain for distros.
>>>
>>> If two foo.c files in the same driver share the PCI ID, they likely
>>> share other things as well, so there's likely a shared .h file where a
>>> private PCI_VENDOR_ID_CAVIUM could go.
>>>
>>> But this is a vendor ID (not a device ID), and it seems likely that
>>> there will be other devices from Cavium, so maybe it would make sense
>>> to apply the policy to device IDs, and go ahead and add vendor IDs to
>>> pci_ids.h.
>>
>> That makes sense to me, and therefore this change is probably fine as-is.
>
> OK.  I assume you'll take the whole series, so:
>
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
>

Thanks guys,

Just for the record, the Cavium ThunderX network controller driver (that 
is part 2/2 of the series), is just the first user of the 
PCI_VENDOR_ID_CAVIUM.  We have in the pipeline drivers/patches for USB 
(xHCI), SATA (AHCI), GPIO, I2C, MMC, and maybe others that will also be 
using this #define.

I also agree with the concept that the vendor ID has more if a place in 
pci_ids.h than device IDs (which usually can go in the driver itself).

David Daney

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[Aleksey Makarov]

Author of this patch is

Author: Sunil Goutham <sgoutham@cavium.com>

Sorry for this.  It will be fixed in next versions.

On 05/15/2015 08:36 PM, Aleksey Makarov wrote:
> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
> ---
>   include/linux/pci_ids.h | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e63c02a..3633cc6 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2327,6 +2327,8 @@
>   #define PCI_DEVICE_ID_ALTIMA_AC9100	0x03ea
>   #define PCI_DEVICE_ID_ALTIMA_AC1003	0x03eb
>
> +#define PCI_VENDOR_ID_CAVIUM		0x177d
> +
>   #define PCI_VENDOR_ID_BELKIN		0x1799
>   #define PCI_DEVICE_ID_BELKIN_F5D7010V7	0x701f
>
>

Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id

[David Miller]

From: Aleksey Makarov <aleksey.makarov@auriga.com>
Date: Mon, 18 May 2015 14:00:22 -0700

> 
> Author of this patch is
> 
> Author: Sunil Goutham <sgoutham@cavium.com>
> 
> Sorry for this.  It will be fixed in next versions.

You indicate this with:

From: Sunil Goutham <sgoutham@cavium.com>

at the top of the commit message when you post the patch.