Commit 49686338 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by David S. Miller

ravb: Use the max frame size from hardware info for RZ/G2L

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: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarPaul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfbad647
...@@ -1017,7 +1017,6 @@ enum CSR2_BIT { ...@@ -1017,7 +1017,6 @@ enum CSR2_BIT {
#define RX_BUF_SZ (2048 - ETH_FCS_LEN + sizeof(__sum16)) #define RX_BUF_SZ (2048 - ETH_FCS_LEN + sizeof(__sum16))
#define GBETH_RX_BUFF_MAX 8192
#define GBETH_RX_DESC_DATA_SIZE 4080 #define GBETH_RX_DESC_DATA_SIZE 4080
struct ravb_tstamp_skb { struct ravb_tstamp_skb {
......
...@@ -568,7 +568,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev) ...@@ -568,7 +568,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
} }
/* Receive frame limit set register */ /* 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 */ /* EMAC Mode: PAUSE prohibition; Duplex; TX; RX; CRC Pass Through */
ravb_write(ndev, ECMR_ZPF | ((priv->duplex > 0) ? ECMR_DM : 0) | ravb_write(ndev, ECMR_ZPF | ((priv->duplex > 0) ? ECMR_DM : 0) |
...@@ -629,6 +629,7 @@ static void ravb_emac_init(struct net_device *ndev) ...@@ -629,6 +629,7 @@ static void ravb_emac_init(struct net_device *ndev)
static int ravb_dmac_init_gbeth(struct net_device *ndev) static int ravb_dmac_init_gbeth(struct net_device *ndev)
{ {
struct ravb_private *priv = netdev_priv(ndev);
int error; int error;
error = ravb_ring_init(ndev, RAVB_BE); error = ravb_ring_init(ndev, RAVB_BE);
...@@ -642,7 +643,7 @@ static int ravb_dmac_init_gbeth(struct net_device *ndev) ...@@ -642,7 +643,7 @@ static int ravb_dmac_init_gbeth(struct net_device *ndev)
ravb_write(ndev, 0x60000000, RCR); ravb_write(ndev, 0x60000000, RCR);
/* Set Max Frame Length (RTC) */ /* 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 */ /* Set FIFO size */
ravb_write(ndev, 0x00222200, TGC); ravb_write(ndev, 0x00222200, TGC);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment