Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40e2b8ed authored by Shahed Shaikh's avatar Shahed Shaikh Committed by David S. Miller
Browse files

qlcnic: Add support for 0x8830 device ID 



Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd6e7381

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+2 −0
Original line number Diff line number Diff line
@@ -2283,6 +2283,7 @@ extern const struct ethtool_ops qlcnic_ethtool_failed_ops; 


#define PCI_DEVICE_ID_QLOGIC_QLE824X		0x8020

#define PCI_DEVICE_ID_QLOGIC_QLE834X		0x8030

#define PCI_DEVICE_ID_QLOGIC_QLE8830		0x8830

#define PCI_DEVICE_ID_QLOGIC_VF_QLE834X	0x8430

#define PCI_DEVICE_ID_QLOGIC_QLE844X		0x8040

#define PCI_DEVICE_ID_QLOGIC_VF_QLE844X	0x8440
@@ -2307,6 +2308,7 @@ static inline bool qlcnic_83xx_check(struct qlcnic_adapter *adapter) 
	bool status;



	status = ((device == PCI_DEVICE_ID_QLOGIC_QLE834X) ||

		  (device == PCI_DEVICE_ID_QLOGIC_QLE8830) ||

		  (device == PCI_DEVICE_ID_QLOGIC_QLE844X) ||

		  (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X) ||

		  (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X)) ? true : false;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

+1 −0
Original line number Diff line number Diff line
@@ -2284,6 +2284,7 @@ static int qlcnic_83xx_get_fw_info(struct qlcnic_adapter *adapter) 
		fw_info = ahw->fw_info;

		switch (pdev->device) {

		case PCI_DEVICE_ID_QLOGIC_QLE834X:

		case PCI_DEVICE_ID_QLOGIC_QLE8830:

			strncpy(fw_info->fw_file_name, QLC_83XX_FW_FILE_NAME,

				QLC_FW_FILE_NAME_LEN);

			break;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+8 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter) 
static const struct pci_device_id qlcnic_pci_tbl[] = {

	ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X),

	ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X),

	ENTRY(PCI_DEVICE_ID_QLOGIC_QLE8830),

	ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X),

	ENTRY(PCI_DEVICE_ID_QLOGIC_QLE844X),

	ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE844X),
@@ -227,6 +228,11 @@ static const struct qlcnic_board_info qlcnic_boards[] = { 
	{ PCI_VENDOR_ID_QLOGIC,

	  PCI_DEVICE_ID_QLOGIC_QLE834X,

	  0x0, 0x0, "8300 Series 1/10GbE Controller" },

	{ PCI_VENDOR_ID_QLOGIC,

	  PCI_DEVICE_ID_QLOGIC_QLE8830,

	  0x0,

	  0x0,

	  "8830 Series 1/10GbE Controller" },

	{ PCI_VENDOR_ID_QLOGIC,

	  PCI_DEVICE_ID_QLOGIC_QLE824X,

	  PCI_VENDOR_ID_QLOGIC,
@@ -1131,6 +1137,7 @@ static void qlcnic_get_bar_length(u32 dev_id, ulong *bar) 
		*bar = QLCNIC_82XX_BAR0_LENGTH;

		break;

	case PCI_DEVICE_ID_QLOGIC_QLE834X:

	case PCI_DEVICE_ID_QLOGIC_QLE8830:

	case PCI_DEVICE_ID_QLOGIC_QLE844X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE834X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE844X:
@@ -2474,6 +2481,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		ahw->reg_tbl = (u32 *) qlcnic_reg_tbl;

		break;

	case PCI_DEVICE_ID_QLOGIC_QLE834X:

	case PCI_DEVICE_ID_QLOGIC_QLE8830:

	case PCI_DEVICE_ID_QLOGIC_QLE844X:

		qlcnic_83xx_register_map(ahw);

		break;