Skip to content

Commit 2c77081

Browse files
Karan Tilak Kumarmartinkpetersen
Karan Tilak Kumar
authored and
martinkpetersen
committed
scsi: fnic: Add Cisco hardware model names
Add model IDs for Cisco VIC. Reviewed-by: Sesidhar Baddela <[email protected]> Co-developed-by: Gian Carlo Boffa <[email protected]> Signed-off-by: Gian Carlo Boffa <[email protected]> Co-developed-by: Arulprabhu Ponnusamy <[email protected]> Signed-off-by: Arulprabhu Ponnusamy <[email protected]> Co-developed-by: Arun Easi <[email protected]> Signed-off-by: Arun Easi <[email protected]> Co-developed-by: Karan Tilak Kumar <[email protected]> Signed-off-by: Karan Tilak Kumar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent f828af4 commit 2c77081

File tree

4 files changed

+214
-1
lines changed

4 files changed

+214
-1
lines changed

‎drivers/scsi/fnic/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ fnic-y := \
1616
vnic_intr.o \
1717
vnic_rq.o \
1818
vnic_wq_copy.o \
19-
vnic_wq.o
19+
vnic_wq.o \
20+
fnic_pci_subsys_devid.o

‎drivers/scsi/fnic/fnic.h

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,72 @@
8787
/* Retry supported by rport (returned by PRLI service parameters) */
8888
#define FNIC_FC_RP_FLAGS_RETRY 0x1
8989

90+
/* Cisco vendor id */
91+
#define PCI_VENDOR_ID_CISCO 0x1137
92+
#define PCI_DEVICE_ID_CISCO_VIC_FC 0x0045 /* fc vnic */
93+
94+
/* sereno pcie switch */
95+
#define PCI_DEVICE_ID_CISCO_SERENO 0x004e
96+
#define PCI_DEVICE_ID_CISCO_CRUZ 0x007a /* Cruz */
97+
#define PCI_DEVICE_ID_CISCO_BODEGA 0x0131 /* Bodega */
98+
#define PCI_DEVICE_ID_CISCO_BEVERLY 0x025f /* Beverly */
99+
100+
/* Sereno */
101+
#define PCI_SUBDEVICE_ID_CISCO_VASONA 0x004f /* vasona mezz */
102+
#define PCI_SUBDEVICE_ID_CISCO_COTATI 0x0084 /* cotati mlom */
103+
#define PCI_SUBDEVICE_ID_CISCO_LEXINGTON 0x0085 /* lexington pcie */
104+
#define PCI_SUBDEVICE_ID_CISCO_ICEHOUSE 0x00cd /* Icehouse */
105+
#define PCI_SUBDEVICE_ID_CISCO_KIRKWOODLAKE 0x00ce /* KirkwoodLake pcie */
106+
#define PCI_SUBDEVICE_ID_CISCO_SUSANVILLE 0x012e /* Susanville MLOM */
107+
#define PCI_SUBDEVICE_ID_CISCO_TORRANCE 0x0139 /* Torrance MLOM */
108+
109+
/* Cruz */
110+
#define PCI_SUBDEVICE_ID_CISCO_CALISTOGA 0x012c /* Calistoga MLOM */
111+
#define PCI_SUBDEVICE_ID_CISCO_MOUNTAINVIEW 0x0137 /* Cruz Mezz */
112+
/* Cruz MountTian SIOC */
113+
#define PCI_SUBDEVICE_ID_CISCO_MOUNTTIAN 0x014b
114+
#define PCI_SUBDEVICE_ID_CISCO_CLEARLAKE 0x014d /* ClearLake pcie */
115+
/* Cruz MountTian2 SIOC */
116+
#define PCI_SUBDEVICE_ID_CISCO_MOUNTTIAN2 0x0157
117+
#define PCI_SUBDEVICE_ID_CISCO_CLAREMONT 0x015d /* Claremont MLOM */
118+
119+
/* Bodega */
120+
/* VIC 1457 PCIe mLOM */
121+
#define PCI_SUBDEVICE_ID_CISCO_BRADBURY 0x0218
122+
#define PCI_SUBDEVICE_ID_CISCO_BRENTWOOD 0x0217 /* VIC 1455 PCIe */
123+
/* VIC 1487 PCIe mLOM */
124+
#define PCI_SUBDEVICE_ID_CISCO_BURLINGAME 0x021a
125+
#define PCI_SUBDEVICE_ID_CISCO_BAYSIDE 0x0219 /* VIC 1485 PCIe */
126+
/* VIC 1440 Mezz mLOM */
127+
#define PCI_SUBDEVICE_ID_CISCO_BAKERSFIELD 0x0215
128+
#define PCI_SUBDEVICE_ID_CISCO_BOONVILLE 0x0216 /* VIC 1480 Mezz */
129+
#define PCI_SUBDEVICE_ID_CISCO_BENICIA 0x024a /* VIC 1495 */
130+
#define PCI_SUBDEVICE_ID_CISCO_BEAUMONT 0x024b /* VIC 1497 */
131+
#define PCI_SUBDEVICE_ID_CISCO_BRISBANE 0x02af /* VIC 1467 */
132+
#define PCI_SUBDEVICE_ID_CISCO_BENTON 0x02b0 /* VIC 1477 */
133+
#define PCI_SUBDEVICE_ID_CISCO_TWIN_RIVER 0x02cf /* VIC 14425 */
134+
#define PCI_SUBDEVICE_ID_CISCO_TWIN_PEAK 0x02d0 /* VIC 14825 */
135+
136+
/* Beverly */
137+
#define PCI_SUBDEVICE_ID_CISCO_BERN 0x02de /* VIC 15420 */
138+
#define PCI_SUBDEVICE_ID_CISCO_STOCKHOLM 0x02dd /* VIC 15428 */
139+
#define PCI_SUBDEVICE_ID_CISCO_KRAKOW 0x02dc /* VIC 15411 */
140+
#define PCI_SUBDEVICE_ID_CISCO_LUCERNE 0x02db /* VIC 15231 */
141+
#define PCI_SUBDEVICE_ID_CISCO_TURKU 0x02e8 /* VIC 15238 */
142+
#define PCI_SUBDEVICE_ID_CISCO_TURKU_PLUS 0x02f3 /* VIC 15237 */
143+
#define PCI_SUBDEVICE_ID_CISCO_ZURICH 0x02df /* VIC 15230 */
144+
#define PCI_SUBDEVICE_ID_CISCO_RIGA 0x02e0 /* VIC 15427 */
145+
#define PCI_SUBDEVICE_ID_CISCO_GENEVA 0x02e1 /* VIC 15422 */
146+
#define PCI_SUBDEVICE_ID_CISCO_HELSINKI 0x02e4 /* VIC 15235 */
147+
#define PCI_SUBDEVICE_ID_CISCO_GOTHENBURG 0x02f2 /* VIC 15425 */
148+
149+
struct fnic_pcie_device {
150+
u32 device;
151+
u8 *desc;
152+
u32 subsystem_device;
153+
u8 *subsys_desc;
154+
};
155+
90156
/*
91157
* fnic private data per SCSI command.
92158
* These fields are locked by the hashed io_req_lock.
@@ -343,6 +409,9 @@ struct fnic {
343409
struct work_struct tport_work;
344410
struct list_head tport_event_list;
345411

412+
char subsys_desc[14];
413+
int subsys_desc_len;
414+
346415
/*** FIP related data members -- start ***/
347416
void (*set_vlan)(struct fnic *, u16 vlan);
348417
struct work_struct fip_frame_work;
@@ -443,6 +512,8 @@ fnic_chk_state_flags_locked(struct fnic *fnic, unsigned long st_flags)
443512
void __fnic_set_state_flags(struct fnic *, unsigned long, unsigned long);
444513
void fnic_dump_fchost_stats(struct Scsi_Host *, struct fc_host_statistics *);
445514
void fnic_free_txq(struct list_head *head);
515+
int fnic_get_desc_by_devid(struct pci_dev *pdev, char **desc,
516+
char **subsys_desc);
446517

