OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 		temp = (cmd << MDIO_VALUE_OFFSET);
 		temp |= MDIO_WRITE_COMMAND;
 	} else {
 		temp = MDIO_READ_COMMAND;
+	}
 	temp |= ((location & 0x1f) << MDIO_REG_OFFSET);
 	temp |= (phy_id & 0x1f);
 		udelay(1);
 		cycles++;
+	}
 	if (cycles == 5000) {
+		printk(KERN_ERR "%s #%i: MII transaction failed\n", bus->name,
-		printk(KERN_ERR "%s #%i: MII transaction failed\n", bus->name, phy_id);
+		       phy_id);
 		return -1;
+	}
 	ret = cns3xxx_mdio_cmd(bus, phy_id, location, 0, 0);
 	spin_unlock_irqrestore(&mdio_lock, flags);
 	return ret;
+}
+static int cns3xxx_mdio_write(struct mii_bus *bus, int phy_id, int location,
-static int cns3xxx_mdio_write(struct mii_bus *bus, int phy_id, int location, u16 val)
+			     u16 val)
+{
 	unsigned long flags;
 	int ret;
 	mdio_bus->write = &cns3xxx_mdio_write;
 	strcpy(mdio_bus->id, "0");
 	if ((err = mdiobus_register(mdio_bus)))
-		mdiobus_free(mdio_bus);
 		mdiobus_free(mdio_bus);
 	return err;
+}
 		wmb();
 		/* put the new buffer on RX-free queue */
 		rx_ring->buff_tab[i] = buf;
-		rx_ring->phys_tab[i] = phys;
 		rx_ring->phys_tab[i] = phys;
