korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-24 19:45:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: stmmac: stmmac_platform: use correct setup function for gmac4

Browse Source 
devicetree binding for stmmac states:
- compatible: Should be "snps,dwmac-<ip_version>", "snps,dwmac"
	For backwards compatibility: "st,spear600-gmac" is also supported.

Previously, when specifying "snps,dwmac-4.10a", "snps,dwmac" as your
compatible string, plat_stmmacenet_data would have both has_gmac and
has_gmac4 set.

This would lead to stmmac_hw_init calling dwmac1000_setup rather than
dwmac4_setup, resulting in a non-functional driver.
This happened since the check for has_gmac is done before the check for
has_gmac4. However, the order should not matter, so it does not make sense
to have both set.

If something is valid for both, you should do as the stmmac_interrupt does:
if (priv->plat->has_gmac || priv->plat->has_gmac4) ...

The places where it was obvious that the author actually meant
if (has_gmac || has_gmac4) rather than if (has_gmac) has been updated.

Signed-off-by: Niklas Cassel <niklas.cassel@axis.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Niklas Cassel 2016-12-07 13:41:08 +01:00 committed by David S. Miller
parent 4966a692d0
commit 7cc99fd29b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
View File

@ -263,7 +263,7 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev,
{ {
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
if (priv->plat->has_gmac) if (priv->plat->has_gmac || priv->plat->has_gmac4)
strlcpy(info->driver, GMAC_ETHTOOL_NAME, sizeof(info->driver)); strlcpy(info->driver, GMAC_ETHTOOL_NAME, sizeof(info->driver));
else else
strlcpy(info->driver, MAC100_ETHTOOL_NAME, strlcpy(info->driver, MAC100_ETHTOOL_NAME,
@ -446,7 +446,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev,
memset(reg_space, 0x0, REG_SPACE_SIZE); memset(reg_space, 0x0, REG_SPACE_SIZE);
if (!priv->plat->has_gmac) { if (!(priv->plat->has_gmac || priv->plat->has_gmac4)) {
/* MAC registers */ /* MAC registers */
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
reg_space[i] = readl(priv->ioaddr + (i * 4)); reg_space[i] = readl(priv->ioaddr + (i * 4));

1
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@ -292,6 +292,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
if (of_device_is_compatible(np, "snps,dwmac-4.00") || if (of_device_is_compatible(np, "snps,dwmac-4.00") ||
of_device_is_compatible(np, "snps,dwmac-4.10a")) { of_device_is_compatible(np, "snps,dwmac-4.10a")) {
plat->has_gmac4 = 1; plat->has_gmac4 = 1;
plat->has_gmac = 0;
plat->pmt = 1; plat->pmt = 1;
plat->tso_en = of_property_read_bool(np, "snps,tso"); plat->tso_en = of_property_read_bool(np, "snps,tso");
} }