Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753687AbbERR1L (ORCPT ); Mon, 18 May 2015 13:27:11 -0400 Received: from mail-qc0-f172.google.com ([209.85.216.172]:33926 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbbERR1I (ORCPT ); Mon, 18 May 2015 13:27:08 -0400 MIME-Version: 1.0 In-Reply-To: <20150518.124152.558065488359768601.davem@davemloft.net> References: <20150516.171444.245757401088795324.davem@davemloft.net> <20150518.124152.558065488359768601.davem@davemloft.net> From: Bjorn Helgaas Date: Mon, 18 May 2015 12:26:47 -0500 Message-ID: Subject: Re: [PATCH net-next v3 1/2] pci: Add Cavium PCI vendor id To: David Miller Cc: Aleksey Makarov , netdev , "linux-kernel@vger.kernel.org" , David Daney , "linux-pci@vger.kernel.org" , Greg Kroah-Hartman Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2420 Lines: 61 On Mon, May 18, 2015 at 11:41 AM, David Miller wrote: > From: Bjorn Helgaas > Date: Mon, 18 May 2015 11:35:20 -0500 > >> [+cc Greg] >> >> On Sat, May 16, 2015 at 4:14 PM, David Miller wrote: >>> From: Bjorn Helgaas >>> Date: Sat, 16 May 2015 09:49:40 -0500 >>> >>>> Hi Aleksey, >>>> >>>> On Fri, May 15, 2015 at 10:36 PM, Aleksey Makarov >>>> wrote: >>>>> Signed-off-by: Aleksey Makarov >>>>> --- >>>>> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/