| Message ID | 20240227014014.44855-5-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ravb: Align Rx descriptor setup and maintenance | expand |
On 27/02/2024 01:40, Niklas Söderlund wrote: > Remove the define describing the RZ/G2L maximum frame size and only use > the information in the hardware information struct. This will make it > easier to merge the R-Car and RZ/G2L code paths. > > There is no functional change as both the define and the maximum frame > length in the hardware information is set to 8K. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/net/ethernet/renesas/ravb.h | 1 - > drivers/net/ethernet/renesas/ravb_main.c | 5 +++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h > index 751bb29cd488..7fa60fccb6ea 100644 > --- a/drivers/net/ethernet/renesas/ravb.h > +++ b/drivers/net/ethernet/renesas/ravb.h > @@ -1017,7 +1017,6 @@ enum CSR2_BIT { > > #define RX_BUF_SZ (2048 - ETH_FCS_LEN + sizeof(__sum16)) > > -#define GBETH_RX_BUFF_MAX 8192 > #define GBETH_RX_DESC_DATA_SIZE 4080 > > struct ravb_tstamp_skb { > diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c > index 6e39d498936f..b309ca23f5b6 100644 > --- a/drivers/net/ethernet/renesas/ravb_main.c > +++ b/drivers/net/ethernet/renesas/ravb_main.c > @@ -566,7 +566,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) > } > > /* Receive frame limit set register */ > - ravb_write(ndev, GBETH_RX_BUFF_MAX + ETH_FCS_LEN, RFLR); > + ravb_write(ndev, priv->info->rx_max_frame_size + ETH_FCS_LEN, RFLR); > > /* EMAC Mode: PAUSE prohibition; Duplex; TX; RX; CRC Pass Through */ > ravb_write(ndev, ECMR_ZPF | ((priv->duplex > 0) ? ECMR_DM : 0) | > @@ -627,6 +627,7 @@ static void ravb_emac_init(struct net_device *ndev) > > static int ravb_dmac_init_gbeth(struct net_device *ndev) > { > + struct ravb_private *priv = netdev_priv(ndev); > int error; > > error = ravb_ring_init(ndev, RAVB_BE); > @@ -640,7 +641,7 @@ static int ravb_dmac_init_gbeth(struct net_device *ndev) > ravb_write(ndev, 0x60000000, RCR); > > /* Set Max Frame Length (RTC) */ > - ravb_write(ndev, 0x7ffc0000 | GBETH_RX_BUFF_MAX, RTC); > + ravb_write(ndev, 0x7ffc0000 | priv->info->rx_max_frame_size, RTC); > > /* Set FIFO size */ > ravb_write(ndev, 0x00222200, TGC); Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index 751bb29cd488..7fa60fccb6ea 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -1017,7 +1017,6 @@ enum CSR2_BIT { #define RX_BUF_SZ (2048 - ETH_FCS_LEN + sizeof(__sum16)) -#define GBETH_RX_BUFF_MAX 8192 #define GBETH_RX_DESC_DATA_SIZE 4080 struct ravb_tstamp_skb { diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 6e39d498936f..b309ca23f5b6 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -566,7 +566,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) } /* Receive frame limit set register */ - ravb_write(ndev, GBETH_RX_BUFF_MAX + ETH_FCS_LEN, RFLR); + ravb_write(ndev, priv->info->rx_max_frame_size + ETH_FCS_LEN, RFLR); /* EMAC Mode: PAUSE prohibition; Duplex; TX; RX; CRC Pass Through */ ravb_write(ndev, ECMR_ZPF | ((priv->duplex > 0) ? ECMR_DM : 0) | @@ -627,6 +627,7 @@ static void ravb_emac_init(struct net_device *ndev) static int ravb_dmac_init_gbeth(struct net_device *ndev) { + struct ravb_private *priv = netdev_priv(ndev); int error; error = ravb_ring_init(ndev, RAVB_BE); @@ -640,7 +641,7 @@ static int ravb_dmac_init_gbeth(struct net_device *ndev) ravb_write(ndev, 0x60000000, RCR); /* Set Max Frame Length (RTC) */ - ravb_write(ndev, 0x7ffc0000 | GBETH_RX_BUFF_MAX, RTC); + ravb_write(ndev, 0x7ffc0000 | priv->info->rx_max_frame_size, RTC); /* Set FIFO size */ ravb_write(ndev, 0x00222200, TGC);
Remove the define describing the RZ/G2L maximum frame size and only use the information in the hardware information struct. This will make it easier to merge the R-Car and RZ/G2L code paths. There is no functional change as both the define and the maximum frame length in the hardware information is set to 8K. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- drivers/net/ethernet/renesas/ravb.h | 1 - drivers/net/ethernet/renesas/ravb_main.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-)