447518
struct fnic_scsi_iter_data {
448519
struct fnic *fnic;

‎drivers/scsi/fnic/fnic_main.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
611611
int i;
612612
unsigned long flags;
613613
int hwq;
614+
char *desc, *subsys_desc;
614615

615616
/*
616617
* Allocate SCSI Host and set up association between host,
@@ -644,6 +645,15 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
644645
fnic->fnic_num = fnic_id;
645646
fnic_stats_debugfs_init(fnic);
646647

648+
/* Find model name from PCIe subsys ID */
649+
if (fnic_get_desc_by_devid(pdev, &desc, &subsys_desc) == 0)
650+
dev_info(&fnic->pdev->dev, "Model: %s\n", subsys_desc);
651+
else {
652+
fnic->subsys_desc_len = 0;
653+
dev_info(&fnic->pdev->dev, "Model: %s subsys_id: 0x%04x\n", "Unknown",
654+
pdev->subsystem_device);
655+
}
656+
647657
err = pci_enable_device(pdev);
648658
if (err) {
649659
dev_err(&fnic->pdev->dev, "Cannot enable PCI device, aborting.\n");

‎drivers/scsi/fnic/fnic_pci_subsys_devid.c

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
// SPDX-License-Identifier: GPL-2.0-only
2+
/*
3+
* Copyright 2008 Cisco Systems, Inc. All rights reserved.
4+
* Copyright 2007 Nuova Systems, Inc. All rights reserved.
5+
*/
6+
7+
#include <linux/module.h>
8+
#include <linux/mempool.h>
9+
#include <linux/string.h>
10+
#include <linux/slab.h>
11+
#include <linux/errno.h>
12+
#include <linux/init.h>
13+
#include <linux/pci.h>
14+
#include <linux/interrupt.h>
15+
#include <linux/irq.h>
16+
#include <linux/spinlock.h>
17+
#include <linux/workqueue.h>
18+
#include <linux/kthread.h>
19+
#include <linux/if_ether.h>
20+
#include "fnic.h"
21+
22+
static struct fnic_pcie_device fnic_pcie_device_table[] = {
23+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno", PCI_SUBDEVICE_ID_CISCO_VASONA,
24+
"VIC 1280"},
25+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno", PCI_SUBDEVICE_ID_CISCO_COTATI,
26+
"VIC 1240"},
27+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno",
28+
PCI_SUBDEVICE_ID_CISCO_LEXINGTON, "VIC 1225"},
29+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno", PCI_SUBDEVICE_ID_CISCO_ICEHOUSE,
30+
"VIC 1285"},
31+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno",
32+
PCI_SUBDEVICE_ID_CISCO_KIRKWOODLAKE, "VIC 1225T"},
33+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno",
34+
PCI_SUBDEVICE_ID_CISCO_SUSANVILLE, "VIC 1227"},
35+
{PCI_DEVICE_ID_CISCO_SERENO, "Sereno", PCI_SUBDEVICE_ID_CISCO_TORRANCE,
36+
"VIC 1227T"},
37+
38+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_CALISTOGA,
39+
"VIC 1340"},
40+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_MOUNTAINVIEW,
41+
"VIC 1380"},
42+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_MOUNTTIAN,
43+
"C3260-SIOC"},
44+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_CLEARLAKE,
45+
"VIC 1385"},
46+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_MOUNTTIAN2,
47+
"C3260-SIOC"},
48+
{PCI_DEVICE_ID_CISCO_CRUZ, "Cruz", PCI_SUBDEVICE_ID_CISCO_CLAREMONT,
49+
"VIC 1387"},
50+
51+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BRADBURY,
52+
"VIC 1457"},
53+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
54+
PCI_SUBDEVICE_ID_CISCO_BRENTWOOD, "VIC 1455"},
55+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
56+
PCI_SUBDEVICE_ID_CISCO_BURLINGAME, "VIC 1487"},
57+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BAYSIDE,
58+
"VIC 1485"},
59+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
60+
PCI_SUBDEVICE_ID_CISCO_BAKERSFIELD, "VIC 1440"},
61+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
62+
PCI_SUBDEVICE_ID_CISCO_BOONVILLE, "VIC 1480"},
63+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BENICIA,
64+
"VIC 1495"},
65+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BEAUMONT,
66+
"VIC 1497"},
67+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BRISBANE,
68+
"VIC 1467"},
69+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega", PCI_SUBDEVICE_ID_CISCO_BENTON,
70+
"VIC 1477"},
71+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
72+
PCI_SUBDEVICE_ID_CISCO_TWIN_RIVER, "VIC 14425"},
73+
{PCI_DEVICE_ID_CISCO_BODEGA, "Bodega",
74+
PCI_SUBDEVICE_ID_CISCO_TWIN_PEAK, "VIC 14825"},
75+
76+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_BERN,
77+
"VIC 15420"},
78+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly",
79+
PCI_SUBDEVICE_ID_CISCO_STOCKHOLM, "VIC 15428"},
80+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_KRAKOW,
81+
"VIC 15411"},
82+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly",
83+
PCI_SUBDEVICE_ID_CISCO_LUCERNE, "VIC 15231"},
84+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_TURKU,
85+
"VIC 15238"},
86+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_GENEVA,
87+
"VIC 15422"},
88+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly",
89+
PCI_SUBDEVICE_ID_CISCO_HELSINKI, "VIC 15235"},
90+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly",
91+
PCI_SUBDEVICE_ID_CISCO_GOTHENBURG, "VIC 15425"},
92+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly",
93+
PCI_SUBDEVICE_ID_CISCO_TURKU_PLUS, "VIC 15237"},
94+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_ZURICH,
95+
"VIC 15230"},
96+
{PCI_DEVICE_ID_CISCO_BEVERLY, "Beverly", PCI_SUBDEVICE_ID_CISCO_RIGA,
97+
"VIC 15427"},
98+
99+
{0,}
100+
};
101+
102+
int fnic_get_desc_by_devid(struct pci_dev *pdev, char **desc,
103+
char **subsys_desc)
104+
{
105+
unsigned short device = PCI_DEVICE_ID_CISCO_VIC_FC;
106+
int max = ARRAY_SIZE(fnic_pcie_device_table);
107+
struct fnic_pcie_device *t = fnic_pcie_device_table;
108+
int index = 0;
109+
110+
if (pdev->device != device)
111+
return 1;
112+
113+
while (t->device != 0) {
114+
if (memcmp
115+
((char *) &pdev->subsystem_device,
116+
(char *) &t->subsystem_device, sizeof(short)) == 0)
117+
break;
118+
t++;
119+
index++;
120+
}
121+
122+
if (index >= max - 1) {
123+
*desc = NULL;
124+
*subsys_desc = NULL;
125+
return 1;
126+
}
127+
128+
*desc = fnic_pcie_device_table[index].desc;
129+
*subsys_desc = fnic_pcie_device_table[index].subsys_desc;
130+
return 0;
131+
}

0 commit comments

Comments
 (0)