atheros: refresh 2.6.32 patches

[openwrt.git] / target / linux / ramips / files / drivers / net / ramips.c

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index 3061bcc..5a728be 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -51,6 +51,32 @@ ramips_fe_rr(unsigned reg)
        return __raw_readl(ramips_fe_base + reg);
 }
 
+static inline void
+ramips_fe_int_disable(u32 mask)
+{
+       ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~mask,
+                    RAMIPS_FE_INT_ENABLE);
+       /* flush write */
+       ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
+}
+
+static inline void
+ramips_fe_int_enable(u32 mask)
+{
+       ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | mask,
+                    RAMIPS_FE_INT_ENABLE);
+       /* flush write */
+       ramips_fe_rr(RAMIPS_FE_INT_ENABLE);
+}
+
+static inline void
+ramips_hw_set_macaddr(unsigned char *mac)
+{
+       ramips_fe_wr((mac[0] << 8) | mac[1], RAMIPS_GDMA1_MAC_ADRH);
+       ramips_fe_wr((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
+                    RAMIPS_GDMA1_MAC_ADRL);
+}
+
 static void
 ramips_cleanup_dma(struct raeth_priv *re)
 {
@@ -163,10 +189,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
        spin_lock_irqsave(&priv->page_lock, flags);
        tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
-       if (tx == NUM_TX_DESC - 1)
-               tx_next = 0;
-       else
-               tx_next = tx + 1;
+       tx_next = (tx + 1) % NUM_TX_DESC;
 
        if ((priv->tx_skb[tx]) || (priv->tx_skb[tx_next]) ||
            !(priv->tx[tx].txd2 & TX_DMA_DONE) ||
@@ -180,7 +203,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        dev->stats.tx_bytes += skb->len;
        priv->tx_skb[tx] = skb;
        wmb();
-       ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
+       ramips_fe_wr(tx_next, RAMIPS_TX_CTX_IDX0);
        spin_unlock_irqrestore(&priv->page_lock, flags);
        return NETDEV_TX_OK;
 
@@ -232,8 +255,7 @@ ramips_eth_rx_hw(unsigned long ptr)
        if (max_rx == 0)
                tasklet_schedule(&priv->rx_tasklet);
        else
-               ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | RAMIPS_RX_DLY_INT,
-                            RAMIPS_FE_INT_ENABLE);
+               ramips_fe_int_enable(RAMIPS_RX_DLY_INT);
 }
 
 static void
@@ -244,30 +266,14 @@ ramips_eth_tx_housekeeping(unsigned long ptr)
 
        while ((priv->tx[priv->skb_free_idx].txd2 & TX_DMA_DONE) &&
               (priv->tx_skb[priv->skb_free_idx])) {
-               dev_kfree_skb_irq((struct sk_buff *) priv->tx_skb[priv->skb_free_idx]);
+               dev_kfree_skb_irq(priv->tx_skb[priv->skb_free_idx]);
                priv->tx_skb[priv->skb_free_idx] = 0;
                priv->skb_free_idx++;
                if (priv->skb_free_idx >= NUM_TX_DESC)
                        priv->skb_free_idx = 0;
        }
 
-       ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) | RAMIPS_TX_DLY_INT,
-                    RAMIPS_FE_INT_ENABLE);
-}
-
-static int
-ramips_eth_set_mac_addr(struct net_device *dev, void *priv)
-{
-       unsigned char *mac = (unsigned char *) priv;
-
-       if (netif_running(dev))
-               return -EBUSY;
-
-       memcpy(dev->dev_addr, ((struct sockaddr*)priv)->sa_data, dev->addr_len);
-       ramips_fe_wr((mac[0] << 8) | mac[1], RAMIPS_GDMA1_MAC_ADRH);
-       ramips_fe_wr((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5],
-                    RAMIPS_GDMA1_MAC_ADRL);
-       return 0;
+       ramips_fe_int_enable(RAMIPS_TX_DLY_INT);
 }
 
 static void
@@ -287,8 +293,7 @@ ramips_eth_irq(int irq, void *dev)
        ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS);
 
        if (fe_int & RAMIPS_RX_DLY_INT) {
-               ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~(RAMIPS_RX_DLY_INT),
-                            RAMIPS_FE_INT_ENABLE);
+               ramips_fe_int_disable(RAMIPS_RX_DLY_INT);
                tasklet_schedule(&priv->rx_tasklet);
        }
 
@@ -313,6 +318,8 @@ ramips_eth_open(struct net_device *dev)
        if (err)
                goto err_free_irq;
 
+       ramips_hw_set_macaddr(dev->dev_addr);
+
        ramips_setup_dma(priv);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
                (RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
@@ -320,7 +327,7 @@ ramips_eth_open(struct net_device *dev)
                RAMIPS_PDMA_GLO_CFG);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_FE_GLO_CFG) &
                ~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
-               ((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
+               ((priv->plat->sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
                RAMIPS_FE_GLO_CFG);
 
        tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
@@ -368,13 +375,11 @@ static int __init
 ramips_eth_probe(struct net_device *dev)
 {
        struct raeth_priv *priv = netdev_priv(dev);
-       struct sockaddr addr;
 
        BUG_ON(!priv->plat->reset_fe);
        priv->plat->reset_fe();
        net_srandom(jiffies);
-       memcpy(addr.sa_data, priv->plat->mac, 6);
-       ramips_eth_set_mac_addr(dev, &addr);
+       memcpy(dev->dev_addr, priv->plat->mac, ETH_ALEN);
 
        ether_setup(dev);
        dev->mtu = 1500;
@@ -391,7 +396,7 @@ static const struct net_device_ops ramips_eth_netdev_ops = {
        .ndo_start_xmit         = ramips_eth_hard_start_xmit,
        .ndo_tx_timeout         = ramips_eth_timeout,
        .ndo_change_mtu         = eth_change_mtu,
-       .ndo_set_mac_address    = ramips_eth_set_mac_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
 };