Commit 4dbc76e0 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

iavf: rename device ID defines 



Rename the device ID defines to have IAVF in them
and remove all the unused defines.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f1cad2ce

drivers/net/ethernet/intel/iavf/i40e_adminq.c

+10 −12
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
static void i40e_adminq_init_regs(struct i40e_hw *hw)

{

	/* set head and tail registers in our local struct */

	if (i40e_is_vf(hw)) {

	hw->aq.asq.tail = IAVF_VF_ATQT1;

	hw->aq.asq.head = IAVF_VF_ATQH1;

	hw->aq.asq.len  = IAVF_VF_ATQLEN1;
@@ -28,7 +27,6 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw) 
	hw->aq.arq.bal  = IAVF_VF_ARQBAL1;

	hw->aq.arq.bah  = IAVF_VF_ARQBAH1;

}

}



/**

 *  i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings

drivers/net/ethernet/intel/iavf/i40e_common.c

+4 −25
Original line number Diff line number Diff line
@@ -19,33 +19,12 @@ iavf_status i40e_set_mac_type(struct i40e_hw *hw) 


	if (hw->vendor_id == PCI_VENDOR_ID_INTEL) {

		switch (hw->device_id) {

		case I40E_DEV_ID_SFP_XL710:

		case I40E_DEV_ID_QEMU:

		case I40E_DEV_ID_KX_B:

		case I40E_DEV_ID_KX_C:

		case I40E_DEV_ID_QSFP_A:

		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

		case I40E_DEV_ID_10G_BASE_T:

		case I40E_DEV_ID_10G_BASE_T4:

		case I40E_DEV_ID_20G_KR2:

		case I40E_DEV_ID_20G_KR2_A:

		case I40E_DEV_ID_25G_B:

		case I40E_DEV_ID_25G_SFP28:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_SFP_X722:

		case I40E_DEV_ID_1G_BASE_T_X722:

		case I40E_DEV_ID_10G_BASE_T_X722:

		case I40E_DEV_ID_SFP_I_X722:

			hw->mac.type = I40E_MAC_X722;

			break;

		case I40E_DEV_ID_X722_VF:

		case IAVF_DEV_ID_X722_VF:

			hw->mac.type = I40E_MAC_X722_VF;

			break;

		case I40E_DEV_ID_VF:

		case I40E_DEV_ID_VF_HV:

		case I40E_DEV_ID_ADAPTIVE_VF:

		case IAVF_DEV_ID_VF:

		case IAVF_DEV_ID_VF_HV:

		case IAVF_DEV_ID_ADAPTIVE_VF:

			hw->mac.type = I40E_MAC_VF;

			break;

		default:

drivers/net/ethernet/intel/iavf/i40e_devids.h

+9 −31
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2013 - 2018 Intel Corporation. */



#ifndef _I40E_DEVIDS_H_

#define _I40E_DEVIDS_H_



/* Device IDs */

#define I40E_DEV_ID_SFP_XL710		0x1572

#define I40E_DEV_ID_QEMU		0x1574

#define I40E_DEV_ID_KX_B		0x1580

#define I40E_DEV_ID_KX_C		0x1581

#define I40E_DEV_ID_QSFP_A		0x1583

#define I40E_DEV_ID_QSFP_B		0x1584

#define I40E_DEV_ID_QSFP_C		0x1585

#define I40E_DEV_ID_10G_BASE_T		0x1586

#define I40E_DEV_ID_20G_KR2		0x1587

#define I40E_DEV_ID_20G_KR2_A		0x1588

#define I40E_DEV_ID_10G_BASE_T4		0x1589

#define I40E_DEV_ID_25G_B		0x158A

#define I40E_DEV_ID_25G_SFP28		0x158B

#define I40E_DEV_ID_VF			0x154C

#define I40E_DEV_ID_VF_HV		0x1571

#define I40E_DEV_ID_ADAPTIVE_VF		0x1889

#define I40E_DEV_ID_SFP_X722		0x37D0

#define I40E_DEV_ID_1G_BASE_T_X722	0x37D1

#define I40E_DEV_ID_10G_BASE_T_X722	0x37D2

#define I40E_DEV_ID_SFP_I_X722		0x37D3

#define I40E_DEV_ID_X722_VF		0x37CD



#define i40e_is_40G_device(d)		((d) == I40E_DEV_ID_QSFP_A  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \

					 (d) == I40E_DEV_ID_QSFP_C)



#endif /* _I40E_DEVIDS_H_ */
 
#ifndef _IAVF_DEVIDS_H_

#define _IAVF_DEVIDS_H_



/* Device IDs for the VF driver */

#define IAVF_DEV_ID_VF			0x154C

#define IAVF_DEV_ID_VF_HV		0x1571

#define IAVF_DEV_ID_ADAPTIVE_VF		0x1889

#define IAVF_DEV_ID_X722_VF		0x37CD

#endif /* _IAVF_DEVIDS_H_ */

drivers/net/ethernet/intel/iavf/i40e_type.h

+0 −6
Original line number Diff line number Diff line
@@ -193,12 +193,6 @@ struct i40e_hw { 
	char err_str[16];

};



static inline bool i40e_is_vf(struct i40e_hw *hw)

{

	return (hw->mac.type == I40E_MAC_VF ||

		hw->mac.type == I40E_MAC_X722_VF);

}



struct i40e_driver_version {

	u8 major_version;

	u8 minor_version;

drivers/net/ethernet/intel/iavf/iavf_main.c

+4 −4
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ static const char iavf_copyright[] = 
 *   Class, Class Mask, private data (not used) }

 */

static const struct pci_device_id iavf_pci_tbl[] = {

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_VF), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_VF_HV), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_X722_VF), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_ADAPTIVE_VF), 0},

	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF), 0},

	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_VF_HV), 0},

	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_X722_VF), 0},

	{PCI_VDEVICE(INTEL, IAVF_DEV_ID_ADAPTIVE_VF), 0},

	/* required last entry */

	{0, }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE