|
@@ -1614,10 +1614,17 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p)
|
|
|
struct sockaddr *addr = (struct sockaddr *)p;
|
|
|
int flags = 0;
|
|
|
u16 vid = 0;
|
|
|
+ int ret;
|
|
|
|
|
|
if (!is_valid_ether_addr(addr->sa_data))
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
+ ret = pm_runtime_get_sync(&priv->pdev->dev);
|
|
|
+ if (ret < 0) {
|
|
|
+ pm_runtime_put_noidle(&priv->pdev->dev);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
if (priv->data.dual_emac) {
|
|
|
vid = priv->slaves[priv->emac_port].port_vlan;
|
|
|
flags = ALE_VLAN;
|
|
@@ -1632,6 +1639,8 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p)
|
|
|
memcpy(ndev->dev_addr, priv->mac_addr, ETH_ALEN);
|
|
|
for_each_slave(priv, cpsw_set_slave_mac, priv);
|
|
|
|
|
|
+ pm_runtime_put(&priv->pdev->dev);
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -1696,10 +1705,17 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
|
|
|
__be16 proto, u16 vid)
|
|
|
{
|
|
|
struct cpsw_priv *priv = netdev_priv(ndev);
|
|
|
+ int ret;
|
|
|
|
|
|
if (vid == priv->data.default_vlan)
|
|
|
return 0;
|
|
|
|
|
|
+ ret = pm_runtime_get_sync(&priv->pdev->dev);
|
|
|
+ if (ret < 0) {
|
|
|
+ pm_runtime_put_noidle(&priv->pdev->dev);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
if (priv->data.dual_emac) {
|
|
|
/* In dual EMAC, reserved VLAN id should not be used for
|
|
|
* creating VLAN interfaces as this can break the dual
|
|
@@ -1714,7 +1730,10 @@ static int cpsw_ndo_vlan_rx_add_vid(struct net_device *ndev,
|
|
|
}
|
|
|
|
|
|
dev_info(priv->dev, "Adding vlanid %d to vlan filter\n", vid);
|
|
|
- return cpsw_add_vlan_ale_entry(priv, vid);
|
|
|
+ ret = cpsw_add_vlan_ale_entry(priv, vid);
|
|
|
+
|
|
|
+ pm_runtime_put(&priv->pdev->dev);
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
|
|
@@ -1726,6 +1745,12 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
|
|
|
if (vid == priv->data.default_vlan)
|
|
|
return 0;
|
|
|
|
|
|
+ ret = pm_runtime_get_sync(&priv->pdev->dev);
|
|
|
+ if (ret < 0) {
|
|
|
+ pm_runtime_put_noidle(&priv->pdev->dev);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
if (priv->data.dual_emac) {
|
|
|
int i;
|
|
|
|
|
@@ -1745,8 +1770,10 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev,
|
|
|
if (ret != 0)
|
|
|
return ret;
|
|
|
|
|
|
- return cpsw_ale_del_mcast(priv->ale, priv->ndev->broadcast,
|
|
|
- 0, ALE_VLAN, vid);
|
|
|
+ ret = cpsw_ale_del_mcast(priv->ale, priv->ndev->broadcast,
|
|
|
+ 0, ALE_VLAN, vid);
|
|
|
+ pm_runtime_put(&priv->pdev->dev);
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static const struct net_device_ops cpsw_netdev_ops = {
|