struct mii_bus *mdio_bus;
static int ports_open;
static struct port *switch_port_tab[4];
-static struct dma_pool *rx_dma_pool;
-static struct dma_pool *tx_dma_pool;
struct net_device *napi_dev;
static int cns3xxx_mdio_cmd(struct mii_bus *bus, int phy_id, int location,
} else {
temp = MDIO_READ_COMMAND;
}
+
temp |= ((location & 0x1f) << MDIO_REG_OFFSET);
temp |= (phy_id & 0x1f);
}
if (cycles == 5000) {
- printk(KERN_ERR "%s #%i: MII transaction failed\n", bus->name,
- phy_id);
+ printk(KERN_ERR "%s #%i: MII transaction failed\n", bus->name, phy_id);
return -1;
}
return ret;
}
-static int cns3xxx_mdio_write(struct mii_bus *bus, int phy_id, int location,
- u16 val)
+static int cns3xxx_mdio_write(struct mii_bus *bus, int phy_id, int location, u16 val)
{
unsigned long flags;
int ret;
if ((err = mdiobus_register(mdio_bus)))
mdiobus_free(mdio_bus);
+
return err;
}
unsigned int phys;
for (received += rx_ring->alloc_count; received > 0; received--) {
- buf = kmalloc(RX_SEGMENT_ALLOC_SIZE, GFP_ATOMIC);
+ buf = napi_alloc_frag(RX_SEGMENT_ALLOC_SIZE);
if (!buf)
break;
phys = dma_map_single(sw->dev, buf + SKB_HEAD_ALIGN,
RX_SEGMENT_MRU, DMA_FROM_DEVICE);
if (dma_mapping_error(sw->dev, phys)) {
- kfree(buf);
+ skb_free_frag(buf);
break;
}
/* put the new buffer on RX-free queue */
rx_ring->buff_tab[i] = buf;
rx_ring->phys_tab[i] = phys;
+
if (i == RX_DESCS - 1) {
+ desc->config0 = FIRST_SEGMENT | LAST_SEGMENT | RX_SEGMENT_MRU | END_OF_RING;
i = 0;
- desc->config0 = END_OF_RING | FIRST_SEGMENT |
- LAST_SEGMENT | RX_SEGMENT_MRU;
desc = &(rx_ring)->desc[i];
} else {
- desc->config0 = FIRST_SEGMENT | LAST_SEGMENT |
- RX_SEGMENT_MRU;
+ desc->config0 = FIRST_SEGMENT | LAST_SEGMENT | RX_SEGMENT_MRU;
i++;
desc++;
}
return;
tx_ring->stopped = stop;
+
for (i = 0; i < 4; i++) {
struct port *port = switch_port_tab[i];
struct net_device *dev;
continue;
dev = port->netdev;
+
if (stop)
netif_stop_queue(dev);
else
index = tx_ring->free_index;
desc = &(tx_ring)->desc[index];
+
for (i = 0; i < num_used; i++) {
- if (desc->cown) {
- skb = tx_ring->buff_tab[index];
- tx_ring->buff_tab[index] = 0;
- if (skb)
- dev_kfree_skb_any(skb);
- dma_unmap_single(sw->dev, tx_ring->phys_tab[index],
- desc->sdl, DMA_TO_DEVICE);
- if (++index == TX_DESCS) {
- index = 0;
- desc = &(tx_ring)->desc[index];
- } else {
- desc++;
- }
- } else {
+ if (!desc->cown)
break;
+
+ skb = tx_ring->buff_tab[index];
+ tx_ring->buff_tab[index] = 0;
+
+ if (skb)
+ dev_kfree_skb_any(skb);
+
+ dma_unmap_single(sw->dev, tx_ring->phys_tab[index], desc->sdl, DMA_TO_DEVICE);
+
+ if (index == TX_DESCS - 1) {
+ index = 0;
+ desc = &(tx_ring)->desc[index];
+ } else {
+ index++;
+ desc++;
}
}
+
tx_ring->free_index = index;
tx_ring->num_used -= i;
eth_check_num_used(tx_ring);
break;
/* process received frame */
- dma_unmap_single(sw->dev, rx_ring->phys_tab[i],
- RX_SEGMENT_MRU, DMA_FROM_DEVICE);
+ dma_unmap_single(sw->dev, rx_ring->phys_tab[i], RX_SEGMENT_MRU, DMA_FROM_DEVICE);
- skb = build_skb(rx_ring->buff_tab[i], 0);
+ skb = build_skb(rx_ring->buff_tab[i], RX_SEGMENT_ALLOC_SIZE);
if (!skb)
break;
}
received++;
- if (++i == RX_DESCS) {
+ if (i == RX_DESCS - 1) {
i = 0;
desc = &(rx_ring)->desc[i];
} else {
+ i++;
desc++;
}
}
rx_ring->cur_index = i;
- if (!received) {
- napi_complete(napi);
- enable_irq(sw->rx_irq);
- /* if rx descriptors are full schedule another poll */
- if (rx_ring->desc[(i-1) & (RX_DESCS-1)].cown)
- eth_schedule_poll(sw);
+ cns3xxx_alloc_rx_buf(sw, received);
+ wmb();
+ enable_rx_dma(sw);
+
+ if (received < budget && napi_complete_done(napi, received)) {
+ enable_irq(sw->rx_irq);
}
spin_lock_bh(&tx_lock);
eth_complete_tx(sw);
spin_unlock_bh(&tx_lock);
- cns3xxx_alloc_rx_buf(sw, received);
-
- wmb();
- enable_rx_dma(sw);
-
return received;
}
tx_ring->phys_tab[index] = phys;
config0 |= len;
+
if (index == TX_DESCS - 1)
config0 |= END_OF_RING;
+
if (index == index_last)
config0 |= LAST_SEGMENT;
int nr_desc = nr_frags;
int index0, index, index_last;
int len0;
- unsigned int i;
+ int i;
u32 config0;
if (pmap == 8)
eth_schedule_poll(sw);
spin_lock_bh(&tx_lock);
+
if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) {
spin_unlock_bh(&tx_lock);
return NETDEV_TX_BUSY;
strcpy(info->bus_info, "internal");
}
-static int cns3xxx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
- struct port *port = netdev_priv(dev);
- return phy_ethtool_gset(port->phydev, cmd);
-}
-
-static int cns3xxx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
- struct port *port = netdev_priv(dev);
- return phy_ethtool_sset(port->phydev, cmd);
-}
-
static int cns3xxx_nway_reset(struct net_device *dev)
{
struct port *port = netdev_priv(dev);
static struct ethtool_ops cns3xxx_ethtool_ops = {
.get_drvinfo = cns3xxx_get_drvinfo,
- .get_settings = cns3xxx_get_settings,
- .set_settings = cns3xxx_set_settings,
+ .get_link_ksettings = phy_ethtool_get_link_ksettings,
+ .set_link_ksettings = phy_ethtool_set_link_ksettings,
.nway_reset = cns3xxx_nway_reset,
.get_link = ethtool_op_get_link,
};
__raw_writel(TS_SUSPEND | FS_SUSPEND, &sw->regs->dma_auto_poll_cfg);
__raw_writel(QUEUE_THRESHOLD, &sw->regs->dma_ring_ctrl);
__raw_writel(CLR_FS_STATE | QUEUE_THRESHOLD, &sw->regs->dma_ring_ctrl);
-
__raw_writel(QUEUE_THRESHOLD, &sw->regs->dma_ring_ctrl);
- if (!(rx_dma_pool = dma_pool_create(DRV_NAME, sw->dev,
- RX_POOL_ALLOC_SIZE, 32, 0)))
+ rx_ring->desc = dmam_alloc_coherent(sw->dev, RX_POOL_ALLOC_SIZE,
+ &rx_ring->phys_addr, GFP_KERNEL);
+ if (!rx_ring->desc)
return -ENOMEM;
- if (!(rx_ring->desc = dma_pool_alloc(rx_dma_pool, GFP_KERNEL,
- &rx_ring->phys_addr)))
- return -ENOMEM;
+ /* Setup RX buffers */
memset(rx_ring->desc, 0, RX_POOL_ALLOC_SIZE);
- /* Setup RX buffers */
for (i = 0; i < RX_DESCS; i++) {
struct rx_desc *desc = &(rx_ring)->desc[i];
void *buf;
- buf = kzalloc(RX_SEGMENT_ALLOC_SIZE, GFP_KERNEL);
+ buf = netdev_alloc_frag(RX_SEGMENT_ALLOC_SIZE);
if (!buf)
return -ENOMEM;
desc->sdl = RX_SEGMENT_MRU;
+
if (i == (RX_DESCS - 1))
desc->eor = 1;
+
desc->fsd = 1;
desc->lsd = 1;
desc->sdp = dma_map_single(sw->dev, buf + SKB_HEAD_ALIGN,
RX_SEGMENT_MRU, DMA_FROM_DEVICE);
+
if (dma_mapping_error(sw->dev, desc->sdp))
return -EIO;
__raw_writel(rx_ring->phys_addr, &sw->regs->fs_desc_ptr0);
__raw_writel(rx_ring->phys_addr, &sw->regs->fs_desc_base_addr0);
- if (!(tx_dma_pool = dma_pool_create(DRV_NAME, sw->dev,
- TX_POOL_ALLOC_SIZE, 32, 0)))
+ tx_ring->desc = dmam_alloc_coherent(sw->dev, TX_POOL_ALLOC_SIZE,
+ &tx_ring->phys_addr, GFP_KERNEL);
+ if (!tx_ring->desc)
return -ENOMEM;
- if (!(tx_ring->desc = dma_pool_alloc(tx_dma_pool, GFP_KERNEL,
- &tx_ring->phys_addr)))
- return -ENOMEM;
+ /* Setup TX buffers */
memset(tx_ring->desc, 0, TX_POOL_ALLOC_SIZE);
- /* Setup TX buffers */
for (i = 0; i < TX_DESCS; i++) {
struct tx_desc *desc = &(tx_ring)->desc[i];
tx_ring->buff_tab[i] = 0;
if (i == (TX_DESCS - 1))
desc->eor = 1;
+
desc->cown = 1;
}
__raw_writel(tx_ring->phys_addr, &sw->regs->ts_desc_ptr0);
static void destroy_rings(struct sw *sw)
{
int i;
- if (sw->rx_ring.desc) {
- for (i = 0; i < RX_DESCS; i++) {
- struct _rx_ring *rx_ring = &sw->rx_ring;
- struct rx_desc *desc = &(rx_ring)->desc[i];
- struct sk_buff *skb = sw->rx_ring.buff_tab[i];
-
- if (!skb)
- continue;
-
- dma_unmap_single(sw->dev, desc->sdp, RX_SEGMENT_MRU,
- DMA_FROM_DEVICE);
- dev_kfree_skb(skb);
- }
- dma_pool_free(rx_dma_pool, sw->rx_ring.desc, sw->rx_ring.phys_addr);
- dma_pool_destroy(rx_dma_pool);
- rx_dma_pool = 0;
- sw->rx_ring.desc = 0;
+
+ for (i = 0; i < RX_DESCS; i++) {
+ struct _rx_ring *rx_ring = &sw->rx_ring;
+ struct rx_desc *desc = &(rx_ring)->desc[i];
+ void *buf = sw->rx_ring.buff_tab[i];
+
+ if (!buf)
+ continue;
+
+ dma_unmap_single(sw->dev, desc->sdp, RX_SEGMENT_MRU, DMA_FROM_DEVICE);
+ skb_free_frag(buf);
}
- if (sw->tx_ring.desc) {
- for (i = 0; i < TX_DESCS; i++) {
- struct _tx_ring *tx_ring = &sw->tx_ring;
- struct tx_desc *desc = &(tx_ring)->desc[i];
- struct sk_buff *skb = sw->tx_ring.buff_tab[i];
- if (skb) {
- dma_unmap_single(sw->dev, desc->sdp,
- skb->len, DMA_TO_DEVICE);
- dev_kfree_skb(skb);
- }
- }
- dma_pool_free(tx_dma_pool, sw->tx_ring.desc, sw->tx_ring.phys_addr);
- dma_pool_destroy(tx_dma_pool);
- tx_dma_pool = 0;
- sw->tx_ring.desc = 0;
+
+ for (i = 0; i < TX_DESCS; i++) {
+ struct _tx_ring *tx_ring = &sw->tx_ring;
+ struct tx_desc *desc = &(tx_ring)->desc[i];
+ struct sk_buff *skb = sw->tx_ring.buff_tab[i];
+
+ if (!skb)
+ continue;
+
+ dma_unmap_single(sw->dev, desc->sdp, skb->len, DMA_TO_DEVICE);
+ dev_kfree_skb(skb);
}
}
return 0;
}
-static int cns3xxx_change_mtu(struct net_device *dev, int new_mtu)
-{
- if (new_mtu > MAX_MTU)
- return -EINVAL;
-
- dev->mtu = new_mtu;
- return 0;
-}
-
static const struct net_device_ops cns3xxx_netdev_ops = {
.ndo_open = eth_open,
.ndo_stop = eth_close,
.ndo_start_xmit = eth_xmit,
.ndo_set_rx_mode = eth_rx_mode,
.ndo_do_ioctl = eth_ioctl,
- .ndo_change_mtu = cns3xxx_change_mtu,
.ndo_set_mac_address = eth_set_mac,
.ndo_validate_addr = eth_validate_addr,
};
goto err_remove_mdio;
}
- strcpy(napi_dev->name, "switch%d");
+ strcpy(napi_dev->name, "cns3xxx_eth");
napi_dev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST;
SET_NETDEV_DEV(napi_dev, &pdev->dev);
CRC_STRIPPING, &sw->regs->mac_glob_cfg);
if ((err = init_rings(sw)) != 0) {
- destroy_rings(sw);
err = -ENOMEM;
goto err_free;
}
dev->netdev_ops = &cns3xxx_netdev_ops;
dev->ethtool_ops = &cns3xxx_ethtool_ops;
dev->tx_queue_len = 1000;
+ dev->max_mtu = MAX_MTU;
dev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST;
switch_port_tab[port->id] = port;
struct net_device *dev = platform_get_drvdata(pdev);
struct sw *sw = netdev_priv(dev);
int i;
- destroy_rings(sw);
+ destroy_rings(sw);
for (i = 3; i >= 0; i--) {
if (switch_port_tab[i]) {
struct port *port = switch_port_tab[i];