aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorSergey Ryazanov <ryazanov.s.a@gmail.com>2017-06-07 01:49:37 +0300
committerJohn Crispin <john@phrozen.org>2017-06-07 06:46:52 +0200
commitb1cc215d276855a0ec910e953e6b49cfe0721719 (patch)
tree220b0a5b017598472b72bc4a6e19897dfa37737a /target/linux
parent0827a0b4f1e598943302346f2fb70f9a3ff1f747 (diff)
downloadupstream-b1cc215d276855a0ec910e953e6b49cfe0721719.tar.gz
upstream-b1cc215d276855a0ec910e953e6b49cfe0721719.tar.bz2
upstream-b1cc215d276855a0ec910e953e6b49cfe0721719.zip
ath25: 4.9: fix Ethernet tiny issues
Few tiny fixes for issues caused by changes in the upstream: - do not touch PHY IRQ array (core code initializes it itself now) - add missed SET_NETDEV_DEV() invocation (causes segfault during phy connection) - use phy API inside the MDIO probe function instead of direct field access (consider phy structure changes in upstream and prevent similar issues in the future) Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ath25/patches-4.9/110-ar2313_ethernet.patch22
1 files changed, 7 insertions, 15 deletions
diff --git a/target/linux/ath25/patches-4.9/110-ar2313_ethernet.patch b/target/linux/ath25/patches-4.9/110-ar2313_ethernet.patch
index 9b1286c075..ed3dcb491c 100644
--- a/target/linux/ath25/patches-4.9/110-ar2313_ethernet.patch
+++ b/target/linux/ath25/patches-4.9/110-ar2313_ethernet.patch
@@ -33,7 +33,7 @@
+obj-$(CONFIG_NET_AR231X) += ar231x.o
--- /dev/null
+++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c
-@@ -0,0 +1,1206 @@
+@@ -0,0 +1,1198 @@
+/*
+ * ar231x.c: Linux driver for the Atheros AR231x Ethernet device.
+ *
@@ -221,6 +221,8 @@
+
+ platform_set_drvdata(pdev, dev);
+
++ SET_NETDEV_DEV(dev, &pdev->dev);
++
+ sp = netdev_priv(dev);
+ sp->dev = dev;
+ sp->cfg = pdev->dev.platform_data;
@@ -304,8 +306,6 @@
+ sp->mii_bus->reset = ar231x_mdiobus_reset;
+ sp->mii_bus->name = "ar231x_eth_mii";
+ snprintf(sp->mii_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id);
-+ sp->mii_bus->irq = kmalloc(sizeof(int), GFP_KERNEL);
-+ *sp->mii_bus->irq = PHY_POLL;
+
+ mdiobus_register(sp->mii_bus);
+
@@ -1192,28 +1192,19 @@
+{
+ struct ar231x_private *const sp = netdev_priv(dev);
+ struct phy_device *phydev = NULL;
-+ int phy_addr;
+
+ /* find the first (lowest address) PHY on the current MAC's MII bus */
-+ for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
-+ if (sp->mii_bus->phy_map[phy_addr]) {
-+ phydev = sp->mii_bus->phy_map[phy_addr];
-+ sp->phy = phy_addr;
-+ break; /* break out with first one found */
-+ }
-+
++ phydev = phy_find_first(sp->mii_bus);
+ if (!phydev) {
+ printk(KERN_ERR "ar231x: %s: no PHY found\n", dev->name);
+ return -1;
+ }
+
+ /* now we are supposed to have a proper phydev, to attach to... */
-+ BUG_ON(!phydev);
+ BUG_ON(phydev->attached_dev);
+
-+ phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
++ phydev = phy_connect(dev, phydev_name(phydev), &ar231x_adjust_link,
+ PHY_INTERFACE_MODE_MII);
-+
+ if (IS_ERR(phydev)) {
+ printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
+ return PTR_ERR(phydev);
@@ -1233,9 +1224,10 @@
+
+ sp->oldduplex = -1;
+ sp->phy_dev = phydev;
++ sp->phy = phydev->mdio.addr;
+
+ printk(KERN_INFO "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
-+ dev->name, phydev->drv->name, dev_name(&phydev->dev));
++ dev->name, phydev->drv->name, phydev_name(phydev));
+
+ return 0;
+}