drivers: net: xgene: Fix RSS indirection table fields (29b4eafb) · Commits · 戴 / test

drivers/net/ethernet/apm/xgene/xgene_enet_cle.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -32,13 +32,20 @@ static void xgene_cle_sband_to_hw(u8 frag, enum xgene_cle_prot_version ver,
		SET_VAL(SB_HDRLEN, len);
		}

		static void xgene_cle_idt_to_hw(u32 dstqid, u32 fpsel,
		static void xgene_cle_idt_to_hw(struct xgene_enet_pdata *pdata,
		u32 dstqid, u32 fpsel,
		u32 nfpsel, u32 *idt_reg)
		{
		if (pdata->enet_id == XGENE_ENET1) {
		*idt_reg = SET_VAL(IDT_DSTQID, dstqid) \|
		SET_VAL(IDT_FPSEL1, fpsel) \|
		SET_VAL(IDT_NFPSEL1, nfpsel);
		} else {
		*idt_reg = SET_VAL(IDT_DSTQID, dstqid) \|
		SET_VAL(IDT_FPSEL, fpsel) \|
		SET_VAL(IDT_NFPSEL, nfpsel);
		}
		}

		static void xgene_cle_dbptr_to_hw(struct xgene_enet_pdata *pdata,
		struct xgene_cle_dbptr dbptr, u32 buf)
		@@ -344,7 +351,7 @@ static int xgene_cle_set_rss_idt(struct xgene_enet_pdata *pdata)
		nfpsel = 0;
		idt_reg = 0;

		xgene_cle_idt_to_hw(dstqid, fpsel, nfpsel, &idt_reg);
		xgene_cle_idt_to_hw(pdata, dstqid, fpsel, nfpsel, &idt_reg);
		ret = xgene_cle_dram_wr(&pdata->cle, &idt_reg, 1, i,
		RSS_IDT, CLE_CMD_WR);
		if (ret)

+7 −3

Original line number	Diff line number	Diff line
		@@ -196,9 +196,13 @@ enum xgene_cle_ptree_dbptrs {
		#define IDT_DSTQID_POS 0
		#define IDT_DSTQID_LEN 12
		#define IDT_FPSEL_POS 12
		#define IDT_FPSEL_LEN 4
		#define IDT_NFPSEL_POS 16
		#define IDT_NFPSEL_LEN 4
		#define IDT_FPSEL_LEN 5
		#define IDT_NFPSEL_POS 17
		#define IDT_NFPSEL_LEN 5
		#define IDT_FPSEL1_POS 12
		#define IDT_FPSEL1_LEN 4
		#define IDT_NFPSEL1_POS 16
		#define IDT_NFPSEL1_LEN 4

		struct xgene_cle_ptree_branch {
		bool valid;