diff for duplicates of <d33e6f92-7080-5077-ba44-629fefef052d@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b092b2a..953ee54 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,13 +63,13 @@ Thank you. >> >> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> >> --- ->> ? drivers/net/ethernet/stmicro/stmmac/common.h???????? |? 2 +- ->> ? drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c??? |? 3 ++- ->> ? drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 12 +++++++++++- ->> ? drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c? |? 3 ++- ->> ? drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c??? | 11 ++++++++++- ->> ? drivers/net/ethernet/stmicro/stmmac/stmmac_main.c??? |? 2 +- ->> ? 6 files changed, 27 insertions(+), 6 deletions(-) +>> drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- +>> drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 ++- +>> drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 12 +++++++++++- +>> drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 3 ++- +>> drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 11 ++++++++++- +>> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- +>> 6 files changed, 27 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h >> b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -77,15 +77,15 @@ Thank you. >> --- a/drivers/net/ethernet/stmicro/stmmac/common.h >> +++ b/drivers/net/ethernet/stmicro/stmmac/common.h >> @@ -474,7 +474,7 @@ struct mac_device_info; ->> ? /* Helpers to program the MAC core */ ->> ? struct stmmac_ops { ->> ????? /* MAC core initialization */ ->> -??? void (*core_init)(struct mac_device_info *hw, int mtu); ->> +??? void (*core_init)(struct mac_device_info *hw, struct net_device +>> /* Helpers to program the MAC core */ +>> struct stmmac_ops { +>> /* MAC core initialization */ +>> - void (*core_init)(struct mac_device_info *hw, int mtu); +>> + void (*core_init)(struct mac_device_info *hw, struct net_device >> *dev); ->> ????? /* Enable the MAC RX/TX */ ->> ????? void (*set_mac)(void __iomem *ioaddr, bool enable); ->> ????? /* Enable and verify that the IPC module is supported */ +>> /* Enable the MAC RX/TX */ +>> void (*set_mac)(void __iomem *ioaddr, bool enable); +>> /* Enable and verify that the IPC module is supported */ >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> index 9eb7f65d8000..a3fa65b1ca8e 100644 @@ -93,88 +93,88 @@ Thank you. >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c >> @@ -483,7 +483,8 @@ static int sun8i_dwmac_init(struct platform_device >> *pdev, void *priv) ->> ????? return 0; ->> ? } ->> ? -static void sun8i_dwmac_core_init(struct mac_device_info *hw, int mtu) +>> return 0; +>> } +>> -static void sun8i_dwmac_core_init(struct mac_device_info *hw, int mtu) >> +static void sun8i_dwmac_core_init(struct mac_device_info *hw, ->> +????????????????? struct net_device *dev) ->> ? { ->> ????? void __iomem *ioaddr = hw->pcsr; ->> ????? u32 v; +>> + struct net_device *dev) +>> { +>> void __iomem *ioaddr = hw->pcsr; +>> u32 v; >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c >> b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c >> index 8a86340ff2d3..540d21786a43 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c >> @@ -25,18 +25,28 @@ ->> ? #include <linux/crc32.h> ->> ? #include <linux/slab.h> ->> ? #include <linux/ethtool.h> +>> #include <linux/crc32.h> +>> #include <linux/slab.h> +>> #include <linux/ethtool.h> >> +#include <net/dsa.h> ->> ? #include <asm/io.h> ->> ? #include "stmmac_pcs.h" ->> ? #include "dwmac1000.h" ->> ? -static void dwmac1000_core_init(struct mac_device_info *hw, int mtu) +>> #include <asm/io.h> +>> #include "stmmac_pcs.h" +>> #include "dwmac1000.h" +>> -static void dwmac1000_core_init(struct mac_device_info *hw, int mtu) >> +static void dwmac1000_core_init(struct mac_device_info *hw, ->> +??????????????? struct net_device *dev) ->> ? { ->> ????? void __iomem *ioaddr = hw->pcsr; ->> ????? u32 value = readl(ioaddr + GMAC_CONTROL); ->> +??? int mtu = dev->mtu; ->> ? ????? /* Configure GMAC core */ ->> ????? value |= GMAC_CORE_INIT; ->> ? +??? /* Clear ACS bit because Ethernet switch tagging formats such as ->> +???? * Broadcom tags can look like invalid LLC/SNAP packets and cause +>> + struct net_device *dev) +>> { +>> void __iomem *ioaddr = hw->pcsr; +>> u32 value = readl(ioaddr + GMAC_CONTROL); +>> + int mtu = dev->mtu; +>> /* Configure GMAC core */ +>> value |= GMAC_CORE_INIT; +>> + /* Clear ACS bit because Ethernet switch tagging formats such as +>> + * Broadcom tags can look like invalid LLC/SNAP packets and cause >> the ->> +???? * hardware to truncate packets on reception. ->> +???? */ ->> +??? if (netdev_uses_dsa(dev)) ->> +??????? value &= ~GMAC_CONTROL_ACS; +>> + * hardware to truncate packets on reception. +>> + */ +>> + if (netdev_uses_dsa(dev)) +>> + value &= ~GMAC_CONTROL_ACS; >> + ->> ????? if (mtu > 1500) ->> ????????? value |= GMAC_CONTROL_2K; ->> ????? if (mtu > 2000) +>> if (mtu > 1500) +>> value |= GMAC_CONTROL_2K; +>> if (mtu > 2000) >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c >> b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c >> index 8ef517356313..c1ee427c42cb 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c >> @@ -28,7 +28,8 @@ ->> ? #include <asm/io.h> ->> ? #include "dwmac100.h" ->> ? -static void dwmac100_core_init(struct mac_device_info *hw, int mtu) +>> #include <asm/io.h> +>> #include "dwmac100.h" +>> -static void dwmac100_core_init(struct mac_device_info *hw, int mtu) >> +static void dwmac100_core_init(struct mac_device_info *hw, ->> +?????????????????? struct net_device *dev) ->> ? { ->> ????? void __iomem *ioaddr = hw->pcsr; ->> ????? u32 value = readl(ioaddr + MAC_CONTROL); +>> + struct net_device *dev) +>> { +>> void __iomem *ioaddr = hw->pcsr; +>> u32 value = readl(ioaddr + MAC_CONTROL); >> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c >> b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c >> index f3ed8f7853eb..6af5100d3cb2 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c >> @@ -20,13 +20,22 @@ ->> ? #include "stmmac_pcs.h" ->> ? #include "dwmac4.h" ->> ? -static void dwmac4_core_init(struct mac_device_info *hw, int mtu) +>> #include "stmmac_pcs.h" +>> #include "dwmac4.h" +>> -static void dwmac4_core_init(struct mac_device_info *hw, int mtu) >> +static void dwmac4_core_init(struct mac_device_info *hw, ->> +???????????????? struct net_device *dev) ->> ? { ->> ????? void __iomem *ioaddr = hw->pcsr; ->> ????? u32 value = readl(ioaddr + GMAC_CONFIG); ->> +??? int mtu = dev->mtu; ->> ? ????? value |= GMAC_CORE_INIT; ->> ? +??? /* Clear ACS bit because Ethernet switch tagging formats such as ->> +???? * Broadcom tags can look like invalid LLC/SNAP packets and cause +>> + struct net_device *dev) +>> { +>> void __iomem *ioaddr = hw->pcsr; +>> u32 value = readl(ioaddr + GMAC_CONFIG); +>> + int mtu = dev->mtu; +>> value |= GMAC_CORE_INIT; +>> + /* Clear ACS bit because Ethernet switch tagging formats such as +>> + * Broadcom tags can look like invalid LLC/SNAP packets and cause >> the ->> +???? * hardware to truncate packets on reception. ->> +???? */ ->> +??? if (netdev_uses_dsa(dev)) ->> +??????? value &= ~GMAC_CONTROL_ACS; +>> + * hardware to truncate packets on reception. +>> + */ +>> + if (netdev_uses_dsa(dev)) +>> + value &= ~GMAC_CONTROL_ACS; >> + ->> ????? if (mtu > 1500) ->> ????????? value |= GMAC_CONFIG_2K; ->> ????? if (mtu > 2000) +>> if (mtu > 1500) +>> value |= GMAC_CONFIG_2K; +>> if (mtu > 2000) >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> index f99f14c35063..7ad841434ec8 100644 @@ -182,12 +182,12 @@ Thank you. >> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c >> @@ -2527,7 +2527,7 @@ static int stmmac_hw_setup(struct net_device >> *dev, bool init_ptp) ->> ????? } ->> ? ????? /* Initialize the MAC Core */ ->> -??? priv->hw->mac->core_init(priv->hw, dev->mtu); ->> +??? priv->hw->mac->core_init(priv->hw, dev); ->> ? ????? /* Initialize MTL*/ ->> ????? if (priv->synopsys_id >= DWMAC_CORE_4_00) +>> } +>> /* Initialize the MAC Core */ +>> - priv->hw->mac->core_init(priv->hw, dev->mtu); +>> + priv->hw->mac->core_init(priv->hw, dev); +>> /* Initialize MTL*/ +>> if (priv->synopsys_id >= DWMAC_CORE_4_00) > > diff --git a/a/content_digest b/N1/content_digest index 5919334..8387bb7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\020180116232545.22054-1-f.fainelli@gmail.com\0" "ref\04fb40e11-a160-b9c7-aa02-f30a9de172bd@st.com\0" - "From\0f.fainelli@gmail.com (Florian Fainelli)\0" - "Subject\0[PATCH net-next] net: stmmac: Fix reception of Broadcom switches tags\0" + "From\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Subject\0Re: [PATCH net-next] net: stmmac: Fix reception of Broadcom switches tags\0" "Date\0Wed, 17 Jan 2018 15:16:33 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Giuseppe CAVALLARO <peppe.cavallaro@st.com>" + " netdev@vger.kernel.org\0" + "Cc\0andrew@lunn.ch" + vivien.didelot@savoirfairelinux.com + Alexandre Torgue <alexandre.torgue@st.com> + Maxime Ripard <maxime.ripard@free-electrons.com> + Chen-Yu Tsai <wens@csie.org> + open list <linux-kernel@vger.kernel.org> + " moderated list:ARM/Allwinner sunXi SoC support <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Hi Peppe,\n" @@ -71,13 +79,13 @@ ">>\n" ">> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>\n" ">> ---\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/common.h???????? |? 2 +-\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c??? |? 3 ++-\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 12 +++++++++++-\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c? |? 3 ++-\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c??? | 11 ++++++++++-\n" - ">> ? drivers/net/ethernet/stmicro/stmmac/stmmac_main.c??? |? 2 +-\n" - ">> ? 6 files changed, 27 insertions(+), 6 deletions(-)\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/common.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 |\302\240 2 +-\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c\302\240\302\240\302\240 |\302\240 3 ++-\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 12 +++++++++++-\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c\302\240 |\302\240 3 ++-\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c\302\240\302\240\302\240 | 11 ++++++++++-\n" + ">> \302\240 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c\302\240\302\240\302\240 |\302\240 2 +-\n" + ">> \302\240 6 files changed, 27 insertions(+), 6 deletions(-)\n" ">>\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h\n" ">> b/drivers/net/ethernet/stmicro/stmmac/common.h\n" @@ -85,15 +93,15 @@ ">> --- a/drivers/net/ethernet/stmicro/stmmac/common.h\n" ">> +++ b/drivers/net/ethernet/stmicro/stmmac/common.h\n" ">> @@ -474,7 +474,7 @@ struct mac_device_info;\n" - ">> ? /* Helpers to program the MAC core */\n" - ">> ? struct stmmac_ops {\n" - ">> ????? /* MAC core initialization */\n" - ">> -??? void (*core_init)(struct mac_device_info *hw, int mtu);\n" - ">> +??? void (*core_init)(struct mac_device_info *hw, struct net_device\n" + ">> \302\240 /* Helpers to program the MAC core */\n" + ">> \302\240 struct stmmac_ops {\n" + ">> \302\240\302\240\302\240\302\240\302\240 /* MAC core initialization */\n" + ">> -\302\240\302\240\302\240 void (*core_init)(struct mac_device_info *hw, int mtu);\n" + ">> +\302\240\302\240\302\240 void (*core_init)(struct mac_device_info *hw, struct net_device\n" ">> *dev);\n" - ">> ????? /* Enable the MAC RX/TX */\n" - ">> ????? void (*set_mac)(void __iomem *ioaddr, bool enable);\n" - ">> ????? /* Enable and verify that the IPC module is supported */\n" + ">> \302\240\302\240\302\240\302\240\302\240 /* Enable the MAC RX/TX */\n" + ">> \302\240\302\240\302\240\302\240\302\240 void (*set_mac)(void __iomem *ioaddr, bool enable);\n" + ">> \302\240\302\240\302\240\302\240\302\240 /* Enable and verify that the IPC module is supported */\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c\n" ">> b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c\n" ">> index 9eb7f65d8000..a3fa65b1ca8e 100644\n" @@ -101,88 +109,88 @@ ">> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c\n" ">> @@ -483,7 +483,8 @@ static int sun8i_dwmac_init(struct platform_device\n" ">> *pdev, void *priv)\n" - ">> ????? return 0;\n" - ">> ? }\n" - ">> ? -static void sun8i_dwmac_core_init(struct mac_device_info *hw, int mtu)\n" + ">> \302\240\302\240\302\240\302\240\302\240 return 0;\n" + ">> \302\240 }\n" + ">> \302\240 -static void sun8i_dwmac_core_init(struct mac_device_info *hw, int mtu)\n" ">> +static void sun8i_dwmac_core_init(struct mac_device_info *hw,\n" - ">> +????????????????? struct net_device *dev)\n" - ">> ? {\n" - ">> ????? void __iomem *ioaddr = hw->pcsr;\n" - ">> ????? u32 v;\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev)\n" + ">> \302\240 {\n" + ">> \302\240\302\240\302\240\302\240\302\240 void __iomem *ioaddr = hw->pcsr;\n" + ">> \302\240\302\240\302\240\302\240\302\240 u32 v;\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c\n" ">> b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c\n" ">> index 8a86340ff2d3..540d21786a43 100644\n" ">> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c\n" ">> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c\n" ">> @@ -25,18 +25,28 @@\n" - ">> ? #include <linux/crc32.h>\n" - ">> ? #include <linux/slab.h>\n" - ">> ? #include <linux/ethtool.h>\n" + ">> \302\240 #include <linux/crc32.h>\n" + ">> \302\240 #include <linux/slab.h>\n" + ">> \302\240 #include <linux/ethtool.h>\n" ">> +#include <net/dsa.h>\n" - ">> ? #include <asm/io.h>\n" - ">> ? #include \"stmmac_pcs.h\"\n" - ">> ? #include \"dwmac1000.h\"\n" - ">> ? -static void dwmac1000_core_init(struct mac_device_info *hw, int mtu)\n" + ">> \302\240 #include <asm/io.h>\n" + ">> \302\240 #include \"stmmac_pcs.h\"\n" + ">> \302\240 #include \"dwmac1000.h\"\n" + ">> \302\240 -static void dwmac1000_core_init(struct mac_device_info *hw, int mtu)\n" ">> +static void dwmac1000_core_init(struct mac_device_info *hw,\n" - ">> +??????????????? struct net_device *dev)\n" - ">> ? {\n" - ">> ????? void __iomem *ioaddr = hw->pcsr;\n" - ">> ????? u32 value = readl(ioaddr + GMAC_CONTROL);\n" - ">> +??? int mtu = dev->mtu;\n" - ">> ? ????? /* Configure GMAC core */\n" - ">> ????? value |= GMAC_CORE_INIT;\n" - ">> ? +??? /* Clear ACS bit because Ethernet switch tagging formats such as\n" - ">> +???? * Broadcom tags can look like invalid LLC/SNAP packets and cause\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev)\n" + ">> \302\240 {\n" + ">> \302\240\302\240\302\240\302\240\302\240 void __iomem *ioaddr = hw->pcsr;\n" + ">> \302\240\302\240\302\240\302\240\302\240 u32 value = readl(ioaddr + GMAC_CONTROL);\n" + ">> +\302\240\302\240\302\240 int mtu = dev->mtu;\n" + ">> \302\240 \302\240\302\240\302\240\302\240\302\240 /* Configure GMAC core */\n" + ">> \302\240\302\240\302\240\302\240\302\240 value |= GMAC_CORE_INIT;\n" + ">> \302\240 +\302\240\302\240\302\240 /* Clear ACS bit because Ethernet switch tagging formats such as\n" + ">> +\302\240\302\240\302\240\302\240 * Broadcom tags can look like invalid LLC/SNAP packets and cause\n" ">> the\n" - ">> +???? * hardware to truncate packets on reception.\n" - ">> +???? */\n" - ">> +??? if (netdev_uses_dsa(dev))\n" - ">> +??????? value &= ~GMAC_CONTROL_ACS;\n" + ">> +\302\240\302\240\302\240\302\240 * hardware to truncate packets on reception.\n" + ">> +\302\240\302\240\302\240\302\240 */\n" + ">> +\302\240\302\240\302\240 if (netdev_uses_dsa(dev))\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 value &= ~GMAC_CONTROL_ACS;\n" ">> +\n" - ">> ????? if (mtu > 1500)\n" - ">> ????????? value |= GMAC_CONTROL_2K;\n" - ">> ????? if (mtu > 2000)\n" + ">> \302\240\302\240\302\240\302\240\302\240 if (mtu > 1500)\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 value |= GMAC_CONTROL_2K;\n" + ">> \302\240\302\240\302\240\302\240\302\240 if (mtu > 2000)\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c\n" ">> b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c\n" ">> index 8ef517356313..c1ee427c42cb 100644\n" ">> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c\n" ">> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c\n" ">> @@ -28,7 +28,8 @@\n" - ">> ? #include <asm/io.h>\n" - ">> ? #include \"dwmac100.h\"\n" - ">> ? -static void dwmac100_core_init(struct mac_device_info *hw, int mtu)\n" + ">> \302\240 #include <asm/io.h>\n" + ">> \302\240 #include \"dwmac100.h\"\n" + ">> \302\240 -static void dwmac100_core_init(struct mac_device_info *hw, int mtu)\n" ">> +static void dwmac100_core_init(struct mac_device_info *hw,\n" - ">> +?????????????????? struct net_device *dev)\n" - ">> ? {\n" - ">> ????? void __iomem *ioaddr = hw->pcsr;\n" - ">> ????? u32 value = readl(ioaddr + MAC_CONTROL);\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev)\n" + ">> \302\240 {\n" + ">> \302\240\302\240\302\240\302\240\302\240 void __iomem *ioaddr = hw->pcsr;\n" + ">> \302\240\302\240\302\240\302\240\302\240 u32 value = readl(ioaddr + MAC_CONTROL);\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c\n" ">> b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c\n" ">> index f3ed8f7853eb..6af5100d3cb2 100644\n" ">> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c\n" ">> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c\n" ">> @@ -20,13 +20,22 @@\n" - ">> ? #include \"stmmac_pcs.h\"\n" - ">> ? #include \"dwmac4.h\"\n" - ">> ? -static void dwmac4_core_init(struct mac_device_info *hw, int mtu)\n" + ">> \302\240 #include \"stmmac_pcs.h\"\n" + ">> \302\240 #include \"dwmac4.h\"\n" + ">> \302\240 -static void dwmac4_core_init(struct mac_device_info *hw, int mtu)\n" ">> +static void dwmac4_core_init(struct mac_device_info *hw,\n" - ">> +???????????????? struct net_device *dev)\n" - ">> ? {\n" - ">> ????? void __iomem *ioaddr = hw->pcsr;\n" - ">> ????? u32 value = readl(ioaddr + GMAC_CONFIG);\n" - ">> +??? int mtu = dev->mtu;\n" - ">> ? ????? value |= GMAC_CORE_INIT;\n" - ">> ? +??? /* Clear ACS bit because Ethernet switch tagging formats such as\n" - ">> +???? * Broadcom tags can look like invalid LLC/SNAP packets and cause\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev)\n" + ">> \302\240 {\n" + ">> \302\240\302\240\302\240\302\240\302\240 void __iomem *ioaddr = hw->pcsr;\n" + ">> \302\240\302\240\302\240\302\240\302\240 u32 value = readl(ioaddr + GMAC_CONFIG);\n" + ">> +\302\240\302\240\302\240 int mtu = dev->mtu;\n" + ">> \302\240 \302\240\302\240\302\240\302\240\302\240 value |= GMAC_CORE_INIT;\n" + ">> \302\240 +\302\240\302\240\302\240 /* Clear ACS bit because Ethernet switch tagging formats such as\n" + ">> +\302\240\302\240\302\240\302\240 * Broadcom tags can look like invalid LLC/SNAP packets and cause\n" ">> the\n" - ">> +???? * hardware to truncate packets on reception.\n" - ">> +???? */\n" - ">> +??? if (netdev_uses_dsa(dev))\n" - ">> +??????? value &= ~GMAC_CONTROL_ACS;\n" + ">> +\302\240\302\240\302\240\302\240 * hardware to truncate packets on reception.\n" + ">> +\302\240\302\240\302\240\302\240 */\n" + ">> +\302\240\302\240\302\240 if (netdev_uses_dsa(dev))\n" + ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 value &= ~GMAC_CONTROL_ACS;\n" ">> +\n" - ">> ????? if (mtu > 1500)\n" - ">> ????????? value |= GMAC_CONFIG_2K;\n" - ">> ????? if (mtu > 2000)\n" + ">> \302\240\302\240\302\240\302\240\302\240 if (mtu > 1500)\n" + ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 value |= GMAC_CONFIG_2K;\n" + ">> \302\240\302\240\302\240\302\240\302\240 if (mtu > 2000)\n" ">> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c\n" ">> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c\n" ">> index f99f14c35063..7ad841434ec8 100644\n" @@ -190,12 +198,12 @@ ">> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c\n" ">> @@ -2527,7 +2527,7 @@ static int stmmac_hw_setup(struct net_device\n" ">> *dev, bool init_ptp)\n" - ">> ????? }\n" - ">> ? ????? /* Initialize the MAC Core */\n" - ">> -??? priv->hw->mac->core_init(priv->hw, dev->mtu);\n" - ">> +??? priv->hw->mac->core_init(priv->hw, dev);\n" - ">> ? ????? /* Initialize MTL*/\n" - ">> ????? if (priv->synopsys_id >= DWMAC_CORE_4_00)\n" + ">> \302\240\302\240\302\240\302\240\302\240 }\n" + ">> \302\240 \302\240\302\240\302\240\302\240\302\240 /* Initialize the MAC Core */\n" + ">> -\302\240\302\240\302\240 priv->hw->mac->core_init(priv->hw, dev->mtu);\n" + ">> +\302\240\302\240\302\240 priv->hw->mac->core_init(priv->hw, dev);\n" + ">> \302\240 \302\240\302\240\302\240\302\240\302\240 /* Initialize MTL*/\n" + ">> \302\240\302\240\302\240\302\240\302\240 if (priv->synopsys_id >= DWMAC_CORE_4_00)\n" "> \n" "> \n" "\n" @@ -203,4 +211,4 @@ "-- \n" Florian -7261625bb84137caded367fb4359b893e2f515dd3296a63ef0b23aa4252bce5f +5f1b236e71cc956445708140fbd0d9cc930e7085230f353156c35d32620d4374
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.