Commit 4c33f83a authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e/i40evf: i40e_register.h update 



This updates the register file for new hardware.
The format of the file has changed requiring drivers to
declare I40E_MASK. I40E_MASK is to be used with 32 bit registers.

This patch also updates the drivers to accommodate the register changes.

Change-ID: If9bc8d736391024cbf99054efe50f9acc12ee4f1
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e0f802fb

drivers/net/ethernet/intel/i40e/i40e_main.c

+16 −14
Original line number Diff line number Diff line
@@ -5744,26 +5744,28 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) 
	/* find what triggered the MDD event */

	reg = rd32(hw, I40E_GL_MDET_TX);

	if (reg & I40E_GL_MDET_TX_VALID_MASK) {

		u8 func = (reg & I40E_GL_MDET_TX_FUNCTION_MASK)

				>> I40E_GL_MDET_TX_FUNCTION_SHIFT;

		u8 event = (reg & I40E_GL_MDET_TX_EVENT_SHIFT)

				>> I40E_GL_MDET_TX_EVENT_SHIFT;

		u8 queue = (reg & I40E_GL_MDET_TX_QUEUE_MASK)

				>> I40E_GL_MDET_TX_QUEUE_SHIFT;

		u8 pf_num = (reg & I40E_GL_MDET_TX_PF_NUM_MASK) >>

				I40E_GL_MDET_TX_PF_NUM_SHIFT;

		u8 vf_num = (reg & I40E_GL_MDET_TX_VF_NUM_MASK) >>

				I40E_GL_MDET_TX_VF_NUM_SHIFT;

		u8 event = (reg & I40E_GL_MDET_TX_EVENT_SHIFT) >>

				I40E_GL_MDET_TX_EVENT_SHIFT;

		u8 queue = (reg & I40E_GL_MDET_TX_QUEUE_MASK) >>

				I40E_GL_MDET_TX_QUEUE_SHIFT;

		dev_info(&pf->pdev->dev,

			 "Malicious Driver Detection event 0x%02x on TX queue %d of function 0x%02x\n",

			 event, queue, func);

			 "Malicious Driver Detection event 0x%02x on TX queue %d pf number 0x%02x vf number 0x%02x\n",

			 event, queue, pf_num, vf_num);

		wr32(hw, I40E_GL_MDET_TX, 0xffffffff);

		mdd_detected = true;

	}

	reg = rd32(hw, I40E_GL_MDET_RX);

	if (reg & I40E_GL_MDET_RX_VALID_MASK) {

		u8 func = (reg & I40E_GL_MDET_RX_FUNCTION_MASK)

				>> I40E_GL_MDET_RX_FUNCTION_SHIFT;

		u8 event = (reg & I40E_GL_MDET_RX_EVENT_SHIFT)

				>> I40E_GL_MDET_RX_EVENT_SHIFT;

		u8 queue = (reg & I40E_GL_MDET_RX_QUEUE_MASK)

				>> I40E_GL_MDET_RX_QUEUE_SHIFT;

		u8 func = (reg & I40E_GL_MDET_RX_FUNCTION_MASK) >>

				I40E_GL_MDET_RX_FUNCTION_SHIFT;

		u8 event = (reg & I40E_GL_MDET_RX_EVENT_SHIFT) >>

				I40E_GL_MDET_RX_EVENT_SHIFT;

		u8 queue = (reg & I40E_GL_MDET_RX_QUEUE_MASK) >>

				I40E_GL_MDET_RX_QUEUE_SHIFT;

		dev_info(&pf->pdev->dev,

			 "Malicious Driver Detection event 0x%02x on RX queue %d of function 0x%02x\n",

			 event, queue, func);

drivers/net/ethernet/intel/i40e/i40e_register.h

+1853 −3158

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
					 (d) == I40E_DEV_ID_QSFP_B  || \

					 (d) == I40E_DEV_ID_QSFP_C)



/* I40E_MASK is a macro used on 32 bit registers */

#define I40E_MASK(mask, shift) (mask << shift)



#define I40E_MAX_VSI_QP			16

#define I40E_MAX_VF_VSI			3

#define I40E_MAX_CHAINED_RX_BUFFERS	5

drivers/net/ethernet/intel/i40evf/i40e_register.h

+1853 −3158

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
					 (d) == I40E_DEV_ID_QSFP_B  || \

					 (d) == I40E_DEV_ID_QSFP_C)



/* I40E_MASK is a macro used on 32 bit registers */

#define I40E_MASK(mask, shift) (mask << shift)



#define I40E_MAX_VSI_QP			16

#define I40E_MAX_VF_VSI			3

#define I40E_MAX_CHAINED_RX_BUFFERS	5