-		if (i == RX_DESCS - 1) {
-			desc->config0 = FIRST_SEGMENT | LAST_SEGMENT | RX_SEGMENT_MRU | END_OF_RING;
+		if (i == RX_DESCS - 1) {
+			i = 0;
+			desc->config0 = END_OF_RING | FIRST_SEGMENT |
-			i = 0;
+					LAST_SEGMENT | RX_SEGMENT_MRU;
 			desc = &(rx_ring)->desc[i];
 		} else {
+			desc->config0 = FIRST_SEGMENT | LAST_SEGMENT |
-			desc->config0 = FIRST_SEGMENT | LAST_SEGMENT | RX_SEGMENT_MRU;
+					RX_SEGMENT_MRU;
 			i++;
 			desc++;
+		}
 	if (tx_ring->stopped == stop)
 		return;
 	tx_ring->stopped = stop;
 	tx_ring->stopped = stop;
 	for (i = 0; i < 4; i++) {
 		struct port *port = switch_port_tab[i];
 		struct net_device *dev;
-		if (!port)
-			continue;
+		if (!port)
 			continue;
 		dev = port->netdev;
 		dev = port->netdev;
 		if (stop)
 	int num_used = tx_ring->num_used;
 	struct sk_buff *skb;
 	index = tx_ring->free_index;
-	desc = &(tx_ring)->desc[index];
 	desc = &(tx_ring)->desc[index];
 	for (i = 0; i < num_used; i++) {
-		if (!desc->cown)
-			break;
+		if (desc->cown) {
-		skb = tx_ring->buff_tab[index];
+			skb = tx_ring->buff_tab[index];
-		tx_ring->buff_tab[index] = 0;
+			tx_ring->buff_tab[index] = 0;
-		if (skb)
+			if (skb)
-			dev_kfree_skb_any(skb);
+				dev_kfree_skb_any(skb);
-		dma_unmap_single(sw->dev, tx_ring->phys_tab[index], desc->sdl, DMA_TO_DEVICE);
+			dma_unmap_single(sw->dev, tx_ring->phys_tab[index],
+				desc->sdl, DMA_TO_DEVICE);
-		if (index == TX_DESCS - 1) {
+			if (++index == TX_DESCS) {
-			index = 0;
+				index = 0;
+				desc = &(tx_ring)->desc[index];
+			} else {
+				desc++;
 			desc = &(tx_ring)->desc[index];
 		} else {
-			index++;
-			desc++;
+			break;
+		}
-	}
+	}
 	tx_ring->free_index = index;
 	tx_ring->num_used -= i;
 	eth_check_num_used(tx_ring);
 		if (received >= budget)
 			break;
+		/* process received frame */
-		/* process received frame */
+		dma_unmap_single(sw->dev, rx_ring->phys_tab[i],
-		dma_unmap_single(sw->dev, rx_ring->phys_tab[i], RX_SEGMENT_MRU, DMA_FROM_DEVICE);
+				 RX_SEGMENT_MRU, DMA_FROM_DEVICE);
 			sw->frag_first = NULL;
 			sw->frag_last = NULL;
+		}
 		received++;
-		if (i == RX_DESCS - 1) {
+		if (++i == RX_DESCS) {
 			i = 0;
 			desc = &(rx_ring)->desc[i];
-		} else {
-			i++;
+		} else {
 			desc++;
+		}
+	}
 	tx_desc->sdp = phys;
 	tx_desc->pmap = pmap;
 	tx_ring->phys_tab[index] = phys;
-	config0 |= len;
 	config0 |= len;
 	if (index == TX_DESCS - 1)
-		config0 |= END_OF_RING;
 		config0 |= END_OF_RING;
 	if (index == index_last)
 		config0 |= LAST_SEGMENT;
 	char pmap = (1 << port->id);
 	int nr_frags = skb_shinfo(skb)->nr_frags;
 	int nr_desc = nr_frags;
 	int index0, index, index_last;
 	int len0;
-	int i;
+	unsigned int i;
 	u32 config0;
 	if (pmap == 8)
 		pmap = (1 << 4);
 	skb_walk_frags(skb, skb1)
 		nr_desc++;
 	eth_schedule_poll(sw);
-	spin_lock_bh(&tx_lock);
+	eth_schedule_poll(sw);
 	spin_lock_bh(&tx_lock);
 	if ((tx_ring->num_used + nr_desc + 1) >= TX_DESCS) {
 	__raw_writel(0, &sw->regs->fs_dma_ctrl0);
 	__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(CLR_FS_STATE | QUEUE_THRESHOLD, &sw->regs->dma_ring_ctrl);
 	__raw_writel(QUEUE_THRESHOLD, &sw->regs->dma_ring_ctrl);
 	rx_ring->desc = dmam_alloc_coherent(sw->dev, RX_POOL_ALLOC_SIZE,
 					    &rx_ring->phys_addr, GFP_KERNEL);
 	if (!rx_ring->desc)
 		return -ENOMEM;
 	/* Setup RX buffers */
-	memset(rx_ring->desc, 0, RX_POOL_ALLOC_SIZE);
+	/* Setup RX buffers */
 	memset(rx_ring->desc, 0, RX_POOL_ALLOC_SIZE);
 	for (i = 0; i < RX_DESCS; i++) {
 		struct rx_desc *desc = &(rx_ring)->desc[i];
 		void *buf;
-		buf = netdev_alloc_frag(RX_SEGMENT_ALLOC_SIZE);
-		if (!buf)
+		buf = netdev_alloc_frag(RX_SEGMENT_ALLOC_SIZE);
-			return -ENOMEM;
+		if (!buf)
-		desc->sdl = RX_SEGMENT_MRU;
+			return -ENOMEM;
-		if (i == (RX_DESCS - 1))
+		desc->sdl = RX_SEGMENT_MRU;
-			desc->eor = 1;
+		if (i == (RX_DESCS - 1))
-		desc->fsd = 1;
+			desc->eor = 1;
-		desc->lsd = 1;
+		desc->fsd = 1;
 		desc->lsd = 1;
 		desc->sdp = dma_map_single(sw->dev, buf + SKB_HEAD_ALIGN,
 	if (!tx_ring->desc)
 		return -ENOMEM;
 	/* Setup TX buffers */
-	memset(tx_ring->desc, 0, TX_POOL_ALLOC_SIZE);
 	memset(tx_ring->desc, 0, TX_POOL_ALLOC_SIZE);
 	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;
+		if (i == (TX_DESCS - 1))
 			desc->eor = 1;
 		desc->cown = 1;
+	}
 		void *buf = sw->rx_ring.buff_tab[i];
 		if (!buf)
 			continue;
 		dma_unmap_single(sw->dev, desc->sdp, RX_SEGMENT_MRU,
-		dma_unmap_single(sw->dev, desc->sdp, RX_SEGMENT_MRU, DMA_FROM_DEVICE);
+				 DMA_FROM_DEVICE);
 		skb_free_frag(buf);
+	}
 		cycles++;
+	}
 	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_do_ioctl = eth_ioctl,
+	.ndo_change_mtu = cns3xxx_change_mtu,
 	.ndo_set_mac_address = eth_set_mac,
 	.ndo_validate_addr = eth_validate_addr,
 };
 		SET_NETDEV_DEV(dev, &pdev->dev);
 		dev->netdev_ops = &cns3xxx_netdev_ops;
 		dev->ethtool_ops = &cns3xxx_ethtool_ops;
-		dev->tx_queue_len = 1000;
-		dev->max_mtu = MAX_MTU;
+		dev->tx_queue_len = 1000;
 		dev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST;