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

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

qlcnic: Add new VF device ID 0x8C30 



This is a 83xx series based VF device

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

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

+8 −4
Original line number Diff line number Diff line
@@ -2290,8 +2290,9 @@ 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_QLE8830		0x8830

#define PCI_DEVICE_ID_QLOGIC_VF_QLE8C30		0x8C30

#define PCI_DEVICE_ID_QLOGIC_QLE844X		0x8040

#define PCI_DEVICE_ID_QLOGIC_VF_QLE844X	0x8440
@@ -2318,7 +2319,8 @@ static inline bool qlcnic_83xx_check(struct qlcnic_adapter *adapter) 
		  (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;

		  (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ||

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



	return status;

}
@@ -2334,7 +2336,8 @@ static inline bool qlcnic_sriov_vf_check(struct qlcnic_adapter *adapter) 
	bool status;



	status = ((device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ||

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

		  (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X) ||

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



	return status;

}
@@ -2350,7 +2353,8 @@ static inline bool qlcnic_83xx_vf_check(struct qlcnic_adapter *adapter) 
{

	unsigned short device = adapter->pdev->device;



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

	return ((device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ||

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

}



static inline bool qlcnic_sriov_check(struct qlcnic_adapter *adapter)

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

+4 −1
Original line number Diff line number Diff line
@@ -110,8 +110,9 @@ 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_QLE8830),

	ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE8C30),

	ENTRY(PCI_DEVICE_ID_QLOGIC_QLE844X),

	ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE844X),

	{0,}
@@ -1148,6 +1149,7 @@ static void qlcnic_get_bar_length(u32 dev_id, ulong *bar) 
	case PCI_DEVICE_ID_QLOGIC_QLE844X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE834X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE844X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE8C30:

		*bar = QLCNIC_83XX_BAR0_LENGTH;

		break;

	default:
@@ -2490,6 +2492,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		qlcnic_83xx_register_map(ahw);

		break;

	case PCI_DEVICE_ID_QLOGIC_VF_QLE834X:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE8C30:

	case PCI_DEVICE_ID_QLOGIC_VF_QLE844X:

		qlcnic_sriov_vf_register_map(ahw);

		break;