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

Commit a7c9b47b authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

ice: enable VF admin queue interrupts 



The VPINT_MBX_CTL register array must be programmed to enable VF admin
queue interrupts. Without this, VFs never get interrupts on vector 0,
and some VF drivers will fail to init.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 64a59d05

drivers/net/ethernet/intel/ice/ice_hw_autogen.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#define VPINT_ALLOC_PCI_LAST_S			12

#define VPINT_ALLOC_PCI_LAST_M			ICE_M(0x7FF, 12)

#define VPINT_ALLOC_PCI_VALID_M			BIT(31)

#define VPINT_MBX_CTL(_VSI)			(0x0016A000 + ((_VSI) * 4))

#define VPINT_MBX_CTL_CAUSE_ENA_M		BIT(30)

#define GLLAN_RCTL_0				0x002941F8

#define QRX_CONTEXT(_i, _QRX)			(0x00280000 + ((_i) * 8192 + (_QRX) * 4))

#define QRX_CTRL(_QRX)				(0x00120000 + ((_QRX) * 4))

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c

+4 −0
Original line number Diff line number Diff line
@@ -604,6 +604,10 @@ static void ice_ena_vf_mappings(struct ice_vf *vf) 
		wr32(hw, GLINT_VECT2FUNC(v), reg);

	}



	/* Map mailbox interrupt. We put an explicit 0 here to remind us that

	 * VF admin queue interrupts will go to VF MSI-X vector 0.

	 */

	wr32(hw, VPINT_MBX_CTL(abs_vf_id), VPINT_MBX_CTL_CAUSE_ENA_M | 0);

	/* set regardless of mapping mode */

	wr32(hw, VPLAN_TXQ_MAPENA(vf->vf_id), VPLAN_TXQ_MAPENA_TX_ENA_M);