Commit 937383a5 authored by Ben Hutchings's avatar Ben Hutchings Committed by Jesse Barnes
Browse files

PCI: Add Solarflare vendor ID and SFC4000 device IDs 



These will be shared between the sfc driver and a PCI quirk.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent e9308cfd

drivers/net/sfc/efx.c

+6 −4
Original line number Diff line number Diff line
@@ -2197,13 +2197,15 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type) 


/* PCI device ID table */

static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {

	{PCI_DEVICE(EFX_VENDID_SFC, FALCON_A_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0),

	 .driver_data = (unsigned long) &falcon_a1_nic_type},

	{PCI_DEVICE(EFX_VENDID_SFC, FALCON_B_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),

	 .driver_data = (unsigned long) &falcon_b0_nic_type},

	{PCI_DEVICE(EFX_VENDID_SFC, BETHPAGE_A_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, BETHPAGE_A_P_DEVID),

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	{PCI_DEVICE(EFX_VENDID_SFC, SIENA_A_P_DEVID),

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, SIENA_A_P_DEVID),

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	{0}			/* end of list */

};

drivers/net/sfc/efx.h

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
#include "filter.h"



/* PCI IDs */

#define EFX_VENDID_SFC	        0x1924

#define FALCON_A_P_DEVID	0x0703

#define FALCON_A_S_DEVID        0x6703

#define FALCON_B_P_DEVID        0x0710

#define BETHPAGE_A_P_DEVID      0x0803

#define SIENA_A_P_DEVID         0x0813

drivers/net/sfc/falcon.c

+2 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,8 @@ static int falcon_probe_nic(struct efx_nic *efx) 
		}



		dev = pci_dev_get(efx->pci_dev);

		while ((dev = pci_get_device(EFX_VENDID_SFC, FALCON_A_S_DEVID,

		while ((dev = pci_get_device(PCI_VENDOR_ID_SOLARFLARE,

					     PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1,

					     dev))) {

			if (dev->bus == efx->pci_dev->bus &&

			    dev->devfn == efx->pci_dev->devfn + 1) {

drivers/net/sfc/falcon_boards.c

+2 −1
Original line number Diff line number Diff line
@@ -764,7 +764,8 @@ int falcon_probe_board(struct efx_nic *efx, u16 revision_info) 


	if (board->type) {

		netif_info(efx, probe, efx->net_dev, "board is %s rev %c%d\n",

			 (efx->pci_dev->subsystem_vendor == EFX_VENDID_SFC)

			 (efx->pci_dev->subsystem_vendor ==

			  PCI_VENDOR_ID_SOLARFLARE)

			 ? board->type->ref_model : board->type->gen_type,

			 'A' + board->major, board->minor);

		return 0;

include/linux/pci_ids.h

+5 −0
Original line number Diff line number Diff line
@@ -2302,6 +2302,11 @@ 
#define PCI_DEVICE_ID_RENESAS_SH7785	0x0007

#define PCI_DEVICE_ID_RENESAS_SH7786	0x0010



#define PCI_VENDOR_ID_SOLARFLARE	0x1924

#define PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0	0x0703

#define PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1	0x6703

#define PCI_DEVICE_ID_SOLARFLARE_SFC4000B	0x0710



#define PCI_VENDOR_ID_TDI               0x192E

#define PCI_DEVICE_ID_TDI_EHCI          0x0101