diff options
Diffstat (limited to 'bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0196-sh_eth-remove-sh_eth_cpu_data-rpadir_value.patch')
| -rw-r--r-- | bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0196-sh_eth-remove-sh_eth_cpu_data-rpadir_value.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0196-sh_eth-remove-sh_eth_cpu_data-rpadir_value.patch b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0196-sh_eth-remove-sh_eth_cpu_data-rpadir_value.patch new file mode 100644 index 00000000..db774e11 --- /dev/null +++ b/bsp/meta-rcar/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0196-sh_eth-remove-sh_eth_cpu_data-rpadir_value.patch @@ -0,0 +1,95 @@ +From 3edb531642371a70dc3efbd3c468581521e03c9c Mon Sep 17 00:00:00 2001 +From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> +Date: Mon, 25 Jun 2018 23:37:06 +0300 +Subject: [PATCH 016/211] sh_eth: remove sh_eth_cpu_data::rpadir_value + +If RPADIR exists, the value written to it is always the same for all SoCs +(and derived from NET_IP_ALIGN), so there has not been any need to store +it in the *struct* sh_eth_cpu_data... + +Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> +Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> +Signed-off-by: David S. Miller <davem@davemloft.net> +(cherry picked from commit 470103dc840ec9cda91b5049d82f4bb599cea759) +Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> +--- + drivers/net/ethernet/renesas/sh_eth.c | 8 +------- + drivers/net/ethernet/renesas/sh_eth.h | 1 - + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c +index 87a6bcd..981ea16 100644 +--- a/drivers/net/ethernet/renesas/sh_eth.c ++++ b/drivers/net/ethernet/renesas/sh_eth.c +@@ -622,7 +622,6 @@ static struct sh_eth_cpu_data r7s72100_data = { + .tpauser = 1, + .hw_swap = 1, + .rpadir = 1, +- .rpadir_value = 2 << 16, + .no_trimd = 1, + .no_ade = 1, + .xdfar_rw = 1, +@@ -672,7 +671,6 @@ static struct sh_eth_cpu_data r8a7740_data = { + .bculr = 1, + .hw_swap = 1, + .rpadir = 1, +- .rpadir_value = 2 << 16, + .no_trimd = 1, + .no_ade = 1, + .xdfar_rw = 1, +@@ -798,7 +796,6 @@ static struct sh_eth_cpu_data r8a77980_data = { + .hw_swap = 1, + .nbst = 1, + .rpadir = 1, +- .rpadir_value = 2 << 16, + .no_trimd = 1, + .no_ade = 1, + .xdfar_rw = 1, +@@ -851,7 +848,6 @@ static struct sh_eth_cpu_data sh7724_data = { + .tpauser = 1, + .hw_swap = 1, + .rpadir = 1, +- .rpadir_value = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */ + }; + + static void sh_eth_set_rate_sh7757(struct net_device *ndev) +@@ -898,7 +894,6 @@ static struct sh_eth_cpu_data sh7757_data = { + .hw_swap = 1, + .no_ade = 1, + .rpadir = 1, +- .rpadir_value = 2 << 16, + .rtrate = 1, + .dual_port = 1, + }; +@@ -978,7 +973,6 @@ static struct sh_eth_cpu_data sh7757_data_giga = { + .bculr = 1, + .hw_swap = 1, + .rpadir = 1, +- .rpadir_value = 2 << 16, + .no_trimd = 1, + .no_ade = 1, + .xdfar_rw = 1, +@@ -1467,7 +1461,7 @@ static int sh_eth_dev_init(struct net_device *ndev) + /* Descriptor format */ + sh_eth_ring_format(ndev); + if (mdp->cd->rpadir) +- sh_eth_write(ndev, mdp->cd->rpadir_value, RPADIR); ++ sh_eth_write(ndev, NET_IP_ALIGN << 16, RPADIR); + + /* all sh_eth int mask */ + sh_eth_write(ndev, 0, EESIPR); +diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h +index ae3ef5d..a03d99f 100644 +--- a/drivers/net/ethernet/renesas/sh_eth.h ++++ b/drivers/net/ethernet/renesas/sh_eth.h +@@ -487,7 +487,6 @@ struct sh_eth_cpu_data { + u32 ecsipr_value; + u32 fdr_value; + u32 fcftr_value; +- u32 rpadir_value; + + /* interrupt checking mask */ + u32 tx_check; +-- +2.7.4 + |