[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <014b01dbcafd$31197450$934c5cf0$@trustnetic.com>
Date: Thu, 22 May 2025 17:37:53 +0800
From: Jiawen Wu <jiawenwu@...stnetic.com>
To: "'Simon Horman'" <horms@...nel.org>
Cc: <netdev@...r.kernel.org>,
<pabeni@...hat.com>,
<kuba@...nel.org>,
<edumazet@...gle.com>,
<davem@...emloft.net>,
<andrew+netdev@...n.ch>,
<mengyuanlou@...-swift.com>
Subject: RE: [PATCH net-next 2/2] net: txgbe: Support the FDIR rules assigned to VFs
> > diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c
> > index ef50efbaec0f..d542c8a5a689 100644
> > --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c
> > +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c
> > @@ -307,6 +307,7 @@ void txgbe_atr(struct wx_ring *ring, struct wx_tx_buffer *first, u8 ptype)
> > int txgbe_fdir_set_input_mask(struct wx *wx, union txgbe_atr_input *input_mask)
> > {
> > u32 fdirm = 0, fdirtcpm = 0, flex = 0;
> > + int i, j;
>
> It would be nice to have more intuitive variable names than i and j,
> which seem more appropriate as names for iterators.
May not be a very intuitive variable name. It just defines the index and offset.
This code piece says, there are 16 registers to store flex information of 64 VMs.
And each register has 32 bits for 4 VMs. I can change to name it "index" and
"offset" if necessary. :)
>
> >
> > /* Program the relevant mask registers. If src/dst_port or src/dst_addr
> > * are zero, then assume a full mask for that field. Also assume that
> > @@ -352,15 +353,17 @@ int txgbe_fdir_set_input_mask(struct wx *wx, union txgbe_atr_input *input_mask)
> > /* Now mask VM pool and destination IPv6 - bits 5 and 2 */
> > wr32(wx, TXGBE_RDB_FDIR_OTHER_MSK, fdirm);
> >
> > - flex = rd32(wx, TXGBE_RDB_FDIR_FLEX_CFG(0));
> > - flex &= ~TXGBE_RDB_FDIR_FLEX_CFG_FIELD0;
> > + i = VMDQ_P(0) / 4;
> > + j = VMDQ_P(0) % 4;
> > + flex = rd32(wx, TXGBE_RDB_FDIR_FLEX_CFG(i));
> > + flex &= ~(TXGBE_RDB_FDIR_FLEX_CFG_FIELD0 << (j * 8));
> > flex |= (TXGBE_RDB_FDIR_FLEX_CFG_BASE_MAC |
> > - TXGBE_RDB_FDIR_FLEX_CFG_OFST(0x6));
> > + TXGBE_RDB_FDIR_FLEX_CFG_OFST(0x6)) << (j * 8);
> >
> > switch ((__force u16)input_mask->formatted.flex_bytes & 0xFFFF) {
> > case 0x0000:
> > /* Mask Flex Bytes */
> > - flex |= TXGBE_RDB_FDIR_FLEX_CFG_MSK;
> > + flex |= TXGBE_RDB_FDIR_FLEX_CFG_MSK << (j * 8);
> > break;
> > case 0xFFFF:
> > break;
> > @@ -368,7 +371,7 @@ int txgbe_fdir_set_input_mask(struct wx *wx, union txgbe_atr_input *input_mask)
> > wx_err(wx, "Error on flexible byte mask\n");
> > return -EINVAL;
> > }
> > - wr32(wx, TXGBE_RDB_FDIR_FLEX_CFG(0), flex);
> > + wr32(wx, TXGBE_RDB_FDIR_FLEX_CFG(i), flex);
> >
> > /* store the TCP/UDP port masks, bit reversed from port layout */
> > fdirtcpm = ntohs(input_mask->formatted.dst_port);
> > @@ -516,14 +519,16 @@ static void txgbe_fdir_enable(struct wx *wx, u32 fdirctrl)
> > static void txgbe_init_fdir_signature(struct wx *wx)
> > {
> > u32 fdirctrl = TXGBE_FDIR_PBALLOC_64K;
> > + int i = VMDQ_P(0) / 4;
> > + int j = VMDQ_P(0) % 4;
>
> Ditto.
>
> > u32 flex = 0;
> >
> > - flex = rd32(wx, TXGBE_RDB_FDIR_FLEX_CFG(0));
> > - flex &= ~TXGBE_RDB_FDIR_FLEX_CFG_FIELD0;
> > + flex = rd32(wx, TXGBE_RDB_FDIR_FLEX_CFG(i));
> > + flex &= ~(TXGBE_RDB_FDIR_FLEX_CFG_FIELD0 << (j * 8));
> >
> > flex |= (TXGBE_RDB_FDIR_FLEX_CFG_BASE_MAC |
> > - TXGBE_RDB_FDIR_FLEX_CFG_OFST(0x6));
> > - wr32(wx, TXGBE_RDB_FDIR_FLEX_CFG(0), flex);
> > + TXGBE_RDB_FDIR_FLEX_CFG_OFST(0x6)) << (j * 8);
> > + wr32(wx, TXGBE_RDB_FDIR_FLEX_CFG(i), flex);
> >
> > /* Continue setup of fdirctrl register bits:
> > * Move the flexible bytes to use the ethertype - shift 6 words
> > diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
> > index 261a83308568..094d55cdb86c 100644
> > --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
> > +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
> > @@ -272,7 +272,7 @@ struct txgbe_fdir_filter {
> > struct hlist_node fdir_node;
> > union txgbe_atr_input filter;
> > u16 sw_idx;
> > - u16 action;
> > + u64 action;
> > };
> >
> > /* TX/RX descriptor defines */
> > --
> > 2.48.1
> >
> >
>
Powered by blists - more mailing lists