Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb

[linux-beck.git] / drivers / net / usb / r8152.c

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 5cfd414b9a3ea5cc59224cffe0dd675bef490930..e3d84c322e4ec2589d496ad9a6355bd14e08da31 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -26,7 +26,7 @@
 #include <linux/mdio.h>
 
 /* Version Information */
-#define DRIVER_VERSION "v1.06.1 (2014/10/01)"
+#define DRIVER_VERSION "v1.07.0 (2014/10/09)"
 #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>"
 #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters"
 #define MODULENAME "r8152"
@@ -566,6 +566,7 @@ struct r8152 {
        spinlock_t rx_lock, tx_lock;
        struct delayed_work schedule;
        struct mii_if_info mii;
+       struct mutex control;   /* use for hw setting */
 
        struct rtl_ops {
                void (*init)(struct r8152 *);
@@ -942,15 +943,8 @@ static int read_mii_word(struct net_device *netdev, int phy_id, int reg)
        if (phy_id != R8152_PHY_ID)
                return -EINVAL;
 
-       ret = usb_autopm_get_interface(tp->intf);
-       if (ret < 0)
-               goto out;
-
        ret = r8152_mdio_read(tp, reg);
 
-       usb_autopm_put_interface(tp->intf);
-
-out:
        return ret;
 }
 
@@ -965,12 +959,7 @@ void write_mii_word(struct net_device *netdev, int phy_id, int reg, int val)
        if (phy_id != R8152_PHY_ID)
                return;
 
-       if (usb_autopm_get_interface(tp->intf) < 0)
-               return;
-
        r8152_mdio_write(tp, reg, val);
-
-       usb_autopm_put_interface(tp->intf);
 }
 
 static int
@@ -989,12 +978,16 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
        if (ret < 0)
                goto out1;
 
+       mutex_lock(&tp->control);
+
        memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
 
        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_CONFIG);
        pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 out1:
        return ret;
@@ -2145,6 +2138,13 @@ static int rtl8152_set_features(struct net_device *dev,
 {
        netdev_features_t changed = features ^ dev->features;
        struct r8152 *tp = netdev_priv(dev);
+       int ret;
+
+       ret = usb_autopm_get_interface(tp->intf);
+       if (ret < 0)
+               goto out;
+
+       mutex_lock(&tp->control);
 
        if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
                if (features & NETIF_F_HW_VLAN_CTAG_RX)
@@ -2153,7 +2153,12 @@ static int rtl8152_set_features(struct net_device *dev,
                        rtl_rx_vlan_en(tp, false);
        }
 
-       return 0;
+       mutex_unlock(&tp->control);
+
+       usb_autopm_put_interface(tp->intf);
+
+out:
+       return ret;
 }
 
 #define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
@@ -2851,6 +2856,11 @@ static void rtl_work_func_t(struct work_struct *work)
        if (test_bit(RTL8152_UNPLUG, &tp->flags))
                goto out1;
 
+       if (!mutex_trylock(&tp->control)) {
+               schedule_delayed_work(&tp->schedule, 0);
+               goto out1;
+       }
+
        if (test_bit(RTL8152_LINK_CHG, &tp->flags))
                set_carrier(tp);
 
@@ -2866,6 +2876,8 @@ static void rtl_work_func_t(struct work_struct *work)
        if (test_bit(PHY_RESET, &tp->flags))
                rtl_phy_reset(tp);
 
+       mutex_unlock(&tp->control);
+
 out1:
        usb_autopm_put_interface(tp->intf);
 }
@@ -2885,6 +2897,8 @@ static int rtl8152_open(struct net_device *netdev)
                goto out;
        }
 
+       mutex_lock(&tp->control);
+
        /* The WORK_ENABLE may be set when autoresume occurs */
        if (test_bit(WORK_ENABLE, &tp->flags)) {
                clear_bit(WORK_ENABLE, &tp->flags);
@@ -2913,6 +2927,8 @@ static int rtl8152_open(struct net_device *netdev)
                free_all_mem(tp);
        }
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 
 out:
@@ -2933,6 +2949,8 @@ static int rtl8152_close(struct net_device *netdev)
        if (res < 0) {
                rtl_drop_queued_tx(tp);
        } else {
+               mutex_lock(&tp->control);
+
                /* The autosuspend may have been enabled and wouldn't
                 * be disable when autoresume occurs, because the
                 * netif_running() would be false.
@@ -2945,6 +2963,9 @@ static int rtl8152_close(struct net_device *netdev)
                tasklet_disable(&tp->tl);
                tp->rtl_ops.down(tp);
                tasklet_enable(&tp->tl);
+
+               mutex_unlock(&tp->control);
+
                usb_autopm_put_interface(tp->intf);
        }
 
@@ -3168,33 +3189,47 @@ static void r8153_init(struct r8152 *tp)
 static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)
 {
        struct r8152 *tp = usb_get_intfdata(intf);
+       struct net_device *netdev = tp->netdev;
+       int ret = 0;
+
+       mutex_lock(&tp->control);
+
+       if (PMSG_IS_AUTO(message)) {
+               if (netif_running(netdev) && work_busy(&tp->schedule.work)) {
+                       ret = -EBUSY;
+                       goto out1;
+               }
 
-       if (PMSG_IS_AUTO(message))
                set_bit(SELECTIVE_SUSPEND, &tp->flags);
-       else
-               netif_device_detach(tp->netdev);
+       } else {
+               netif_device_detach(netdev);
+       }
 
-       if (netif_running(tp->netdev)) {
+       if (netif_running(netdev)) {
                clear_bit(WORK_ENABLE, &tp->flags);
                usb_kill_urb(tp->intr_urb);
-               cancel_delayed_work_sync(&tp->schedule);
                tasklet_disable(&tp->tl);
                if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                        rtl_stop_rx(tp);
                        rtl_runtime_suspend_enable(tp, true);
                } else {
+                       cancel_delayed_work_sync(&tp->schedule);
                        tp->rtl_ops.down(tp);
                }
                tasklet_enable(&tp->tl);
        }
+out1:
+       mutex_unlock(&tp->control);
 
-       return 0;
+       return ret;
 }
 
 static int rtl8152_resume(struct usb_interface *intf)
 {
        struct r8152 *tp = usb_get_intfdata(intf);
 
+       mutex_lock(&tp->control);
+
        if (!test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
                tp->rtl_ops.init(tp);
                netif_device_attach(tp->netdev);
@@ -3220,6 +3255,8 @@ static int rtl8152_resume(struct usb_interface *intf)
                usb_submit_urb(tp->intr_urb, GFP_KERNEL);
        }
 
+       mutex_unlock(&tp->control);
+
        return 0;
 }
 
@@ -3230,9 +3267,13 @@ static void rtl8152_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
        if (usb_autopm_get_interface(tp->intf) < 0)
                return;
 
+       mutex_lock(&tp->control);
+
        wol->supported = WAKE_ANY;
        wol->wolopts = __rtl_get_wol(tp);
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 }
 
@@ -3245,9 +3286,13 @@ static int rtl8152_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
        if (ret < 0)
                goto out_set_wol;
 
+       mutex_lock(&tp->control);
+
        __rtl_set_wol(tp, wol->wolopts);
        tp->saved_wolopts = wol->wolopts & WAKE_ANY;
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 
 out_set_wol:
@@ -3282,11 +3327,25 @@ static
 int rtl8152_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
 {
        struct r8152 *tp = netdev_priv(netdev);
+       int ret;
 
        if (!tp->mii.mdio_read)
                return -EOPNOTSUPP;
 
-       return mii_ethtool_gset(&tp->mii, cmd);
+       ret = usb_autopm_get_interface(tp->intf);
+       if (ret < 0)
+               goto out;
+
+       mutex_lock(&tp->control);
+
+       ret = mii_ethtool_gset(&tp->mii, cmd);
+
+       mutex_unlock(&tp->control);
+
+       usb_autopm_put_interface(tp->intf);
+
+out:
+       return ret;
 }
 
 static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
@@ -3298,8 +3357,12 @@ static int rtl8152_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
        if (ret < 0)
                goto out;
 
+       mutex_lock(&tp->control);
+
        ret = rtl8152_set_speed(tp, cmd->autoneg, cmd->speed, cmd->duplex);
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 
 out:
@@ -3459,8 +3522,12 @@ rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
        if (ret < 0)
                goto out;
 
+       mutex_lock(&tp->control);
+
        ret = tp->rtl_ops.eee_get(tp, edata);
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 
 out:
@@ -3477,10 +3544,14 @@ rtl_ethtool_set_eee(struct net_device *net, struct ethtool_eee *edata)
        if (ret < 0)
                goto out;
 
+       mutex_lock(&tp->control);
+
        ret = tp->rtl_ops.eee_set(tp, edata);
        if (!ret)
                ret = mii_nway_restart(&tp->mii);
 
+       mutex_unlock(&tp->control);
+
        usb_autopm_put_interface(tp->intf);
 
 out:
@@ -3522,7 +3593,9 @@ static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
                break;
 
        case SIOCGMIIREG:
+               mutex_lock(&tp->control);
                data->val_out = r8152_mdio_read(tp, data->reg_num);
+               mutex_unlock(&tp->control);
                break;
 
        case SIOCSMIIREG:
@@ -3530,7 +3603,9 @@ static int rtl8152_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
                        res = -EPERM;
                        break;
                }
+               mutex_lock(&tp->control);
                r8152_mdio_write(tp, data->reg_num, data->val_in);
+               mutex_unlock(&tp->control);
                break;
 
        default:
@@ -3723,6 +3798,7 @@ static int rtl8152_probe(struct usb_interface *intf,
                goto out;
 
        tasklet_init(&tp->tl, bottom_half, (unsigned long)tp);
+       mutex_init(&tp->control);
        INIT_DELAYED_WORK(&tp->schedule, rtl_work_func_t);
 
        netdev->netdev_ops = &rtl8152_netdev_ops;