* [PATCH 01/39] mv643xx_eth: reverse topological sort of functions
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:23 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 02/39] mv643xx_eth: trim unnecessary includes Lennert Buytenhek
` (37 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
This patch performs a reverse topological sort of all functions in
mv643xx_eth.c, so that we can get rid of all forward declarations,
and end up with a more understandable driver due to related functions
being grouped together.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 3438 ++++++++++++++++++++++-----------------------
1 files changed, 1646 insertions(+), 1792 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b7915cd..835b85d 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -62,6 +62,9 @@
#include <asm/delay.h>
#include <asm/dma-mapping.h>
+static char mv643xx_driver_name[] = "mv643xx_eth";
+static char mv643xx_driver_version[] = "1.0";
+
#define MV643XX_CHECKSUM_OFFLOAD_TX
#define MV643XX_NAPI
#define MV643XX_TX_FAST_REFILL
@@ -478,7 +481,21 @@ struct pkt_info {
struct sk_buff *return_info; /* User resource return information */
};
-/* Ethernet port specific information */
+
+/* global *******************************************************************/
+struct mv643xx_shared_private {
+ void __iomem *eth_base;
+
+ /* used to protect SMI_REG, which is shared across ports */
+ spinlock_t phy_lock;
+
+ u32 win_protect;
+
+ unsigned int t_clk;
+};
+
+
+/* per-port *****************************************************************/
struct mv643xx_mib_counters {
u64 good_octets_received;
u32 bad_octets_received;
@@ -512,17 +529,6 @@ struct mv643xx_mib_counters {
u32 late_collision;
};
-struct mv643xx_shared_private {
- void __iomem *eth_base;
-
- /* used to protect SMI_REG, which is shared across ports */
- spinlock_t phy_lock;
-
- u32 win_protect;
-
- unsigned int t_clk;
-};
-
struct mv643xx_private {
struct mv643xx_shared_private *shared;
int port_num; /* User Ethernet port number */
@@ -585,93 +591,135 @@ struct mv643xx_private {
struct mii_if_info mii;
};
-/* Static function declarations */
-static void eth_port_init(struct mv643xx_private *mp);
-static void eth_port_reset(struct mv643xx_private *mp);
-static void eth_port_start(struct net_device *dev);
-static void ethernet_phy_reset(struct mv643xx_private *mp);
+/* port register accessors **************************************************/
+static inline u32 rdl(struct mv643xx_private *mp, int offset)
+{
+ return readl(mp->shared->eth_base + offset);
+}
-static void eth_port_write_smi_reg(struct mv643xx_private *mp,
- unsigned int phy_reg, unsigned int value);
+static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
+{
+ writel(data, mp->shared->eth_base + offset);
+}
-static void eth_port_read_smi_reg(struct mv643xx_private *mp,
- unsigned int phy_reg, unsigned int *value);
-static void eth_clear_mib_counters(struct mv643xx_private *mp);
+/* rxq/txq helper functions *************************************************/
+static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
+ unsigned int queues)
+{
+ wrl(mp, RECEIVE_QUEUE_COMMAND_REG(mp->port_num), queues);
+}
-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
- struct pkt_info *p_pkt_info);
-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
- struct pkt_info *p_pkt_info);
+static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
+{
+ unsigned int port_num = mp->port_num;
+ u32 queues;
-static void eth_port_uc_addr_get(struct mv643xx_private *mp,
- unsigned char *p_addr);
-static void eth_port_uc_addr_set(struct mv643xx_private *mp,
- unsigned char *p_addr);
-static void eth_port_set_multicast_list(struct net_device *);
-static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
- unsigned int queues);
-static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
- unsigned int queues);
-static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp);
-static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp);
-static int mv643xx_eth_open(struct net_device *);
-static int mv643xx_eth_stop(struct net_device *);
-static void eth_port_init_mac_tables(struct mv643xx_private *mp);
-#ifdef MV643XX_NAPI
-static int mv643xx_poll(struct napi_struct *napi, int budget);
-#endif
-static int ethernet_phy_get(struct mv643xx_private *mp);
-static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr);
-static int ethernet_phy_detect(struct mv643xx_private *mp);
-static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location);
-static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val);
-static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-static const struct ethtool_ops mv643xx_ethtool_ops;
+ /* Stop Rx port activity. Check port Rx activity. */
+ queues = rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+ if (queues) {
+ /* Issue stop command for active queues only */
+ wrl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num), (queues << 8));
-static char mv643xx_driver_name[] = "mv643xx_eth";
-static char mv643xx_driver_version[] = "1.0";
+ /* Wait for all Rx activity to terminate. */
+ /* Check port cause register that all Rx queues are stopped */
+ while (rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+ udelay(PHY_WAIT_MICRO_SECONDS);
+ }
-static inline u32 rdl(struct mv643xx_private *mp, int offset)
+ return queues;
+}
+
+static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
+ unsigned int queues)
{
- return readl(mp->shared->eth_base + offset);
+ wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(mp->port_num), queues);
}
-static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
+static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
{
- writel(data, mp->shared->eth_base + offset);
+ unsigned int port_num = mp->port_num;
+ u32 queues;
+
+ /* Stop Tx port activity. Check port Tx activity. */
+ queues = rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+ if (queues) {
+ /* Issue stop command for active queues only */
+ wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num), (queues << 8));
+
+ /* Wait for all Tx activity to terminate. */
+ /* Check port cause register that all Tx queues are stopped */
+ while (rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+ udelay(PHY_WAIT_MICRO_SECONDS);
+
+ /* Wait for Tx FIFO to empty */
+ while (rdl(mp, PORT_STATUS_REG(port_num)) &
+ ETH_PORT_TX_FIFO_EMPTY)
+ udelay(PHY_WAIT_MICRO_SECONDS);
+ }
+
+ return queues;
}
+
+/* rx ***********************************************************************/
+static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
+
/*
- * Changes MTU (maximum transfer unit) of the gigabit ethenret port
+ * eth_rx_return_buff - Returns a Rx buffer back to the Rx ring.
*
- * Input : pointer to ethernet interface network device structure
- * new mtu size
- * Output : 0 upon success, -EINVAL upon failure
+ * DESCRIPTION:
+ * This routine returns a Rx buffer back to the Rx ring. It retrieves the
+ * next 'used' descriptor and attached the returned buffer to it.
+ * In case the Rx ring was in "resource error" condition, where there are
+ * no available Rx resources, the function resets the resource error flag.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct pkt_info *p_pkt_info Information on returned buffer.
+ *
+ * OUTPUT:
+ * New available Rx resource in Rx descriptor ring.
+ *
+ * RETURN:
+ * ETH_ERROR in case the routine can not access Rx desc ring.
+ * ETH_OK otherwise.
*/
-static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
+static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
+ struct pkt_info *p_pkt_info)
{
- if ((new_mtu > 9500) || (new_mtu < 64))
- return -EINVAL;
+ int used_rx_desc; /* Where to return Rx resource */
+ volatile struct eth_rx_desc *p_used_rx_desc;
+ unsigned long flags;
- dev->mtu = new_mtu;
- if (!netif_running(dev))
- return 0;
+ spin_lock_irqsave(&mp->lock, flags);
- /*
- * Stop and then re-open the interface. This will allocate RX
- * skbs of the new MTU.
- * There is a possible danger that the open will not succeed,
- * due to memory being full, which might fail the open function.
- */
- mv643xx_eth_stop(dev);
- if (mv643xx_eth_open(dev)) {
- printk(KERN_ERR "%s: Fatal error on opening device\n",
- dev->name);
- }
+ /* Get 'used' Rx descriptor */
+ used_rx_desc = mp->rx_used_desc_q;
+ p_used_rx_desc = &mp->p_rx_desc_area[used_rx_desc];
- return 0;
+ p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
+ p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
+ mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+
+ /* Flush the write pipe */
+
+ /* Return the descriptor to DMA ownership */
+ wmb();
+ p_used_rx_desc->cmd_sts =
+ ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
+ wmb();
+
+ /* Move the used descriptor pointer to the next descriptor */
+ mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
+
+ /* Any Rx return cancels the Rx resource error status */
+ mp->rx_resource_err = 0;
+
+ spin_unlock_irqrestore(&mp->lock, flags);
+
+ return ETH_OK;
}
/*
@@ -736,42 +784,841 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
}
/*
- * mv643xx_eth_update_mac_address
+ * eth_port_receive - Get received information from Rx ring.
*
- * Update the MAC address of the port in the address table
+ * DESCRIPTION:
+ * This routine returns the received data to the caller. There is no
+ * data copying during routine operation. All information is returned
+ * using pointer to packet information struct passed from the caller.
+ * If the routine exhausts Rx ring resources then the resource error flag
+ * is set.
*
- * Input : pointer to ethernet interface network device structure
- * Output : N/A
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct pkt_info *p_pkt_info User packet buffer.
+ *
+ * OUTPUT:
+ * Rx ring current and used indexes are updated.
+ *
+ * RETURN:
+ * ETH_ERROR in case the routine can not access Rx desc ring.
+ * ETH_QUEUE_FULL if Rx ring resources are exhausted.
+ * ETH_END_OF_JOB if there is no received data.
+ * ETH_OK otherwise.
*/
-static void mv643xx_eth_update_mac_address(struct net_device *dev)
+static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
+ struct pkt_info *p_pkt_info)
+{
+ int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
+ volatile struct eth_rx_desc *p_rx_desc;
+ unsigned int command_status;
+ unsigned long flags;
+
+ /* Do not process Rx ring in case of Rx ring resource error */
+ if (mp->rx_resource_err)
+ return ETH_QUEUE_FULL;
+
+ spin_lock_irqsave(&mp->lock, flags);
+
+ /* Get the Rx Desc ring 'curr and 'used' indexes */
+ rx_curr_desc = mp->rx_curr_desc_q;
+ rx_used_desc = mp->rx_used_desc_q;
+
+ p_rx_desc = &mp->p_rx_desc_area[rx_curr_desc];
+
+ /* The following parameters are used to save readings from memory */
+ command_status = p_rx_desc->cmd_sts;
+ rmb();
+
+ /* Nothing to receive... */
+ if (command_status & (ETH_BUFFER_OWNED_BY_DMA)) {
+ spin_unlock_irqrestore(&mp->lock, flags);
+ return ETH_END_OF_JOB;
+ }
+
+ p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET;
+ p_pkt_info->cmd_sts = command_status;
+ p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET;
+ p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
+ p_pkt_info->l4i_chk = p_rx_desc->buf_size;
+
+ /*
+ * Clean the return info field to indicate that the
+ * packet has been moved to the upper layers
+ */
+ mp->rx_skb[rx_curr_desc] = NULL;
+
+ /* Update current index in data structure */
+ rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
+ mp->rx_curr_desc_q = rx_next_curr_desc;
+
+ /* Rx descriptors exhausted. Set the Rx ring resource error flag */
+ if (rx_next_curr_desc == rx_used_desc)
+ mp->rx_resource_err = 1;
+
+ spin_unlock_irqrestore(&mp->lock, flags);
+
+ return ETH_OK;
+}
+
+/*
+ * mv643xx_eth_receive
+ *
+ * This function is forward packets that are received from the port's
+ * queues toward kernel core or FastRoute them to another interface.
+ *
+ * Input : dev - a pointer to the required interface
+ * max - maximum number to receive (0 means unlimted)
+ *
+ * Output : number of served packets
+ */
+static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
{
struct mv643xx_private *mp = netdev_priv(dev);
+ struct net_device_stats *stats = &dev->stats;
+ unsigned int received_packets = 0;
+ struct sk_buff *skb;
+ struct pkt_info pkt_info;
- eth_port_init_mac_tables(mp);
- eth_port_uc_addr_set(mp, dev->dev_addr);
+ while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
+ dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
+ DMA_FROM_DEVICE);
+ mp->rx_desc_count--;
+ received_packets++;
+
+ /*
+ * Update statistics.
+ * Note byte count includes 4 byte CRC count
+ */
+ stats->rx_packets++;
+ stats->rx_bytes += pkt_info.byte_cnt;
+ skb = pkt_info.return_info;
+ /*
+ * In case received a packet without first / last bits on OR
+ * the error summary bit is on, the packets needs to be dropeed.
+ */
+ if (((pkt_info.cmd_sts
+ & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
+ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
+ || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
+ stats->rx_dropped++;
+ if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
+ ETH_RX_LAST_DESC)) !=
+ (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
+ if (net_ratelimit())
+ printk(KERN_ERR
+ "%s: Received packet spread "
+ "on multiple descriptors\n",
+ dev->name);
+ }
+ if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
+ stats->rx_errors++;
+
+ dev_kfree_skb_irq(skb);
+ } else {
+ /*
+ * The -4 is for the CRC in the trailer of the
+ * received packet
+ */
+ skb_put(skb, pkt_info.byte_cnt - 4);
+
+ if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ skb->csum = htons(
+ (pkt_info.cmd_sts & 0x0007fff8) >> 3);
+ }
+ skb->protocol = eth_type_trans(skb, dev);
+#ifdef MV643XX_NAPI
+ netif_receive_skb(skb);
+#else
+ netif_rx(skb);
+#endif
+ }
+ dev->last_rx = jiffies;
+ }
+ mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
+
+ return received_packets;
}
+#ifdef MV643XX_NAPI
/*
- * mv643xx_eth_set_rx_mode
+ * mv643xx_poll
*
- * Change from promiscuos to regular rx mode
+ * This function is used in case of NAPI
+ */
+static int mv643xx_poll(struct napi_struct *napi, int budget)
+{
+ struct mv643xx_private *mp = container_of(napi, struct mv643xx_private, napi);
+ struct net_device *dev = mp->dev;
+ unsigned int port_num = mp->port_num;
+ int work_done;
+
+#ifdef MV643XX_TX_FAST_REFILL
+ if (++mp->tx_clean_threshold > 5) {
+ mv643xx_eth_free_completed_tx_descs(dev);
+ mp->tx_clean_threshold = 0;
+ }
+#endif
+
+ work_done = 0;
+ if ((rdl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
+ != (u32) mp->rx_used_desc_q)
+ work_done = mv643xx_eth_receive_queue(dev, budget);
+
+ if (work_done < budget) {
+ netif_rx_complete(dev, napi);
+ wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
+ wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+ wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+ }
+
+ return work_done;
+}
+#endif
+
+
+/* tx ***********************************************************************/
+/**
+ * has_tiny_unaligned_frags - check if skb has any small, unaligned fragments
+ *
+ * Hardware can't handle unaligned fragments smaller than 9 bytes.
+ * This helper function detects that case.
+ */
+
+static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
+{
+ unsigned int frag;
+ skb_frag_t *fragp;
+
+ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
+ fragp = &skb_shinfo(skb)->frags[frag];
+ if (fragp->size <= 8 && fragp->page_offset & 0x7)
+ return 1;
+ }
+ return 0;
+}
+
+/**
+ * eth_alloc_tx_desc_index - return the index of the next available tx desc
+ */
+static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
+{
+ int tx_desc_curr;
+
+ BUG_ON(mp->tx_desc_count >= mp->tx_ring_size);
+
+ tx_desc_curr = mp->tx_curr_desc_q;
+ mp->tx_curr_desc_q = (tx_desc_curr + 1) % mp->tx_ring_size;
+
+ BUG_ON(mp->tx_curr_desc_q == mp->tx_used_desc_q);
+
+ return tx_desc_curr;
+}
+
+/**
+ * eth_tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
+ *
+ * Ensure the data for each fragment to be transmitted is mapped properly,
+ * then fill in descriptors in the tx hw queue.
+ */
+static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
+ struct sk_buff *skb)
+{
+ int frag;
+ int tx_index;
+ struct eth_tx_desc *desc;
+
+ for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
+ skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
+
+ tx_index = eth_alloc_tx_desc_index(mp);
+ desc = &mp->p_tx_desc_area[tx_index];
+
+ desc->cmd_sts = ETH_BUFFER_OWNED_BY_DMA;
+ /* Last Frag enables interrupt and frees the skb */
+ if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
+ desc->cmd_sts |= ETH_ZERO_PADDING |
+ ETH_TX_LAST_DESC |
+ ETH_TX_ENABLE_INTERRUPT;
+ mp->tx_skb[tx_index] = skb;
+ } else
+ mp->tx_skb[tx_index] = NULL;
+
+ desc = &mp->p_tx_desc_area[tx_index];
+ desc->l4i_chk = 0;
+ desc->byte_cnt = this_frag->size;
+ desc->buf_ptr = dma_map_page(NULL, this_frag->page,
+ this_frag->page_offset,
+ this_frag->size,
+ DMA_TO_DEVICE);
+ }
+}
+
+static inline __be16 sum16_as_be(__sum16 sum)
+{
+ return (__force __be16)sum;
+}
+
+/**
+ * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw
+ *
+ * Ensure the data for an skb to be transmitted is mapped properly,
+ * then fill in descriptors in the tx hw queue and start the hardware.
+ */
+static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
+ struct sk_buff *skb)
+{
+ int tx_index;
+ struct eth_tx_desc *desc;
+ u32 cmd_sts;
+ int length;
+ int nr_frags = skb_shinfo(skb)->nr_frags;
+
+ cmd_sts = ETH_TX_FIRST_DESC | ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
+
+ tx_index = eth_alloc_tx_desc_index(mp);
+ desc = &mp->p_tx_desc_area[tx_index];
+
+ if (nr_frags) {
+ eth_tx_fill_frag_descs(mp, skb);
+
+ length = skb_headlen(skb);
+ mp->tx_skb[tx_index] = NULL;
+ } else {
+ cmd_sts |= ETH_ZERO_PADDING |
+ ETH_TX_LAST_DESC |
+ ETH_TX_ENABLE_INTERRUPT;
+ length = skb->len;
+ mp->tx_skb[tx_index] = skb;
+ }
+
+ desc->byte_cnt = length;
+ desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
+
+ if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ BUG_ON(skb->protocol != htons(ETH_P_IP));
+
+ cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
+ ETH_GEN_IP_V_4_CHECKSUM |
+ ip_hdr(skb)->ihl << ETH_TX_IHL_SHIFT;
+
+ switch (ip_hdr(skb)->protocol) {
+ case IPPROTO_UDP:
+ cmd_sts |= ETH_UDP_FRAME;
+ desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
+ break;
+ case IPPROTO_TCP:
+ desc->l4i_chk = ntohs(sum16_as_be(tcp_hdr(skb)->check));
+ break;
+ default:
+ BUG();
+ }
+ } else {
+ /* Errata BTS #50, IHL must be 5 if no HW checksum */
+ cmd_sts |= 5 << ETH_TX_IHL_SHIFT;
+ desc->l4i_chk = 0;
+ }
+
+ /* ensure all other descriptors are written before first cmd_sts */
+ wmb();
+ desc->cmd_sts = cmd_sts;
+
+ /* ensure all descriptors are written before poking hardware */
+ wmb();
+ mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
+
+ mp->tx_desc_count += nr_frags + 1;
+}
+
+/**
+ * mv643xx_eth_start_xmit - queue an skb to the hardware for transmission
+ *
+ */
+static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ struct net_device_stats *stats = &dev->stats;
+ unsigned long flags;
+
+ BUG_ON(netif_queue_stopped(dev));
+
+ if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
+ stats->tx_dropped++;
+ printk(KERN_DEBUG "%s: failed to linearize tiny "
+ "unaligned fragment\n", dev->name);
+ return NETDEV_TX_BUSY;
+ }
+
+ spin_lock_irqsave(&mp->lock, flags);
+
+ if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
+ printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
+ netif_stop_queue(dev);
+ spin_unlock_irqrestore(&mp->lock, flags);
+ return NETDEV_TX_BUSY;
+ }
+
+ eth_tx_submit_descs_for_skb(mp, skb);
+ stats->tx_bytes += skb->len;
+ stats->tx_packets++;
+ dev->trans_start = jiffies;
+
+ if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB)
+ netif_stop_queue(dev);
+
+ spin_unlock_irqrestore(&mp->lock, flags);
+
+ return NETDEV_TX_OK;
+}
+
+
+/* mii management interface *************************************************/
+static int ethernet_phy_get(struct mv643xx_private *mp);
+
+/*
+ * eth_port_read_smi_reg - Read PHY registers
+ *
+ * DESCRIPTION:
+ * This routine utilize the SMI interface to interact with the PHY in
+ * order to perform PHY register read.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ * unsigned int phy_reg PHY register address offset.
+ * unsigned int *value Register value buffer.
+ *
+ * OUTPUT:
+ * Write the value of a specified PHY register into given buffer.
+ *
+ * RETURN:
+ * false if the PHY is busy or read data is not in valid state.
+ * true otherwise.
+ *
+ */
+static void eth_port_read_smi_reg(struct mv643xx_private *mp,
+ unsigned int phy_reg, unsigned int *value)
+{
+ void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
+ int phy_addr = ethernet_phy_get(mp);
+ unsigned long flags;
+ int i;
+
+ /* the SMI register is a shared resource */
+ spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
+
+ /* wait for the SMI register to become available */
+ for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+ if (i == PHY_WAIT_ITERATIONS) {
+ printk("%s: PHY busy timeout\n", mp->dev->name);
+ goto out;
+ }
+ udelay(PHY_WAIT_MICRO_SECONDS);
+ }
+
+ writel((phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ,
+ smi_reg);
+
+ /* now wait for the data to be valid */
+ for (i = 0; !(readl(smi_reg) & ETH_SMI_READ_VALID); i++) {
+ if (i == PHY_WAIT_ITERATIONS) {
+ printk("%s: PHY read timeout\n", mp->dev->name);
+ goto out;
+ }
+ udelay(PHY_WAIT_MICRO_SECONDS);
+ }
+
+ *value = readl(smi_reg) & 0xffff;
+out:
+ spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
+}
+
+/*
+ * eth_port_write_smi_reg - Write to PHY registers
+ *
+ * DESCRIPTION:
+ * This routine utilize the SMI interface to interact with the PHY in
+ * order to perform writes to PHY registers.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ * unsigned int phy_reg PHY register address offset.
+ * unsigned int value Register value.
+ *
+ * OUTPUT:
+ * Write the given value to the specified PHY register.
+ *
+ * RETURN:
+ * false if the PHY is busy.
+ * true otherwise.
+ *
+ */
+static void eth_port_write_smi_reg(struct mv643xx_private *mp,
+ unsigned int phy_reg, unsigned int value)
+{
+ void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
+ int phy_addr = ethernet_phy_get(mp);
+ unsigned long flags;
+ int i;
+
+ /* the SMI register is a shared resource */
+ spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
+
+ /* wait for the SMI register to become available */
+ for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+ if (i == PHY_WAIT_ITERATIONS) {
+ printk("%s: PHY busy timeout\n", mp->dev->name);
+ goto out;
+ }
+ udelay(PHY_WAIT_MICRO_SECONDS);
+ }
+
+ writel((phy_addr << 16) | (phy_reg << 21) |
+ ETH_SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
+out:
+ spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
+}
+
+
+/* mib counters *************************************************************/
+/*
+ * eth_clear_mib_counters - Clear all MIB counters
+ *
+ * DESCRIPTION:
+ * This function clears all MIB counters of a specific ethernet port.
+ * A read from the MIB counter will reset the counter.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * After reading all MIB counters, the counters resets.
+ *
+ * RETURN:
+ * MIB counter value.
+ *
+ */
+static void eth_clear_mib_counters(struct mv643xx_private *mp)
+{
+ unsigned int port_num = mp->port_num;
+ int i;
+
+ /* Perform dummy reads from MIB counters */
+ for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
+ i += 4)
+ rdl(mp, MIB_COUNTERS_BASE(port_num) + i);
+}
+
+static inline u32 read_mib(struct mv643xx_private *mp, int offset)
+{
+ return rdl(mp, MIB_COUNTERS_BASE(mp->port_num) + offset);
+}
+
+static void eth_update_mib_counters(struct mv643xx_private *mp)
+{
+ struct mv643xx_mib_counters *p = &mp->mib_counters;
+ int offset;
+
+ p->good_octets_received +=
+ read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW);
+ p->good_octets_received +=
+ (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH) << 32;
+
+ for (offset = ETH_MIB_BAD_OCTETS_RECEIVED;
+ offset <= ETH_MIB_FRAMES_1024_TO_MAX_OCTETS;
+ offset += 4)
+ *(u32 *)((char *)p + offset) += read_mib(mp, offset);
+
+ p->good_octets_sent += read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_LOW);
+ p->good_octets_sent +=
+ (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_HIGH) << 32;
+
+ for (offset = ETH_MIB_GOOD_FRAMES_SENT;
+ offset <= ETH_MIB_LATE_COLLISION;
+ offset += 4)
+ *(u32 *)((char *)p + offset) += read_mib(mp, offset);
+}
+
+
+/* ethtool ******************************************************************/
+struct mv643xx_stats {
+ char stat_string[ETH_GSTRING_LEN];
+ int sizeof_stat;
+ int stat_offset;
+};
+
+#define MV643XX_STAT(m) FIELD_SIZEOF(struct mv643xx_private, m), \
+ offsetof(struct mv643xx_private, m)
+
+static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
+ { "rx_packets", MV643XX_STAT(stats.rx_packets) },
+ { "tx_packets", MV643XX_STAT(stats.tx_packets) },
+ { "rx_bytes", MV643XX_STAT(stats.rx_bytes) },
+ { "tx_bytes", MV643XX_STAT(stats.tx_bytes) },
+ { "rx_errors", MV643XX_STAT(stats.rx_errors) },
+ { "tx_errors", MV643XX_STAT(stats.tx_errors) },
+ { "rx_dropped", MV643XX_STAT(stats.rx_dropped) },
+ { "tx_dropped", MV643XX_STAT(stats.tx_dropped) },
+ { "good_octets_received", MV643XX_STAT(mib_counters.good_octets_received) },
+ { "bad_octets_received", MV643XX_STAT(mib_counters.bad_octets_received) },
+ { "internal_mac_transmit_err", MV643XX_STAT(mib_counters.internal_mac_transmit_err) },
+ { "good_frames_received", MV643XX_STAT(mib_counters.good_frames_received) },
+ { "bad_frames_received", MV643XX_STAT(mib_counters.bad_frames_received) },
+ { "broadcast_frames_received", MV643XX_STAT(mib_counters.broadcast_frames_received) },
+ { "multicast_frames_received", MV643XX_STAT(mib_counters.multicast_frames_received) },
+ { "frames_64_octets", MV643XX_STAT(mib_counters.frames_64_octets) },
+ { "frames_65_to_127_octets", MV643XX_STAT(mib_counters.frames_65_to_127_octets) },
+ { "frames_128_to_255_octets", MV643XX_STAT(mib_counters.frames_128_to_255_octets) },
+ { "frames_256_to_511_octets", MV643XX_STAT(mib_counters.frames_256_to_511_octets) },
+ { "frames_512_to_1023_octets", MV643XX_STAT(mib_counters.frames_512_to_1023_octets) },
+ { "frames_1024_to_max_octets", MV643XX_STAT(mib_counters.frames_1024_to_max_octets) },
+ { "good_octets_sent", MV643XX_STAT(mib_counters.good_octets_sent) },
+ { "good_frames_sent", MV643XX_STAT(mib_counters.good_frames_sent) },
+ { "excessive_collision", MV643XX_STAT(mib_counters.excessive_collision) },
+ { "multicast_frames_sent", MV643XX_STAT(mib_counters.multicast_frames_sent) },
+ { "broadcast_frames_sent", MV643XX_STAT(mib_counters.broadcast_frames_sent) },
+ { "unrec_mac_control_received", MV643XX_STAT(mib_counters.unrec_mac_control_received) },
+ { "fc_sent", MV643XX_STAT(mib_counters.fc_sent) },
+ { "good_fc_received", MV643XX_STAT(mib_counters.good_fc_received) },
+ { "bad_fc_received", MV643XX_STAT(mib_counters.bad_fc_received) },
+ { "undersize_received", MV643XX_STAT(mib_counters.undersize_received) },
+ { "fragments_received", MV643XX_STAT(mib_counters.fragments_received) },
+ { "oversize_received", MV643XX_STAT(mib_counters.oversize_received) },
+ { "jabber_received", MV643XX_STAT(mib_counters.jabber_received) },
+ { "mac_receive_error", MV643XX_STAT(mib_counters.mac_receive_error) },
+ { "bad_crc_event", MV643XX_STAT(mib_counters.bad_crc_event) },
+ { "collision", MV643XX_STAT(mib_counters.collision) },
+ { "late_collision", MV643XX_STAT(mib_counters.late_collision) },
+};
+
+#define MV643XX_STATS_LEN ARRAY_SIZE(mv643xx_gstrings_stats)
+
+static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ int err;
+
+ spin_lock_irq(&mp->lock);
+ err = mii_ethtool_gset(&mp->mii, cmd);
+ spin_unlock_irq(&mp->lock);
+
+ /* The PHY may support 1000baseT_Half, but the mv643xx does not */
+ cmd->supported &= ~SUPPORTED_1000baseT_Half;
+ cmd->advertising &= ~ADVERTISED_1000baseT_Half;
+
+ return err;
+}
+
+static int mv643xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ int err;
+
+ spin_lock_irq(&mp->lock);
+ err = mii_ethtool_sset(&mp->mii, cmd);
+ spin_unlock_irq(&mp->lock);
+
+ return err;
+}
+
+static void mv643xx_get_drvinfo(struct net_device *netdev,
+ struct ethtool_drvinfo *drvinfo)
+{
+ strncpy(drvinfo->driver, mv643xx_driver_name, 32);
+ strncpy(drvinfo->version, mv643xx_driver_version, 32);
+ strncpy(drvinfo->fw_version, "N/A", 32);
+ strncpy(drvinfo->bus_info, "mv643xx", 32);
+ drvinfo->n_stats = MV643XX_STATS_LEN;
+}
+
+static int mv643xx_eth_nway_restart(struct net_device *dev)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+
+ return mii_nway_restart(&mp->mii);
+}
+
+static u32 mv643xx_eth_get_link(struct net_device *dev)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+
+ return mii_link_ok(&mp->mii);
+}
+
+static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
+ uint8_t *data)
+{
+ int i;
+
+ switch(stringset) {
+ case ETH_SS_STATS:
+ for (i=0; i < MV643XX_STATS_LEN; i++) {
+ memcpy(data + i * ETH_GSTRING_LEN,
+ mv643xx_gstrings_stats[i].stat_string,
+ ETH_GSTRING_LEN);
+ }
+ break;
+ }
+}
+
+static void mv643xx_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats *stats, uint64_t *data)
+{
+ struct mv643xx_private *mp = netdev->priv;
+ int i;
+
+ eth_update_mib_counters(mp);
+
+ for (i = 0; i < MV643XX_STATS_LEN; i++) {
+ char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
+ data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
+ sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
+ }
+}
+
+static int mv643xx_get_sset_count(struct net_device *netdev, int sset)
+{
+ switch (sset) {
+ case ETH_SS_STATS:
+ return MV643XX_STATS_LEN;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static const struct ethtool_ops mv643xx_ethtool_ops = {
+ .get_settings = mv643xx_get_settings,
+ .set_settings = mv643xx_set_settings,
+ .get_drvinfo = mv643xx_get_drvinfo,
+ .get_link = mv643xx_eth_get_link,
+ .set_sg = ethtool_op_set_sg,
+ .get_sset_count = mv643xx_get_sset_count,
+ .get_ethtool_stats = mv643xx_get_ethtool_stats,
+ .get_strings = mv643xx_get_strings,
+ .nway_reset = mv643xx_eth_nway_restart,
+};
+
+
+/* address handling *********************************************************/
+/*
+ * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
+ */
+static void eth_port_uc_addr_get(struct mv643xx_private *mp,
+ unsigned char *p_addr)
+{
+ unsigned int port_num = mp->port_num;
+ unsigned int mac_h;
+ unsigned int mac_l;
+
+ mac_h = rdl(mp, MAC_ADDR_HIGH(port_num));
+ mac_l = rdl(mp, MAC_ADDR_LOW(port_num));
+
+ p_addr[0] = (mac_h >> 24) & 0xff;
+ p_addr[1] = (mac_h >> 16) & 0xff;
+ p_addr[2] = (mac_h >> 8) & 0xff;
+ p_addr[3] = mac_h & 0xff;
+ p_addr[4] = (mac_l >> 8) & 0xff;
+ p_addr[5] = mac_l & 0xff;
+}
+
+/*
+ * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
+ *
+ * DESCRIPTION:
+ * Go through all the DA filter tables (Unicast, Special Multicast &
+ * Other Multicast) and set each entry to 0.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * Multicast and Unicast packets are rejected.
+ *
+ * RETURN:
+ * None.
+ */
+static void eth_port_init_mac_tables(struct mv643xx_private *mp)
+{
+ unsigned int port_num = mp->port_num;
+ int table_index;
+
+ /* Clear DA filter unicast table (Ex_dFUT) */
+ for (table_index = 0; table_index <= 0xC; table_index += 4)
+ wrl(mp, DA_FILTER_UNICAST_TABLE_BASE(port_num) +
+ table_index, 0);
+
+ for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+ /* Clear DA filter special multicast table (Ex_dFSMT) */
+ wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num) +
+ table_index, 0);
+ /* Clear DA filter other multicast table (Ex_dFOMT) */
+ wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num) +
+ table_index, 0);
+ }
+}
+
+/*
+ * The entries in each table are indexed by a hash of a packet's MAC
+ * address. One bit in each entry determines whether the packet is
+ * accepted. There are 4 entries (each 8 bits wide) in each register
+ * of the table. The bits in each entry are defined as follows:
+ * 0 Accept=1, Drop=0
+ * 3-1 Queue (ETH_Q0=0)
+ * 7-4 Reserved = 0;
+ */
+static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
+ int table, unsigned char entry)
+{
+ unsigned int table_reg;
+ unsigned int tbl_offset;
+ unsigned int reg_offset;
+
+ tbl_offset = (entry / 4) * 4; /* Register offset of DA table entry */
+ reg_offset = entry % 4; /* Entry offset within the register */
+
+ /* Set "accepts frame bit" at specified table entry */
+ table_reg = rdl(mp, table + tbl_offset);
+ table_reg |= 0x01 << (8 * reg_offset);
+ wrl(mp, table + tbl_offset, table_reg);
+}
+
+/*
+ * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
+ */
+static void eth_port_uc_addr_set(struct mv643xx_private *mp,
+ unsigned char *p_addr)
+{
+ unsigned int port_num = mp->port_num;
+ unsigned int mac_h;
+ unsigned int mac_l;
+ int table;
+
+ mac_l = (p_addr[4] << 8) | (p_addr[5]);
+ mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
+ (p_addr[3] << 0);
+
+ wrl(mp, MAC_ADDR_LOW(port_num), mac_l);
+ wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
+
+ /* Accept frames with this address */
+ table = DA_FILTER_UNICAST_TABLE_BASE(port_num);
+ eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
+}
+
+/*
+ * mv643xx_eth_update_mac_address
+ *
+ * Update the MAC address of the port in the address table
*
* Input : pointer to ethernet interface network device structure
* Output : N/A
*/
-static void mv643xx_eth_set_rx_mode(struct net_device *dev)
+static void mv643xx_eth_update_mac_address(struct net_device *dev)
{
struct mv643xx_private *mp = netdev_priv(dev);
- u32 config_reg;
-
- config_reg = rdl(mp, PORT_CONFIG_REG(mp->port_num));
- if (dev->flags & IFF_PROMISC)
- config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
- else
- config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
- wrl(mp, PORT_CONFIG_REG(mp->port_num), config_reg);
- eth_port_set_multicast_list(dev);
+ eth_port_init_mac_tables(mp);
+ eth_port_uc_addr_set(mp, dev->dev_addr);
}
/*
@@ -797,44 +1644,306 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
}
/*
- * mv643xx_eth_tx_timeout
+ * eth_port_mc_addr - Multicast address settings.
*
- * Called upon a timeout on transmitting a packet
+ * The MV device supports multicast using two tables:
+ * 1) Special Multicast Table for MAC addresses of the form
+ * 0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF).
+ * The MAC DA[7:0] bits are used as a pointer to the Special Multicast
+ * Table entries in the DA-Filter table.
+ * 2) Other Multicast Table for multicast of another type. A CRC-8bit
+ * is used as an index to the Other Multicast Table entries in the
+ * DA-Filter table. This function calculates the CRC-8bit value.
+ * In either case, eth_port_set_filter_table_entry() is then called
+ * to set to set the actual table entry.
+ */
+static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
+{
+ unsigned int port_num = mp->port_num;
+ unsigned int mac_h;
+ unsigned int mac_l;
+ unsigned char crc_result = 0;
+ int table;
+ int mac_array[48];
+ int crc[8];
+ int i;
+
+ if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
+ (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
+ table = DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num);
+ eth_port_set_filter_table_entry(mp, table, p_addr[5]);
+ return;
+ }
+
+ /* Calculate CRC-8 out of the given address */
+ mac_h = (p_addr[0] << 8) | (p_addr[1]);
+ mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) |
+ (p_addr[4] << 8) | (p_addr[5] << 0);
+
+ for (i = 0; i < 32; i++)
+ mac_array[i] = (mac_l >> i) & 0x1;
+ for (i = 32; i < 48; i++)
+ mac_array[i] = (mac_h >> (i - 32)) & 0x1;
+
+ crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
+ mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
+ mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
+ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
+ mac_array[8] ^ mac_array[7] ^ mac_array[6] ^ mac_array[0];
+
+ crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
+ mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
+ mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
+ mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
+ mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
+ mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
+ mac_array[9] ^ mac_array[6] ^ mac_array[1] ^ mac_array[0];
+
+ crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^
+ mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^
+ mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^
+ mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^
+ mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8] ^
+ mac_array[6] ^ mac_array[2] ^ mac_array[1] ^ mac_array[0];
+
+ crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
+ mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^
+ mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^
+ mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^
+ mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[7] ^
+ mac_array[3] ^ mac_array[2] ^ mac_array[1];
+
+ crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^
+ mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^
+ mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^
+ mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^
+ mac_array[12] ^ mac_array[10] ^ mac_array[8] ^ mac_array[4] ^
+ mac_array[3] ^ mac_array[2];
+
+ crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^
+ mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^
+ mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^
+ mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^
+ mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[5] ^
+ mac_array[4] ^ mac_array[3];
+
+ crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^
+ mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^
+ mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^
+ mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^
+ mac_array[12] ^ mac_array[10] ^ mac_array[6] ^ mac_array[5] ^
+ mac_array[4];
+
+ crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^
+ mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^
+ mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^
+ mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^
+ mac_array[11] ^ mac_array[7] ^ mac_array[6] ^ mac_array[5];
+
+ for (i = 0; i < 8; i++)
+ crc_result = crc_result | (crc[i] << i);
+
+ table = DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num);
+ eth_port_set_filter_table_entry(mp, table, crc_result);
+}
+
+/*
+ * Set the entire multicast list based on dev->mc_list.
+ */
+static void eth_port_set_multicast_list(struct net_device *dev)
+{
+
+ struct dev_mc_list *mc_list;
+ int i;
+ int table_index;
+ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int eth_port_num = mp->port_num;
+
+ /* If the device is in promiscuous mode or in all multicast mode,
+ * we will fully populate both multicast tables with accept.
+ * This is guaranteed to yield a match on all multicast addresses...
+ */
+ if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) {
+ for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+ /* Set all entries in DA filter special multicast
+ * table (Ex_dFSMT)
+ * Set for ETH_Q0 for now
+ * Bits
+ * 0 Accept=1, Drop=0
+ * 3-1 Queue ETH_Q0=0
+ * 7-4 Reserved = 0;
+ */
+ wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+
+ /* Set all entries in DA filter other multicast
+ * table (Ex_dFOMT)
+ * Set for ETH_Q0 for now
+ * Bits
+ * 0 Accept=1, Drop=0
+ * 3-1 Queue ETH_Q0=0
+ * 7-4 Reserved = 0;
+ */
+ wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+ }
+ return;
+ }
+
+ /* We will clear out multicast tables every time we get the list.
+ * Then add the entire new list...
+ */
+ for (table_index = 0; table_index <= 0xFC; table_index += 4) {
+ /* Clear DA filter special multicast table (Ex_dFSMT) */
+ wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
+ (eth_port_num) + table_index, 0);
+
+ /* Clear DA filter other multicast table (Ex_dFOMT) */
+ wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE
+ (eth_port_num) + table_index, 0);
+ }
+
+ /* Get pointer to net_device multicast list and add each one... */
+ for (i = 0, mc_list = dev->mc_list;
+ (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
+ i++, mc_list = mc_list->next)
+ if (mc_list->dmi_addrlen == 6)
+ eth_port_mc_addr(mp, mc_list->dmi_addr);
+}
+
+/*
+ * mv643xx_eth_set_rx_mode
*
- * Input : pointer to ethernet interface network device structure.
+ * Change from promiscuos to regular rx mode
+ *
+ * Input : pointer to ethernet interface network device structure
* Output : N/A
*/
-static void mv643xx_eth_tx_timeout(struct net_device *dev)
+static void mv643xx_eth_set_rx_mode(struct net_device *dev)
{
struct mv643xx_private *mp = netdev_priv(dev);
+ u32 config_reg;
- printk(KERN_INFO "%s: TX timeout ", dev->name);
+ config_reg = rdl(mp, PORT_CONFIG_REG(mp->port_num));
+ if (dev->flags & IFF_PROMISC)
+ config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
+ else
+ config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
+ wrl(mp, PORT_CONFIG_REG(mp->port_num), config_reg);
- /* Do the reset outside of interrupt context */
- schedule_work(&mp->tx_timeout_task);
+ eth_port_set_multicast_list(dev);
}
+
+/* rx/tx queue initialisation ***********************************************/
/*
- * mv643xx_eth_tx_timeout_task
+ * ether_init_rx_desc_ring - Curve a Rx chain desc list and buffer in memory.
*
- * Actual routine to reset the adapter when a timeout on Tx has occurred
+ * DESCRIPTION:
+ * This function prepares a Rx chained list of descriptors and packet
+ * buffers in a form of a ring. The routine must be called after port
+ * initialization routine and before port start routine.
+ * The Ethernet SDMA engine uses CPU bus addresses to access the various
+ * devices in the system (i.e. DRAM). This function uses the ethernet
+ * struct 'virtual to physical' routine (set by the user) to set the ring
+ * with physical addresses.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ *
+ * OUTPUT:
+ * The routine updates the Ethernet port control struct with information
+ * regarding the Rx descriptors and buffers.
+ *
+ * RETURN:
+ * None.
*/
-static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
+static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
{
- struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
- tx_timeout_task);
- struct net_device *dev = mp->dev;
+ volatile struct eth_rx_desc *p_rx_desc;
+ int rx_desc_num = mp->rx_ring_size;
+ int i;
- if (!netif_running(dev))
- return;
+ /* initialize the next_desc_ptr links in the Rx descriptors ring */
+ p_rx_desc = (struct eth_rx_desc *)mp->p_rx_desc_area;
+ for (i = 0; i < rx_desc_num; i++) {
+ p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
+ ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
+ }
- netif_stop_queue(dev);
+ /* Save Rx desc pointer to driver struct. */
+ mp->rx_curr_desc_q = 0;
+ mp->rx_used_desc_q = 0;
- eth_port_reset(mp);
- eth_port_start(dev);
+ mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
+}
- if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
- netif_wake_queue(dev);
+static void mv643xx_eth_free_rx_rings(struct net_device *dev)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ int curr;
+
+ /* Stop RX Queues */
+ mv643xx_eth_port_disable_rx(mp);
+
+ /* Free preallocated skb's on RX rings */
+ for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
+ if (mp->rx_skb[curr]) {
+ dev_kfree_skb(mp->rx_skb[curr]);
+ mp->rx_desc_count--;
+ }
+ }
+
+ if (mp->rx_desc_count)
+ printk(KERN_ERR
+ "%s: Error in freeing Rx Ring. %d skb's still"
+ " stuck in RX Ring - ignoring them\n", dev->name,
+ mp->rx_desc_count);
+ /* Free RX ring */
+ if (mp->rx_sram_size)
+ iounmap(mp->p_rx_desc_area);
+ else
+ dma_free_coherent(NULL, mp->rx_desc_area_size,
+ mp->p_rx_desc_area, mp->rx_desc_dma);
+}
+
+/*
+ * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
+ *
+ * DESCRIPTION:
+ * This function prepares a Tx chained list of descriptors and packet
+ * buffers in a form of a ring. The routine must be called after port
+ * initialization routine and before port start routine.
+ * The Ethernet SDMA engine uses CPU bus addresses to access the various
+ * devices in the system (i.e. DRAM). This function uses the ethernet
+ * struct 'virtual to physical' routine (set by the user) to set the ring
+ * with physical addresses.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ *
+ * OUTPUT:
+ * The routine updates the Ethernet port control struct with information
+ * regarding the Tx descriptors and buffers.
+ *
+ * RETURN:
+ * None.
+ */
+static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
+{
+ int tx_desc_num = mp->tx_ring_size;
+ struct eth_tx_desc *p_tx_desc;
+ int i;
+
+ /* Initialize the next_desc_ptr links in the Tx descriptors ring */
+ p_tx_desc = (struct eth_tx_desc *)mp->p_tx_desc_area;
+ for (i = 0; i < tx_desc_num; i++) {
+ p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
+ ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
+ }
+
+ mp->tx_curr_desc_q = 0;
+ mp->tx_used_desc_q = 0;
+
+ mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
}
/**
@@ -916,86 +2025,30 @@ static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
mv643xx_eth_free_tx_descs(dev, 1);
}
-/*
- * mv643xx_eth_receive
- *
- * This function is forward packets that are received from the port's
- * queues toward kernel core or FastRoute them to another interface.
- *
- * Input : dev - a pointer to the required interface
- * max - maximum number to receive (0 means unlimted)
- *
- * Output : number of served packets
- */
-static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
+static void mv643xx_eth_free_tx_rings(struct net_device *dev)
{
struct mv643xx_private *mp = netdev_priv(dev);
- struct net_device_stats *stats = &dev->stats;
- unsigned int received_packets = 0;
- struct sk_buff *skb;
- struct pkt_info pkt_info;
- while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
- dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
- DMA_FROM_DEVICE);
- mp->rx_desc_count--;
- received_packets++;
-
- /*
- * Update statistics.
- * Note byte count includes 4 byte CRC count
- */
- stats->rx_packets++;
- stats->rx_bytes += pkt_info.byte_cnt;
- skb = pkt_info.return_info;
- /*
- * In case received a packet without first / last bits on OR
- * the error summary bit is on, the packets needs to be dropeed.
- */
- if (((pkt_info.cmd_sts
- & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
- || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
- stats->rx_dropped++;
- if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
- ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
- if (net_ratelimit())
- printk(KERN_ERR
- "%s: Received packet spread "
- "on multiple descriptors\n",
- dev->name);
- }
- if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
- stats->rx_errors++;
+ /* Stop Tx Queues */
+ mv643xx_eth_port_disable_tx(mp);
- dev_kfree_skb_irq(skb);
- } else {
- /*
- * The -4 is for the CRC in the trailer of the
- * received packet
- */
- skb_put(skb, pkt_info.byte_cnt - 4);
+ /* Free outstanding skb's on TX ring */
+ mv643xx_eth_free_all_tx_descs(dev);
- if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
- skb->ip_summed = CHECKSUM_UNNECESSARY;
- skb->csum = htons(
- (pkt_info.cmd_sts & 0x0007fff8) >> 3);
- }
- skb->protocol = eth_type_trans(skb, dev);
-#ifdef MV643XX_NAPI
- netif_receive_skb(skb);
-#else
- netif_rx(skb);
-#endif
- }
- dev->last_rx = jiffies;
- }
- mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
+ BUG_ON(mp->tx_used_desc_q != mp->tx_curr_desc_q);
- return received_packets;
+ /* Free TX ring */
+ if (mp->tx_sram_size)
+ iounmap(mp->p_tx_desc_area);
+ else
+ dma_free_coherent(NULL, mp->tx_desc_area_size,
+ mp->p_tx_desc_area, mp->tx_desc_dma);
}
+
+/* netdev ops and related ***************************************************/
+static void eth_port_reset(struct mv643xx_private *mp);
+
/* Set the mv643xx port configuration register for the speed/duplex mode. */
static void mv643xx_eth_update_pscr(struct net_device *dev,
struct ethtool_cmd *ecmd)
@@ -1118,6 +2171,125 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
+/*
+ * ethernet_phy_reset - Reset Ethernet port PHY.
+ *
+ * DESCRIPTION:
+ * This routine utilizes the SMI interface to reset the ethernet port PHY.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * The PHY is reset.
+ *
+ * RETURN:
+ * None.
+ *
+ */
+static void ethernet_phy_reset(struct mv643xx_private *mp)
+{
+ unsigned int phy_reg_data;
+
+ /* Reset the PHY */
+ eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+ phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
+ eth_port_write_smi_reg(mp, 0, phy_reg_data);
+
+ /* wait for PHY to come out of reset */
+ do {
+ udelay(1);
+ eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+ } while (phy_reg_data & 0x8000);
+}
+
+/*
+ * eth_port_start - Start the Ethernet port activity.
+ *
+ * DESCRIPTION:
+ * This routine prepares the Ethernet port for Rx and Tx activity:
+ * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
+ * has been initialized a descriptor's ring (using
+ * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
+ * 2. Initialize and enable the Ethernet configuration port by writing to
+ * the port's configuration and command registers.
+ * 3. Initialize and enable the SDMA by writing to the SDMA's
+ * configuration and command registers. After completing these steps,
+ * the ethernet port SDMA can starts to perform Rx and Tx activities.
+ *
+ * Note: Each Rx and Tx queue descriptor's list must be initialized prior
+ * to calling this function (use ether_init_tx_desc_ring for Tx queues
+ * and ether_init_rx_desc_ring for Rx queues).
+ *
+ * INPUT:
+ * dev - a pointer to the required interface
+ *
+ * OUTPUT:
+ * Ethernet port is ready to receive and transmit.
+ *
+ * RETURN:
+ * None.
+ */
+static void eth_port_start(struct net_device *dev)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+ int tx_curr_desc, rx_curr_desc;
+ u32 pscr;
+ struct ethtool_cmd ethtool_cmd;
+
+ /* Assignment of Tx CTRP of given queue */
+ tx_curr_desc = mp->tx_curr_desc_q;
+ wrl(mp, TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+ (u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
+
+ /* Assignment of Rx CRDP of given queue */
+ rx_curr_desc = mp->rx_curr_desc_q;
+ wrl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+ (u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
+
+ /* Add the assigned Ethernet address to the port's address table */
+ eth_port_uc_addr_set(mp, dev->dev_addr);
+
+ /* Assign port configuration and command. */
+ wrl(mp, PORT_CONFIG_REG(port_num),
+ PORT_CONFIG_DEFAULT_VALUE);
+
+ wrl(mp, PORT_CONFIG_EXTEND_REG(port_num),
+ PORT_CONFIG_EXTEND_DEFAULT_VALUE);
+
+ pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
+
+ pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
+ wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+
+ pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
+ DISABLE_AUTO_NEG_SPEED_GMII |
+ DISABLE_AUTO_NEG_FOR_DUPLX |
+ DO_NOT_FORCE_LINK_FAIL |
+ SERIAL_PORT_CONTROL_RESERVED;
+
+ wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+
+ pscr |= SERIAL_PORT_ENABLE;
+ wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+
+ /* Assign port SDMA configuration */
+ wrl(mp, SDMA_CONFIG_REG(port_num),
+ PORT_SDMA_CONFIG_DEFAULT_VALUE);
+
+ /* Enable port Rx. */
+ mv643xx_eth_port_enable_rx(mp, ETH_RX_QUEUES_ENABLED);
+
+ /* Disable port bandwidth limits by clearing MTU register */
+ wrl(mp, MAXIMUM_TRANSMIT_UNIT(port_num), 0);
+
+ /* save phy settings across reset */
+ mv643xx_get_settings(dev, ðtool_cmd);
+ ethernet_phy_reset(mp);
+ mv643xx_set_settings(dev, ðtool_cmd);
+}
+
#ifdef MV643XX_COAL
/*
@@ -1192,114 +2364,36 @@ static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
}
/*
- * ether_init_rx_desc_ring - Curve a Rx chain desc list and buffer in memory.
- *
- * DESCRIPTION:
- * This function prepares a Rx chained list of descriptors and packet
- * buffers in a form of a ring. The routine must be called after port
- * initialization routine and before port start routine.
- * The Ethernet SDMA engine uses CPU bus addresses to access the various
- * devices in the system (i.e. DRAM). This function uses the ethernet
- * struct 'virtual to physical' routine (set by the user) to set the ring
- * with physical addresses.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
- *
- * OUTPUT:
- * The routine updates the Ethernet port control struct with information
- * regarding the Rx descriptors and buffers.
- *
- * RETURN:
- * None.
- */
-static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
-{
- volatile struct eth_rx_desc *p_rx_desc;
- int rx_desc_num = mp->rx_ring_size;
- int i;
-
- /* initialize the next_desc_ptr links in the Rx descriptors ring */
- p_rx_desc = (struct eth_rx_desc *)mp->p_rx_desc_area;
- for (i = 0; i < rx_desc_num; i++) {
- p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
- ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
- }
-
- /* Save Rx desc pointer to driver struct. */
- mp->rx_curr_desc_q = 0;
- mp->rx_used_desc_q = 0;
-
- mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
-}
-
-/*
- * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
+ * eth_port_init - Initialize the Ethernet port driver
*
* DESCRIPTION:
- * This function prepares a Tx chained list of descriptors and packet
- * buffers in a form of a ring. The routine must be called after port
- * initialization routine and before port start routine.
- * The Ethernet SDMA engine uses CPU bus addresses to access the various
- * devices in the system (i.e. DRAM). This function uses the ethernet
- * struct 'virtual to physical' routine (set by the user) to set the ring
- * with physical addresses.
+ * This function prepares the ethernet port to start its activity:
+ * 1) Completes the ethernet port driver struct initialization toward port
+ * start routine.
+ * 2) Resets the device to a quiescent state in case of warm reboot.
+ * 3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
+ * 4) Clean MAC tables. The reset status of those tables is unknown.
+ * 5) Set PHY address.
+ * Note: Call this routine prior to eth_port_start routine and after
+ * setting user values in the user fields of Ethernet port control
+ * struct.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct mv643xx_private *mp Ethernet port control struct
*
* OUTPUT:
- * The routine updates the Ethernet port control struct with information
- * regarding the Tx descriptors and buffers.
+ * See description.
*
* RETURN:
* None.
*/
-static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
-{
- int tx_desc_num = mp->tx_ring_size;
- struct eth_tx_desc *p_tx_desc;
- int i;
-
- /* Initialize the next_desc_ptr links in the Tx descriptors ring */
- p_tx_desc = (struct eth_tx_desc *)mp->p_tx_desc_area;
- for (i = 0; i < tx_desc_num; i++) {
- p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
- ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
- }
-
- mp->tx_curr_desc_q = 0;
- mp->tx_used_desc_q = 0;
-
- mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
-}
-
-static int mv643xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
- int err;
-
- spin_lock_irq(&mp->lock);
- err = mii_ethtool_sset(&mp->mii, cmd);
- spin_unlock_irq(&mp->lock);
-
- return err;
-}
-
-static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static void eth_port_init(struct mv643xx_private *mp)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- int err;
-
- spin_lock_irq(&mp->lock);
- err = mii_ethtool_gset(&mp->mii, cmd);
- spin_unlock_irq(&mp->lock);
+ mp->rx_resource_err = 0;
- /* The PHY may support 1000baseT_Half, but the mv643xx does not */
- cmd->supported &= ~SUPPORTED_1000baseT_Half;
- cmd->advertising &= ~ADVERTISED_1000baseT_Half;
+ eth_port_reset(mp);
- return err;
+ eth_port_init_mac_tables(mp);
}
/*
@@ -1449,53 +2543,41 @@ out_free_irq:
return err;
}
-static void mv643xx_eth_free_tx_rings(struct net_device *dev)
+/*
+ * eth_port_reset - Reset Ethernet port
+ *
+ * DESCRIPTION:
+ * This routine resets the chip by aborting any SDMA engine activity and
+ * clearing the MIB counters. The Receiver and the Transmit unit are in
+ * idle state after this command is performed and the port is disabled.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * Channel activity is halted.
+ *
+ * RETURN:
+ * None.
+ *
+ */
+static void eth_port_reset(struct mv643xx_private *mp)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ unsigned int port_num = mp->port_num;
+ unsigned int reg_data;
- /* Stop Tx Queues */
mv643xx_eth_port_disable_tx(mp);
-
- /* Free outstanding skb's on TX ring */
- mv643xx_eth_free_all_tx_descs(dev);
-
- BUG_ON(mp->tx_used_desc_q != mp->tx_curr_desc_q);
-
- /* Free TX ring */
- if (mp->tx_sram_size)
- iounmap(mp->p_tx_desc_area);
- else
- dma_free_coherent(NULL, mp->tx_desc_area_size,
- mp->p_tx_desc_area, mp->tx_desc_dma);
-}
-
-static void mv643xx_eth_free_rx_rings(struct net_device *dev)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
- int curr;
-
- /* Stop RX Queues */
mv643xx_eth_port_disable_rx(mp);
- /* Free preallocated skb's on RX rings */
- for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
- if (mp->rx_skb[curr]) {
- dev_kfree_skb(mp->rx_skb[curr]);
- mp->rx_desc_count--;
- }
- }
+ /* Clear all MIB counters */
+ eth_clear_mib_counters(mp);
- if (mp->rx_desc_count)
- printk(KERN_ERR
- "%s: Error in freeing Rx Ring. %d skb's still"
- " stuck in RX Ring - ignoring them\n", dev->name,
- mp->rx_desc_count);
- /* Free RX ring */
- if (mp->rx_sram_size)
- iounmap(mp->p_rx_desc_area);
- else
- dma_free_coherent(NULL, mp->rx_desc_area_size,
- mp->p_rx_desc_area, mp->rx_desc_dma);
+ /* Reset the Enable bit in the Configuration Register */
+ reg_data = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
+ reg_data &= ~(SERIAL_PORT_ENABLE |
+ DO_NOT_FORCE_LINK_FAIL |
+ FORCE_LINK_PASS);
+ wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), reg_data);
}
/*
@@ -1534,250 +2616,308 @@ static int mv643xx_eth_stop(struct net_device *dev)
return 0;
}
-#ifdef MV643XX_NAPI
-/*
- * mv643xx_poll
- *
- * This function is used in case of NAPI
- */
-static int mv643xx_poll(struct napi_struct *napi, int budget)
+static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- struct mv643xx_private *mp = container_of(napi, struct mv643xx_private, napi);
- struct net_device *dev = mp->dev;
- unsigned int port_num = mp->port_num;
- int work_done;
-
-#ifdef MV643XX_TX_FAST_REFILL
- if (++mp->tx_clean_threshold > 5) {
- mv643xx_eth_free_completed_tx_descs(dev);
- mp->tx_clean_threshold = 0;
- }
-#endif
-
- work_done = 0;
- if ((rdl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
- != (u32) mp->rx_used_desc_q)
- work_done = mv643xx_eth_receive_queue(dev, budget);
-
- if (work_done < budget) {
- netif_rx_complete(dev, napi);
- wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
- wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
- }
+ struct mv643xx_private *mp = netdev_priv(dev);
- return work_done;
+ return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
}
-#endif
-/**
- * has_tiny_unaligned_frags - check if skb has any small, unaligned fragments
+/*
+ * Changes MTU (maximum transfer unit) of the gigabit ethenret port
*
- * Hardware can't handle unaligned fragments smaller than 9 bytes.
- * This helper function detects that case.
+ * Input : pointer to ethernet interface network device structure
+ * new mtu size
+ * Output : 0 upon success, -EINVAL upon failure
*/
-
-static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
+static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
{
- unsigned int frag;
- skb_frag_t *fragp;
+ if ((new_mtu > 9500) || (new_mtu < 64))
+ return -EINVAL;
- for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
- fragp = &skb_shinfo(skb)->frags[frag];
- if (fragp->size <= 8 && fragp->page_offset & 0x7)
- return 1;
+ dev->mtu = new_mtu;
+ if (!netif_running(dev))
+ return 0;
+
+ /*
+ * Stop and then re-open the interface. This will allocate RX
+ * skbs of the new MTU.
+ * There is a possible danger that the open will not succeed,
+ * due to memory being full, which might fail the open function.
+ */
+ mv643xx_eth_stop(dev);
+ if (mv643xx_eth_open(dev)) {
+ printk(KERN_ERR "%s: Fatal error on opening device\n",
+ dev->name);
}
+
return 0;
}
-/**
- * eth_alloc_tx_desc_index - return the index of the next available tx desc
+/*
+ * mv643xx_eth_tx_timeout_task
+ *
+ * Actual routine to reset the adapter when a timeout on Tx has occurred
*/
-static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
+static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
{
- int tx_desc_curr;
+ struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
+ tx_timeout_task);
+ struct net_device *dev = mp->dev;
- BUG_ON(mp->tx_desc_count >= mp->tx_ring_size);
+ if (!netif_running(dev))
+ return;
- tx_desc_curr = mp->tx_curr_desc_q;
- mp->tx_curr_desc_q = (tx_desc_curr + 1) % mp->tx_ring_size;
+ netif_stop_queue(dev);
- BUG_ON(mp->tx_curr_desc_q == mp->tx_used_desc_q);
+ eth_port_reset(mp);
+ eth_port_start(dev);
- return tx_desc_curr;
+ if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+ netif_wake_queue(dev);
}
-/**
- * eth_tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
+/*
+ * mv643xx_eth_tx_timeout
*
- * Ensure the data for each fragment to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue.
+ * Called upon a timeout on transmitting a packet
+ *
+ * Input : pointer to ethernet interface network device structure.
+ * Output : N/A
*/
-static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
- struct sk_buff *skb)
+static void mv643xx_eth_tx_timeout(struct net_device *dev)
{
- int frag;
- int tx_index;
- struct eth_tx_desc *desc;
-
- for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
- skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-
- tx_index = eth_alloc_tx_desc_index(mp);
- desc = &mp->p_tx_desc_area[tx_index];
+ struct mv643xx_private *mp = netdev_priv(dev);
- desc->cmd_sts = ETH_BUFFER_OWNED_BY_DMA;
- /* Last Frag enables interrupt and frees the skb */
- if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
- desc->cmd_sts |= ETH_ZERO_PADDING |
- ETH_TX_LAST_DESC |
- ETH_TX_ENABLE_INTERRUPT;
- mp->tx_skb[tx_index] = skb;
- } else
- mp->tx_skb[tx_index] = NULL;
+ printk(KERN_INFO "%s: TX timeout ", dev->name);
- desc = &mp->p_tx_desc_area[tx_index];
- desc->l4i_chk = 0;
- desc->byte_cnt = this_frag->size;
- desc->buf_ptr = dma_map_page(NULL, this_frag->page,
- this_frag->page_offset,
- this_frag->size,
- DMA_TO_DEVICE);
- }
+ /* Do the reset outside of interrupt context */
+ schedule_work(&mp->tx_timeout_task);
}
-static inline __be16 sum16_as_be(__sum16 sum)
+#ifdef CONFIG_NET_POLL_CONTROLLER
+static void mv643xx_netpoll(struct net_device *netdev)
{
- return (__force __be16)sum;
+ struct mv643xx_private *mp = netdev_priv(netdev);
+ int port_num = mp->port_num;
+
+ wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+ /* wait for previous write to complete */
+ rdl(mp, INTERRUPT_MASK_REG(port_num));
+
+ mv643xx_eth_int_handler(netdev->irq, netdev);
+
+ wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
}
+#endif
-/**
- * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw
- *
- * Ensure the data for an skb to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue and start the hardware.
+/*
+ * Wrappers for MII support library.
*/
-static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
- struct sk_buff *skb)
+static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
{
- int tx_index;
- struct eth_tx_desc *desc;
- u32 cmd_sts;
- int length;
- int nr_frags = skb_shinfo(skb)->nr_frags;
+ struct mv643xx_private *mp = netdev_priv(dev);
+ int val;
- cmd_sts = ETH_TX_FIRST_DESC | ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
+ eth_port_read_smi_reg(mp, location, &val);
+ return val;
+}
- tx_index = eth_alloc_tx_desc_index(mp);
- desc = &mp->p_tx_desc_area[tx_index];
+static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
+{
+ struct mv643xx_private *mp = netdev_priv(dev);
+ eth_port_write_smi_reg(mp, location, val);
+}
- if (nr_frags) {
- eth_tx_fill_frag_descs(mp, skb);
- length = skb_headlen(skb);
- mp->tx_skb[tx_index] = NULL;
- } else {
- cmd_sts |= ETH_ZERO_PADDING |
- ETH_TX_LAST_DESC |
- ETH_TX_ENABLE_INTERRUPT;
- length = skb->len;
- mp->tx_skb[tx_index] = skb;
+/* platform glue ************************************************************/
+static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
+ struct mbus_dram_target_info *dram)
+{
+ void __iomem *base = msp->eth_base;
+ u32 win_enable;
+ u32 win_protect;
+ int i;
+
+ for (i = 0; i < 6; i++) {
+ writel(0, base + WINDOW_BASE(i));
+ writel(0, base + WINDOW_SIZE(i));
+ if (i < 4)
+ writel(0, base + WINDOW_REMAP_HIGH(i));
}
- desc->byte_cnt = length;
- desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
+ win_enable = 0x3f;
+ win_protect = 0;
- if (skb->ip_summed == CHECKSUM_PARTIAL) {
- BUG_ON(skb->protocol != htons(ETH_P_IP));
+ for (i = 0; i < dram->num_cs; i++) {
+ struct mbus_dram_window *cs = dram->cs + i;
- cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
- ETH_GEN_IP_V_4_CHECKSUM |
- ip_hdr(skb)->ihl << ETH_TX_IHL_SHIFT;
+ writel((cs->base & 0xffff0000) |
+ (cs->mbus_attr << 8) |
+ dram->mbus_dram_target_id, base + WINDOW_BASE(i));
+ writel((cs->size - 1) & 0xffff0000, base + WINDOW_SIZE(i));
- switch (ip_hdr(skb)->protocol) {
- case IPPROTO_UDP:
- cmd_sts |= ETH_UDP_FRAME;
- desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
- break;
- case IPPROTO_TCP:
- desc->l4i_chk = ntohs(sum16_as_be(tcp_hdr(skb)->check));
- break;
- default:
- BUG();
- }
- } else {
- /* Errata BTS #50, IHL must be 5 if no HW checksum */
- cmd_sts |= 5 << ETH_TX_IHL_SHIFT;
- desc->l4i_chk = 0;
+ win_enable &= ~(1 << i);
+ win_protect |= 3 << (2 * i);
}
- /* ensure all other descriptors are written before first cmd_sts */
- wmb();
- desc->cmd_sts = cmd_sts;
+ writel(win_enable, base + WINDOW_BAR_ENABLE);
+ msp->win_protect = win_protect;
+}
- /* ensure all descriptors are written before poking hardware */
- wmb();
- mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
+static int mv643xx_eth_shared_probe(struct platform_device *pdev)
+{
+ static int mv643xx_version_printed = 0;
+ struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
+ struct mv643xx_shared_private *msp;
+ struct resource *res;
+ int ret;
- mp->tx_desc_count += nr_frags + 1;
+ if (!mv643xx_version_printed++)
+ printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
+
+ ret = -EINVAL;
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (res == NULL)
+ goto out;
+
+ ret = -ENOMEM;
+ msp = kmalloc(sizeof(*msp), GFP_KERNEL);
+ if (msp == NULL)
+ goto out;
+ memset(msp, 0, sizeof(*msp));
+
+ msp->eth_base = ioremap(res->start, res->end - res->start + 1);
+ if (msp->eth_base == NULL)
+ goto out_free;
+
+ spin_lock_init(&msp->phy_lock);
+ msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
+
+ platform_set_drvdata(pdev, msp);
+
+ /*
+ * (Re-)program MBUS remapping windows if we are asked to.
+ */
+ if (pd != NULL && pd->dram != NULL)
+ mv643xx_eth_conf_mbus_windows(msp, pd->dram);
+
+ return 0;
+
+out_free:
+ kfree(msp);
+out:
+ return ret;
}
-/**
- * mv643xx_eth_start_xmit - queue an skb to the hardware for transmission
- *
- */
-static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static int mv643xx_eth_shared_remove(struct platform_device *pdev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- struct net_device_stats *stats = &dev->stats;
- unsigned long flags;
+ struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);
- BUG_ON(netif_queue_stopped(dev));
+ iounmap(msp->eth_base);
+ kfree(msp);
- if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
- stats->tx_dropped++;
- printk(KERN_DEBUG "%s: failed to linearize tiny "
- "unaligned fragment\n", dev->name);
- return NETDEV_TX_BUSY;
- }
+ return 0;
+}
- spin_lock_irqsave(&mp->lock, flags);
+static struct platform_driver mv643xx_eth_shared_driver = {
+ .probe = mv643xx_eth_shared_probe,
+ .remove = mv643xx_eth_shared_remove,
+ .driver = {
+ .name = MV643XX_ETH_SHARED_NAME,
+ .owner = THIS_MODULE,
+ },
+};
- if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
- printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
- netif_stop_queue(dev);
- spin_unlock_irqrestore(&mp->lock, flags);
- return NETDEV_TX_BUSY;
- }
+/*
+ * ethernet_phy_set - Set the ethernet port PHY address.
+ *
+ * DESCRIPTION:
+ * This routine sets the given ethernet port PHY address.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ * int phy_addr PHY address.
+ *
+ * OUTPUT:
+ * None.
+ *
+ * RETURN:
+ * None.
+ *
+ */
+static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
+{
+ u32 reg_data;
+ int addr_shift = 5 * mp->port_num;
- eth_tx_submit_descs_for_skb(mp, skb);
- stats->tx_bytes += skb->len;
- stats->tx_packets++;
- dev->trans_start = jiffies;
+ reg_data = rdl(mp, PHY_ADDR_REG);
+ reg_data &= ~(0x1f << addr_shift);
+ reg_data |= (phy_addr & 0x1f) << addr_shift;
+ wrl(mp, PHY_ADDR_REG, reg_data);
+}
- if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB)
- netif_stop_queue(dev);
+/*
+ * ethernet_phy_get - Get the ethernet port PHY address.
+ *
+ * DESCRIPTION:
+ * This routine returns the given ethernet port PHY address.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * None.
+ *
+ * RETURN:
+ * PHY address.
+ *
+ */
+static int ethernet_phy_get(struct mv643xx_private *mp)
+{
+ unsigned int reg_data;
- spin_unlock_irqrestore(&mp->lock, flags);
+ reg_data = rdl(mp, PHY_ADDR_REG);
- return NETDEV_TX_OK;
+ return ((reg_data >> (5 * mp->port_num)) & 0x1f);
}
-#ifdef CONFIG_NET_POLL_CONTROLLER
-static void mv643xx_netpoll(struct net_device *netdev)
+/*
+ * ethernet_phy_detect - Detect whether a phy is present
+ *
+ * DESCRIPTION:
+ * This function tests whether there is a PHY present on
+ * the specified port.
+ *
+ * INPUT:
+ * struct mv643xx_private *mp Ethernet Port.
+ *
+ * OUTPUT:
+ * None
+ *
+ * RETURN:
+ * 0 on success
+ * -ENODEV on failure
+ *
+ */
+static int ethernet_phy_detect(struct mv643xx_private *mp)
{
- struct mv643xx_private *mp = netdev_priv(netdev);
- int port_num = mp->port_num;
+ unsigned int phy_reg_data0;
+ int auto_neg;
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
- /* wait for previous write to complete */
- rdl(mp, INTERRUPT_MASK_REG(port_num));
+ eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+ auto_neg = phy_reg_data0 & 0x1000;
+ phy_reg_data0 ^= 0x1000; /* invert auto_neg */
+ eth_port_write_smi_reg(mp, 0, phy_reg_data0);
- mv643xx_eth_int_handler(netdev->irq, netdev);
+ eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+ if ((phy_reg_data0 & 0x1000) == auto_neg)
+ return -ENODEV; /* change didn't take */
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+ phy_reg_data0 ^= 0x1000;
+ eth_port_write_smi_reg(mp, 0, phy_reg_data0);
+ return 0;
}
-#endif
static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
int speed, int duplex,
@@ -2008,95 +3148,6 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
return 0;
}
-static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
- struct mbus_dram_target_info *dram)
-{
- void __iomem *base = msp->eth_base;
- u32 win_enable;
- u32 win_protect;
- int i;
-
- for (i = 0; i < 6; i++) {
- writel(0, base + WINDOW_BASE(i));
- writel(0, base + WINDOW_SIZE(i));
- if (i < 4)
- writel(0, base + WINDOW_REMAP_HIGH(i));
- }
-
- win_enable = 0x3f;
- win_protect = 0;
-
- for (i = 0; i < dram->num_cs; i++) {
- struct mbus_dram_window *cs = dram->cs + i;
-
- writel((cs->base & 0xffff0000) |
- (cs->mbus_attr << 8) |
- dram->mbus_dram_target_id, base + WINDOW_BASE(i));
- writel((cs->size - 1) & 0xffff0000, base + WINDOW_SIZE(i));
-
- win_enable &= ~(1 << i);
- win_protect |= 3 << (2 * i);
- }
-
- writel(win_enable, base + WINDOW_BAR_ENABLE);
- msp->win_protect = win_protect;
-}
-
-static int mv643xx_eth_shared_probe(struct platform_device *pdev)
-{
- static int mv643xx_version_printed = 0;
- struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
- struct mv643xx_shared_private *msp;
- struct resource *res;
- int ret;
-
- if (!mv643xx_version_printed++)
- printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
-
- ret = -EINVAL;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res == NULL)
- goto out;
-
- ret = -ENOMEM;
- msp = kmalloc(sizeof(*msp), GFP_KERNEL);
- if (msp == NULL)
- goto out;
- memset(msp, 0, sizeof(*msp));
-
- msp->eth_base = ioremap(res->start, res->end - res->start + 1);
- if (msp->eth_base == NULL)
- goto out_free;
-
- spin_lock_init(&msp->phy_lock);
- msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
-
- platform_set_drvdata(pdev, msp);
-
- /*
- * (Re-)program MBUS remapping windows if we are asked to.
- */
- if (pd != NULL && pd->dram != NULL)
- mv643xx_eth_conf_mbus_windows(msp, pd->dram);
-
- return 0;
-
-out_free:
- kfree(msp);
-out:
- return ret;
-}
-
-static int mv643xx_eth_shared_remove(struct platform_device *pdev)
-{
- struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);
-
- iounmap(msp->eth_base);
- kfree(msp);
-
- return 0;
-}
-
static void mv643xx_eth_shutdown(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
@@ -2120,15 +3171,6 @@ static struct platform_driver mv643xx_eth_driver = {
},
};
-static struct platform_driver mv643xx_eth_shared_driver = {
- .probe = mv643xx_eth_shared_probe,
- .remove = mv643xx_eth_shared_remove,
- .driver = {
- .name = MV643XX_ETH_SHARED_NAME,
- .owner = THIS_MODULE,
- },
-};
-
/*
* mv643xx_init_module
*
@@ -2175,1191 +3217,3 @@ MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
MODULE_ALIAS("platform:" MV643XX_ETH_NAME);
MODULE_ALIAS("platform:" MV643XX_ETH_SHARED_NAME);
-
-/*
- * The second part is the low level driver of the gigE ethernet ports.
- */
-
-/*
- * Marvell's Gigabit Ethernet controller low level driver
- *
- * DESCRIPTION:
- * This file introduce low level API to Marvell's Gigabit Ethernet
- * controller. This Gigabit Ethernet Controller driver API controls
- * 1) Operations (i.e. port init, start, reset etc').
- * 2) Data flow (i.e. port send, receive etc').
- * Each Gigabit Ethernet port is controlled via
- * struct mv643xx_private.
- * This struct includes user configuration information as well as
- * driver internal data needed for its operations.
- *
- * Supported Features:
- * - This low level driver is OS independent. Allocating memory for
- * the descriptor rings and buffers are not within the scope of
- * this driver.
- * - The user is free from Rx/Tx queue managing.
- * - This low level driver introduce functionality API that enable
- * the to operate Marvell's Gigabit Ethernet Controller in a
- * convenient way.
- * - Simple Gigabit Ethernet port operation API.
- * - Simple Gigabit Ethernet port data flow API.
- * - Data flow and operation API support per queue functionality.
- * - Support cached descriptors for better performance.
- * - Enable access to all four DRAM banks and internal SRAM memory
- * spaces.
- * - PHY access and control API.
- * - Port control register configuration API.
- * - Full control over Unicast and Multicast MAC configurations.
- *
- * Operation flow:
- *
- * Initialization phase
- * This phase complete the initialization of the the
- * mv643xx_private struct.
- * User information regarding port configuration has to be set
- * prior to calling the port initialization routine.
- *
- * In this phase any port Tx/Rx activity is halted, MIB counters
- * are cleared, PHY address is set according to user parameter and
- * access to DRAM and internal SRAM memory spaces.
- *
- * Driver ring initialization
- * Allocating memory for the descriptor rings and buffers is not
- * within the scope of this driver. Thus, the user is required to
- * allocate memory for the descriptors ring and buffers. Those
- * memory parameters are used by the Rx and Tx ring initialization
- * routines in order to curve the descriptor linked list in a form
- * of a ring.
- * Note: Pay special attention to alignment issues when using
- * cached descriptors/buffers. In this phase the driver store
- * information in the mv643xx_private struct regarding each queue
- * ring.
- *
- * Driver start
- * This phase prepares the Ethernet port for Rx and Tx activity.
- * It uses the information stored in the mv643xx_private struct to
- * initialize the various port registers.
- *
- * Data flow:
- * All packet references to/from the driver are done using
- * struct pkt_info.
- * This struct is a unified struct used with Rx and Tx operations.
- * This way the user is not required to be familiar with neither
- * Tx nor Rx descriptors structures.
- * The driver's descriptors rings are management by indexes.
- * Those indexes controls the ring resources and used to indicate
- * a SW resource error:
- * 'current'
- * This index points to the current available resource for use. For
- * example in Rx process this index will point to the descriptor
- * that will be passed to the user upon calling the receive
- * routine. In Tx process, this index will point to the descriptor
- * that will be assigned with the user packet info and transmitted.
- * 'used'
- * This index points to the descriptor that need to restore its
- * resources. For example in Rx process, using the Rx buffer return
- * API will attach the buffer returned in packet info to the
- * descriptor pointed by 'used'. In Tx process, using the Tx
- * descriptor return will merely return the user packet info with
- * the command status of the transmitted buffer pointed by the
- * 'used' index. Nevertheless, it is essential to use this routine
- * to update the 'used' index.
- * 'first'
- * This index supports Tx Scatter-Gather. It points to the first
- * descriptor of a packet assembled of multiple buffers. For
- * example when in middle of Such packet we have a Tx resource
- * error the 'curr' index get the value of 'first' to indicate
- * that the ring returned to its state before trying to transmit
- * this packet.
- *
- * Receive operation:
- * The eth_port_receive API set the packet information struct,
- * passed by the caller, with received information from the
- * 'current' SDMA descriptor.
- * It is the user responsibility to return this resource back
- * to the Rx descriptor ring to enable the reuse of this source.
- * Return Rx resource is done using the eth_rx_return_buff API.
- *
- * Prior to calling the initialization routine eth_port_init() the user
- * must set the following fields under mv643xx_private struct:
- * port_num User Ethernet port number.
- * port_config User port configuration value.
- * port_config_extend User port config extend value.
- * port_sdma_config User port SDMA config value.
- * port_serial_control User port serial control value.
- *
- * This driver data flow is done using the struct pkt_info which
- * is a unified struct for Rx and Tx operations:
- *
- * byte_cnt Tx/Rx descriptor buffer byte count.
- * l4i_chk CPU provided TCP Checksum. For Tx operation
- * only.
- * cmd_sts Tx/Rx descriptor command status.
- * buf_ptr Tx/Rx descriptor buffer pointer.
- * return_info Tx/Rx user resource return information.
- */
-
-/* Ethernet Port routines */
-static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
- int table, unsigned char entry);
-
-/*
- * eth_port_init - Initialize the Ethernet port driver
- *
- * DESCRIPTION:
- * This function prepares the ethernet port to start its activity:
- * 1) Completes the ethernet port driver struct initialization toward port
- * start routine.
- * 2) Resets the device to a quiescent state in case of warm reboot.
- * 3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
- * 4) Clean MAC tables. The reset status of those tables is unknown.
- * 5) Set PHY address.
- * Note: Call this routine prior to eth_port_start routine and after
- * setting user values in the user fields of Ethernet port control
- * struct.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet port control struct
- *
- * OUTPUT:
- * See description.
- *
- * RETURN:
- * None.
- */
-static void eth_port_init(struct mv643xx_private *mp)
-{
- mp->rx_resource_err = 0;
-
- eth_port_reset(mp);
-
- eth_port_init_mac_tables(mp);
-}
-
-/*
- * eth_port_start - Start the Ethernet port activity.
- *
- * DESCRIPTION:
- * This routine prepares the Ethernet port for Rx and Tx activity:
- * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
- * has been initialized a descriptor's ring (using
- * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
- * 2. Initialize and enable the Ethernet configuration port by writing to
- * the port's configuration and command registers.
- * 3. Initialize and enable the SDMA by writing to the SDMA's
- * configuration and command registers. After completing these steps,
- * the ethernet port SDMA can starts to perform Rx and Tx activities.
- *
- * Note: Each Rx and Tx queue descriptor's list must be initialized prior
- * to calling this function (use ether_init_tx_desc_ring for Tx queues
- * and ether_init_rx_desc_ring for Rx queues).
- *
- * INPUT:
- * dev - a pointer to the required interface
- *
- * OUTPUT:
- * Ethernet port is ready to receive and transmit.
- *
- * RETURN:
- * None.
- */
-static void eth_port_start(struct net_device *dev)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
- int tx_curr_desc, rx_curr_desc;
- u32 pscr;
- struct ethtool_cmd ethtool_cmd;
-
- /* Assignment of Tx CTRP of given queue */
- tx_curr_desc = mp->tx_curr_desc_q;
- wrl(mp, TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
- (u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
-
- /* Assignment of Rx CRDP of given queue */
- rx_curr_desc = mp->rx_curr_desc_q;
- wrl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
- (u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
-
- /* Add the assigned Ethernet address to the port's address table */
- eth_port_uc_addr_set(mp, dev->dev_addr);
-
- /* Assign port configuration and command. */
- wrl(mp, PORT_CONFIG_REG(port_num),
- PORT_CONFIG_DEFAULT_VALUE);
-
- wrl(mp, PORT_CONFIG_EXTEND_REG(port_num),
- PORT_CONFIG_EXTEND_DEFAULT_VALUE);
-
- pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
-
- pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
-
- pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
- DISABLE_AUTO_NEG_SPEED_GMII |
- DISABLE_AUTO_NEG_FOR_DUPLX |
- DO_NOT_FORCE_LINK_FAIL |
- SERIAL_PORT_CONTROL_RESERVED;
-
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
-
- pscr |= SERIAL_PORT_ENABLE;
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
-
- /* Assign port SDMA configuration */
- wrl(mp, SDMA_CONFIG_REG(port_num),
- PORT_SDMA_CONFIG_DEFAULT_VALUE);
-
- /* Enable port Rx. */
- mv643xx_eth_port_enable_rx(mp, ETH_RX_QUEUES_ENABLED);
-
- /* Disable port bandwidth limits by clearing MTU register */
- wrl(mp, MAXIMUM_TRANSMIT_UNIT(port_num), 0);
-
- /* save phy settings across reset */
- mv643xx_get_settings(dev, ðtool_cmd);
- ethernet_phy_reset(mp);
- mv643xx_set_settings(dev, ðtool_cmd);
-}
-
-/*
- * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
- */
-static void eth_port_uc_addr_set(struct mv643xx_private *mp,
- unsigned char *p_addr)
-{
- unsigned int port_num = mp->port_num;
- unsigned int mac_h;
- unsigned int mac_l;
- int table;
-
- mac_l = (p_addr[4] << 8) | (p_addr[5]);
- mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
- (p_addr[3] << 0);
-
- wrl(mp, MAC_ADDR_LOW(port_num), mac_l);
- wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
-
- /* Accept frames with this address */
- table = DA_FILTER_UNICAST_TABLE_BASE(port_num);
- eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
-}
-
-/*
- * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
- */
-static void eth_port_uc_addr_get(struct mv643xx_private *mp,
- unsigned char *p_addr)
-{
- unsigned int port_num = mp->port_num;
- unsigned int mac_h;
- unsigned int mac_l;
-
- mac_h = rdl(mp, MAC_ADDR_HIGH(port_num));
- mac_l = rdl(mp, MAC_ADDR_LOW(port_num));
-
- p_addr[0] = (mac_h >> 24) & 0xff;
- p_addr[1] = (mac_h >> 16) & 0xff;
- p_addr[2] = (mac_h >> 8) & 0xff;
- p_addr[3] = mac_h & 0xff;
- p_addr[4] = (mac_l >> 8) & 0xff;
- p_addr[5] = mac_l & 0xff;
-}
-
-/*
- * The entries in each table are indexed by a hash of a packet's MAC
- * address. One bit in each entry determines whether the packet is
- * accepted. There are 4 entries (each 8 bits wide) in each register
- * of the table. The bits in each entry are defined as follows:
- * 0 Accept=1, Drop=0
- * 3-1 Queue (ETH_Q0=0)
- * 7-4 Reserved = 0;
- */
-static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
- int table, unsigned char entry)
-{
- unsigned int table_reg;
- unsigned int tbl_offset;
- unsigned int reg_offset;
-
- tbl_offset = (entry / 4) * 4; /* Register offset of DA table entry */
- reg_offset = entry % 4; /* Entry offset within the register */
-
- /* Set "accepts frame bit" at specified table entry */
- table_reg = rdl(mp, table + tbl_offset);
- table_reg |= 0x01 << (8 * reg_offset);
- wrl(mp, table + tbl_offset, table_reg);
-}
-
-/*
- * eth_port_mc_addr - Multicast address settings.
- *
- * The MV device supports multicast using two tables:
- * 1) Special Multicast Table for MAC addresses of the form
- * 0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF).
- * The MAC DA[7:0] bits are used as a pointer to the Special Multicast
- * Table entries in the DA-Filter table.
- * 2) Other Multicast Table for multicast of another type. A CRC-8bit
- * is used as an index to the Other Multicast Table entries in the
- * DA-Filter table. This function calculates the CRC-8bit value.
- * In either case, eth_port_set_filter_table_entry() is then called
- * to set to set the actual table entry.
- */
-static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
-{
- unsigned int port_num = mp->port_num;
- unsigned int mac_h;
- unsigned int mac_l;
- unsigned char crc_result = 0;
- int table;
- int mac_array[48];
- int crc[8];
- int i;
-
- if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
- (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
- table = DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num);
- eth_port_set_filter_table_entry(mp, table, p_addr[5]);
- return;
- }
-
- /* Calculate CRC-8 out of the given address */
- mac_h = (p_addr[0] << 8) | (p_addr[1]);
- mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) |
- (p_addr[4] << 8) | (p_addr[5] << 0);
-
- for (i = 0; i < 32; i++)
- mac_array[i] = (mac_l >> i) & 0x1;
- for (i = 32; i < 48; i++)
- mac_array[i] = (mac_h >> (i - 32)) & 0x1;
-
- crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
- mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
- mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
- mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
- mac_array[8] ^ mac_array[7] ^ mac_array[6] ^ mac_array[0];
-
- crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
- mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
- mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
- mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
- mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
- mac_array[9] ^ mac_array[6] ^ mac_array[1] ^ mac_array[0];
-
- crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^
- mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^
- mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^
- mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8] ^
- mac_array[6] ^ mac_array[2] ^ mac_array[1] ^ mac_array[0];
-
- crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^
- mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^
- mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^
- mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[7] ^
- mac_array[3] ^ mac_array[2] ^ mac_array[1];
-
- crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^
- mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^
- mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^
- mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^
- mac_array[12] ^ mac_array[10] ^ mac_array[8] ^ mac_array[4] ^
- mac_array[3] ^ mac_array[2];
-
- crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^
- mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^
- mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^
- mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^
- mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[5] ^
- mac_array[4] ^ mac_array[3];
-
- crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^
- mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^
- mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^
- mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^
- mac_array[12] ^ mac_array[10] ^ mac_array[6] ^ mac_array[5] ^
- mac_array[4];
-
- crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^
- mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^
- mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^
- mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^
- mac_array[11] ^ mac_array[7] ^ mac_array[6] ^ mac_array[5];
-
- for (i = 0; i < 8; i++)
- crc_result = crc_result | (crc[i] << i);
-
- table = DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num);
- eth_port_set_filter_table_entry(mp, table, crc_result);
-}
-
-/*
- * Set the entire multicast list based on dev->mc_list.
- */
-static void eth_port_set_multicast_list(struct net_device *dev)
-{
-
- struct dev_mc_list *mc_list;
- int i;
- int table_index;
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int eth_port_num = mp->port_num;
-
- /* If the device is in promiscuous mode or in all multicast mode,
- * we will fully populate both multicast tables with accept.
- * This is guaranteed to yield a match on all multicast addresses...
- */
- if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) {
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Set all entries in DA filter special multicast
- * table (Ex_dFSMT)
- * Set for ETH_Q0 for now
- * Bits
- * 0 Accept=1, Drop=0
- * 3-1 Queue ETH_Q0=0
- * 7-4 Reserved = 0;
- */
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
-
- /* Set all entries in DA filter other multicast
- * table (Ex_dFOMT)
- * Set for ETH_Q0 for now
- * Bits
- * 0 Accept=1, Drop=0
- * 3-1 Queue ETH_Q0=0
- * 7-4 Reserved = 0;
- */
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
- }
- return;
- }
-
- /* We will clear out multicast tables every time we get the list.
- * Then add the entire new list...
- */
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
- (eth_port_num) + table_index, 0);
-
- /* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE
- (eth_port_num) + table_index, 0);
- }
-
- /* Get pointer to net_device multicast list and add each one... */
- for (i = 0, mc_list = dev->mc_list;
- (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
- i++, mc_list = mc_list->next)
- if (mc_list->dmi_addrlen == 6)
- eth_port_mc_addr(mp, mc_list->dmi_addr);
-}
-
-/*
- * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
- *
- * DESCRIPTION:
- * Go through all the DA filter tables (Unicast, Special Multicast &
- * Other Multicast) and set each entry to 0.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * Multicast and Unicast packets are rejected.
- *
- * RETURN:
- * None.
- */
-static void eth_port_init_mac_tables(struct mv643xx_private *mp)
-{
- unsigned int port_num = mp->port_num;
- int table_index;
-
- /* Clear DA filter unicast table (Ex_dFUT) */
- for (table_index = 0; table_index <= 0xC; table_index += 4)
- wrl(mp, DA_FILTER_UNICAST_TABLE_BASE(port_num) +
- table_index, 0);
-
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num) +
- table_index, 0);
- /* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num) +
- table_index, 0);
- }
-}
-
-/*
- * eth_clear_mib_counters - Clear all MIB counters
- *
- * DESCRIPTION:
- * This function clears all MIB counters of a specific ethernet port.
- * A read from the MIB counter will reset the counter.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * After reading all MIB counters, the counters resets.
- *
- * RETURN:
- * MIB counter value.
- *
- */
-static void eth_clear_mib_counters(struct mv643xx_private *mp)
-{
- unsigned int port_num = mp->port_num;
- int i;
-
- /* Perform dummy reads from MIB counters */
- for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
- i += 4)
- rdl(mp, MIB_COUNTERS_BASE(port_num) + i);
-}
-
-static inline u32 read_mib(struct mv643xx_private *mp, int offset)
-{
- return rdl(mp, MIB_COUNTERS_BASE(mp->port_num) + offset);
-}
-
-static void eth_update_mib_counters(struct mv643xx_private *mp)
-{
- struct mv643xx_mib_counters *p = &mp->mib_counters;
- int offset;
-
- p->good_octets_received +=
- read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW);
- p->good_octets_received +=
- (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH) << 32;
-
- for (offset = ETH_MIB_BAD_OCTETS_RECEIVED;
- offset <= ETH_MIB_FRAMES_1024_TO_MAX_OCTETS;
- offset += 4)
- *(u32 *)((char *)p + offset) += read_mib(mp, offset);
-
- p->good_octets_sent += read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_LOW);
- p->good_octets_sent +=
- (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_HIGH) << 32;
-
- for (offset = ETH_MIB_GOOD_FRAMES_SENT;
- offset <= ETH_MIB_LATE_COLLISION;
- offset += 4)
- *(u32 *)((char *)p + offset) += read_mib(mp, offset);
-}
-
-/*
- * ethernet_phy_detect - Detect whether a phy is present
- *
- * DESCRIPTION:
- * This function tests whether there is a PHY present on
- * the specified port.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * None
- *
- * RETURN:
- * 0 on success
- * -ENODEV on failure
- *
- */
-static int ethernet_phy_detect(struct mv643xx_private *mp)
-{
- unsigned int phy_reg_data0;
- int auto_neg;
-
- eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
- auto_neg = phy_reg_data0 & 0x1000;
- phy_reg_data0 ^= 0x1000; /* invert auto_neg */
- eth_port_write_smi_reg(mp, 0, phy_reg_data0);
-
- eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
- if ((phy_reg_data0 & 0x1000) == auto_neg)
- return -ENODEV; /* change didn't take */
-
- phy_reg_data0 ^= 0x1000;
- eth_port_write_smi_reg(mp, 0, phy_reg_data0);
- return 0;
-}
-
-/*
- * ethernet_phy_get - Get the ethernet port PHY address.
- *
- * DESCRIPTION:
- * This routine returns the given ethernet port PHY address.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * None.
- *
- * RETURN:
- * PHY address.
- *
- */
-static int ethernet_phy_get(struct mv643xx_private *mp)
-{
- unsigned int reg_data;
-
- reg_data = rdl(mp, PHY_ADDR_REG);
-
- return ((reg_data >> (5 * mp->port_num)) & 0x1f);
-}
-
-/*
- * ethernet_phy_set - Set the ethernet port PHY address.
- *
- * DESCRIPTION:
- * This routine sets the given ethernet port PHY address.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- * int phy_addr PHY address.
- *
- * OUTPUT:
- * None.
- *
- * RETURN:
- * None.
- *
- */
-static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
-{
- u32 reg_data;
- int addr_shift = 5 * mp->port_num;
-
- reg_data = rdl(mp, PHY_ADDR_REG);
- reg_data &= ~(0x1f << addr_shift);
- reg_data |= (phy_addr & 0x1f) << addr_shift;
- wrl(mp, PHY_ADDR_REG, reg_data);
-}
-
-/*
- * ethernet_phy_reset - Reset Ethernet port PHY.
- *
- * DESCRIPTION:
- * This routine utilizes the SMI interface to reset the ethernet port PHY.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * The PHY is reset.
- *
- * RETURN:
- * None.
- *
- */
-static void ethernet_phy_reset(struct mv643xx_private *mp)
-{
- unsigned int phy_reg_data;
-
- /* Reset the PHY */
- eth_port_read_smi_reg(mp, 0, &phy_reg_data);
- phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
- eth_port_write_smi_reg(mp, 0, phy_reg_data);
-
- /* wait for PHY to come out of reset */
- do {
- udelay(1);
- eth_port_read_smi_reg(mp, 0, &phy_reg_data);
- } while (phy_reg_data & 0x8000);
-}
-
-static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
- unsigned int queues)
-{
- wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(mp->port_num), queues);
-}
-
-static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
- unsigned int queues)
-{
- wrl(mp, RECEIVE_QUEUE_COMMAND_REG(mp->port_num), queues);
-}
-
-static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
-{
- unsigned int port_num = mp->port_num;
- u32 queues;
-
- /* Stop Tx port activity. Check port Tx activity. */
- queues = rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF;
- if (queues) {
- /* Issue stop command for active queues only */
- wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num), (queues << 8));
-
- /* Wait for all Tx activity to terminate. */
- /* Check port cause register that all Tx queues are stopped */
- while (rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF)
- udelay(PHY_WAIT_MICRO_SECONDS);
-
- /* Wait for Tx FIFO to empty */
- while (rdl(mp, PORT_STATUS_REG(port_num)) &
- ETH_PORT_TX_FIFO_EMPTY)
- udelay(PHY_WAIT_MICRO_SECONDS);
- }
-
- return queues;
-}
-
-static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
-{
- unsigned int port_num = mp->port_num;
- u32 queues;
-
- /* Stop Rx port activity. Check port Rx activity. */
- queues = rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF;
- if (queues) {
- /* Issue stop command for active queues only */
- wrl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num), (queues << 8));
-
- /* Wait for all Rx activity to terminate. */
- /* Check port cause register that all Rx queues are stopped */
- while (rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF)
- udelay(PHY_WAIT_MICRO_SECONDS);
- }
-
- return queues;
-}
-
-/*
- * eth_port_reset - Reset Ethernet port
- *
- * DESCRIPTION:
- * This routine resets the chip by aborting any SDMA engine activity and
- * clearing the MIB counters. The Receiver and the Transmit unit are in
- * idle state after this command is performed and the port is disabled.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- *
- * OUTPUT:
- * Channel activity is halted.
- *
- * RETURN:
- * None.
- *
- */
-static void eth_port_reset(struct mv643xx_private *mp)
-{
- unsigned int port_num = mp->port_num;
- unsigned int reg_data;
-
- mv643xx_eth_port_disable_tx(mp);
- mv643xx_eth_port_disable_rx(mp);
-
- /* Clear all MIB counters */
- eth_clear_mib_counters(mp);
-
- /* Reset the Enable bit in the Configuration Register */
- reg_data = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
- reg_data &= ~(SERIAL_PORT_ENABLE |
- DO_NOT_FORCE_LINK_FAIL |
- FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), reg_data);
-}
-
-
-/*
- * eth_port_read_smi_reg - Read PHY registers
- *
- * DESCRIPTION:
- * This routine utilize the SMI interface to interact with the PHY in
- * order to perform PHY register read.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- * unsigned int phy_reg PHY register address offset.
- * unsigned int *value Register value buffer.
- *
- * OUTPUT:
- * Write the value of a specified PHY register into given buffer.
- *
- * RETURN:
- * false if the PHY is busy or read data is not in valid state.
- * true otherwise.
- *
- */
-static void eth_port_read_smi_reg(struct mv643xx_private *mp,
- unsigned int phy_reg, unsigned int *value)
-{
- void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
- int phy_addr = ethernet_phy_get(mp);
- unsigned long flags;
- int i;
-
- /* the SMI register is a shared resource */
- spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
-
- /* wait for the SMI register to become available */
- for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
- if (i == PHY_WAIT_ITERATIONS) {
- printk("%s: PHY busy timeout\n", mp->dev->name);
- goto out;
- }
- udelay(PHY_WAIT_MICRO_SECONDS);
- }
-
- writel((phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ,
- smi_reg);
-
- /* now wait for the data to be valid */
- for (i = 0; !(readl(smi_reg) & ETH_SMI_READ_VALID); i++) {
- if (i == PHY_WAIT_ITERATIONS) {
- printk("%s: PHY read timeout\n", mp->dev->name);
- goto out;
- }
- udelay(PHY_WAIT_MICRO_SECONDS);
- }
-
- *value = readl(smi_reg) & 0xffff;
-out:
- spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
-}
-
-/*
- * eth_port_write_smi_reg - Write to PHY registers
- *
- * DESCRIPTION:
- * This routine utilize the SMI interface to interact with the PHY in
- * order to perform writes to PHY registers.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port.
- * unsigned int phy_reg PHY register address offset.
- * unsigned int value Register value.
- *
- * OUTPUT:
- * Write the given value to the specified PHY register.
- *
- * RETURN:
- * false if the PHY is busy.
- * true otherwise.
- *
- */
-static void eth_port_write_smi_reg(struct mv643xx_private *mp,
- unsigned int phy_reg, unsigned int value)
-{
- void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
- int phy_addr = ethernet_phy_get(mp);
- unsigned long flags;
- int i;
-
- /* the SMI register is a shared resource */
- spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
-
- /* wait for the SMI register to become available */
- for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
- if (i == PHY_WAIT_ITERATIONS) {
- printk("%s: PHY busy timeout\n", mp->dev->name);
- goto out;
- }
- udelay(PHY_WAIT_MICRO_SECONDS);
- }
-
- writel((phy_addr << 16) | (phy_reg << 21) |
- ETH_SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
-out:
- spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
-}
-
-/*
- * Wrappers for MII support library.
- */
-static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
- int val;
-
- eth_port_read_smi_reg(mp, location, &val);
- return val;
-}
-
-static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
- eth_port_write_smi_reg(mp, location, val);
-}
-
-/*
- * eth_port_receive - Get received information from Rx ring.
- *
- * DESCRIPTION:
- * This routine returns the received data to the caller. There is no
- * data copying during routine operation. All information is returned
- * using pointer to packet information struct passed from the caller.
- * If the routine exhausts Rx ring resources then the resource error flag
- * is set.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
- * struct pkt_info *p_pkt_info User packet buffer.
- *
- * OUTPUT:
- * Rx ring current and used indexes are updated.
- *
- * RETURN:
- * ETH_ERROR in case the routine can not access Rx desc ring.
- * ETH_QUEUE_FULL if Rx ring resources are exhausted.
- * ETH_END_OF_JOB if there is no received data.
- * ETH_OK otherwise.
- */
-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
- struct pkt_info *p_pkt_info)
-{
- int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
- volatile struct eth_rx_desc *p_rx_desc;
- unsigned int command_status;
- unsigned long flags;
-
- /* Do not process Rx ring in case of Rx ring resource error */
- if (mp->rx_resource_err)
- return ETH_QUEUE_FULL;
-
- spin_lock_irqsave(&mp->lock, flags);
-
- /* Get the Rx Desc ring 'curr and 'used' indexes */
- rx_curr_desc = mp->rx_curr_desc_q;
- rx_used_desc = mp->rx_used_desc_q;
-
- p_rx_desc = &mp->p_rx_desc_area[rx_curr_desc];
-
- /* The following parameters are used to save readings from memory */
- command_status = p_rx_desc->cmd_sts;
- rmb();
-
- /* Nothing to receive... */
- if (command_status & (ETH_BUFFER_OWNED_BY_DMA)) {
- spin_unlock_irqrestore(&mp->lock, flags);
- return ETH_END_OF_JOB;
- }
-
- p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET;
- p_pkt_info->cmd_sts = command_status;
- p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET;
- p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
- p_pkt_info->l4i_chk = p_rx_desc->buf_size;
-
- /*
- * Clean the return info field to indicate that the
- * packet has been moved to the upper layers
- */
- mp->rx_skb[rx_curr_desc] = NULL;
-
- /* Update current index in data structure */
- rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
- mp->rx_curr_desc_q = rx_next_curr_desc;
-
- /* Rx descriptors exhausted. Set the Rx ring resource error flag */
- if (rx_next_curr_desc == rx_used_desc)
- mp->rx_resource_err = 1;
-
- spin_unlock_irqrestore(&mp->lock, flags);
-
- return ETH_OK;
-}
-
-/*
- * eth_rx_return_buff - Returns a Rx buffer back to the Rx ring.
- *
- * DESCRIPTION:
- * This routine returns a Rx buffer back to the Rx ring. It retrieves the
- * next 'used' descriptor and attached the returned buffer to it.
- * In case the Rx ring was in "resource error" condition, where there are
- * no available Rx resources, the function resets the resource error flag.
- *
- * INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
- * struct pkt_info *p_pkt_info Information on returned buffer.
- *
- * OUTPUT:
- * New available Rx resource in Rx descriptor ring.
- *
- * RETURN:
- * ETH_ERROR in case the routine can not access Rx desc ring.
- * ETH_OK otherwise.
- */
-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
- struct pkt_info *p_pkt_info)
-{
- int used_rx_desc; /* Where to return Rx resource */
- volatile struct eth_rx_desc *p_used_rx_desc;
- unsigned long flags;
-
- spin_lock_irqsave(&mp->lock, flags);
-
- /* Get 'used' Rx descriptor */
- used_rx_desc = mp->rx_used_desc_q;
- p_used_rx_desc = &mp->p_rx_desc_area[used_rx_desc];
-
- p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
- p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
- mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
-
- /* Flush the write pipe */
-
- /* Return the descriptor to DMA ownership */
- wmb();
- p_used_rx_desc->cmd_sts =
- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
- wmb();
-
- /* Move the used descriptor pointer to the next descriptor */
- mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
-
- /* Any Rx return cancels the Rx resource error status */
- mp->rx_resource_err = 0;
-
- spin_unlock_irqrestore(&mp->lock, flags);
-
- return ETH_OK;
-}
-
-/************* Begin ethtool support *************************/
-
-struct mv643xx_stats {
- char stat_string[ETH_GSTRING_LEN];
- int sizeof_stat;
- int stat_offset;
-};
-
-#define MV643XX_STAT(m) FIELD_SIZEOF(struct mv643xx_private, m), \
- offsetof(struct mv643xx_private, m)
-
-static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
- { "rx_packets", MV643XX_STAT(stats.rx_packets) },
- { "tx_packets", MV643XX_STAT(stats.tx_packets) },
- { "rx_bytes", MV643XX_STAT(stats.rx_bytes) },
- { "tx_bytes", MV643XX_STAT(stats.tx_bytes) },
- { "rx_errors", MV643XX_STAT(stats.rx_errors) },
- { "tx_errors", MV643XX_STAT(stats.tx_errors) },
- { "rx_dropped", MV643XX_STAT(stats.rx_dropped) },
- { "tx_dropped", MV643XX_STAT(stats.tx_dropped) },
- { "good_octets_received", MV643XX_STAT(mib_counters.good_octets_received) },
- { "bad_octets_received", MV643XX_STAT(mib_counters.bad_octets_received) },
- { "internal_mac_transmit_err", MV643XX_STAT(mib_counters.internal_mac_transmit_err) },
- { "good_frames_received", MV643XX_STAT(mib_counters.good_frames_received) },
- { "bad_frames_received", MV643XX_STAT(mib_counters.bad_frames_received) },
- { "broadcast_frames_received", MV643XX_STAT(mib_counters.broadcast_frames_received) },
- { "multicast_frames_received", MV643XX_STAT(mib_counters.multicast_frames_received) },
- { "frames_64_octets", MV643XX_STAT(mib_counters.frames_64_octets) },
- { "frames_65_to_127_octets", MV643XX_STAT(mib_counters.frames_65_to_127_octets) },
- { "frames_128_to_255_octets", MV643XX_STAT(mib_counters.frames_128_to_255_octets) },
- { "frames_256_to_511_octets", MV643XX_STAT(mib_counters.frames_256_to_511_octets) },
- { "frames_512_to_1023_octets", MV643XX_STAT(mib_counters.frames_512_to_1023_octets) },
- { "frames_1024_to_max_octets", MV643XX_STAT(mib_counters.frames_1024_to_max_octets) },
- { "good_octets_sent", MV643XX_STAT(mib_counters.good_octets_sent) },
- { "good_frames_sent", MV643XX_STAT(mib_counters.good_frames_sent) },
- { "excessive_collision", MV643XX_STAT(mib_counters.excessive_collision) },
- { "multicast_frames_sent", MV643XX_STAT(mib_counters.multicast_frames_sent) },
- { "broadcast_frames_sent", MV643XX_STAT(mib_counters.broadcast_frames_sent) },
- { "unrec_mac_control_received", MV643XX_STAT(mib_counters.unrec_mac_control_received) },
- { "fc_sent", MV643XX_STAT(mib_counters.fc_sent) },
- { "good_fc_received", MV643XX_STAT(mib_counters.good_fc_received) },
- { "bad_fc_received", MV643XX_STAT(mib_counters.bad_fc_received) },
- { "undersize_received", MV643XX_STAT(mib_counters.undersize_received) },
- { "fragments_received", MV643XX_STAT(mib_counters.fragments_received) },
- { "oversize_received", MV643XX_STAT(mib_counters.oversize_received) },
- { "jabber_received", MV643XX_STAT(mib_counters.jabber_received) },
- { "mac_receive_error", MV643XX_STAT(mib_counters.mac_receive_error) },
- { "bad_crc_event", MV643XX_STAT(mib_counters.bad_crc_event) },
- { "collision", MV643XX_STAT(mib_counters.collision) },
- { "late_collision", MV643XX_STAT(mib_counters.late_collision) },
-};
-
-#define MV643XX_STATS_LEN ARRAY_SIZE(mv643xx_gstrings_stats)
-
-static void mv643xx_get_drvinfo(struct net_device *netdev,
- struct ethtool_drvinfo *drvinfo)
-{
- strncpy(drvinfo->driver, mv643xx_driver_name, 32);
- strncpy(drvinfo->version, mv643xx_driver_version, 32);
- strncpy(drvinfo->fw_version, "N/A", 32);
- strncpy(drvinfo->bus_info, "mv643xx", 32);
- drvinfo->n_stats = MV643XX_STATS_LEN;
-}
-
-static int mv643xx_get_sset_count(struct net_device *netdev, int sset)
-{
- switch (sset) {
- case ETH_SS_STATS:
- return MV643XX_STATS_LEN;
- default:
- return -EOPNOTSUPP;
- }
-}
-
-static void mv643xx_get_ethtool_stats(struct net_device *netdev,
- struct ethtool_stats *stats, uint64_t *data)
-{
- struct mv643xx_private *mp = netdev->priv;
- int i;
-
- eth_update_mib_counters(mp);
-
- for (i = 0; i < MV643XX_STATS_LEN; i++) {
- char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
- data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
- sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
- }
-}
-
-static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
- uint8_t *data)
-{
- int i;
-
- switch(stringset) {
- case ETH_SS_STATS:
- for (i=0; i < MV643XX_STATS_LEN; i++) {
- memcpy(data + i * ETH_GSTRING_LEN,
- mv643xx_gstrings_stats[i].stat_string,
- ETH_GSTRING_LEN);
- }
- break;
- }
-}
-
-static u32 mv643xx_eth_get_link(struct net_device *dev)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
-
- return mii_link_ok(&mp->mii);
-}
-
-static int mv643xx_eth_nway_restart(struct net_device *dev)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
-
- return mii_nway_restart(&mp->mii);
-}
-
-static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
- struct mv643xx_private *mp = netdev_priv(dev);
-
- return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
-}
-
-static const struct ethtool_ops mv643xx_ethtool_ops = {
- .get_settings = mv643xx_get_settings,
- .set_settings = mv643xx_set_settings,
- .get_drvinfo = mv643xx_get_drvinfo,
- .get_link = mv643xx_eth_get_link,
- .set_sg = ethtool_op_set_sg,
- .get_sset_count = mv643xx_get_sset_count,
- .get_ethtool_stats = mv643xx_get_ethtool_stats,
- .get_strings = mv643xx_get_strings,
- .nway_reset = mv643xx_eth_nway_restart,
-};
-
-/************* End ethtool support *************************/
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 01/39] mv643xx_eth: reverse topological sort of functions
2008-06-03 11:02 ` [PATCH 01/39] mv643xx_eth: reverse topological sort of functions Lennert Buytenhek
@ 2008-06-05 11:23 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:23 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:16PM +0200, Lennert Buytenhek wrote:
> This patch performs a reverse topological sort of all functions in
> mv643xx_eth.c, so that we can get rid of all forward declarations,
> and end up with a more understandable driver due to related functions
> being grouped together.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 3438 ++++++++++++++++++++++-----------------------
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 02/39] mv643xx_eth: trim unnecessary includes
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
2008-06-03 11:02 ` [PATCH 01/39] mv643xx_eth: reverse topological sort of functions Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:02 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 03/39] mv643xx_eth: shorten reg names Lennert Buytenhek
` (36 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 835b85d..c04058c 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -34,34 +34,18 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <linux/init.h>
-#include <linux/dma-mapping.h>
+
#include <linux/in.h>
-#include <linux/ip.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/etherdevice.h>
-
-#include <linux/bitops.h>
-#include <linux/delay.h>
#include <linux/ethtool.h>
#include <linux/platform_device.h>
-
#include <linux/module.h>
-#include <linux/kernel.h>
#include <linux/spinlock.h>
-#include <linux/workqueue.h>
#include <linux/mii.h>
-
#include <linux/mv643xx_eth.h>
-#include <asm/io.h>
-#include <asm/types.h>
-#include <asm/pgtable.h>
-#include <asm/system.h>
-#include <asm/delay.h>
-#include <asm/dma-mapping.h>
-
static char mv643xx_driver_name[] = "mv643xx_eth";
static char mv643xx_driver_version[] = "1.0";
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 02/39] mv643xx_eth: trim unnecessary includes
2008-06-03 11:02 ` [PATCH 02/39] mv643xx_eth: trim unnecessary includes Lennert Buytenhek
@ 2008-06-05 11:02 ` Dale Farnsworth
2008-06-06 8:18 ` Lennert Buytenhek
0 siblings, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:02 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:17PM +0200, Lennert Buytenhek wrote:
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 18 +-----------------
> 1 files changed, 1 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index 835b85d..c04058c 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -34,34 +34,18 @@
> * along with this program; if not, write to the Free Software
> * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> */
> -#include <linux/init.h>
> -#include <linux/dma-mapping.h>
> +
> #include <linux/in.h>
> -#include <linux/ip.h>
> #include <linux/tcp.h>
> #include <linux/udp.h>
> #include <linux/etherdevice.h>
> -
> -#include <linux/bitops.h>
> -#include <linux/delay.h>
> #include <linux/ethtool.h>
> #include <linux/platform_device.h>
> -
> #include <linux/module.h>
> -#include <linux/kernel.h>
> #include <linux/spinlock.h>
> -#include <linux/workqueue.h>
Isn't this needed for the definition of struct work and schedule_work()?
> #include <linux/mii.h>
> -
> #include <linux/mv643xx_eth.h>
>
> -#include <asm/io.h>
> -#include <asm/types.h>
> -#include <asm/pgtable.h>
> -#include <asm/system.h>
> -#include <asm/delay.h>
Don't we still need this for udelay()?
> -#include <asm/dma-mapping.h>
And this for dma_map_single, etc.
I didn't bother to check all the other includes being removed, but it
seems you may have been a bit overly aggressive.
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 02/39] mv643xx_eth: trim unnecessary includes
2008-06-05 11:02 ` Dale Farnsworth
@ 2008-06-06 8:18 ` Lennert Buytenhek
2008-06-06 10:55 ` Dale Farnsworth
0 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-06 8:18 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 04:02:52AM -0700, Dale Farnsworth wrote:
> > -#include <linux/workqueue.h>
>
> Isn't this needed for the definition of struct work and schedule_work()?
>
> > #include <linux/mii.h>
> > -
> > #include <linux/mv643xx_eth.h>
> >
> > -#include <asm/io.h>
> > -#include <asm/types.h>
> > -#include <asm/pgtable.h>
> > -#include <asm/system.h>
> > -#include <asm/delay.h>
>
> Don't we still need this for udelay()?
> > -#include <asm/dma-mapping.h>
>
> And this for dma_map_single, etc.
>
> I didn't bother to check all the other includes being removed, but it
> seems you may have been a bit overly aggressive.
I just deleted everything that didn't make it stop compile, which I
admit is a bit overzealous. :)
I've attached a new patch below:
- linux/ip.h only contains struct iphdr/ip_auth_hdr/ip_esp_hdr/
ip_comp_hdr and various IP options and IP TOS-related things,
none of which we use.
- linux/bitops.h contains various BIT()/BIT_MASK()/etc defines and
find_{first,next}_*bit()/ffs/for_each_bit(), none of which we use.
- asm/pgtable.h contains low-level page table handling functions and
nothing of interest to the driver as far as I can tell.
- asm/delay.h isn't needed since we include linux/delay.h
- ditto for asm/dma-mapping.h
OK?
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun Jun 1 00:54:05 CEST 2008
Subject: mv643xx_eth: trim unnecessary includes
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
===================================================================
--- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c
+++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
@@ -34,33 +34,25 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/in.h>
-#include <linux/ip.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/etherdevice.h>
-
-#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/ethtool.h>
#include <linux/platform_device.h>
-
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/mii.h>
-
#include <linux/mv643xx_eth.h>
-
#include <asm/io.h>
#include <asm/types.h>
-#include <asm/pgtable.h>
#include <asm/system.h>
-#include <asm/delay.h>
-#include <asm/dma-mapping.h>
static char mv643xx_driver_name[] = "mv643xx_eth";
static char mv643xx_driver_version[] = "1.0";
^ permalink raw reply [flat|nested] 92+ messages in thread* Re: [PATCH 02/39] mv643xx_eth: trim unnecessary includes
2008-06-06 8:18 ` Lennert Buytenhek
@ 2008-06-06 10:55 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-06 10:55 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Fri, Jun 06, 2008 at 10:18:39AM +0200, Lennert Buytenhek wrote:
> On Thu, Jun 05, 2008 at 04:02:52AM -0700, Dale Farnsworth wrote:
>
> > > -#include <linux/workqueue.h>
> >
> > Isn't this needed for the definition of struct work and schedule_work()?
> >
> > > #include <linux/mii.h>
> > > -
> > > #include <linux/mv643xx_eth.h>
> > >
> > > -#include <asm/io.h>
> > > -#include <asm/types.h>
> > > -#include <asm/pgtable.h>
> > > -#include <asm/system.h>
> > > -#include <asm/delay.h>
> >
> > Don't we still need this for udelay()?
> > > -#include <asm/dma-mapping.h>
> >
> > And this for dma_map_single, etc.
> >
> > I didn't bother to check all the other includes being removed, but it
> > seems you may have been a bit overly aggressive.
>
> I just deleted everything that didn't make it stop compile, which I
> admit is a bit overzealous. :)
>
> I've attached a new patch below:
> - linux/ip.h only contains struct iphdr/ip_auth_hdr/ip_esp_hdr/
> ip_comp_hdr and various IP options and IP TOS-related things,
> none of which we use.
> - linux/bitops.h contains various BIT()/BIT_MASK()/etc defines and
> find_{first,next}_*bit()/ffs/for_each_bit(), none of which we use.
> - asm/pgtable.h contains low-level page table handling functions and
> nothing of interest to the driver as far as I can tell.
> - asm/delay.h isn't needed since we include linux/delay.h
> - ditto for asm/dma-mapping.h
>
> OK?
Sounds good. (I missed that fact taht linux/delay.h and
linux/dma-mapping.h were still included.)
-Dale
> From: Lennert Buytenhek <buytenh@wantstofly.org>
> Date: Sun Jun 1 00:54:05 CEST 2008
> Subject: mv643xx_eth: trim unnecessary includes
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
>
> Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
> ===================================================================
> --- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c
> +++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
> @@ -34,33 +34,25 @@
> * along with this program; if not, write to the Free Software
> * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> */
> +
> #include <linux/init.h>
> #include <linux/dma-mapping.h>
> #include <linux/in.h>
> -#include <linux/ip.h>
> #include <linux/tcp.h>
> #include <linux/udp.h>
> #include <linux/etherdevice.h>
> -
> -#include <linux/bitops.h>
> #include <linux/delay.h>
> #include <linux/ethtool.h>
> #include <linux/platform_device.h>
> -
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/spinlock.h>
> #include <linux/workqueue.h>
> #include <linux/mii.h>
> -
> #include <linux/mv643xx_eth.h>
> -
> #include <asm/io.h>
> #include <asm/types.h>
> -#include <asm/pgtable.h>
> #include <asm/system.h>
> -#include <asm/delay.h>
> -#include <asm/dma-mapping.h>
>
> static char mv643xx_driver_name[] = "mv643xx_eth";
> static char mv643xx_driver_version[] = "1.0";
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 03/39] mv643xx_eth: shorten reg names
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
2008-06-03 11:02 ` [PATCH 01/39] mv643xx_eth: reverse topological sort of functions Lennert Buytenhek
2008-06-03 11:02 ` [PATCH 02/39] mv643xx_eth: trim unnecessary includes Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:21 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines Lennert Buytenhek
` (35 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Shorten the various oversized register names in mv643xx_eth.c, to
increase readability.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 204 +++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 108 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index c04058c..9a9218f 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -76,38 +76,38 @@ static char mv643xx_driver_version[] = "1.0";
/*
* Registers shared between all ports.
*/
-#define PHY_ADDR_REG 0x0000
-#define SMI_REG 0x0004
-#define WINDOW_BASE(i) (0x0200 + ((i) << 3))
-#define WINDOW_SIZE(i) (0x0204 + ((i) << 3))
-#define WINDOW_REMAP_HIGH(i) (0x0280 + ((i) << 2))
-#define WINDOW_BAR_ENABLE 0x0290
-#define WINDOW_PROTECT(i) (0x0294 + ((i) << 4))
+#define PHY_ADDR 0x0000
+#define SMI_REG 0x0004
+#define WINDOW_BASE(w) (0x0200 + ((w) << 3))
+#define WINDOW_SIZE(w) (0x0204 + ((w) << 3))
+#define WINDOW_REMAP_HIGH(w) (0x0280 + ((w) << 2))
+#define WINDOW_BAR_ENABLE 0x0290
+#define WINDOW_PROTECT(w) (0x0294 + ((w) << 4))
/*
* Per-port registers.
*/
-#define PORT_CONFIG_REG(p) (0x0400 + ((p) << 10))
-#define PORT_CONFIG_EXTEND_REG(p) (0x0404 + ((p) << 10))
-#define MAC_ADDR_LOW(p) (0x0414 + ((p) << 10))
-#define MAC_ADDR_HIGH(p) (0x0418 + ((p) << 10))
-#define SDMA_CONFIG_REG(p) (0x041c + ((p) << 10))
-#define PORT_SERIAL_CONTROL_REG(p) (0x043c + ((p) << 10))
-#define PORT_STATUS_REG(p) (0x0444 + ((p) << 10))
-#define TRANSMIT_QUEUE_COMMAND_REG(p) (0x0448 + ((p) << 10))
-#define MAXIMUM_TRANSMIT_UNIT(p) (0x0458 + ((p) << 10))
-#define INTERRUPT_CAUSE_REG(p) (0x0460 + ((p) << 10))
-#define INTERRUPT_CAUSE_EXTEND_REG(p) (0x0464 + ((p) << 10))
-#define INTERRUPT_MASK_REG(p) (0x0468 + ((p) << 10))
-#define INTERRUPT_EXTEND_MASK_REG(p) (0x046c + ((p) << 10))
-#define TX_FIFO_URGENT_THRESHOLD_REG(p) (0x0474 + ((p) << 10))
-#define RX_CURRENT_QUEUE_DESC_PTR_0(p) (0x060c + ((p) << 10))
-#define RECEIVE_QUEUE_COMMAND_REG(p) (0x0680 + ((p) << 10))
-#define TX_CURRENT_QUEUE_DESC_PTR_0(p) (0x06c0 + ((p) << 10))
-#define MIB_COUNTERS_BASE(p) (0x1000 + ((p) << 7))
-#define DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(p) (0x1400 + ((p) << 10))
-#define DA_FILTER_OTHER_MULTICAST_TABLE_BASE(p) (0x1500 + ((p) << 10))
-#define DA_FILTER_UNICAST_TABLE_BASE(p) (0x1600 + ((p) << 10))
+#define PORT_CONFIG(p) (0x0400 + ((p) << 10))
+#define PORT_CONFIG_EXT(p) (0x0404 + ((p) << 10))
+#define MAC_ADDR_LOW(p) (0x0414 + ((p) << 10))
+#define MAC_ADDR_HIGH(p) (0x0418 + ((p) << 10))
+#define SDMA_CONFIG(p) (0x041c + ((p) << 10))
+#define PORT_SERIAL_CONTROL(p) (0x043c + ((p) << 10))
+#define PORT_STATUS(p) (0x0444 + ((p) << 10))
+#define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
+#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
+#define INT_CAUSE(p) (0x0460 + ((p) << 10))
+#define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
+#define INT_MASK(p) (0x0468 + ((p) << 10))
+#define INT_MASK_EXT(p) (0x046c + ((p) << 10))
+#define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
+#define RXQ_CURRENT_DESC_PTR(p) (0x060c + ((p) << 10))
+#define RXQ_COMMAND(p) (0x0680 + ((p) << 10))
+#define TXQ_CURRENT_DESC_PTR(p) (0x06c0 + ((p) << 10))
+#define MIB_COUNTERS(p) (0x1000 + ((p) << 7))
+#define SPECIAL_MCAST_TABLE(p) (0x1400 + ((p) << 10))
+#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
+#define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
#define UNICAST_NORMAL_MODE (0 << 0)
@@ -592,7 +592,7 @@ static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
unsigned int queues)
{
- wrl(mp, RECEIVE_QUEUE_COMMAND_REG(mp->port_num), queues);
+ wrl(mp, RXQ_COMMAND(mp->port_num), queues);
}
static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
@@ -601,14 +601,14 @@ static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
u32 queues;
/* Stop Rx port activity. Check port Rx activity. */
- queues = rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+ queues = rdl(mp, RXQ_COMMAND(port_num)) & 0xFF;
if (queues) {
/* Issue stop command for active queues only */
- wrl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num), (queues << 8));
+ wrl(mp, RXQ_COMMAND(port_num), (queues << 8));
/* Wait for all Rx activity to terminate. */
/* Check port cause register that all Rx queues are stopped */
- while (rdl(mp, RECEIVE_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+ while (rdl(mp, RXQ_COMMAND(port_num)) & 0xFF)
udelay(PHY_WAIT_MICRO_SECONDS);
}
@@ -618,7 +618,7 @@ static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
unsigned int queues)
{
- wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(mp->port_num), queues);
+ wrl(mp, TXQ_COMMAND(mp->port_num), queues);
}
static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
@@ -627,19 +627,18 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
u32 queues;
/* Stop Tx port activity. Check port Tx activity. */
- queues = rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF;
+ queues = rdl(mp, TXQ_COMMAND(port_num)) & 0xFF;
if (queues) {
/* Issue stop command for active queues only */
- wrl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num), (queues << 8));
+ wrl(mp, TXQ_COMMAND(port_num), (queues << 8));
/* Wait for all Tx activity to terminate. */
/* Check port cause register that all Tx queues are stopped */
- while (rdl(mp, TRANSMIT_QUEUE_COMMAND_REG(port_num)) & 0xFF)
+ while (rdl(mp, TXQ_COMMAND(port_num)) & 0xFF)
udelay(PHY_WAIT_MICRO_SECONDS);
/* Wait for Tx FIFO to empty */
- while (rdl(mp, PORT_STATUS_REG(port_num)) &
- ETH_PORT_TX_FIFO_EMPTY)
+ while (rdl(mp, PORT_STATUS(port_num)) & ETH_PORT_TX_FIFO_EMPTY)
udelay(PHY_WAIT_MICRO_SECONDS);
}
@@ -946,15 +945,15 @@ static int mv643xx_poll(struct napi_struct *napi, int budget)
#endif
work_done = 0;
- if ((rdl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num)))
+ if ((rdl(mp, RXQ_CURRENT_DESC_PTR(port_num)))
!= (u32) mp->rx_used_desc_q)
work_done = mv643xx_eth_receive_queue(dev, budget);
if (work_done < budget) {
netif_rx_complete(dev, napi);
- wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
- wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_CAUSE(port_num), 0);
+ wrl(mp, INT_CAUSE_EXT(port_num), 0);
+ wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
}
return work_done;
@@ -1290,12 +1289,12 @@ static void eth_clear_mib_counters(struct mv643xx_private *mp)
/* Perform dummy reads from MIB counters */
for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
i += 4)
- rdl(mp, MIB_COUNTERS_BASE(port_num) + i);
+ rdl(mp, MIB_COUNTERS(port_num) + i);
}
static inline u32 read_mib(struct mv643xx_private *mp, int offset)
{
- return rdl(mp, MIB_COUNTERS_BASE(mp->port_num) + offset);
+ return rdl(mp, MIB_COUNTERS(mp->port_num) + offset);
}
static void eth_update_mib_counters(struct mv643xx_private *mp)
@@ -1528,16 +1527,13 @@ static void eth_port_init_mac_tables(struct mv643xx_private *mp)
/* Clear DA filter unicast table (Ex_dFUT) */
for (table_index = 0; table_index <= 0xC; table_index += 4)
- wrl(mp, DA_FILTER_UNICAST_TABLE_BASE(port_num) +
- table_index, 0);
+ wrl(mp, UNICAST_TABLE(port_num) + table_index, 0);
for (table_index = 0; table_index <= 0xFC; table_index += 4) {
/* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num) +
- table_index, 0);
+ wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
/* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num) +
- table_index, 0);
+ wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0);
}
}
@@ -1585,7 +1581,7 @@ static void eth_port_uc_addr_set(struct mv643xx_private *mp,
wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
/* Accept frames with this address */
- table = DA_FILTER_UNICAST_TABLE_BASE(port_num);
+ table = UNICAST_TABLE(port_num);
eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
}
@@ -1654,7 +1650,7 @@ static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
(p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
- table = DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(port_num);
+ table = SPECIAL_MCAST_TABLE(port_num);
eth_port_set_filter_table_entry(mp, table, p_addr[5]);
return;
}
@@ -1727,7 +1723,7 @@ static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
for (i = 0; i < 8; i++)
crc_result = crc_result | (crc[i] << i);
- table = DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port_num);
+ table = OTHER_MCAST_TABLE(port_num);
eth_port_set_filter_table_entry(mp, table, crc_result);
}
@@ -1757,7 +1753,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+ wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
/* Set all entries in DA filter other multicast
* table (Ex_dFOMT)
@@ -1767,7 +1763,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101);
+ wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
}
return;
}
@@ -1777,12 +1773,10 @@ static void eth_port_set_multicast_list(struct net_device *dev)
*/
for (table_index = 0; table_index <= 0xFC; table_index += 4) {
/* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE
- (eth_port_num) + table_index, 0);
+ wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0);
/* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, DA_FILTER_OTHER_MULTICAST_TABLE_BASE
- (eth_port_num) + table_index, 0);
+ wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0);
}
/* Get pointer to net_device multicast list and add each one... */
@@ -1806,12 +1800,12 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
struct mv643xx_private *mp = netdev_priv(dev);
u32 config_reg;
- config_reg = rdl(mp, PORT_CONFIG_REG(mp->port_num));
+ config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
if (dev->flags & IFF_PROMISC)
config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
else
config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
- wrl(mp, PORT_CONFIG_REG(mp->port_num), config_reg);
+ wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
eth_port_set_multicast_list(dev);
}
@@ -2042,7 +2036,7 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
u32 o_pscr, n_pscr;
unsigned int queues;
- o_pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
+ o_pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
n_pscr = o_pscr;
/* clear speed, duplex and rx buffer size fields */
@@ -2065,14 +2059,14 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
if (n_pscr != o_pscr) {
if ((o_pscr & SERIAL_PORT_ENABLE) == 0)
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
else {
queues = mv643xx_eth_port_disable_tx(mp);
o_pscr &= ~SERIAL_PORT_ENABLE;
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), o_pscr);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), n_pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), o_pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
if (queues)
mv643xx_eth_port_enable_tx(mp, queues);
}
@@ -2098,14 +2092,11 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
unsigned int port_num = mp->port_num;
/* Read interrupt cause registers */
- eth_int_cause = rdl(mp, INTERRUPT_CAUSE_REG(port_num)) &
- ETH_INT_UNMASK_ALL;
+ eth_int_cause = rdl(mp, INT_CAUSE(port_num)) & ETH_INT_UNMASK_ALL;
if (eth_int_cause & ETH_INT_CAUSE_EXT) {
- eth_int_cause_ext = rdl(mp,
- INTERRUPT_CAUSE_EXTEND_REG(port_num)) &
- ETH_INT_UNMASK_ALL_EXT;
- wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num),
- ~eth_int_cause_ext);
+ eth_int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
+ & ETH_INT_UNMASK_ALL_EXT;
+ wrl(mp, INT_CAUSE_EXT(port_num), ~eth_int_cause_ext);
}
/* PHY status changed */
@@ -2131,10 +2122,10 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
#ifdef MV643XX_NAPI
if (eth_int_cause & ETH_INT_CAUSE_RX) {
/* schedule the NAPI poll routine to maintain port */
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
/* wait for previous write to complete */
- rdl(mp, INTERRUPT_MASK_REG(port_num));
+ rdl(mp, INT_MASK(port_num));
netif_rx_schedule(dev, &mp->napi);
}
@@ -2224,28 +2215,26 @@ static void eth_port_start(struct net_device *dev)
/* Assignment of Tx CTRP of given queue */
tx_curr_desc = mp->tx_curr_desc_q;
- wrl(mp, TX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+ wrl(mp, TXQ_CURRENT_DESC_PTR(port_num),
(u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
/* Assignment of Rx CRDP of given queue */
rx_curr_desc = mp->rx_curr_desc_q;
- wrl(mp, RX_CURRENT_QUEUE_DESC_PTR_0(port_num),
+ wrl(mp, RXQ_CURRENT_DESC_PTR(port_num),
(u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
/* Add the assigned Ethernet address to the port's address table */
eth_port_uc_addr_set(mp, dev->dev_addr);
/* Assign port configuration and command. */
- wrl(mp, PORT_CONFIG_REG(port_num),
- PORT_CONFIG_DEFAULT_VALUE);
+ wrl(mp, PORT_CONFIG(port_num), PORT_CONFIG_DEFAULT_VALUE);
- wrl(mp, PORT_CONFIG_EXTEND_REG(port_num),
- PORT_CONFIG_EXTEND_DEFAULT_VALUE);
+ wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
- pscr = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
+ pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
DISABLE_AUTO_NEG_SPEED_GMII |
@@ -2253,20 +2242,19 @@ static void eth_port_start(struct net_device *dev)
DO_NOT_FORCE_LINK_FAIL |
SERIAL_PORT_CONTROL_RESERVED;
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
pscr |= SERIAL_PORT_ENABLE;
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), pscr);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
/* Assign port SDMA configuration */
- wrl(mp, SDMA_CONFIG_REG(port_num),
- PORT_SDMA_CONFIG_DEFAULT_VALUE);
+ wrl(mp, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
/* Enable port Rx. */
mv643xx_eth_port_enable_rx(mp, ETH_RX_QUEUES_ENABLED);
/* Disable port bandwidth limits by clearing MTU register */
- wrl(mp, MAXIMUM_TRANSMIT_UNIT(port_num), 0);
+ wrl(mp, TX_BW_MTU(port_num), 0);
/* save phy settings across reset */
mv643xx_get_settings(dev, ðtool_cmd);
@@ -2305,9 +2293,9 @@ static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
/* Set RX Coalescing mechanism */
- wrl(mp, SDMA_CONFIG_REG(port_num),
+ wrl(mp, SDMA_CONFIG(port_num),
((coal & 0x3fff) << 8) |
- (rdl(mp, SDMA_CONFIG_REG(port_num))
+ (rdl(mp, SDMA_CONFIG(port_num))
& 0xffc000ff));
return coal;
@@ -2342,7 +2330,7 @@ static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
/* Set TX Coalescing mechanism */
- wrl(mp, TX_FIFO_URGENT_THRESHOLD_REG(mp->port_num), coal << 4);
+ wrl(mp, TX_FIFO_URGENT_THRESHOLD(mp->port_num), coal << 4);
return coal;
}
@@ -2401,10 +2389,10 @@ static int mv643xx_eth_open(struct net_device *dev)
int err;
/* Clear any pending ethernet port interrupts */
- wrl(mp, INTERRUPT_CAUSE_REG(port_num), 0);
- wrl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num), 0);
+ wrl(mp, INT_CAUSE(port_num), 0);
+ wrl(mp, INT_CAUSE_EXT(port_num), 0);
/* wait for previous write to complete */
- rdl(mp, INTERRUPT_CAUSE_EXTEND_REG(port_num));
+ rdl(mp, INT_CAUSE_EXT(port_num));
err = request_irq(dev->irq, mv643xx_eth_int_handler,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
@@ -2510,10 +2498,10 @@ static int mv643xx_eth_open(struct net_device *dev)
eth_port_set_tx_coal(mp, MV643XX_TX_COAL);
/* Unmask phy and link status changes interrupts */
- wrl(mp, INTERRUPT_EXTEND_MASK_REG(port_num), ETH_INT_UNMASK_ALL_EXT);
+ wrl(mp, INT_MASK_EXT(port_num), ETH_INT_UNMASK_ALL_EXT);
/* Unmask RX buffer and TX end interrupt */
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
return 0;
@@ -2557,11 +2545,11 @@ static void eth_port_reset(struct mv643xx_private *mp)
eth_clear_mib_counters(mp);
/* Reset the Enable bit in the Configuration Register */
- reg_data = rdl(mp, PORT_SERIAL_CONTROL_REG(port_num));
+ reg_data = rdl(mp, PORT_SERIAL_CONTROL(port_num));
reg_data &= ~(SERIAL_PORT_ENABLE |
DO_NOT_FORCE_LINK_FAIL |
FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL_REG(port_num), reg_data);
+ wrl(mp, PORT_SERIAL_CONTROL(port_num), reg_data);
}
/*
@@ -2580,9 +2568,9 @@ static int mv643xx_eth_stop(struct net_device *dev)
unsigned int port_num = mp->port_num;
/* Mask all interrupts on ethernet port */
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
/* wait for previous write to complete */
- rdl(mp, INTERRUPT_MASK_REG(port_num));
+ rdl(mp, INT_MASK(port_num));
#ifdef MV643XX_NAPI
napi_disable(&mp->napi);
@@ -2685,13 +2673,13 @@ static void mv643xx_netpoll(struct net_device *netdev)
struct mv643xx_private *mp = netdev_priv(netdev);
int port_num = mp->port_num;
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
/* wait for previous write to complete */
- rdl(mp, INTERRUPT_MASK_REG(port_num));
+ rdl(mp, INT_MASK(port_num));
mv643xx_eth_int_handler(netdev->irq, netdev);
- wrl(mp, INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
}
#endif
@@ -2835,10 +2823,10 @@ static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
u32 reg_data;
int addr_shift = 5 * mp->port_num;
- reg_data = rdl(mp, PHY_ADDR_REG);
+ reg_data = rdl(mp, PHY_ADDR);
reg_data &= ~(0x1f << addr_shift);
reg_data |= (phy_addr & 0x1f) << addr_shift;
- wrl(mp, PHY_ADDR_REG, reg_data);
+ wrl(mp, PHY_ADDR, reg_data);
}
/*
@@ -2861,7 +2849,7 @@ static int ethernet_phy_get(struct mv643xx_private *mp)
{
unsigned int reg_data;
- reg_data = rdl(mp, PHY_ADDR_REG);
+ reg_data = rdl(mp, PHY_ADDR);
return ((reg_data >> (5 * mp->port_num)) & 0x1f);
}
@@ -3139,8 +3127,8 @@ static void mv643xx_eth_shutdown(struct platform_device *pdev)
unsigned int port_num = mp->port_num;
/* Mask all interrupts on ethernet port */
- wrl(mp, INTERRUPT_MASK_REG(port_num), 0);
- rdl(mp, INTERRUPT_MASK_REG(port_num));
+ wrl(mp, INT_MASK(port_num), 0);
+ rdl(mp, INT_MASK(port_num));
eth_port_reset(mp);
}
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (2 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 03/39] mv643xx_eth: shorten reg names Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:07 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 05/39] mv643xx_eth: get rid of individual port config extend " Lennert Buytenhek
` (34 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The mv643xx_eth driver only ever changes bit 0 of the port config
register at run time, the rest of the register bits are fixed (and
always zero). Document the meaning of the chosen default value,
and get rid of all the defines for each of the individual bits.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 44 +++++++-------------------------------------
1 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 9a9218f..38ba365 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -109,39 +109,6 @@ static char mv643xx_driver_version[] = "1.0";
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
#define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
-/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
-#define UNICAST_NORMAL_MODE (0 << 0)
-#define UNICAST_PROMISCUOUS_MODE (1 << 0)
-#define DEFAULT_RX_QUEUE(queue) ((queue) << 1)
-#define DEFAULT_RX_ARP_QUEUE(queue) ((queue) << 4)
-#define RECEIVE_BC_IF_NOT_IP_OR_ARP (0 << 7)
-#define REJECT_BC_IF_NOT_IP_OR_ARP (1 << 7)
-#define RECEIVE_BC_IF_IP (0 << 8)
-#define REJECT_BC_IF_IP (1 << 8)
-#define RECEIVE_BC_IF_ARP (0 << 9)
-#define REJECT_BC_IF_ARP (1 << 9)
-#define TX_AM_NO_UPDATE_ERROR_SUMMARY (1 << 12)
-#define CAPTURE_TCP_FRAMES_DIS (0 << 14)
-#define CAPTURE_TCP_FRAMES_EN (1 << 14)
-#define CAPTURE_UDP_FRAMES_DIS (0 << 15)
-#define CAPTURE_UDP_FRAMES_EN (1 << 15)
-#define DEFAULT_RX_TCP_QUEUE(queue) ((queue) << 16)
-#define DEFAULT_RX_UDP_QUEUE(queue) ((queue) << 19)
-#define DEFAULT_RX_BPDU_QUEUE(queue) ((queue) << 22)
-
-#define PORT_CONFIG_DEFAULT_VALUE \
- UNICAST_NORMAL_MODE | \
- DEFAULT_RX_QUEUE(0) | \
- DEFAULT_RX_ARP_QUEUE(0) | \
- RECEIVE_BC_IF_NOT_IP_OR_ARP | \
- RECEIVE_BC_IF_IP | \
- RECEIVE_BC_IF_ARP | \
- CAPTURE_TCP_FRAMES_DIS | \
- CAPTURE_UDP_FRAMES_DIS | \
- DEFAULT_RX_TCP_QUEUE(0) | \
- DEFAULT_RX_UDP_QUEUE(0) | \
- DEFAULT_RX_BPDU_QUEUE(0)
-
/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
#define CLASSIFY_EN (1 << 0)
#define SPAN_BPDU_PACKETS_AS_NORMAL (0 << 1)
@@ -1802,9 +1769,9 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
if (dev->flags & IFF_PROMISC)
- config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
+ config_reg |= 0x00000001;
else
- config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
+ config_reg &= ~0x00000001;
wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
eth_port_set_multicast_list(dev);
@@ -2226,8 +2193,11 @@ static void eth_port_start(struct net_device *dev)
/* Add the assigned Ethernet address to the port's address table */
eth_port_uc_addr_set(mp, dev->dev_addr);
- /* Assign port configuration and command. */
- wrl(mp, PORT_CONFIG(port_num), PORT_CONFIG_DEFAULT_VALUE);
+ /*
+ * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
+ * frames to RX queue #0.
+ */
+ wrl(mp, PORT_CONFIG(port_num), 0x00000000);
wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines
2008-06-03 11:02 ` [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines Lennert Buytenhek
@ 2008-06-05 11:07 ` Dale Farnsworth
2008-06-06 6:58 ` Lennert Buytenhek
0 siblings, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:07 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:19PM +0200, Lennert Buytenhek wrote:
> The mv643xx_eth driver only ever changes bit 0 of the port config
> register at run time, the rest of the register bits are fixed (and
> always zero). Document the meaning of the chosen default value,
> and get rid of all the defines for each of the individual bits.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 44 +++++++-------------------------------------
> 1 files changed, 7 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index 9a9218f..38ba365 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -109,39 +109,6 @@ static char mv643xx_driver_version[] = "1.0";
> #define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
> #define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
>
> -/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
> -#define UNICAST_NORMAL_MODE (0 << 0)
> -#define UNICAST_PROMISCUOUS_MODE (1 << 0)
> -#define DEFAULT_RX_QUEUE(queue) ((queue) << 1)
> -#define DEFAULT_RX_ARP_QUEUE(queue) ((queue) << 4)
> -#define RECEIVE_BC_IF_NOT_IP_OR_ARP (0 << 7)
> -#define REJECT_BC_IF_NOT_IP_OR_ARP (1 << 7)
> -#define RECEIVE_BC_IF_IP (0 << 8)
> -#define REJECT_BC_IF_IP (1 << 8)
> -#define RECEIVE_BC_IF_ARP (0 << 9)
> -#define REJECT_BC_IF_ARP (1 << 9)
> -#define TX_AM_NO_UPDATE_ERROR_SUMMARY (1 << 12)
> -#define CAPTURE_TCP_FRAMES_DIS (0 << 14)
> -#define CAPTURE_TCP_FRAMES_EN (1 << 14)
> -#define CAPTURE_UDP_FRAMES_DIS (0 << 15)
> -#define CAPTURE_UDP_FRAMES_EN (1 << 15)
> -#define DEFAULT_RX_TCP_QUEUE(queue) ((queue) << 16)
> -#define DEFAULT_RX_UDP_QUEUE(queue) ((queue) << 19)
> -#define DEFAULT_RX_BPDU_QUEUE(queue) ((queue) << 22)
> -
> -#define PORT_CONFIG_DEFAULT_VALUE \
> - UNICAST_NORMAL_MODE | \
> - DEFAULT_RX_QUEUE(0) | \
> - DEFAULT_RX_ARP_QUEUE(0) | \
> - RECEIVE_BC_IF_NOT_IP_OR_ARP | \
> - RECEIVE_BC_IF_IP | \
> - RECEIVE_BC_IF_ARP | \
> - CAPTURE_TCP_FRAMES_DIS | \
> - CAPTURE_UDP_FRAMES_DIS | \
> - DEFAULT_RX_TCP_QUEUE(0) | \
> - DEFAULT_RX_UDP_QUEUE(0) | \
> - DEFAULT_RX_BPDU_QUEUE(0)
> -
> /* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
> #define CLASSIFY_EN (1 << 0)
> #define SPAN_BPDU_PACKETS_AS_NORMAL (0 << 1)
> @@ -1802,9 +1769,9 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
>
> config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
> if (dev->flags & IFF_PROMISC)
> - config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
> + config_reg |= 0x00000001;
Except for the stupid cast, I think the meaning was clearer with the
define.
> else
> - config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
> + config_reg &= ~0x00000001;
> wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
>
> eth_port_set_multicast_list(dev);
> @@ -2226,8 +2193,11 @@ static void eth_port_start(struct net_device *dev)
> /* Add the assigned Ethernet address to the port's address table */
> eth_port_uc_addr_set(mp, dev->dev_addr);
>
> - /* Assign port configuration and command. */
> - wrl(mp, PORT_CONFIG(port_num), PORT_CONFIG_DEFAULT_VALUE);
> + /*
> + * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
> + * frames to RX queue #0.
> + */
> + wrl(mp, PORT_CONFIG(port_num), 0x00000000);
Same here.
> wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
Getting rid of the unused definitions is a good thing though.
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines
2008-06-05 11:07 ` Dale Farnsworth
@ 2008-06-06 6:58 ` Lennert Buytenhek
2008-06-06 10:52 ` Dale Farnsworth
0 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-06 6:58 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 04:07:34AM -0700, Dale Farnsworth wrote:
> > The mv643xx_eth driver only ever changes bit 0 of the port config
> > register at run time, the rest of the register bits are fixed (and
> > always zero). Document the meaning of the chosen default value,
> > and get rid of all the defines for each of the individual bits.
> >
> > Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> > ---
> > drivers/net/mv643xx_eth.c | 44 +++++++-------------------------------------
> > 1 files changed, 7 insertions(+), 37 deletions(-)
> >
> > diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> > index 9a9218f..38ba365 100644
> > --- a/drivers/net/mv643xx_eth.c
> > +++ b/drivers/net/mv643xx_eth.c
> > @@ -109,39 +109,6 @@ static char mv643xx_driver_version[] = "1.0";
> > #define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
> > #define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
> >
> > -/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
> > -#define UNICAST_NORMAL_MODE (0 << 0)
> > -#define UNICAST_PROMISCUOUS_MODE (1 << 0)
> > -#define DEFAULT_RX_QUEUE(queue) ((queue) << 1)
> > -#define DEFAULT_RX_ARP_QUEUE(queue) ((queue) << 4)
> > -#define RECEIVE_BC_IF_NOT_IP_OR_ARP (0 << 7)
> > -#define REJECT_BC_IF_NOT_IP_OR_ARP (1 << 7)
> > -#define RECEIVE_BC_IF_IP (0 << 8)
> > -#define REJECT_BC_IF_IP (1 << 8)
> > -#define RECEIVE_BC_IF_ARP (0 << 9)
> > -#define REJECT_BC_IF_ARP (1 << 9)
> > -#define TX_AM_NO_UPDATE_ERROR_SUMMARY (1 << 12)
> > -#define CAPTURE_TCP_FRAMES_DIS (0 << 14)
> > -#define CAPTURE_TCP_FRAMES_EN (1 << 14)
> > -#define CAPTURE_UDP_FRAMES_DIS (0 << 15)
> > -#define CAPTURE_UDP_FRAMES_EN (1 << 15)
> > -#define DEFAULT_RX_TCP_QUEUE(queue) ((queue) << 16)
> > -#define DEFAULT_RX_UDP_QUEUE(queue) ((queue) << 19)
> > -#define DEFAULT_RX_BPDU_QUEUE(queue) ((queue) << 22)
> > -
> > -#define PORT_CONFIG_DEFAULT_VALUE \
> > - UNICAST_NORMAL_MODE | \
> > - DEFAULT_RX_QUEUE(0) | \
> > - DEFAULT_RX_ARP_QUEUE(0) | \
> > - RECEIVE_BC_IF_NOT_IP_OR_ARP | \
> > - RECEIVE_BC_IF_IP | \
> > - RECEIVE_BC_IF_ARP | \
> > - CAPTURE_TCP_FRAMES_DIS | \
> > - CAPTURE_UDP_FRAMES_DIS | \
> > - DEFAULT_RX_TCP_QUEUE(0) | \
> > - DEFAULT_RX_UDP_QUEUE(0) | \
> > - DEFAULT_RX_BPDU_QUEUE(0)
> > -
> > /* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
> > #define CLASSIFY_EN (1 << 0)
> > #define SPAN_BPDU_PACKETS_AS_NORMAL (0 << 1)
> > @@ -1802,9 +1769,9 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
> >
> > config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
> > if (dev->flags & IFF_PROMISC)
> > - config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
> > + config_reg |= 0x00000001;
>
> Except for the stupid cast, I think the meaning was clearer with the
> define.
Right, I got a bit carried away. :-) How about this instead:
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun Jun 1 01:22:06 CEST 2008
Subject: mv643xx_eth: get rid of individual port config register bit defines
The mv643xx_eth driver only ever changes bit 0 of the port config
register at run time, the rest of the register bits are fixed (and
always zero). Document the meaning of the chosen default value,
and get rid of all the defines for each of the individual bits.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
===================================================================
--- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c
+++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
@@ -88,6 +88,7 @@ static char mv643xx_driver_version[] = "
* Per-port registers.
*/
#define PORT_CONFIG(p) (0x0400 + ((p) << 10))
+#define UNICAST_PROMISCUOUS_MODE 0x00000001
#define PORT_CONFIG_EXT(p) (0x0404 + ((p) << 10))
#define MAC_ADDR_LOW(p) (0x0414 + ((p) << 10))
#define MAC_ADDR_HIGH(p) (0x0418 + ((p) << 10))
@@ -109,39 +110,6 @@ static char mv643xx_driver_version[] = "
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
#define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
-/* These macros describe Ethernet Port configuration reg (Px_cR) bits */
-#define UNICAST_NORMAL_MODE (0 << 0)
-#define UNICAST_PROMISCUOUS_MODE (1 << 0)
-#define DEFAULT_RX_QUEUE(queue) ((queue) << 1)
-#define DEFAULT_RX_ARP_QUEUE(queue) ((queue) << 4)
-#define RECEIVE_BC_IF_NOT_IP_OR_ARP (0 << 7)
-#define REJECT_BC_IF_NOT_IP_OR_ARP (1 << 7)
-#define RECEIVE_BC_IF_IP (0 << 8)
-#define REJECT_BC_IF_IP (1 << 8)
-#define RECEIVE_BC_IF_ARP (0 << 9)
-#define REJECT_BC_IF_ARP (1 << 9)
-#define TX_AM_NO_UPDATE_ERROR_SUMMARY (1 << 12)
-#define CAPTURE_TCP_FRAMES_DIS (0 << 14)
-#define CAPTURE_TCP_FRAMES_EN (1 << 14)
-#define CAPTURE_UDP_FRAMES_DIS (0 << 15)
-#define CAPTURE_UDP_FRAMES_EN (1 << 15)
-#define DEFAULT_RX_TCP_QUEUE(queue) ((queue) << 16)
-#define DEFAULT_RX_UDP_QUEUE(queue) ((queue) << 19)
-#define DEFAULT_RX_BPDU_QUEUE(queue) ((queue) << 22)
-
-#define PORT_CONFIG_DEFAULT_VALUE \
- UNICAST_NORMAL_MODE | \
- DEFAULT_RX_QUEUE(0) | \
- DEFAULT_RX_ARP_QUEUE(0) | \
- RECEIVE_BC_IF_NOT_IP_OR_ARP | \
- RECEIVE_BC_IF_IP | \
- RECEIVE_BC_IF_ARP | \
- CAPTURE_TCP_FRAMES_DIS | \
- CAPTURE_UDP_FRAMES_DIS | \
- DEFAULT_RX_TCP_QUEUE(0) | \
- DEFAULT_RX_UDP_QUEUE(0) | \
- DEFAULT_RX_BPDU_QUEUE(0)
-
/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
#define CLASSIFY_EN (1 << 0)
#define SPAN_BPDU_PACKETS_AS_NORMAL (0 << 1)
@@ -1802,9 +1770,9 @@ static void mv643xx_eth_set_rx_mode(stru
config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
if (dev->flags & IFF_PROMISC)
- config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
+ config_reg |= UNICAST_PROMISCUOUS_MODE;
else
- config_reg &= ~(u32) UNICAST_PROMISCUOUS_MODE;
+ config_reg &= ~UNICAST_PROMISCUOUS_MODE;
wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
eth_port_set_multicast_list(dev);
@@ -2226,8 +2194,11 @@ static void eth_port_start(struct net_de
/* Add the assigned Ethernet address to the port's address table */
eth_port_uc_addr_set(mp, dev->dev_addr);
- /* Assign port configuration and command. */
- wrl(mp, PORT_CONFIG(port_num), PORT_CONFIG_DEFAULT_VALUE);
+ /*
+ * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
+ * frames to RX queue #0.
+ */
+ wrl(mp, PORT_CONFIG(port_num), 0x00000000);
wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines
2008-06-06 6:58 ` Lennert Buytenhek
@ 2008-06-06 10:52 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-06 10:52 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Fri, Jun 06, 2008 at 08:58:39AM +0200, Lennert Buytenhek wrote:
> On Thu, Jun 05, 2008 at 04:07:34AM -0700, Dale Farnsworth wrote:
> > > config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
> > > if (dev->flags & IFF_PROMISC)
> > > - config_reg |= (u32) UNICAST_PROMISCUOUS_MODE;
> > > + config_reg |= 0x00000001;
> >
> > Except for the stupid cast, I think the meaning was clearer with the
> > define.
>
> Right, I got a bit carried away. :-) How about this instead:
Looks good.
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 05/39] mv643xx_eth: get rid of individual port config extend register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (3 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 04/39] mv643xx_eth: get rid of individual port config register bit defines Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:24 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 06/39] mv643xx_eth: delete unused SDMA config " Lennert Buytenhek
` (33 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The port config extend register is never changed at run time.
Document the meaning of the initial value, and delete the defines
for the individual bits in this register.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 38ba365..210e7cc 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -109,17 +109,6 @@ static char mv643xx_driver_version[] = "1.0";
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
#define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
-/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
-#define CLASSIFY_EN (1 << 0)
-#define SPAN_BPDU_PACKETS_AS_NORMAL (0 << 1)
-#define SPAN_BPDU_PACKETS_TO_RX_QUEUE_7 (1 << 1)
-#define PARTITION_DISABLE (0 << 2)
-#define PARTITION_ENABLE (1 << 2)
-
-#define PORT_CONFIG_EXTEND_DEFAULT_VALUE \
- SPAN_BPDU_PACKETS_AS_NORMAL | \
- PARTITION_DISABLE
-
/* These macros describe Ethernet Port Sdma configuration reg (SDCR) bits */
#define RIFB (1 << 0)
#define RX_BURST_SIZE_1_64BIT (0 << 1)
@@ -2199,7 +2188,10 @@ static void eth_port_start(struct net_device *dev)
*/
wrl(mp, PORT_CONFIG(port_num), 0x00000000);
- wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
+ /*
+ * Treat BPDUs as normal multicasts, and disable partition mode.
+ */
+ wrl(mp, PORT_CONFIG_EXT(port_num), 0x00000000);
pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 06/39] mv643xx_eth: delete unused SDMA config register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (4 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 05/39] mv643xx_eth: get rid of individual port config extend " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:25 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 07/39] mv643xx_eth: delete unused port serial control " Lennert Buytenhek
` (32 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Delete the defines for SDMA config register bit values that are
never used in the driver, to tidy up the code some more.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 210e7cc..8287cf0 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -109,37 +109,24 @@ static char mv643xx_driver_version[] = "1.0";
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
#define UNICAST_TABLE(p) (0x1600 + ((p) << 10))
-/* These macros describe Ethernet Port Sdma configuration reg (SDCR) bits */
-#define RIFB (1 << 0)
-#define RX_BURST_SIZE_1_64BIT (0 << 1)
-#define RX_BURST_SIZE_2_64BIT (1 << 1)
+
+/*
+ * SDMA configuration register.
+ */
#define RX_BURST_SIZE_4_64BIT (2 << 1)
-#define RX_BURST_SIZE_8_64BIT (3 << 1)
-#define RX_BURST_SIZE_16_64BIT (4 << 1)
#define BLM_RX_NO_SWAP (1 << 4)
-#define BLM_RX_BYTE_SWAP (0 << 4)
#define BLM_TX_NO_SWAP (1 << 5)
-#define BLM_TX_BYTE_SWAP (0 << 5)
-#define DESCRIPTORS_BYTE_SWAP (1 << 6)
-#define DESCRIPTORS_NO_SWAP (0 << 6)
-#define IPG_INT_RX(value) (((value) & 0x3fff) << 8)
-#define TX_BURST_SIZE_1_64BIT (0 << 22)
-#define TX_BURST_SIZE_2_64BIT (1 << 22)
#define TX_BURST_SIZE_4_64BIT (2 << 22)
-#define TX_BURST_SIZE_8_64BIT (3 << 22)
-#define TX_BURST_SIZE_16_64BIT (4 << 22)
#if defined(__BIG_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
RX_BURST_SIZE_4_64BIT | \
- IPG_INT_RX(0) | \
TX_BURST_SIZE_4_64BIT
#elif defined(__LITTLE_ENDIAN)
#define PORT_SDMA_CONFIG_DEFAULT_VALUE \
RX_BURST_SIZE_4_64BIT | \
BLM_RX_NO_SWAP | \
BLM_TX_NO_SWAP | \
- IPG_INT_RX(0) | \
TX_BURST_SIZE_4_64BIT
#else
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 07/39] mv643xx_eth: delete unused port serial control register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (5 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 06/39] mv643xx_eth: delete unused SDMA config " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:27 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 08/39] mv643xx_eth: nuke port status " Lennert Buytenhek
` (31 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Over half of the port serial control register bit defines are never
used, and the PORT_SERIAL_CONTROL_DEFAULT_VALUE define is never used
either. Keep only those defines that are actually used.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 78 +++++++++------------------------------------
1 files changed, 15 insertions(+), 63 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 8287cf0..e4f0189 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -132,71 +132,23 @@ static char mv643xx_driver_version[] = "1.0";
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
#endif
-/* These macros describe Ethernet Port serial control reg (PSCR) bits */
-#define SERIAL_PORT_DISABLE (0 << 0)
-#define SERIAL_PORT_ENABLE (1 << 0)
-#define DO_NOT_FORCE_LINK_PASS (0 << 1)
-#define FORCE_LINK_PASS (1 << 1)
-#define ENABLE_AUTO_NEG_FOR_DUPLX (0 << 2)
-#define DISABLE_AUTO_NEG_FOR_DUPLX (1 << 2)
-#define ENABLE_AUTO_NEG_FOR_FLOW_CTRL (0 << 3)
-#define DISABLE_AUTO_NEG_FOR_FLOW_CTRL (1 << 3)
-#define ADV_NO_FLOW_CTRL (0 << 4)
-#define ADV_SYMMETRIC_FLOW_CTRL (1 << 4)
-#define FORCE_FC_MODE_NO_PAUSE_DIS_TX (0 << 5)
-#define FORCE_FC_MODE_TX_PAUSE_DIS (1 << 5)
-#define FORCE_BP_MODE_NO_JAM (0 << 7)
-#define FORCE_BP_MODE_JAM_TX (1 << 7)
-#define FORCE_BP_MODE_JAM_TX_ON_RX_ERR (2 << 7)
-#define SERIAL_PORT_CONTROL_RESERVED (1 << 9)
-#define FORCE_LINK_FAIL (0 << 10)
-#define DO_NOT_FORCE_LINK_FAIL (1 << 10)
-#define RETRANSMIT_16_ATTEMPTS (0 << 11)
-#define RETRANSMIT_FOREVER (1 << 11)
-#define ENABLE_AUTO_NEG_SPEED_GMII (0 << 13)
-#define DISABLE_AUTO_NEG_SPEED_GMII (1 << 13)
-#define DTE_ADV_0 (0 << 14)
-#define DTE_ADV_1 (1 << 14)
-#define DISABLE_AUTO_NEG_BYPASS (0 << 15)
-#define ENABLE_AUTO_NEG_BYPASS (1 << 15)
-#define AUTO_NEG_NO_CHANGE (0 << 16)
-#define RESTART_AUTO_NEG (1 << 16)
-#define MAX_RX_PACKET_1518BYTE (0 << 17)
+
+/*
+ * Port serial control register.
+ */
+#define SET_MII_SPEED_TO_100 (1 << 24)
+#define SET_GMII_SPEED_TO_1000 (1 << 23)
+#define SET_FULL_DUPLEX_MODE (1 << 21)
#define MAX_RX_PACKET_1522BYTE (1 << 17)
-#define MAX_RX_PACKET_1552BYTE (2 << 17)
-#define MAX_RX_PACKET_9022BYTE (3 << 17)
-#define MAX_RX_PACKET_9192BYTE (4 << 17)
#define MAX_RX_PACKET_9700BYTE (5 << 17)
#define MAX_RX_PACKET_MASK (7 << 17)
-#define CLR_EXT_LOOPBACK (0 << 20)
-#define SET_EXT_LOOPBACK (1 << 20)
-#define SET_HALF_DUPLEX_MODE (0 << 21)
-#define SET_FULL_DUPLEX_MODE (1 << 21)
-#define DISABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX (0 << 22)
-#define ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX (1 << 22)
-#define SET_GMII_SPEED_TO_10_100 (0 << 23)
-#define SET_GMII_SPEED_TO_1000 (1 << 23)
-#define SET_MII_SPEED_TO_10 (0 << 24)
-#define SET_MII_SPEED_TO_100 (1 << 24)
-
-#define PORT_SERIAL_CONTROL_DEFAULT_VALUE \
- DO_NOT_FORCE_LINK_PASS | \
- ENABLE_AUTO_NEG_FOR_DUPLX | \
- DISABLE_AUTO_NEG_FOR_FLOW_CTRL | \
- ADV_SYMMETRIC_FLOW_CTRL | \
- FORCE_FC_MODE_NO_PAUSE_DIS_TX | \
- FORCE_BP_MODE_NO_JAM | \
- (1 << 9) /* reserved */ | \
- DO_NOT_FORCE_LINK_FAIL | \
- RETRANSMIT_16_ATTEMPTS | \
- ENABLE_AUTO_NEG_SPEED_GMII | \
- DTE_ADV_0 | \
- DISABLE_AUTO_NEG_BYPASS | \
- AUTO_NEG_NO_CHANGE | \
- MAX_RX_PACKET_9700BYTE | \
- CLR_EXT_LOOPBACK | \
- SET_FULL_DUPLEX_MODE | \
- ENABLE_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX
+#define DISABLE_AUTO_NEG_SPEED_GMII (1 << 13)
+#define DO_NOT_FORCE_LINK_FAIL (1 << 10)
+#define SERIAL_PORT_CONTROL_RESERVED (1 << 9)
+#define DISABLE_AUTO_NEG_FOR_FLOW_CTRL (1 << 3)
+#define DISABLE_AUTO_NEG_FOR_DUPLEX (1 << 2)
+#define FORCE_LINK_PASS (1 << 1)
+#define SERIAL_PORT_ENABLE (1 << 0)
/* These macros describe Ethernet Serial Status reg (PSR) bits */
#define PORT_STATUS_MODE_10_BIT (1 << 0)
@@ -2187,7 +2139,7 @@ static void eth_port_start(struct net_device *dev)
pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
DISABLE_AUTO_NEG_SPEED_GMII |
- DISABLE_AUTO_NEG_FOR_DUPLX |
+ DISABLE_AUTO_NEG_FOR_DUPLEX |
DO_NOT_FORCE_LINK_FAIL |
SERIAL_PORT_CONTROL_RESERVED;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 07/39] mv643xx_eth: delete unused port serial control register bit defines
2008-06-03 11:02 ` [PATCH 07/39] mv643xx_eth: delete unused port serial control " Lennert Buytenhek
@ 2008-06-05 11:27 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:27 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:22PM +0200, Lennert Buytenhek wrote:
> Over half of the port serial control register bit defines are never
> used, and the PORT_SERIAL_CONTROL_DEFAULT_VALUE define is never used
> either. Keep only those defines that are actually used.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 78 +++++++++------------------------------------
> 1 files changed, 15 insertions(+), 63 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 08/39] mv643xx_eth: nuke port status register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (6 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 07/39] mv643xx_eth: delete unused port serial control " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:26 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 09/39] mv643xx_eth: remove unused DESC_SIZE define Lennert Buytenhek
` (30 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
None of the port status register bit defines are ever used in the
mv643xx_eth driver -- nuke them all.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index e4f0189..4b61acc 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -150,20 +150,6 @@ static char mv643xx_driver_version[] = "1.0";
#define FORCE_LINK_PASS (1 << 1)
#define SERIAL_PORT_ENABLE (1 << 0)
-/* These macros describe Ethernet Serial Status reg (PSR) bits */
-#define PORT_STATUS_MODE_10_BIT (1 << 0)
-#define PORT_STATUS_LINK_UP (1 << 1)
-#define PORT_STATUS_FULL_DUPLEX (1 << 2)
-#define PORT_STATUS_FLOW_CONTROL (1 << 3)
-#define PORT_STATUS_GMII_1000 (1 << 4)
-#define PORT_STATUS_MII_100 (1 << 5)
-/* PSR bit 6 is undocumented */
-#define PORT_STATUS_TX_IN_PROGRESS (1 << 7)
-#define PORT_STATUS_AUTONEG_BYPASSED (1 << 8)
-#define PORT_STATUS_PARTITION (1 << 9)
-#define PORT_STATUS_TX_FIFO_EMPTY (1 << 10)
-/* PSR bits 11-31 are reserved */
-
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 09/39] mv643xx_eth: remove unused DESC_SIZE define
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (7 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 08/39] mv643xx_eth: nuke port status " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:28 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking Lennert Buytenhek
` (29 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 4b61acc..bdb03f3 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -153,8 +153,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-#define DESC_SIZE 64
-
#define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */
#define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (8 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 09/39] mv643xx_eth: remove unused DESC_SIZE define Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:35 ` Dale Farnsworth
2008-06-05 11:44 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 11/39] mv643xx_eth: move PHY wait defines into callers Lennert Buytenhek
` (28 subsequent siblings)
38 siblings, 2 replies; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Replace the nondescriptive names ETH_INT_UNMASK_ALL and
ETH_INT_UNMASK_ALL_EXT by names of the actual fields being masked
and unmasked in the various writes to the interrupt mask registers.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 61 +++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index bdb03f3..ffdd3fc 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -97,7 +97,14 @@ static char mv643xx_driver_version[] = "1.0";
#define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
#define INT_CAUSE(p) (0x0460 + ((p) << 10))
+#define INT_RX 0x00000804
+#define INT_EXT 0x00000002
#define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
+#define INT_EXT_LINK 0x00100000
+#define INT_EXT_PHY 0x00010000
+#define INT_EXT_TX_ERROR_0 0x00000100
+#define INT_EXT_TX_0 0x00000001
+#define INT_EXT_TX 0x00000101
#define INT_MASK(p) (0x0468 + ((p) << 10))
#define INT_MASK_EXT(p) (0x046c + ((p) << 10))
#define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
@@ -153,26 +160,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-#define ETH_RX_QUEUES_ENABLED (1 << 0) /* use only Q0 for receive */
-#define ETH_TX_QUEUES_ENABLED (1 << 0) /* use only Q0 for transmit */
-
-#define ETH_INT_CAUSE_RX_DONE (ETH_RX_QUEUES_ENABLED << 2)
-#define ETH_INT_CAUSE_RX_ERROR (ETH_RX_QUEUES_ENABLED << 9)
-#define ETH_INT_CAUSE_RX (ETH_INT_CAUSE_RX_DONE | ETH_INT_CAUSE_RX_ERROR)
-#define ETH_INT_CAUSE_EXT 0x00000002
-#define ETH_INT_UNMASK_ALL (ETH_INT_CAUSE_RX | ETH_INT_CAUSE_EXT)
-
-#define ETH_INT_CAUSE_TX_DONE (ETH_TX_QUEUES_ENABLED << 0)
-#define ETH_INT_CAUSE_TX_ERROR (ETH_TX_QUEUES_ENABLED << 8)
-#define ETH_INT_CAUSE_TX (ETH_INT_CAUSE_TX_DONE | ETH_INT_CAUSE_TX_ERROR)
-#define ETH_INT_CAUSE_PHY 0x00010000
-#define ETH_INT_CAUSE_STATE 0x00100000
-#define ETH_INT_UNMASK_ALL_EXT (ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY | \
- ETH_INT_CAUSE_STATE)
-
-#define ETH_INT_MASK_ALL 0x00000000
-#define ETH_INT_MASK_ALL_EXT 0x00000000
-
#define PHY_WAIT_ITERATIONS 1000 /* 1000 iterations * 10uS = 10mS max */
#define PHY_WAIT_MICRO_SECONDS 10
@@ -832,7 +819,7 @@ static int mv643xx_poll(struct napi_struct *napi, int budget)
netif_rx_complete(dev, napi);
wrl(mp, INT_CAUSE(port_num), 0);
wrl(mp, INT_CAUSE_EXT(port_num), 0);
- wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
}
return work_done;
@@ -988,7 +975,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
/* ensure all descriptors are written before poking hardware */
wmb();
- mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
+ mv643xx_eth_port_enable_tx(mp, 1);
mp->tx_desc_count += nr_frags + 1;
}
@@ -1971,21 +1958,21 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
unsigned int port_num = mp->port_num;
/* Read interrupt cause registers */
- eth_int_cause = rdl(mp, INT_CAUSE(port_num)) & ETH_INT_UNMASK_ALL;
- if (eth_int_cause & ETH_INT_CAUSE_EXT) {
+ eth_int_cause = rdl(mp, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
+ if (eth_int_cause & INT_EXT) {
eth_int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
- & ETH_INT_UNMASK_ALL_EXT;
+ & (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
wrl(mp, INT_CAUSE_EXT(port_num), ~eth_int_cause_ext);
}
/* PHY status changed */
- if (eth_int_cause_ext & (ETH_INT_CAUSE_PHY | ETH_INT_CAUSE_STATE)) {
+ if (eth_int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
struct ethtool_cmd cmd;
if (mii_link_ok(&mp->mii)) {
mii_ethtool_gset(&mp->mii, &cmd);
mv643xx_eth_update_pscr(dev, &cmd);
- mv643xx_eth_port_enable_tx(mp, ETH_TX_QUEUES_ENABLED);
+ mv643xx_eth_port_enable_tx(mp, 1);
if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev);
if (mp->tx_ring_size - mp->tx_desc_count >=
@@ -1999,9 +1986,9 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
}
#ifdef MV643XX_NAPI
- if (eth_int_cause & ETH_INT_CAUSE_RX) {
+ if (eth_int_cause & INT_RX) {
/* schedule the NAPI poll routine to maintain port */
- wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
rdl(mp, INT_MASK(port_num));
@@ -2009,10 +1996,10 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
netif_rx_schedule(dev, &mp->napi);
}
#else
- if (eth_int_cause & ETH_INT_CAUSE_RX)
+ if (eth_int_cause & INT_RX)
mv643xx_eth_receive_queue(dev, INT_MAX);
#endif
- if (eth_int_cause_ext & ETH_INT_CAUSE_TX)
+ if (eth_int_cause_ext & INT_EXT_TX)
mv643xx_eth_free_completed_tx_descs(dev);
/*
@@ -2136,7 +2123,7 @@ static void eth_port_start(struct net_device *dev)
wrl(mp, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
/* Enable port Rx. */
- mv643xx_eth_port_enable_rx(mp, ETH_RX_QUEUES_ENABLED);
+ mv643xx_eth_port_enable_rx(mp, 1);
/* Disable port bandwidth limits by clearing MTU register */
wrl(mp, TX_BW_MTU(port_num), 0);
@@ -2383,10 +2370,10 @@ static int mv643xx_eth_open(struct net_device *dev)
eth_port_set_tx_coal(mp, MV643XX_TX_COAL);
/* Unmask phy and link status changes interrupts */
- wrl(mp, INT_MASK_EXT(port_num), ETH_INT_UNMASK_ALL_EXT);
+ wrl(mp, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
/* Unmask RX buffer and TX end interrupt */
- wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
return 0;
@@ -2453,7 +2440,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
unsigned int port_num = mp->port_num;
/* Mask all interrupts on ethernet port */
- wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
rdl(mp, INT_MASK(port_num));
@@ -2558,13 +2545,13 @@ static void mv643xx_netpoll(struct net_device *netdev)
struct mv643xx_private *mp = netdev_priv(netdev);
int port_num = mp->port_num;
- wrl(mp, INT_MASK(port_num), ETH_INT_MASK_ALL);
+ wrl(mp, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
rdl(mp, INT_MASK(port_num));
mv643xx_eth_int_handler(netdev->irq, netdev);
- wrl(mp, INT_MASK(port_num), ETH_INT_UNMASK_ALL);
+ wrl(mp, INT_MASK(port_num), INT_RX | INT_CAUSE_EXT);
}
#endif
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking
2008-06-03 11:02 ` [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking Lennert Buytenhek
@ 2008-06-05 11:35 ` Dale Farnsworth
2008-06-05 11:44 ` Dale Farnsworth
1 sibling, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:35 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:25PM +0200, Lennert Buytenhek wrote:
> Replace the nondescriptive names ETH_INT_UNMASK_ALL and
> ETH_INT_UNMASK_ALL_EXT by names of the actual fields being masked
> and unmasked in the various writes to the interrupt mask registers.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 61 +++++++++++++++++---------------------------
> 1 files changed, 24 insertions(+), 37 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking
2008-06-03 11:02 ` [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking Lennert Buytenhek
2008-06-05 11:35 ` Dale Farnsworth
@ 2008-06-05 11:44 ` Dale Farnsworth
2008-06-05 20:36 ` Lennert Buytenhek
1 sibling, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:44 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:25PM +0200, Lennert Buytenhek wrote:
> Replace the nondescriptive names ETH_INT_UNMASK_ALL and
> ETH_INT_UNMASK_ALL_EXT by names of the actual fields being masked
> and unmasked in the various writes to the interrupt mask registers.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 61 +++++++++++++++++---------------------------
> 1 files changed, 24 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index bdb03f3..ffdd3fc 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -97,7 +97,14 @@ static char mv643xx_driver_version[] = "1.0";
> #define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
> #define TX_BW_MTU(p) (0x0458 + ((p) << 10))
> #define INT_CAUSE(p) (0x0460 + ((p) << 10))
> +#define INT_RX 0x00000804
> +#define INT_EXT 0x00000002
> #define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
> +#define INT_EXT_LINK 0x00100000
> +#define INT_EXT_PHY 0x00010000
> +#define INT_EXT_TX_ERROR_0 0x00000100
> +#define INT_EXT_TX_0 0x00000001
> +#define INT_EXT_TX 0x00000101
Oops, I missed this the first time. You have an extra space in each
of the above added defines.
> #define INT_MASK(p) (0x0468 + ((p) << 10))
> #define INT_MASK_EXT(p) (0x046c + ((p) << 10))
> #define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
[snip]
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking
2008-06-05 11:44 ` Dale Farnsworth
@ 2008-06-05 20:36 ` Lennert Buytenhek
2008-06-05 21:22 ` Dale Farnsworth
0 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-05 20:36 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 04:44:06AM -0700, Dale Farnsworth wrote:
> > diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> > index bdb03f3..ffdd3fc 100644
> > --- a/drivers/net/mv643xx_eth.c
> > +++ b/drivers/net/mv643xx_eth.c
> > @@ -97,7 +97,14 @@ static char mv643xx_driver_version[] = "1.0";
> > #define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
> > #define TX_BW_MTU(p) (0x0458 + ((p) << 10))
> > #define INT_CAUSE(p) (0x0460 + ((p) << 10))
> > +#define INT_RX 0x00000804
> > +#define INT_EXT 0x00000002
> > #define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
> > +#define INT_EXT_LINK 0x00100000
> > +#define INT_EXT_PHY 0x00010000
> > +#define INT_EXT_TX_ERROR_0 0x00000100
> > +#define INT_EXT_TX_0 0x00000001
> > +#define INT_EXT_TX 0x00000101
>
> Oops, I missed this the first time. You have an extra space in each
> of the above added defines.
Right, that's because they are possible values of that register,
instead of the definition of a new register. A couple of existing
drivers follow this format (e.g. look at b44.h or tg3.h), and I kind
of like it, because it groups things logically together.
OK?
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking
2008-06-05 20:36 ` Lennert Buytenhek
@ 2008-06-05 21:22 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 21:22 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Thu, Jun 05, 2008 at 10:36:05PM +0200, Lennert Buytenhek wrote:
> On Thu, Jun 05, 2008 at 04:44:06AM -0700, Dale Farnsworth wrote:
>
> > > diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> > > index bdb03f3..ffdd3fc 100644
> > > --- a/drivers/net/mv643xx_eth.c
> > > +++ b/drivers/net/mv643xx_eth.c
> > > @@ -97,7 +97,14 @@ static char mv643xx_driver_version[] = "1.0";
> > > #define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
> > > #define TX_BW_MTU(p) (0x0458 + ((p) << 10))
> > > #define INT_CAUSE(p) (0x0460 + ((p) << 10))
> > > +#define INT_RX 0x00000804
> > > +#define INT_EXT 0x00000002
> > > #define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
> > > +#define INT_EXT_LINK 0x00100000
> > > +#define INT_EXT_PHY 0x00010000
> > > +#define INT_EXT_TX_ERROR_0 0x00000100
> > > +#define INT_EXT_TX_0 0x00000001
> > > +#define INT_EXT_TX 0x00000101
> >
> > Oops, I missed this the first time. You have an extra space in each
> > of the above added defines.
>
> Right, that's because they are possible values of that register,
> instead of the definition of a new register. A couple of existing
> drivers follow this format (e.g. look at b44.h or tg3.h), and I kind
> of like it, because it groups things logically together.
Yes, it makes sense. I think I'd use at least a couple of
spaces of indent though. But, I'm fine with it either way.
Thanks,
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 11/39] mv643xx_eth: move PHY wait defines into callers
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (9 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 10/39] mv643xx_eth: clarify irq masking and unmasking Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:39 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 12/39] mv643xx_eth: get rid of RX_BUF_OFFSET Lennert Buytenhek
` (27 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index ffdd3fc..b3f4fd8 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -160,9 +160,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-#define PHY_WAIT_ITERATIONS 1000 /* 1000 iterations * 10uS = 10mS max */
-#define PHY_WAIT_MICRO_SECONDS 10
-
/* Buffer offset from buffer pointer */
#define RX_BUF_OFFSET 0x2
@@ -475,7 +472,7 @@ static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
/* Wait for all Rx activity to terminate. */
/* Check port cause register that all Rx queues are stopped */
while (rdl(mp, RXQ_COMMAND(port_num)) & 0xFF)
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
}
return queues;
@@ -501,11 +498,11 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
/* Wait for all Tx activity to terminate. */
/* Check port cause register that all Tx queues are stopped */
while (rdl(mp, TXQ_COMMAND(port_num)) & 0xFF)
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
/* Wait for Tx FIFO to empty */
while (rdl(mp, PORT_STATUS(port_num)) & ETH_PORT_TX_FIFO_EMPTY)
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
}
return queues;
@@ -1058,11 +1055,11 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
/* wait for the SMI register to become available */
for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
- if (i == PHY_WAIT_ITERATIONS) {
+ if (i == 1000) {
printk("%s: PHY busy timeout\n", mp->dev->name);
goto out;
}
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
}
writel((phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ,
@@ -1070,11 +1067,11 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
/* now wait for the data to be valid */
for (i = 0; !(readl(smi_reg) & ETH_SMI_READ_VALID); i++) {
- if (i == PHY_WAIT_ITERATIONS) {
+ if (i == 1000) {
printk("%s: PHY read timeout\n", mp->dev->name);
goto out;
}
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
}
*value = readl(smi_reg) & 0xffff;
@@ -1115,11 +1112,11 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp,
/* wait for the SMI register to become available */
for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
- if (i == PHY_WAIT_ITERATIONS) {
+ if (i == 1000) {
printk("%s: PHY busy timeout\n", mp->dev->name);
goto out;
}
- udelay(PHY_WAIT_MICRO_SECONDS);
+ udelay(10);
}
writel((phy_addr << 16) | (phy_reg << 21) |
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 12/39] mv643xx_eth: get rid of RX_BUF_OFFSET
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (10 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 11/39] mv643xx_eth: move PHY wait defines into callers Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:37 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 13/39] mv643xx_eth: move MIB offset defines into their only user Lennert Buytenhek
` (26 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Get rid of RX_BUF_OFFSET (which is synonymous with ETH_HW_IP_ALIGN).
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b3f4fd8..3c5c992 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -160,9 +160,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-/* Buffer offset from buffer pointer */
-#define RX_BUF_OFFSET 0x2
-
/* Gigabit Ethernet Unit Global Registers */
/* MIB Counters register definitions */
@@ -682,9 +679,9 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
return ETH_END_OF_JOB;
}
- p_pkt_info->byte_cnt = (p_rx_desc->byte_cnt) - RX_BUF_OFFSET;
+ p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
p_pkt_info->cmd_sts = command_status;
- p_pkt_info->buf_ptr = (p_rx_desc->buf_ptr) + RX_BUF_OFFSET;
+ p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
p_pkt_info->l4i_chk = p_rx_desc->buf_size;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 13/39] mv643xx_eth: move MIB offset defines into their only user
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (11 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 12/39] mv643xx_eth: get rid of RX_BUF_OFFSET Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:47 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 14/39] mv643xx_eth: remove port serial status register bit defines Lennert Buytenhek
` (25 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The only user of the ETH_MIB_VERY_LONG_NAME_HERE defines is the
eth_update_mib_counters() function. Get rid of the defines by
open-coding the register offsets in the latter.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 92 ++++++++++++++++----------------------------
1 files changed, 34 insertions(+), 58 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 3c5c992..075ee2a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -160,42 +160,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-/* Gigabit Ethernet Unit Global Registers */
-
-/* MIB Counters register definitions */
-#define ETH_MIB_GOOD_OCTETS_RECEIVED_LOW 0x0
-#define ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH 0x4
-#define ETH_MIB_BAD_OCTETS_RECEIVED 0x8
-#define ETH_MIB_INTERNAL_MAC_TRANSMIT_ERR 0xc
-#define ETH_MIB_GOOD_FRAMES_RECEIVED 0x10
-#define ETH_MIB_BAD_FRAMES_RECEIVED 0x14
-#define ETH_MIB_BROADCAST_FRAMES_RECEIVED 0x18
-#define ETH_MIB_MULTICAST_FRAMES_RECEIVED 0x1c
-#define ETH_MIB_FRAMES_64_OCTETS 0x20
-#define ETH_MIB_FRAMES_65_TO_127_OCTETS 0x24
-#define ETH_MIB_FRAMES_128_TO_255_OCTETS 0x28
-#define ETH_MIB_FRAMES_256_TO_511_OCTETS 0x2c
-#define ETH_MIB_FRAMES_512_TO_1023_OCTETS 0x30
-#define ETH_MIB_FRAMES_1024_TO_MAX_OCTETS 0x34
-#define ETH_MIB_GOOD_OCTETS_SENT_LOW 0x38
-#define ETH_MIB_GOOD_OCTETS_SENT_HIGH 0x3c
-#define ETH_MIB_GOOD_FRAMES_SENT 0x40
-#define ETH_MIB_EXCESSIVE_COLLISION 0x44
-#define ETH_MIB_MULTICAST_FRAMES_SENT 0x48
-#define ETH_MIB_BROADCAST_FRAMES_SENT 0x4c
-#define ETH_MIB_UNREC_MAC_CONTROL_RECEIVED 0x50
-#define ETH_MIB_FC_SENT 0x54
-#define ETH_MIB_GOOD_FC_RECEIVED 0x58
-#define ETH_MIB_BAD_FC_RECEIVED 0x5c
-#define ETH_MIB_UNDERSIZE_RECEIVED 0x60
-#define ETH_MIB_FRAGMENTS_RECEIVED 0x64
-#define ETH_MIB_OVERSIZE_RECEIVED 0x68
-#define ETH_MIB_JABBER_RECEIVED 0x6c
-#define ETH_MIB_MAC_RECEIVE_ERROR 0x70
-#define ETH_MIB_BAD_CRC_EVENT 0x74
-#define ETH_MIB_COLLISION 0x78
-#define ETH_MIB_LATE_COLLISION 0x7c
-
/* Port serial status reg (PSR) */
#define ETH_INTERFACE_PCM 0x00000001
#define ETH_LINK_IS_UP 0x00000002
@@ -1147,8 +1111,7 @@ static void eth_clear_mib_counters(struct mv643xx_private *mp)
int i;
/* Perform dummy reads from MIB counters */
- for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION;
- i += 4)
+ for (i = 0; i < 0x80; i += 4)
rdl(mp, MIB_COUNTERS(port_num) + i);
}
@@ -1160,26 +1123,39 @@ static inline u32 read_mib(struct mv643xx_private *mp, int offset)
static void eth_update_mib_counters(struct mv643xx_private *mp)
{
struct mv643xx_mib_counters *p = &mp->mib_counters;
- int offset;
-
- p->good_octets_received +=
- read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW);
- p->good_octets_received +=
- (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH) << 32;
-
- for (offset = ETH_MIB_BAD_OCTETS_RECEIVED;
- offset <= ETH_MIB_FRAMES_1024_TO_MAX_OCTETS;
- offset += 4)
- *(u32 *)((char *)p + offset) += read_mib(mp, offset);
-
- p->good_octets_sent += read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_LOW);
- p->good_octets_sent +=
- (u64)read_mib(mp, ETH_MIB_GOOD_OCTETS_SENT_HIGH) << 32;
-
- for (offset = ETH_MIB_GOOD_FRAMES_SENT;
- offset <= ETH_MIB_LATE_COLLISION;
- offset += 4)
- *(u32 *)((char *)p + offset) += read_mib(mp, offset);
+
+ p->good_octets_received += read_mib(mp, 0x00);
+ p->good_octets_received += (u64)read_mib(mp, 0x04) << 32;
+ p->bad_octets_received += read_mib(mp, 0x08);
+ p->internal_mac_transmit_err += read_mib(mp, 0x0c);
+ p->good_frames_received += read_mib(mp, 0x10);
+ p->bad_frames_received += read_mib(mp, 0x14);
+ p->broadcast_frames_received += read_mib(mp, 0x18);
+ p->multicast_frames_received += read_mib(mp, 0x1c);
+ p->frames_64_octets += read_mib(mp, 0x20);
+ p->frames_65_to_127_octets += read_mib(mp, 0x24);
+ p->frames_128_to_255_octets += read_mib(mp, 0x28);
+ p->frames_256_to_511_octets += read_mib(mp, 0x2c);
+ p->frames_512_to_1023_octets += read_mib(mp, 0x30);
+ p->frames_1024_to_max_octets += read_mib(mp, 0x34);
+ p->good_octets_sent += read_mib(mp, 0x38);
+ p->good_octets_sent += (u64)read_mib(mp, 0x3c) << 32;
+ p->good_frames_sent += read_mib(mp, 0x40);
+ p->excessive_collision += read_mib(mp, 0x44);
+ p->multicast_frames_sent += read_mib(mp, 0x48);
+ p->broadcast_frames_sent += read_mib(mp, 0x4c);
+ p->unrec_mac_control_received += read_mib(mp, 0x50);
+ p->fc_sent += read_mib(mp, 0x54);
+ p->good_fc_received += read_mib(mp, 0x58);
+ p->bad_fc_received += read_mib(mp, 0x5c);
+ p->undersize_received += read_mib(mp, 0x60);
+ p->fragments_received += read_mib(mp, 0x64);
+ p->oversize_received += read_mib(mp, 0x68);
+ p->jabber_received += read_mib(mp, 0x6c);
+ p->mac_receive_error += read_mib(mp, 0x70);
+ p->bad_crc_event += read_mib(mp, 0x74);
+ p->collision += read_mib(mp, 0x78);
+ p->late_collision += read_mib(mp, 0x7c);
}
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 14/39] mv643xx_eth: remove port serial status register bit defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (12 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 13/39] mv643xx_eth: move MIB offset defines into their only user Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:41 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 15/39] mv643xx_eth: clean up rx/tx descriptor field defines Lennert Buytenhek
` (24 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
All except one of the port serial status register bit defines are
unused -- kill the unused ones.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 075ee2a..34bfdf6 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -94,6 +94,7 @@ static char mv643xx_driver_version[] = "1.0";
#define SDMA_CONFIG(p) (0x041c + ((p) << 10))
#define PORT_SERIAL_CONTROL(p) (0x043c + ((p) << 10))
#define PORT_STATUS(p) (0x0444 + ((p) << 10))
+#define TX_FIFO_EMPTY 0x00000400
#define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
#define INT_CAUSE(p) (0x0460 + ((p) << 10))
@@ -160,18 +161,6 @@ static char mv643xx_driver_version[] = "1.0";
#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
-/* Port serial status reg (PSR) */
-#define ETH_INTERFACE_PCM 0x00000001
-#define ETH_LINK_IS_UP 0x00000002
-#define ETH_PORT_AT_FULL_DUPLEX 0x00000004
-#define ETH_RX_FLOW_CTRL_ENABLED 0x00000008
-#define ETH_GMII_SPEED_1000 0x00000010
-#define ETH_MII_SPEED_100 0x00000020
-#define ETH_TX_IN_PROGRESS 0x00000080
-#define ETH_BYPASS_ACTIVE 0x00000100
-#define ETH_PORT_AT_PARTITION_STATE 0x00000200
-#define ETH_PORT_TX_FIFO_EMPTY 0x00000400
-
/* SMI reg */
#define ETH_SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */
#define ETH_SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */
@@ -462,7 +451,7 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
udelay(10);
/* Wait for Tx FIFO to empty */
- while (rdl(mp, PORT_STATUS(port_num)) & ETH_PORT_TX_FIFO_EMPTY)
+ while (rdl(mp, PORT_STATUS(port_num)) & TX_FIFO_EMPTY)
udelay(10);
}
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 14/39] mv643xx_eth: remove port serial status register bit defines
2008-06-03 11:02 ` [PATCH 14/39] mv643xx_eth: remove port serial status register bit defines Lennert Buytenhek
@ 2008-06-05 11:41 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:41 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:29PM +0200, Lennert Buytenhek wrote:
> All except one of the port serial status register bit defines are
> unused -- kill the unused ones.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 15 ++-------------
> 1 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index 075ee2a..34bfdf6 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -94,6 +94,7 @@ static char mv643xx_driver_version[] = "1.0";
> #define SDMA_CONFIG(p) (0x041c + ((p) << 10))
> #define PORT_SERIAL_CONTROL(p) (0x043c + ((p) << 10))
> #define PORT_STATUS(p) (0x0444 + ((p) << 10))
> +#define TX_FIFO_EMPTY 0x00000400
Oops, an extra space sneaked in.
> #define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
> #define TX_BW_MTU(p) (0x0458 + ((p) << 10))
> #define INT_CAUSE(p) (0x0460 + ((p) << 10))
[snip]
Looks good otherwise.
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 15/39] mv643xx_eth: clean up rx/tx descriptor field defines
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (13 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 14/39] mv643xx_eth: remove port serial status register bit defines Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:37 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 16/39] mv643xx_eth: get rid of ETH_/ethernet_/eth_ prefixes Lennert Buytenhek
` (23 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Remove the unused rx/tx descriptor field defines, and move the ones
that are actually used to the actual definitions of the rx/tx
descriptor format.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 82 +++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 54 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 34bfdf6..ea1af64 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -167,57 +167,6 @@ static char mv643xx_driver_version[] = "1.0";
#define ETH_SMI_OPCODE_WRITE 0 /* Completion of Read */
#define ETH_SMI_OPCODE_READ 0x04000000 /* Operation is in progress */
-/* Interrupt Cause Register Bit Definitions */
-
-/* SDMA command status fields macros */
-
-/* Tx & Rx descriptors status */
-#define ETH_ERROR_SUMMARY 0x00000001
-
-/* Tx & Rx descriptors command */
-#define ETH_BUFFER_OWNED_BY_DMA 0x80000000
-
-/* Tx descriptors status */
-#define ETH_LC_ERROR 0
-#define ETH_UR_ERROR 0x00000002
-#define ETH_RL_ERROR 0x00000004
-#define ETH_LLC_SNAP_FORMAT 0x00000200
-
-/* Rx descriptors status */
-#define ETH_OVERRUN_ERROR 0x00000002
-#define ETH_MAX_FRAME_LENGTH_ERROR 0x00000004
-#define ETH_RESOURCE_ERROR 0x00000006
-#define ETH_VLAN_TAGGED 0x00080000
-#define ETH_BPDU_FRAME 0x00100000
-#define ETH_UDP_FRAME_OVER_IP_V_4 0x00200000
-#define ETH_OTHER_FRAME_TYPE 0x00400000
-#define ETH_LAYER_2_IS_ETH_V_2 0x00800000
-#define ETH_FRAME_TYPE_IP_V_4 0x01000000
-#define ETH_FRAME_HEADER_OK 0x02000000
-#define ETH_RX_LAST_DESC 0x04000000
-#define ETH_RX_FIRST_DESC 0x08000000
-#define ETH_UNKNOWN_DESTINATION_ADDR 0x10000000
-#define ETH_RX_ENABLE_INTERRUPT 0x20000000
-#define ETH_LAYER_4_CHECKSUM_OK 0x40000000
-
-/* Rx descriptors byte count */
-#define ETH_FRAME_FRAGMENTED 0x00000004
-
-/* Tx descriptors command */
-#define ETH_LAYER_4_CHECKSUM_FIRST_DESC 0x00000400
-#define ETH_FRAME_SET_TO_VLAN 0x00008000
-#define ETH_UDP_FRAME 0x00010000
-#define ETH_GEN_TCP_UDP_CHECKSUM 0x00020000
-#define ETH_GEN_IP_V_4_CHECKSUM 0x00040000
-#define ETH_ZERO_PADDING 0x00080000
-#define ETH_TX_LAST_DESC 0x00100000
-#define ETH_TX_FIRST_DESC 0x00200000
-#define ETH_GEN_CRC 0x00400000
-#define ETH_TX_ENABLE_INTERRUPT 0x00800000
-#define ETH_AUTO_MODE 0x40000000
-
-#define ETH_TX_IHL_SHIFT 11
-
/* typedefs */
typedef enum _eth_func_ret_status {
@@ -229,8 +178,8 @@ typedef enum _eth_func_ret_status {
ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust. */
} ETH_FUNC_RET_STATUS;
-/* These are for big-endian machines. Little endian needs different
- * definitions.
+/*
+ * RX/TX descriptors.
*/
#if defined(__BIG_ENDIAN)
struct eth_rx_desc {
@@ -268,6 +217,31 @@ struct eth_tx_desc {
#error One of __BIG_ENDIAN or __LITTLE_ENDIAN must be defined
#endif
+/* RX & TX descriptor command */
+#define ETH_BUFFER_OWNED_BY_DMA 0x80000000
+
+/* RX & TX descriptor status */
+#define ETH_ERROR_SUMMARY 0x00000001
+
+/* RX descriptor status */
+#define ETH_LAYER_4_CHECKSUM_OK 0x40000000
+#define ETH_RX_ENABLE_INTERRUPT 0x20000000
+#define ETH_RX_FIRST_DESC 0x08000000
+#define ETH_RX_LAST_DESC 0x04000000
+
+/* TX descriptor command */
+#define ETH_TX_ENABLE_INTERRUPT 0x00800000
+#define ETH_GEN_CRC 0x00400000
+#define ETH_TX_FIRST_DESC 0x00200000
+#define ETH_TX_LAST_DESC 0x00100000
+#define ETH_ZERO_PADDING 0x00080000
+#define ETH_GEN_IP_V4_CHECKSUM 0x00040000
+#define ETH_GEN_TCP_UDP_CHECKSUM 0x00020000
+#define ETH_UDP_FRAME 0x00010000
+
+#define ETH_TX_IHL_SHIFT 11
+
+
/* Unified struct for Rx and Tx operations. The user is not required to */
/* be familier with neither Tx nor Rx descriptors. */
struct pkt_info {
@@ -896,7 +870,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
BUG_ON(skb->protocol != htons(ETH_P_IP));
cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
- ETH_GEN_IP_V_4_CHECKSUM |
+ ETH_GEN_IP_V4_CHECKSUM |
ip_hdr(skb)->ihl << ETH_TX_IHL_SHIFT;
switch (ip_hdr(skb)->protocol) {
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 16/39] mv643xx_eth: get rid of ETH_/ethernet_/eth_ prefixes
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (14 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 15/39] mv643xx_eth: clean up rx/tx descriptor field defines Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:50 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently Lennert Buytenhek
` (22 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The fact that mv643xx_eth is an ethernet driver is pretty obvious,
and having a lot of internal-use-only functions and defines prefixed
with ETH_/ethernet_/eth_ prefixes is rather pointless. So, get rid
of most of those prefixes.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 399 ++++++++++++++++++++++-----------------------
1 files changed, 195 insertions(+), 204 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index ea1af64..4375b7c 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -158,31 +158,31 @@ static char mv643xx_driver_version[] = "1.0";
#define FORCE_LINK_PASS (1 << 1)
#define SERIAL_PORT_ENABLE (1 << 0)
-#define PORT_DEFAULT_TRANSMIT_QUEUE_SIZE 800
-#define PORT_DEFAULT_RECEIVE_QUEUE_SIZE 400
+#define DEFAULT_RX_QUEUE_SIZE 400
+#define DEFAULT_TX_QUEUE_SIZE 800
/* SMI reg */
-#define ETH_SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */
-#define ETH_SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */
-#define ETH_SMI_OPCODE_WRITE 0 /* Completion of Read */
-#define ETH_SMI_OPCODE_READ 0x04000000 /* Operation is in progress */
+#define SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */
+#define SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */
+#define SMI_OPCODE_WRITE 0 /* Completion of Read */
+#define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */
/* typedefs */
-typedef enum _eth_func_ret_status {
+typedef enum _func_ret_status {
ETH_OK, /* Returned as expected. */
ETH_ERROR, /* Fundamental error. */
ETH_RETRY, /* Could not process request. Try later.*/
ETH_END_OF_JOB, /* Ring has nothing to process. */
ETH_QUEUE_FULL, /* Ring resource error. */
ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust. */
-} ETH_FUNC_RET_STATUS;
+} FUNC_RET_STATUS;
/*
* RX/TX descriptors.
*/
#if defined(__BIG_ENDIAN)
-struct eth_rx_desc {
+struct rx_desc {
u16 byte_cnt; /* Descriptor buffer byte count */
u16 buf_size; /* Buffer size */
u32 cmd_sts; /* Descriptor command status */
@@ -190,7 +190,7 @@ struct eth_rx_desc {
u32 buf_ptr; /* Descriptor buffer pointer */
};
-struct eth_tx_desc {
+struct tx_desc {
u16 byte_cnt; /* buffer byte count */
u16 l4i_chk; /* CPU provided TCP checksum */
u32 cmd_sts; /* Command/status field */
@@ -198,7 +198,7 @@ struct eth_tx_desc {
u32 buf_ptr; /* pointer to buffer for this descriptor*/
};
#elif defined(__LITTLE_ENDIAN)
-struct eth_rx_desc {
+struct rx_desc {
u32 cmd_sts; /* Descriptor command status */
u16 buf_size; /* Buffer size */
u16 byte_cnt; /* Descriptor buffer byte count */
@@ -206,7 +206,7 @@ struct eth_rx_desc {
u32 next_desc_ptr; /* Next descriptor pointer */
};
-struct eth_tx_desc {
+struct tx_desc {
u32 cmd_sts; /* Command/status field */
u16 l4i_chk; /* CPU provided TCP checksum */
u16 byte_cnt; /* buffer byte count */
@@ -218,28 +218,28 @@ struct eth_tx_desc {
#endif
/* RX & TX descriptor command */
-#define ETH_BUFFER_OWNED_BY_DMA 0x80000000
+#define BUFFER_OWNED_BY_DMA 0x80000000
/* RX & TX descriptor status */
-#define ETH_ERROR_SUMMARY 0x00000001
+#define ERROR_SUMMARY 0x00000001
/* RX descriptor status */
-#define ETH_LAYER_4_CHECKSUM_OK 0x40000000
-#define ETH_RX_ENABLE_INTERRUPT 0x20000000
-#define ETH_RX_FIRST_DESC 0x08000000
-#define ETH_RX_LAST_DESC 0x04000000
+#define LAYER_4_CHECKSUM_OK 0x40000000
+#define RX_ENABLE_INTERRUPT 0x20000000
+#define RX_FIRST_DESC 0x08000000
+#define RX_LAST_DESC 0x04000000
/* TX descriptor command */
-#define ETH_TX_ENABLE_INTERRUPT 0x00800000
-#define ETH_GEN_CRC 0x00400000
-#define ETH_TX_FIRST_DESC 0x00200000
-#define ETH_TX_LAST_DESC 0x00100000
-#define ETH_ZERO_PADDING 0x00080000
-#define ETH_GEN_IP_V4_CHECKSUM 0x00040000
-#define ETH_GEN_TCP_UDP_CHECKSUM 0x00020000
-#define ETH_UDP_FRAME 0x00010000
+#define TX_ENABLE_INTERRUPT 0x00800000
+#define GEN_CRC 0x00400000
+#define TX_FIRST_DESC 0x00200000
+#define TX_LAST_DESC 0x00100000
+#define ZERO_PADDING 0x00080000
+#define GEN_IP_V4_CHECKSUM 0x00040000
+#define GEN_TCP_UDP_CHECKSUM 0x00020000
+#define UDP_FRAME 0x00010000
-#define ETH_TX_IHL_SHIFT 11
+#define TX_IHL_SHIFT 11
/* Unified struct for Rx and Tx operations. The user is not required to */
@@ -255,7 +255,7 @@ struct pkt_info {
/* global *******************************************************************/
struct mv643xx_shared_private {
- void __iomem *eth_base;
+ void __iomem *base;
/* used to protect SMI_REG, which is shared across ports */
spinlock_t phy_lock;
@@ -325,12 +325,12 @@ struct mv643xx_private {
u32 tx_clean_threshold;
#endif
- struct eth_rx_desc *p_rx_desc_area;
+ struct rx_desc *p_rx_desc_area;
dma_addr_t rx_desc_dma;
int rx_desc_area_size;
struct sk_buff **rx_skb;
- struct eth_tx_desc *p_tx_desc_area;
+ struct tx_desc *p_tx_desc_area;
dma_addr_t tx_desc_dma;
int tx_desc_area_size;
struct sk_buff **tx_skb;
@@ -366,12 +366,12 @@ struct mv643xx_private {
/* port register accessors **************************************************/
static inline u32 rdl(struct mv643xx_private *mp, int offset)
{
- return readl(mp->shared->eth_base + offset);
+ return readl(mp->shared->base + offset);
}
static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
{
- writel(data, mp->shared->eth_base + offset);
+ writel(data, mp->shared->base + offset);
}
@@ -437,7 +437,7 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
/*
- * eth_rx_return_buff - Returns a Rx buffer back to the Rx ring.
+ * rx_return_buff - Returns a Rx buffer back to the Rx ring.
*
* DESCRIPTION:
* This routine returns a Rx buffer back to the Rx ring. It retrieves the
@@ -456,11 +456,11 @@ static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
* ETH_ERROR in case the routine can not access Rx desc ring.
* ETH_OK otherwise.
*/
-static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
+static FUNC_RET_STATUS rx_return_buff(struct mv643xx_private *mp,
struct pkt_info *p_pkt_info)
{
int used_rx_desc; /* Where to return Rx resource */
- volatile struct eth_rx_desc *p_used_rx_desc;
+ volatile struct rx_desc *p_used_rx_desc;
unsigned long flags;
spin_lock_irqsave(&mp->lock, flags);
@@ -477,8 +477,7 @@ static ETH_FUNC_RET_STATUS eth_rx_return_buff(struct mv643xx_private *mp,
/* Return the descriptor to DMA ownership */
wmb();
- p_used_rx_desc->cmd_sts =
- ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
+ p_used_rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
wmb();
/* Move the used descriptor pointer to the next descriptor */
@@ -515,12 +514,12 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
unaligned = (u32)skb->data & (dma_get_cache_alignment() - 1);
if (unaligned)
skb_reserve(skb, dma_get_cache_alignment() - unaligned);
- pkt_info.cmd_sts = ETH_RX_ENABLE_INTERRUPT;
+ pkt_info.cmd_sts = RX_ENABLE_INTERRUPT;
pkt_info.byte_cnt = ETH_RX_SKB_SIZE;
pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
ETH_RX_SKB_SIZE, DMA_FROM_DEVICE);
pkt_info.return_info = skb;
- if (eth_rx_return_buff(mp, &pkt_info) != ETH_OK) {
+ if (rx_return_buff(mp, &pkt_info) != ETH_OK) {
printk(KERN_ERR
"%s: Error allocating RX Ring\n", dev->name);
break;
@@ -554,7 +553,7 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
}
/*
- * eth_port_receive - Get received information from Rx ring.
+ * port_receive - Get received information from Rx ring.
*
* DESCRIPTION:
* This routine returns the received data to the caller. There is no
@@ -576,11 +575,11 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
* ETH_END_OF_JOB if there is no received data.
* ETH_OK otherwise.
*/
-static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
+static FUNC_RET_STATUS port_receive(struct mv643xx_private *mp,
struct pkt_info *p_pkt_info)
{
int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
- volatile struct eth_rx_desc *p_rx_desc;
+ volatile struct rx_desc *p_rx_desc;
unsigned int command_status;
unsigned long flags;
@@ -601,7 +600,7 @@ static ETH_FUNC_RET_STATUS eth_port_receive(struct mv643xx_private *mp,
rmb();
/* Nothing to receive... */
- if (command_status & (ETH_BUFFER_OWNED_BY_DMA)) {
+ if (command_status & BUFFER_OWNED_BY_DMA) {
spin_unlock_irqrestore(&mp->lock, flags);
return ETH_END_OF_JOB;
}
@@ -650,7 +649,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
struct sk_buff *skb;
struct pkt_info pkt_info;
- while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
+ while (budget-- > 0 && port_receive(mp, &pkt_info) == ETH_OK) {
dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
DMA_FROM_DEVICE);
mp->rx_desc_count--;
@@ -667,21 +666,20 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
* In case received a packet without first / last bits on OR
* the error summary bit is on, the packets needs to be dropeed.
*/
- if (((pkt_info.cmd_sts
- & (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC))
- || (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)) {
+ if (((pkt_info.cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
+ (RX_FIRST_DESC | RX_LAST_DESC))
+ || (pkt_info.cmd_sts & ERROR_SUMMARY)) {
stats->rx_dropped++;
- if ((pkt_info.cmd_sts & (ETH_RX_FIRST_DESC |
- ETH_RX_LAST_DESC)) !=
- (ETH_RX_FIRST_DESC | ETH_RX_LAST_DESC)) {
+ if ((pkt_info.cmd_sts & (RX_FIRST_DESC |
+ RX_LAST_DESC)) !=
+ (RX_FIRST_DESC | RX_LAST_DESC)) {
if (net_ratelimit())
printk(KERN_ERR
"%s: Received packet spread "
"on multiple descriptors\n",
dev->name);
}
- if (pkt_info.cmd_sts & ETH_ERROR_SUMMARY)
+ if (pkt_info.cmd_sts & ERROR_SUMMARY)
stats->rx_errors++;
dev_kfree_skb_irq(skb);
@@ -692,7 +690,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
*/
skb_put(skb, pkt_info.byte_cnt - 4);
- if (pkt_info.cmd_sts & ETH_LAYER_4_CHECKSUM_OK) {
+ if (pkt_info.cmd_sts & LAYER_4_CHECKSUM_OK) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->csum = htons(
(pkt_info.cmd_sts & 0x0007fff8) >> 3);
@@ -770,9 +768,9 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
}
/**
- * eth_alloc_tx_desc_index - return the index of the next available tx desc
+ * alloc_tx_desc_index - return the index of the next available tx desc
*/
-static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
+static int alloc_tx_desc_index(struct mv643xx_private *mp)
{
int tx_desc_curr;
@@ -787,30 +785,30 @@ static int eth_alloc_tx_desc_index(struct mv643xx_private *mp)
}
/**
- * eth_tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
+ * tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
*
* Ensure the data for each fragment to be transmitted is mapped properly,
* then fill in descriptors in the tx hw queue.
*/
-static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
+static void tx_fill_frag_descs(struct mv643xx_private *mp,
struct sk_buff *skb)
{
int frag;
int tx_index;
- struct eth_tx_desc *desc;
+ struct tx_desc *desc;
for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
- tx_index = eth_alloc_tx_desc_index(mp);
+ tx_index = alloc_tx_desc_index(mp);
desc = &mp->p_tx_desc_area[tx_index];
- desc->cmd_sts = ETH_BUFFER_OWNED_BY_DMA;
+ desc->cmd_sts = BUFFER_OWNED_BY_DMA;
/* Last Frag enables interrupt and frees the skb */
if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
- desc->cmd_sts |= ETH_ZERO_PADDING |
- ETH_TX_LAST_DESC |
- ETH_TX_ENABLE_INTERRUPT;
+ desc->cmd_sts |= ZERO_PADDING |
+ TX_LAST_DESC |
+ TX_ENABLE_INTERRUPT;
mp->tx_skb[tx_index] = skb;
} else
mp->tx_skb[tx_index] = NULL;
@@ -831,34 +829,32 @@ static inline __be16 sum16_as_be(__sum16 sum)
}
/**
- * eth_tx_submit_descs_for_skb - submit data from an skb to the tx hw
+ * tx_submit_descs_for_skb - submit data from an skb to the tx hw
*
* Ensure the data for an skb to be transmitted is mapped properly,
* then fill in descriptors in the tx hw queue and start the hardware.
*/
-static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
+static void tx_submit_descs_for_skb(struct mv643xx_private *mp,
struct sk_buff *skb)
{
int tx_index;
- struct eth_tx_desc *desc;
+ struct tx_desc *desc;
u32 cmd_sts;
int length;
int nr_frags = skb_shinfo(skb)->nr_frags;
- cmd_sts = ETH_TX_FIRST_DESC | ETH_GEN_CRC | ETH_BUFFER_OWNED_BY_DMA;
+ cmd_sts = TX_FIRST_DESC | GEN_CRC | BUFFER_OWNED_BY_DMA;
- tx_index = eth_alloc_tx_desc_index(mp);
+ tx_index = alloc_tx_desc_index(mp);
desc = &mp->p_tx_desc_area[tx_index];
if (nr_frags) {
- eth_tx_fill_frag_descs(mp, skb);
+ tx_fill_frag_descs(mp, skb);
length = skb_headlen(skb);
mp->tx_skb[tx_index] = NULL;
} else {
- cmd_sts |= ETH_ZERO_PADDING |
- ETH_TX_LAST_DESC |
- ETH_TX_ENABLE_INTERRUPT;
+ cmd_sts |= ZERO_PADDING | TX_LAST_DESC | TX_ENABLE_INTERRUPT;
length = skb->len;
mp->tx_skb[tx_index] = skb;
}
@@ -869,13 +865,13 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
if (skb->ip_summed == CHECKSUM_PARTIAL) {
BUG_ON(skb->protocol != htons(ETH_P_IP));
- cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
- ETH_GEN_IP_V4_CHECKSUM |
- ip_hdr(skb)->ihl << ETH_TX_IHL_SHIFT;
+ cmd_sts |= GEN_TCP_UDP_CHECKSUM |
+ GEN_IP_V4_CHECKSUM |
+ ip_hdr(skb)->ihl << TX_IHL_SHIFT;
switch (ip_hdr(skb)->protocol) {
case IPPROTO_UDP:
- cmd_sts |= ETH_UDP_FRAME;
+ cmd_sts |= UDP_FRAME;
desc->l4i_chk = ntohs(sum16_as_be(udp_hdr(skb)->check));
break;
case IPPROTO_TCP:
@@ -886,7 +882,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
}
} else {
/* Errata BTS #50, IHL must be 5 if no HW checksum */
- cmd_sts |= 5 << ETH_TX_IHL_SHIFT;
+ cmd_sts |= 5 << TX_IHL_SHIFT;
desc->l4i_chk = 0;
}
@@ -929,7 +925,7 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}
- eth_tx_submit_descs_for_skb(mp, skb);
+ tx_submit_descs_for_skb(mp, skb);
stats->tx_bytes += skb->len;
stats->tx_packets++;
dev->trans_start = jiffies;
@@ -944,10 +940,10 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* mii management interface *************************************************/
-static int ethernet_phy_get(struct mv643xx_private *mp);
+static int phy_addr_get(struct mv643xx_private *mp);
/*
- * eth_port_read_smi_reg - Read PHY registers
+ * read_smi_reg - Read PHY registers
*
* DESCRIPTION:
* This routine utilize the SMI interface to interact with the PHY in
@@ -966,11 +962,11 @@ static int ethernet_phy_get(struct mv643xx_private *mp);
* true otherwise.
*
*/
-static void eth_port_read_smi_reg(struct mv643xx_private *mp,
+static void read_smi_reg(struct mv643xx_private *mp,
unsigned int phy_reg, unsigned int *value)
{
- void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
- int phy_addr = ethernet_phy_get(mp);
+ void __iomem *smi_reg = mp->shared_smi->base + SMI_REG;
+ int phy_addr = phy_addr_get(mp);
unsigned long flags;
int i;
@@ -978,7 +974,7 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
/* wait for the SMI register to become available */
- for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+ for (i = 0; readl(smi_reg) & SMI_BUSY; i++) {
if (i == 1000) {
printk("%s: PHY busy timeout\n", mp->dev->name);
goto out;
@@ -986,11 +982,10 @@ static void eth_port_read_smi_reg(struct mv643xx_private *mp,
udelay(10);
}
- writel((phy_addr << 16) | (phy_reg << 21) | ETH_SMI_OPCODE_READ,
- smi_reg);
+ writel((phy_addr << 16) | (phy_reg << 21) | SMI_OPCODE_READ, smi_reg);
/* now wait for the data to be valid */
- for (i = 0; !(readl(smi_reg) & ETH_SMI_READ_VALID); i++) {
+ for (i = 0; !(readl(smi_reg) & SMI_READ_VALID); i++) {
if (i == 1000) {
printk("%s: PHY read timeout\n", mp->dev->name);
goto out;
@@ -1004,7 +999,7 @@ out:
}
/*
- * eth_port_write_smi_reg - Write to PHY registers
+ * write_smi_reg - Write to PHY registers
*
* DESCRIPTION:
* This routine utilize the SMI interface to interact with the PHY in
@@ -1023,11 +1018,11 @@ out:
* true otherwise.
*
*/
-static void eth_port_write_smi_reg(struct mv643xx_private *mp,
+static void write_smi_reg(struct mv643xx_private *mp,
unsigned int phy_reg, unsigned int value)
{
- void __iomem *smi_reg = mp->shared_smi->eth_base + SMI_REG;
- int phy_addr = ethernet_phy_get(mp);
+ void __iomem *smi_reg = mp->shared_smi->base + SMI_REG;
+ int phy_addr = phy_addr_get(mp);
unsigned long flags;
int i;
@@ -1035,7 +1030,7 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp,
spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
/* wait for the SMI register to become available */
- for (i = 0; readl(smi_reg) & ETH_SMI_BUSY; i++) {
+ for (i = 0; readl(smi_reg) & SMI_BUSY; i++) {
if (i == 1000) {
printk("%s: PHY busy timeout\n", mp->dev->name);
goto out;
@@ -1044,7 +1039,7 @@ static void eth_port_write_smi_reg(struct mv643xx_private *mp,
}
writel((phy_addr << 16) | (phy_reg << 21) |
- ETH_SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
+ SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
out:
spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
}
@@ -1052,7 +1047,7 @@ out:
/* mib counters *************************************************************/
/*
- * eth_clear_mib_counters - Clear all MIB counters
+ * clear_mib_counters - Clear all MIB counters
*
* DESCRIPTION:
* This function clears all MIB counters of a specific ethernet port.
@@ -1068,7 +1063,7 @@ out:
* MIB counter value.
*
*/
-static void eth_clear_mib_counters(struct mv643xx_private *mp)
+static void clear_mib_counters(struct mv643xx_private *mp)
{
unsigned int port_num = mp->port_num;
int i;
@@ -1083,7 +1078,7 @@ static inline u32 read_mib(struct mv643xx_private *mp, int offset)
return rdl(mp, MIB_COUNTERS(mp->port_num) + offset);
}
-static void eth_update_mib_counters(struct mv643xx_private *mp)
+static void update_mib_counters(struct mv643xx_private *mp)
{
struct mv643xx_mib_counters *p = &mp->mib_counters;
@@ -1249,7 +1244,7 @@ static void mv643xx_get_ethtool_stats(struct net_device *netdev,
struct mv643xx_private *mp = netdev->priv;
int i;
- eth_update_mib_counters(mp);
+ update_mib_counters(mp);
for (i = 0; i < MV643XX_STATS_LEN; i++) {
char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
@@ -1283,10 +1278,9 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
/* address handling *********************************************************/
/*
- * eth_port_uc_addr_get - Read the MAC address from the port's hw registers
+ * uc_addr_get - Read the MAC address from the port's hw registers
*/
-static void eth_port_uc_addr_get(struct mv643xx_private *mp,
- unsigned char *p_addr)
+static void uc_addr_get(struct mv643xx_private *mp, unsigned char *p_addr)
{
unsigned int port_num = mp->port_num;
unsigned int mac_h;
@@ -1304,7 +1298,7 @@ static void eth_port_uc_addr_get(struct mv643xx_private *mp,
}
/*
- * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
+ * init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
*
* DESCRIPTION:
* Go through all the DA filter tables (Unicast, Special Multicast &
@@ -1319,7 +1313,7 @@ static void eth_port_uc_addr_get(struct mv643xx_private *mp,
* RETURN:
* None.
*/
-static void eth_port_init_mac_tables(struct mv643xx_private *mp)
+static void init_mac_tables(struct mv643xx_private *mp)
{
unsigned int port_num = mp->port_num;
int table_index;
@@ -1345,7 +1339,7 @@ static void eth_port_init_mac_tables(struct mv643xx_private *mp)
* 3-1 Queue (ETH_Q0=0)
* 7-4 Reserved = 0;
*/
-static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
+static void set_filter_table_entry(struct mv643xx_private *mp,
int table, unsigned char entry)
{
unsigned int table_reg;
@@ -1362,10 +1356,9 @@ static void eth_port_set_filter_table_entry(struct mv643xx_private *mp,
}
/*
- * eth_port_uc_addr_set - Write a MAC address into the port's hw registers
+ * uc_addr_set - Write a MAC address into the port's hw registers
*/
-static void eth_port_uc_addr_set(struct mv643xx_private *mp,
- unsigned char *p_addr)
+static void uc_addr_set(struct mv643xx_private *mp, unsigned char *p_addr)
{
unsigned int port_num = mp->port_num;
unsigned int mac_h;
@@ -1381,7 +1374,7 @@ static void eth_port_uc_addr_set(struct mv643xx_private *mp,
/* Accept frames with this address */
table = UNICAST_TABLE(port_num);
- eth_port_set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
+ set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
}
/*
@@ -1396,8 +1389,8 @@ static void mv643xx_eth_update_mac_address(struct net_device *dev)
{
struct mv643xx_private *mp = netdev_priv(dev);
- eth_port_init_mac_tables(mp);
- eth_port_uc_addr_set(mp, dev->dev_addr);
+ init_mac_tables(mp);
+ uc_addr_set(mp, dev->dev_addr);
}
/*
@@ -1423,7 +1416,7 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
}
/*
- * eth_port_mc_addr - Multicast address settings.
+ * mc_addr - Multicast address settings.
*
* The MV device supports multicast using two tables:
* 1) Special Multicast Table for MAC addresses of the form
@@ -1433,10 +1426,10 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
* 2) Other Multicast Table for multicast of another type. A CRC-8bit
* is used as an index to the Other Multicast Table entries in the
* DA-Filter table. This function calculates the CRC-8bit value.
- * In either case, eth_port_set_filter_table_entry() is then called
+ * In either case, set_filter_table_entry() is then called
* to set to set the actual table entry.
*/
-static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
+static void mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
{
unsigned int port_num = mp->port_num;
unsigned int mac_h;
@@ -1450,7 +1443,7 @@ static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
(p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
table = SPECIAL_MCAST_TABLE(port_num);
- eth_port_set_filter_table_entry(mp, table, p_addr[5]);
+ set_filter_table_entry(mp, table, p_addr[5]);
return;
}
@@ -1523,20 +1516,20 @@ static void eth_port_mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
crc_result = crc_result | (crc[i] << i);
table = OTHER_MCAST_TABLE(port_num);
- eth_port_set_filter_table_entry(mp, table, crc_result);
+ set_filter_table_entry(mp, table, crc_result);
}
/*
* Set the entire multicast list based on dev->mc_list.
*/
-static void eth_port_set_multicast_list(struct net_device *dev)
+static void set_multicast_list(struct net_device *dev)
{
struct dev_mc_list *mc_list;
int i;
int table_index;
struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int eth_port_num = mp->port_num;
+ unsigned int port_num = mp->port_num;
/* If the device is in promiscuous mode or in all multicast mode,
* we will fully populate both multicast tables with accept.
@@ -1552,7 +1545,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
+ wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0x01010101);
/* Set all entries in DA filter other multicast
* table (Ex_dFOMT)
@@ -1562,7 +1555,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0x01010101);
+ wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0x01010101);
}
return;
}
@@ -1572,10 +1565,10 @@ static void eth_port_set_multicast_list(struct net_device *dev)
*/
for (table_index = 0; table_index <= 0xFC; table_index += 4) {
/* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, SPECIAL_MCAST_TABLE(eth_port_num) + table_index, 0);
+ wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
/* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, OTHER_MCAST_TABLE(eth_port_num) + table_index, 0);
+ wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0);
}
/* Get pointer to net_device multicast list and add each one... */
@@ -1583,7 +1576,7 @@ static void eth_port_set_multicast_list(struct net_device *dev)
(i < 256) && (mc_list != NULL) && (i < dev->mc_count);
i++, mc_list = mc_list->next)
if (mc_list->dmi_addrlen == 6)
- eth_port_mc_addr(mp, mc_list->dmi_addr);
+ mc_addr(mp, mc_list->dmi_addr);
}
/*
@@ -1606,7 +1599,7 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
config_reg &= ~0x00000001;
wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
- eth_port_set_multicast_list(dev);
+ set_multicast_list(dev);
}
@@ -1635,22 +1628,22 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
*/
static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
{
- volatile struct eth_rx_desc *p_rx_desc;
+ volatile struct rx_desc *p_rx_desc;
int rx_desc_num = mp->rx_ring_size;
int i;
/* initialize the next_desc_ptr links in the Rx descriptors ring */
- p_rx_desc = (struct eth_rx_desc *)mp->p_rx_desc_area;
+ p_rx_desc = (struct rx_desc *)mp->p_rx_desc_area;
for (i = 0; i < rx_desc_num; i++) {
p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
- ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
+ ((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
}
/* Save Rx desc pointer to driver struct. */
mp->rx_curr_desc_q = 0;
mp->rx_used_desc_q = 0;
- mp->rx_desc_area_size = rx_desc_num * sizeof(struct eth_rx_desc);
+ mp->rx_desc_area_size = rx_desc_num * sizeof(struct rx_desc);
}
static void mv643xx_eth_free_rx_rings(struct net_device *dev)
@@ -1707,20 +1700,20 @@ static void mv643xx_eth_free_rx_rings(struct net_device *dev)
static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
{
int tx_desc_num = mp->tx_ring_size;
- struct eth_tx_desc *p_tx_desc;
+ struct tx_desc *p_tx_desc;
int i;
/* Initialize the next_desc_ptr links in the Tx descriptors ring */
- p_tx_desc = (struct eth_tx_desc *)mp->p_tx_desc_area;
+ p_tx_desc = (struct tx_desc *)mp->p_tx_desc_area;
for (i = 0; i < tx_desc_num; i++) {
p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
- ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
+ ((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
}
mp->tx_curr_desc_q = 0;
mp->tx_used_desc_q = 0;
- mp->tx_desc_area_size = tx_desc_num * sizeof(struct eth_tx_desc);
+ mp->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
}
/**
@@ -1731,7 +1724,7 @@ static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
{
struct mv643xx_private *mp = netdev_priv(dev);
- struct eth_tx_desc *desc;
+ struct tx_desc *desc;
u32 cmd_sts;
struct sk_buff *skb;
unsigned long flags;
@@ -1753,7 +1746,7 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
desc = &mp->p_tx_desc_area[tx_index];
cmd_sts = desc->cmd_sts;
- if (!force && (cmd_sts & ETH_BUFFER_OWNED_BY_DMA)) {
+ if (!force && (cmd_sts & BUFFER_OWNED_BY_DMA)) {
spin_unlock_irqrestore(&mp->lock, flags);
return released;
}
@@ -1767,14 +1760,14 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
if (skb)
mp->tx_skb[tx_index] = NULL;
- if (cmd_sts & ETH_ERROR_SUMMARY) {
+ if (cmd_sts & ERROR_SUMMARY) {
printk("%s: Error in TX\n", dev->name);
dev->stats.tx_errors++;
}
spin_unlock_irqrestore(&mp->lock, flags);
- if (cmd_sts & ETH_TX_FIRST_DESC)
+ if (cmd_sts & TX_FIRST_DESC)
dma_unmap_single(NULL, addr, count, DMA_TO_DEVICE);
else
dma_unmap_page(NULL, addr, count, DMA_TO_DEVICE);
@@ -1824,7 +1817,7 @@ static void mv643xx_eth_free_tx_rings(struct net_device *dev)
/* netdev ops and related ***************************************************/
-static void eth_port_reset(struct mv643xx_private *mp);
+static void port_reset(struct mv643xx_private *mp);
/* Set the mv643xx port configuration register for the speed/duplex mode. */
static void mv643xx_eth_update_pscr(struct net_device *dev,
@@ -1887,19 +1880,19 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct mv643xx_private *mp = netdev_priv(dev);
- u32 eth_int_cause, eth_int_cause_ext = 0;
+ u32 int_cause, int_cause_ext = 0;
unsigned int port_num = mp->port_num;
/* Read interrupt cause registers */
- eth_int_cause = rdl(mp, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
- if (eth_int_cause & INT_EXT) {
- eth_int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
+ int_cause = rdl(mp, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
+ if (int_cause & INT_EXT) {
+ int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
& (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
- wrl(mp, INT_CAUSE_EXT(port_num), ~eth_int_cause_ext);
+ wrl(mp, INT_CAUSE_EXT(port_num), ~int_cause_ext);
}
/* PHY status changed */
- if (eth_int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
+ if (int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
struct ethtool_cmd cmd;
if (mii_link_ok(&mp->mii)) {
@@ -1919,7 +1912,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
}
#ifdef MV643XX_NAPI
- if (eth_int_cause & INT_RX) {
+ if (int_cause & INT_RX) {
/* schedule the NAPI poll routine to maintain port */
wrl(mp, INT_MASK(port_num), 0x00000000);
@@ -1929,24 +1922,24 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
netif_rx_schedule(dev, &mp->napi);
}
#else
- if (eth_int_cause & INT_RX)
+ if (int_cause & INT_RX)
mv643xx_eth_receive_queue(dev, INT_MAX);
#endif
- if (eth_int_cause_ext & INT_EXT_TX)
+ if (int_cause_ext & INT_EXT_TX)
mv643xx_eth_free_completed_tx_descs(dev);
/*
* If no real interrupt occured, exit.
* This can happen when using gigE interrupt coalescing mechanism.
*/
- if ((eth_int_cause == 0x0) && (eth_int_cause_ext == 0x0))
+ if ((int_cause == 0x0) && (int_cause_ext == 0x0))
return IRQ_NONE;
return IRQ_HANDLED;
}
/*
- * ethernet_phy_reset - Reset Ethernet port PHY.
+ * phy_reset - Reset Ethernet port PHY.
*
* DESCRIPTION:
* This routine utilizes the SMI interface to reset the ethernet port PHY.
@@ -1961,24 +1954,24 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
* None.
*
*/
-static void ethernet_phy_reset(struct mv643xx_private *mp)
+static void phy_reset(struct mv643xx_private *mp)
{
unsigned int phy_reg_data;
/* Reset the PHY */
- eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+ read_smi_reg(mp, 0, &phy_reg_data);
phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
- eth_port_write_smi_reg(mp, 0, phy_reg_data);
+ write_smi_reg(mp, 0, phy_reg_data);
/* wait for PHY to come out of reset */
do {
udelay(1);
- eth_port_read_smi_reg(mp, 0, &phy_reg_data);
+ read_smi_reg(mp, 0, &phy_reg_data);
} while (phy_reg_data & 0x8000);
}
/*
- * eth_port_start - Start the Ethernet port activity.
+ * port_start - Start the Ethernet port activity.
*
* DESCRIPTION:
* This routine prepares the Ethernet port for Rx and Tx activity:
@@ -2004,7 +1997,7 @@ static void ethernet_phy_reset(struct mv643xx_private *mp)
* RETURN:
* None.
*/
-static void eth_port_start(struct net_device *dev)
+static void port_start(struct net_device *dev)
{
struct mv643xx_private *mp = netdev_priv(dev);
unsigned int port_num = mp->port_num;
@@ -2015,15 +2008,15 @@ static void eth_port_start(struct net_device *dev)
/* Assignment of Tx CTRP of given queue */
tx_curr_desc = mp->tx_curr_desc_q;
wrl(mp, TXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct eth_tx_desc *)mp->tx_desc_dma + tx_curr_desc));
+ (u32)((struct tx_desc *)mp->tx_desc_dma + tx_curr_desc));
/* Assignment of Rx CRDP of given queue */
rx_curr_desc = mp->rx_curr_desc_q;
wrl(mp, RXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct eth_rx_desc *)mp->rx_desc_dma + rx_curr_desc));
+ (u32)((struct rx_desc *)mp->rx_desc_dma + rx_curr_desc));
/* Add the assigned Ethernet address to the port's address table */
- eth_port_uc_addr_set(mp, dev->dev_addr);
+ uc_addr_set(mp, dev->dev_addr);
/*
* Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
@@ -2063,14 +2056,14 @@ static void eth_port_start(struct net_device *dev)
/* save phy settings across reset */
mv643xx_get_settings(dev, ðtool_cmd);
- ethernet_phy_reset(mp);
+ phy_reset(mp);
mv643xx_set_settings(dev, ðtool_cmd);
}
#ifdef MV643XX_COAL
/*
- * eth_port_set_rx_coal - Sets coalescing interrupt mechanism on RX path
+ * set_rx_coal - Sets coalescing interrupt mechanism on RX path
*
* DESCRIPTION:
* This routine sets the RX coalescing interrupt mechanism parameter.
@@ -2091,7 +2084,7 @@ static void eth_port_start(struct net_device *dev)
* The interrupt coalescing value set in the gigE port.
*
*/
-static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
+static unsigned int set_rx_coal(struct mv643xx_private *mp,
unsigned int delay)
{
unsigned int port_num = mp->port_num;
@@ -2108,7 +2101,7 @@ static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
#endif
/*
- * eth_port_set_tx_coal - Sets coalescing interrupt mechanism on TX path
+ * set_tx_coal - Sets coalescing interrupt mechanism on TX path
*
* DESCRIPTION:
* This routine sets the TX coalescing interrupt mechanism parameter.
@@ -2129,7 +2122,7 @@ static unsigned int eth_port_set_rx_coal(struct mv643xx_private *mp,
* The interrupt coalescing value set in the gigE port.
*
*/
-static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
+static unsigned int set_tx_coal(struct mv643xx_private *mp,
unsigned int delay)
{
unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
@@ -2141,7 +2134,7 @@ static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
}
/*
- * eth_port_init - Initialize the Ethernet port driver
+ * port_init - Initialize the Ethernet port driver
*
* DESCRIPTION:
* This function prepares the ethernet port to start its activity:
@@ -2151,7 +2144,7 @@ static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
* 3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
* 4) Clean MAC tables. The reset status of those tables is unknown.
* 5) Set PHY address.
- * Note: Call this routine prior to eth_port_start routine and after
+ * Note: Call this routine prior to port_start routine and after
* setting user values in the user fields of Ethernet port control
* struct.
*
@@ -2164,13 +2157,13 @@ static unsigned int eth_port_set_tx_coal(struct mv643xx_private *mp,
* RETURN:
* None.
*/
-static void eth_port_init(struct mv643xx_private *mp)
+static void port_init(struct mv643xx_private *mp)
{
mp->rx_resource_err = 0;
- eth_port_reset(mp);
+ port_reset(mp);
- eth_port_init_mac_tables(mp);
+ init_mac_tables(mp);
}
/*
@@ -2206,7 +2199,7 @@ static int mv643xx_eth_open(struct net_device *dev)
return -EAGAIN;
}
- eth_port_init(mp);
+ port_init(mp);
memset(&mp->timeout, 0, sizeof(struct timer_list));
mp->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
@@ -2230,7 +2223,7 @@ static int mv643xx_eth_open(struct net_device *dev)
/* Allocate TX ring */
mp->tx_desc_count = 0;
- size = mp->tx_ring_size * sizeof(struct eth_tx_desc);
+ size = mp->tx_ring_size * sizeof(struct tx_desc);
mp->tx_desc_area_size = size;
if (mp->tx_sram_size) {
@@ -2255,7 +2248,7 @@ static int mv643xx_eth_open(struct net_device *dev)
/* Allocate RX ring */
mp->rx_desc_count = 0;
- size = mp->rx_ring_size * sizeof(struct eth_rx_desc);
+ size = mp->rx_ring_size * sizeof(struct rx_desc);
mp->rx_desc_area_size = size;
if (mp->rx_sram_size) {
@@ -2290,17 +2283,15 @@ static int mv643xx_eth_open(struct net_device *dev)
napi_enable(&mp->napi);
#endif
- eth_port_start(dev);
+ port_start(dev);
/* Interrupt Coalescing */
#ifdef MV643XX_COAL
- mp->rx_int_coal =
- eth_port_set_rx_coal(mp, MV643XX_RX_COAL);
+ mp->rx_int_coal = set_rx_coal(mp, MV643XX_RX_COAL);
#endif
- mp->tx_int_coal =
- eth_port_set_tx_coal(mp, MV643XX_TX_COAL);
+ mp->tx_int_coal = set_tx_coal(mp, MV643XX_TX_COAL);
/* Unmask phy and link status changes interrupts */
wrl(mp, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
@@ -2321,7 +2312,7 @@ out_free_irq:
}
/*
- * eth_port_reset - Reset Ethernet port
+ * port_reset - Reset Ethernet port
*
* DESCRIPTION:
* This routine resets the chip by aborting any SDMA engine activity and
@@ -2338,7 +2329,7 @@ out_free_irq:
* None.
*
*/
-static void eth_port_reset(struct mv643xx_private *mp)
+static void port_reset(struct mv643xx_private *mp)
{
unsigned int port_num = mp->port_num;
unsigned int reg_data;
@@ -2347,7 +2338,7 @@ static void eth_port_reset(struct mv643xx_private *mp)
mv643xx_eth_port_disable_rx(mp);
/* Clear all MIB counters */
- eth_clear_mib_counters(mp);
+ clear_mib_counters(mp);
/* Reset the Enable bit in the Configuration Register */
reg_data = rdl(mp, PORT_SERIAL_CONTROL(port_num));
@@ -2383,7 +2374,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
netif_carrier_off(dev);
netif_stop_queue(dev);
- eth_port_reset(mp);
+ port_reset(mp);
mv643xx_eth_free_tx_rings(dev);
mv643xx_eth_free_rx_rings(dev);
@@ -2447,8 +2438,8 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
netif_stop_queue(dev);
- eth_port_reset(mp);
- eth_port_start(dev);
+ port_reset(mp);
+ port_start(dev);
if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
netif_wake_queue(dev);
@@ -2496,14 +2487,14 @@ static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
struct mv643xx_private *mp = netdev_priv(dev);
int val;
- eth_port_read_smi_reg(mp, location, &val);
+ read_smi_reg(mp, location, &val);
return val;
}
static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
{
struct mv643xx_private *mp = netdev_priv(dev);
- eth_port_write_smi_reg(mp, location, val);
+ write_smi_reg(mp, location, val);
}
@@ -2511,7 +2502,7 @@ static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location,
static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
struct mbus_dram_target_info *dram)
{
- void __iomem *base = msp->eth_base;
+ void __iomem *base = msp->base;
u32 win_enable;
u32 win_protect;
int i;
@@ -2564,8 +2555,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
goto out;
memset(msp, 0, sizeof(*msp));
- msp->eth_base = ioremap(res->start, res->end - res->start + 1);
- if (msp->eth_base == NULL)
+ msp->base = ioremap(res->start, res->end - res->start + 1);
+ if (msp->base == NULL)
goto out_free;
spin_lock_init(&msp->phy_lock);
@@ -2591,7 +2582,7 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev)
{
struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);
- iounmap(msp->eth_base);
+ iounmap(msp->base);
kfree(msp);
return 0;
@@ -2607,7 +2598,7 @@ static struct platform_driver mv643xx_eth_shared_driver = {
};
/*
- * ethernet_phy_set - Set the ethernet port PHY address.
+ * phy_addr_set - Set the ethernet port PHY address.
*
* DESCRIPTION:
* This routine sets the given ethernet port PHY address.
@@ -2623,7 +2614,7 @@ static struct platform_driver mv643xx_eth_shared_driver = {
* None.
*
*/
-static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
+static void phy_addr_set(struct mv643xx_private *mp, int phy_addr)
{
u32 reg_data;
int addr_shift = 5 * mp->port_num;
@@ -2635,7 +2626,7 @@ static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
}
/*
- * ethernet_phy_get - Get the ethernet port PHY address.
+ * phy_addr_get - Get the ethernet port PHY address.
*
* DESCRIPTION:
* This routine returns the given ethernet port PHY address.
@@ -2650,7 +2641,7 @@ static void ethernet_phy_set(struct mv643xx_private *mp, int phy_addr)
* PHY address.
*
*/
-static int ethernet_phy_get(struct mv643xx_private *mp)
+static int phy_addr_get(struct mv643xx_private *mp)
{
unsigned int reg_data;
@@ -2660,7 +2651,7 @@ static int ethernet_phy_get(struct mv643xx_private *mp)
}
/*
- * ethernet_phy_detect - Detect whether a phy is present
+ * phy_detect - Detect whether a phy is present
*
* DESCRIPTION:
* This function tests whether there is a PHY present on
@@ -2677,22 +2668,22 @@ static int ethernet_phy_get(struct mv643xx_private *mp)
* -ENODEV on failure
*
*/
-static int ethernet_phy_detect(struct mv643xx_private *mp)
+static int phy_detect(struct mv643xx_private *mp)
{
unsigned int phy_reg_data0;
int auto_neg;
- eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+ read_smi_reg(mp, 0, &phy_reg_data0);
auto_neg = phy_reg_data0 & 0x1000;
phy_reg_data0 ^= 0x1000; /* invert auto_neg */
- eth_port_write_smi_reg(mp, 0, phy_reg_data0);
+ write_smi_reg(mp, 0, phy_reg_data0);
- eth_port_read_smi_reg(mp, 0, &phy_reg_data0);
+ read_smi_reg(mp, 0, &phy_reg_data0);
if ((phy_reg_data0 & 0x1000) == auto_neg)
return -ENODEV; /* change didn't take */
phy_reg_data0 ^= 0x1000;
- eth_port_write_smi_reg(mp, 0, phy_reg_data0);
+ write_smi_reg(mp, 0, phy_reg_data0);
return 0;
}
@@ -2822,15 +2813,15 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
mp->shared_smi = platform_get_drvdata(pd->shared_smi);
/* set default config values */
- eth_port_uc_addr_get(mp, dev->dev_addr);
- mp->rx_ring_size = PORT_DEFAULT_RECEIVE_QUEUE_SIZE;
- mp->tx_ring_size = PORT_DEFAULT_TRANSMIT_QUEUE_SIZE;
+ uc_addr_get(mp, dev->dev_addr);
+ mp->rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
+ mp->tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (is_valid_ether_addr(pd->mac_addr))
memcpy(dev->dev_addr, pd->mac_addr, 6);
if (pd->phy_addr || pd->force_phy_addr)
- ethernet_phy_set(mp, pd->phy_addr);
+ phy_addr_set(mp, pd->phy_addr);
if (pd->rx_queue_size)
mp->rx_ring_size = pd->rx_queue_size;
@@ -2855,18 +2846,18 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
mp->mii.dev = dev;
mp->mii.mdio_read = mv643xx_mdio_read;
mp->mii.mdio_write = mv643xx_mdio_write;
- mp->mii.phy_id = ethernet_phy_get(mp);
+ mp->mii.phy_id = phy_addr_get(mp);
mp->mii.phy_id_mask = 0x3f;
mp->mii.reg_num_mask = 0x1f;
- err = ethernet_phy_detect(mp);
+ err = phy_detect(mp);
if (err) {
pr_debug("%s: No PHY detected at addr %d\n",
- dev->name, ethernet_phy_get(mp));
+ dev->name, phy_addr_get(mp));
goto out;
}
- ethernet_phy_reset(mp);
+ phy_reset(mp);
mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
mv643xx_init_ethtool_cmd(dev, mp->mii.phy_id, speed, duplex, &cmd);
mv643xx_eth_update_pscr(dev, &cmd);
@@ -2935,7 +2926,7 @@ static void mv643xx_eth_shutdown(struct platform_device *pdev)
wrl(mp, INT_MASK(port_num), 0);
rdl(mp, INT_MASK(port_num));
- eth_port_reset(mp);
+ port_reset(mp);
}
static struct platform_driver mv643xx_eth_driver = {
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 16/39] mv643xx_eth: get rid of ETH_/ethernet_/eth_ prefixes
2008-06-03 11:02 ` [PATCH 16/39] mv643xx_eth: get rid of ETH_/ethernet_/eth_ prefixes Lennert Buytenhek
@ 2008-06-05 11:50 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:50 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:31PM +0200, Lennert Buytenhek wrote:
> The fact that mv643xx_eth is an ethernet driver is pretty obvious,
> and having a lot of internal-use-only functions and defines prefixed
> with ETH_/ethernet_/eth_ prefixes is rather pointless. So, get rid
> of most of those prefixes.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 399 ++++++++++++++++++++++-----------------------
> 1 files changed, 195 insertions(+), 204 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (15 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 16/39] mv643xx_eth: get rid of ETH_/ethernet_/eth_ prefixes Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:59 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 18/39] mv643xx_eth: kill superfluous comments Lennert Buytenhek
` (21 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
A bunch of places in the mv643xx_eth driver use the 'mv643xx_'
prefix. Since the mv643xx is a chip that includes more than just
ethernet, this patch makes all those places use either no prefix
(for some internal-use-only functions), or the full 'mv643xx_eth_'
prefix.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 1169 +++++++++++++++++++++++----------------------
1 files changed, 585 insertions(+), 584 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 4375b7c..15174b9 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -46,20 +46,20 @@
#include <linux/mii.h>
#include <linux/mv643xx_eth.h>
-static char mv643xx_driver_name[] = "mv643xx_eth";
-static char mv643xx_driver_version[] = "1.0";
+static char mv643xx_eth_driver_name[] = "mv643xx_eth";
+static char mv643xx_eth_driver_version[] = "1.0";
-#define MV643XX_CHECKSUM_OFFLOAD_TX
-#define MV643XX_NAPI
-#define MV643XX_TX_FAST_REFILL
-#undef MV643XX_COAL
+#define MV643XX_ETH_CHECKSUM_OFFLOAD_TX
+#define MV643XX_ETH_NAPI
+#define MV643XX_ETH_TX_FAST_REFILL
+#undef MV643XX_ETH_COAL
-#define MV643XX_TX_COAL 100
-#ifdef MV643XX_COAL
-#define MV643XX_RX_COAL 100
+#define MV643XX_ETH_TX_COAL 100
+#ifdef MV643XX_ETH_COAL
+#define MV643XX_ETH_RX_COAL 100
#endif
-#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
#define MAX_DESCS_PER_SKB (MAX_SKB_FRAGS + 1)
#else
#define MAX_DESCS_PER_SKB 1
@@ -254,7 +254,7 @@ struct pkt_info {
/* global *******************************************************************/
-struct mv643xx_shared_private {
+struct mv643xx_eth_shared_private {
void __iomem *base;
/* used to protect SMI_REG, which is shared across ports */
@@ -267,7 +267,7 @@ struct mv643xx_shared_private {
/* per-port *****************************************************************/
-struct mv643xx_mib_counters {
+struct mib_counters {
u64 good_octets_received;
u32 bad_octets_received;
u32 internal_mac_transmit_err;
@@ -300,11 +300,11 @@ struct mv643xx_mib_counters {
u32 late_collision;
};
-struct mv643xx_private {
- struct mv643xx_shared_private *shared;
+struct mv643xx_eth_private {
+ struct mv643xx_eth_shared_private *shared;
int port_num; /* User Ethernet port number */
- struct mv643xx_shared_private *shared_smi;
+ struct mv643xx_eth_shared_private *shared_smi;
u32 rx_sram_addr; /* Base address of rx sram area */
u32 rx_sram_size; /* Size of rx sram area */
@@ -321,7 +321,7 @@ struct mv643xx_private {
/* Next available and first returning Tx resource */
int tx_curr_desc_q, tx_used_desc_q;
-#ifdef MV643XX_TX_FAST_REFILL
+#ifdef MV643XX_ETH_TX_FAST_REFILL
u32 tx_clean_threshold;
#endif
@@ -340,7 +340,7 @@ struct mv643xx_private {
struct net_device *dev;
struct napi_struct napi;
struct net_device_stats stats;
- struct mv643xx_mib_counters mib_counters;
+ struct mib_counters mib_counters;
spinlock_t lock;
/* Size of Tx Ring per queue */
int tx_ring_size;
@@ -364,68 +364,68 @@ struct mv643xx_private {
/* port register accessors **************************************************/
-static inline u32 rdl(struct mv643xx_private *mp, int offset)
+static inline u32 rdl(struct mv643xx_eth_private *mep, int offset)
{
- return readl(mp->shared->base + offset);
+ return readl(mep->shared->base + offset);
}
-static inline void wrl(struct mv643xx_private *mp, int offset, u32 data)
+static inline void wrl(struct mv643xx_eth_private *mep, int offset, u32 data)
{
- writel(data, mp->shared->base + offset);
+ writel(data, mep->shared->base + offset);
}
/* rxq/txq helper functions *************************************************/
-static void mv643xx_eth_port_enable_rx(struct mv643xx_private *mp,
+static void mv643xx_eth_port_enable_rx(struct mv643xx_eth_private *mep,
unsigned int queues)
{
- wrl(mp, RXQ_COMMAND(mp->port_num), queues);
+ wrl(mep, RXQ_COMMAND(mep->port_num), queues);
}
-static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_private *mp)
+static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
u32 queues;
/* Stop Rx port activity. Check port Rx activity. */
- queues = rdl(mp, RXQ_COMMAND(port_num)) & 0xFF;
+ queues = rdl(mep, RXQ_COMMAND(port_num)) & 0xFF;
if (queues) {
/* Issue stop command for active queues only */
- wrl(mp, RXQ_COMMAND(port_num), (queues << 8));
+ wrl(mep, RXQ_COMMAND(port_num), (queues << 8));
/* Wait for all Rx activity to terminate. */
/* Check port cause register that all Rx queues are stopped */
- while (rdl(mp, RXQ_COMMAND(port_num)) & 0xFF)
+ while (rdl(mep, RXQ_COMMAND(port_num)) & 0xFF)
udelay(10);
}
return queues;
}
-static void mv643xx_eth_port_enable_tx(struct mv643xx_private *mp,
+static void mv643xx_eth_port_enable_tx(struct mv643xx_eth_private *mep,
unsigned int queues)
{
- wrl(mp, TXQ_COMMAND(mp->port_num), queues);
+ wrl(mep, TXQ_COMMAND(mep->port_num), queues);
}
-static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_private *mp)
+static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
u32 queues;
/* Stop Tx port activity. Check port Tx activity. */
- queues = rdl(mp, TXQ_COMMAND(port_num)) & 0xFF;
+ queues = rdl(mep, TXQ_COMMAND(port_num)) & 0xFF;
if (queues) {
/* Issue stop command for active queues only */
- wrl(mp, TXQ_COMMAND(port_num), (queues << 8));
+ wrl(mep, TXQ_COMMAND(port_num), (queues << 8));
/* Wait for all Tx activity to terminate. */
/* Check port cause register that all Tx queues are stopped */
- while (rdl(mp, TXQ_COMMAND(port_num)) & 0xFF)
+ while (rdl(mep, TXQ_COMMAND(port_num)) & 0xFF)
udelay(10);
/* Wait for Tx FIFO to empty */
- while (rdl(mp, PORT_STATUS(port_num)) & TX_FIFO_EMPTY)
+ while (rdl(mep, PORT_STATUS(port_num)) & TX_FIFO_EMPTY)
udelay(10);
}
@@ -446,7 +446,7 @@ static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
* no available Rx resources, the function resets the resource error flag.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
* struct pkt_info *p_pkt_info Information on returned buffer.
*
* OUTPUT:
@@ -456,22 +456,22 @@ static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
* ETH_ERROR in case the routine can not access Rx desc ring.
* ETH_OK otherwise.
*/
-static FUNC_RET_STATUS rx_return_buff(struct mv643xx_private *mp,
+static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
struct pkt_info *p_pkt_info)
{
int used_rx_desc; /* Where to return Rx resource */
volatile struct rx_desc *p_used_rx_desc;
unsigned long flags;
- spin_lock_irqsave(&mp->lock, flags);
+ spin_lock_irqsave(&mep->lock, flags);
/* Get 'used' Rx descriptor */
- used_rx_desc = mp->rx_used_desc_q;
- p_used_rx_desc = &mp->p_rx_desc_area[used_rx_desc];
+ used_rx_desc = mep->rx_used_desc_q;
+ p_used_rx_desc = &mep->p_rx_desc_area[used_rx_desc];
p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
- mp->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+ mep->rx_skb[used_rx_desc] = p_pkt_info->return_info;
/* Flush the write pipe */
@@ -481,12 +481,12 @@ static FUNC_RET_STATUS rx_return_buff(struct mv643xx_private *mp,
wmb();
/* Move the used descriptor pointer to the next descriptor */
- mp->rx_used_desc_q = (used_rx_desc + 1) % mp->rx_ring_size;
+ mep->rx_used_desc_q = (used_rx_desc + 1) % mep->rx_ring_size;
/* Any Rx return cancels the Rx resource error status */
- mp->rx_resource_err = 0;
+ mep->rx_resource_err = 0;
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return ETH_OK;
}
@@ -501,16 +501,16 @@ static FUNC_RET_STATUS rx_return_buff(struct mv643xx_private *mp,
*/
static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
struct pkt_info pkt_info;
struct sk_buff *skb;
int unaligned;
- while (mp->rx_desc_count < mp->rx_ring_size) {
+ while (mep->rx_desc_count < mep->rx_ring_size) {
skb = dev_alloc_skb(ETH_RX_SKB_SIZE + dma_get_cache_alignment());
if (!skb)
break;
- mp->rx_desc_count++;
+ mep->rx_desc_count++;
unaligned = (u32)skb->data & (dma_get_cache_alignment() - 1);
if (unaligned)
skb_reserve(skb, dma_get_cache_alignment() - unaligned);
@@ -519,7 +519,7 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
ETH_RX_SKB_SIZE, DMA_FROM_DEVICE);
pkt_info.return_info = skb;
- if (rx_return_buff(mp, &pkt_info) != ETH_OK) {
+ if (rx_return_buff(mep, &pkt_info) != ETH_OK) {
printk(KERN_ERR
"%s: Error allocating RX Ring\n", dev->name);
break;
@@ -530,10 +530,10 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
* If RX ring is empty of SKB, set a timer to try allocating
* again at a later time.
*/
- if (mp->rx_desc_count == 0) {
+ if (mep->rx_desc_count == 0) {
printk(KERN_INFO "%s: Rx ring is empty\n", dev->name);
- mp->timeout.expires = jiffies + (HZ / 10); /* 100 mSec */
- add_timer(&mp->timeout);
+ mep->timeout.expires = jiffies + (HZ / 10); /* 100 mSec */
+ add_timer(&mep->timeout);
}
}
@@ -563,7 +563,7 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
* is set.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
* struct pkt_info *p_pkt_info User packet buffer.
*
* OUTPUT:
@@ -575,7 +575,7 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
* ETH_END_OF_JOB if there is no received data.
* ETH_OK otherwise.
*/
-static FUNC_RET_STATUS port_receive(struct mv643xx_private *mp,
+static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
struct pkt_info *p_pkt_info)
{
int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
@@ -584,16 +584,16 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_private *mp,
unsigned long flags;
/* Do not process Rx ring in case of Rx ring resource error */
- if (mp->rx_resource_err)
+ if (mep->rx_resource_err)
return ETH_QUEUE_FULL;
- spin_lock_irqsave(&mp->lock, flags);
+ spin_lock_irqsave(&mep->lock, flags);
/* Get the Rx Desc ring 'curr and 'used' indexes */
- rx_curr_desc = mp->rx_curr_desc_q;
- rx_used_desc = mp->rx_used_desc_q;
+ rx_curr_desc = mep->rx_curr_desc_q;
+ rx_used_desc = mep->rx_used_desc_q;
- p_rx_desc = &mp->p_rx_desc_area[rx_curr_desc];
+ p_rx_desc = &mep->p_rx_desc_area[rx_curr_desc];
/* The following parameters are used to save readings from memory */
command_status = p_rx_desc->cmd_sts;
@@ -601,31 +601,31 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_private *mp,
/* Nothing to receive... */
if (command_status & BUFFER_OWNED_BY_DMA) {
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return ETH_END_OF_JOB;
}
p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
p_pkt_info->cmd_sts = command_status;
p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
- p_pkt_info->return_info = mp->rx_skb[rx_curr_desc];
+ p_pkt_info->return_info = mep->rx_skb[rx_curr_desc];
p_pkt_info->l4i_chk = p_rx_desc->buf_size;
/*
* Clean the return info field to indicate that the
* packet has been moved to the upper layers
*/
- mp->rx_skb[rx_curr_desc] = NULL;
+ mep->rx_skb[rx_curr_desc] = NULL;
/* Update current index in data structure */
- rx_next_curr_desc = (rx_curr_desc + 1) % mp->rx_ring_size;
- mp->rx_curr_desc_q = rx_next_curr_desc;
+ rx_next_curr_desc = (rx_curr_desc + 1) % mep->rx_ring_size;
+ mep->rx_curr_desc_q = rx_next_curr_desc;
/* Rx descriptors exhausted. Set the Rx ring resource error flag */
if (rx_next_curr_desc == rx_used_desc)
- mp->rx_resource_err = 1;
+ mep->rx_resource_err = 1;
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return ETH_OK;
}
@@ -643,16 +643,16 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_private *mp,
*/
static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
unsigned int received_packets = 0;
struct sk_buff *skb;
struct pkt_info pkt_info;
- while (budget-- > 0 && port_receive(mp, &pkt_info) == ETH_OK) {
+ while (budget-- > 0 && port_receive(mep, &pkt_info) == ETH_OK) {
dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
DMA_FROM_DEVICE);
- mp->rx_desc_count--;
+ mep->rx_desc_count--;
received_packets++;
/*
@@ -696,7 +696,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
(pkt_info.cmd_sts & 0x0007fff8) >> 3);
}
skb->protocol = eth_type_trans(skb, dev);
-#ifdef MV643XX_NAPI
+#ifdef MV643XX_ETH_NAPI
netif_receive_skb(skb);
#else
netif_rx(skb);
@@ -709,36 +709,36 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
return received_packets;
}
-#ifdef MV643XX_NAPI
+#ifdef MV643XX_ETH_NAPI
/*
- * mv643xx_poll
+ * mv643xx_eth_poll
*
* This function is used in case of NAPI
*/
-static int mv643xx_poll(struct napi_struct *napi, int budget)
+static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
{
- struct mv643xx_private *mp = container_of(napi, struct mv643xx_private, napi);
- struct net_device *dev = mp->dev;
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = container_of(napi, struct mv643xx_eth_private, napi);
+ struct net_device *dev = mep->dev;
+ unsigned int port_num = mep->port_num;
int work_done;
-#ifdef MV643XX_TX_FAST_REFILL
- if (++mp->tx_clean_threshold > 5) {
+#ifdef MV643XX_ETH_TX_FAST_REFILL
+ if (++mep->tx_clean_threshold > 5) {
mv643xx_eth_free_completed_tx_descs(dev);
- mp->tx_clean_threshold = 0;
+ mep->tx_clean_threshold = 0;
}
#endif
work_done = 0;
- if ((rdl(mp, RXQ_CURRENT_DESC_PTR(port_num)))
- != (u32) mp->rx_used_desc_q)
+ if ((rdl(mep, RXQ_CURRENT_DESC_PTR(port_num)))
+ != (u32) mep->rx_used_desc_q)
work_done = mv643xx_eth_receive_queue(dev, budget);
if (work_done < budget) {
netif_rx_complete(dev, napi);
- wrl(mp, INT_CAUSE(port_num), 0);
- wrl(mp, INT_CAUSE_EXT(port_num), 0);
- wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
+ wrl(mep, INT_CAUSE(port_num), 0);
+ wrl(mep, INT_CAUSE_EXT(port_num), 0);
+ wrl(mep, INT_MASK(port_num), INT_RX | INT_EXT);
}
return work_done;
@@ -770,16 +770,16 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
/**
* alloc_tx_desc_index - return the index of the next available tx desc
*/
-static int alloc_tx_desc_index(struct mv643xx_private *mp)
+static int alloc_tx_desc_index(struct mv643xx_eth_private *mep)
{
int tx_desc_curr;
- BUG_ON(mp->tx_desc_count >= mp->tx_ring_size);
+ BUG_ON(mep->tx_desc_count >= mep->tx_ring_size);
- tx_desc_curr = mp->tx_curr_desc_q;
- mp->tx_curr_desc_q = (tx_desc_curr + 1) % mp->tx_ring_size;
+ tx_desc_curr = mep->tx_curr_desc_q;
+ mep->tx_curr_desc_q = (tx_desc_curr + 1) % mep->tx_ring_size;
- BUG_ON(mp->tx_curr_desc_q == mp->tx_used_desc_q);
+ BUG_ON(mep->tx_curr_desc_q == mep->tx_used_desc_q);
return tx_desc_curr;
}
@@ -790,7 +790,7 @@ static int alloc_tx_desc_index(struct mv643xx_private *mp)
* Ensure the data for each fragment to be transmitted is mapped properly,
* then fill in descriptors in the tx hw queue.
*/
-static void tx_fill_frag_descs(struct mv643xx_private *mp,
+static void tx_fill_frag_descs(struct mv643xx_eth_private *mep,
struct sk_buff *skb)
{
int frag;
@@ -800,8 +800,8 @@ static void tx_fill_frag_descs(struct mv643xx_private *mp,
for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
- tx_index = alloc_tx_desc_index(mp);
- desc = &mp->p_tx_desc_area[tx_index];
+ tx_index = alloc_tx_desc_index(mep);
+ desc = &mep->p_tx_desc_area[tx_index];
desc->cmd_sts = BUFFER_OWNED_BY_DMA;
/* Last Frag enables interrupt and frees the skb */
@@ -809,11 +809,11 @@ static void tx_fill_frag_descs(struct mv643xx_private *mp,
desc->cmd_sts |= ZERO_PADDING |
TX_LAST_DESC |
TX_ENABLE_INTERRUPT;
- mp->tx_skb[tx_index] = skb;
+ mep->tx_skb[tx_index] = skb;
} else
- mp->tx_skb[tx_index] = NULL;
+ mep->tx_skb[tx_index] = NULL;
- desc = &mp->p_tx_desc_area[tx_index];
+ desc = &mep->p_tx_desc_area[tx_index];
desc->l4i_chk = 0;
desc->byte_cnt = this_frag->size;
desc->buf_ptr = dma_map_page(NULL, this_frag->page,
@@ -834,7 +834,7 @@ static inline __be16 sum16_as_be(__sum16 sum)
* Ensure the data for an skb to be transmitted is mapped properly,
* then fill in descriptors in the tx hw queue and start the hardware.
*/
-static void tx_submit_descs_for_skb(struct mv643xx_private *mp,
+static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
struct sk_buff *skb)
{
int tx_index;
@@ -845,18 +845,18 @@ static void tx_submit_descs_for_skb(struct mv643xx_private *mp,
cmd_sts = TX_FIRST_DESC | GEN_CRC | BUFFER_OWNED_BY_DMA;
- tx_index = alloc_tx_desc_index(mp);
- desc = &mp->p_tx_desc_area[tx_index];
+ tx_index = alloc_tx_desc_index(mep);
+ desc = &mep->p_tx_desc_area[tx_index];
if (nr_frags) {
- tx_fill_frag_descs(mp, skb);
+ tx_fill_frag_descs(mep, skb);
length = skb_headlen(skb);
- mp->tx_skb[tx_index] = NULL;
+ mep->tx_skb[tx_index] = NULL;
} else {
cmd_sts |= ZERO_PADDING | TX_LAST_DESC | TX_ENABLE_INTERRUPT;
length = skb->len;
- mp->tx_skb[tx_index] = skb;
+ mep->tx_skb[tx_index] = skb;
}
desc->byte_cnt = length;
@@ -892,9 +892,9 @@ static void tx_submit_descs_for_skb(struct mv643xx_private *mp,
/* ensure all descriptors are written before poking hardware */
wmb();
- mv643xx_eth_port_enable_tx(mp, 1);
+ mv643xx_eth_port_enable_tx(mep, 1);
- mp->tx_desc_count += nr_frags + 1;
+ mep->tx_desc_count += nr_frags + 1;
}
/**
@@ -903,7 +903,7 @@ static void tx_submit_descs_for_skb(struct mv643xx_private *mp,
*/
static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
unsigned long flags;
@@ -916,31 +916,31 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}
- spin_lock_irqsave(&mp->lock, flags);
+ spin_lock_irqsave(&mep->lock, flags);
- if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB) {
+ if (mep->tx_ring_size - mep->tx_desc_count < MAX_DESCS_PER_SKB) {
printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
netif_stop_queue(dev);
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return NETDEV_TX_BUSY;
}
- tx_submit_descs_for_skb(mp, skb);
+ tx_submit_descs_for_skb(mep, skb);
stats->tx_bytes += skb->len;
stats->tx_packets++;
dev->trans_start = jiffies;
- if (mp->tx_ring_size - mp->tx_desc_count < MAX_DESCS_PER_SKB)
+ if (mep->tx_ring_size - mep->tx_desc_count < MAX_DESCS_PER_SKB)
netif_stop_queue(dev);
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return NETDEV_TX_OK;
}
/* mii management interface *************************************************/
-static int phy_addr_get(struct mv643xx_private *mp);
+static int phy_addr_get(struct mv643xx_eth_private *mep);
/*
* read_smi_reg - Read PHY registers
@@ -950,7 +950,7 @@ static int phy_addr_get(struct mv643xx_private *mp);
* order to perform PHY register read.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
* unsigned int phy_reg PHY register address offset.
* unsigned int *value Register value buffer.
*
@@ -962,21 +962,21 @@ static int phy_addr_get(struct mv643xx_private *mp);
* true otherwise.
*
*/
-static void read_smi_reg(struct mv643xx_private *mp,
+static void read_smi_reg(struct mv643xx_eth_private *mep,
unsigned int phy_reg, unsigned int *value)
{
- void __iomem *smi_reg = mp->shared_smi->base + SMI_REG;
- int phy_addr = phy_addr_get(mp);
+ void __iomem *smi_reg = mep->shared_smi->base + SMI_REG;
+ int phy_addr = phy_addr_get(mep);
unsigned long flags;
int i;
/* the SMI register is a shared resource */
- spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
+ spin_lock_irqsave(&mep->shared_smi->phy_lock, flags);
/* wait for the SMI register to become available */
for (i = 0; readl(smi_reg) & SMI_BUSY; i++) {
if (i == 1000) {
- printk("%s: PHY busy timeout\n", mp->dev->name);
+ printk("%s: PHY busy timeout\n", mep->dev->name);
goto out;
}
udelay(10);
@@ -987,7 +987,7 @@ static void read_smi_reg(struct mv643xx_private *mp,
/* now wait for the data to be valid */
for (i = 0; !(readl(smi_reg) & SMI_READ_VALID); i++) {
if (i == 1000) {
- printk("%s: PHY read timeout\n", mp->dev->name);
+ printk("%s: PHY read timeout\n", mep->dev->name);
goto out;
}
udelay(10);
@@ -995,7 +995,7 @@ static void read_smi_reg(struct mv643xx_private *mp,
*value = readl(smi_reg) & 0xffff;
out:
- spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
+ spin_unlock_irqrestore(&mep->shared_smi->phy_lock, flags);
}
/*
@@ -1006,7 +1006,7 @@ out:
* order to perform writes to PHY registers.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
* unsigned int phy_reg PHY register address offset.
* unsigned int value Register value.
*
@@ -1018,21 +1018,21 @@ out:
* true otherwise.
*
*/
-static void write_smi_reg(struct mv643xx_private *mp,
+static void write_smi_reg(struct mv643xx_eth_private *mep,
unsigned int phy_reg, unsigned int value)
{
- void __iomem *smi_reg = mp->shared_smi->base + SMI_REG;
- int phy_addr = phy_addr_get(mp);
+ void __iomem *smi_reg = mep->shared_smi->base + SMI_REG;
+ int phy_addr = phy_addr_get(mep);
unsigned long flags;
int i;
/* the SMI register is a shared resource */
- spin_lock_irqsave(&mp->shared_smi->phy_lock, flags);
+ spin_lock_irqsave(&mep->shared_smi->phy_lock, flags);
/* wait for the SMI register to become available */
for (i = 0; readl(smi_reg) & SMI_BUSY; i++) {
if (i == 1000) {
- printk("%s: PHY busy timeout\n", mp->dev->name);
+ printk("%s: PHY busy timeout\n", mep->dev->name);
goto out;
}
udelay(10);
@@ -1041,7 +1041,7 @@ static void write_smi_reg(struct mv643xx_private *mp,
writel((phy_addr << 16) | (phy_reg << 21) |
SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
out:
- spin_unlock_irqrestore(&mp->shared_smi->phy_lock, flags);
+ spin_unlock_irqrestore(&mep->shared_smi->phy_lock, flags);
}
@@ -1054,7 +1054,7 @@ out:
* A read from the MIB counter will reset the counter.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* After reading all MIB counters, the counters resets.
@@ -1063,121 +1063,121 @@ out:
* MIB counter value.
*
*/
-static void clear_mib_counters(struct mv643xx_private *mp)
+static void clear_mib_counters(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
int i;
/* Perform dummy reads from MIB counters */
for (i = 0; i < 0x80; i += 4)
- rdl(mp, MIB_COUNTERS(port_num) + i);
-}
-
-static inline u32 read_mib(struct mv643xx_private *mp, int offset)
-{
- return rdl(mp, MIB_COUNTERS(mp->port_num) + offset);
-}
-
-static void update_mib_counters(struct mv643xx_private *mp)
-{
- struct mv643xx_mib_counters *p = &mp->mib_counters;
-
- p->good_octets_received += read_mib(mp, 0x00);
- p->good_octets_received += (u64)read_mib(mp, 0x04) << 32;
- p->bad_octets_received += read_mib(mp, 0x08);
- p->internal_mac_transmit_err += read_mib(mp, 0x0c);
- p->good_frames_received += read_mib(mp, 0x10);
- p->bad_frames_received += read_mib(mp, 0x14);
- p->broadcast_frames_received += read_mib(mp, 0x18);
- p->multicast_frames_received += read_mib(mp, 0x1c);
- p->frames_64_octets += read_mib(mp, 0x20);
- p->frames_65_to_127_octets += read_mib(mp, 0x24);
- p->frames_128_to_255_octets += read_mib(mp, 0x28);
- p->frames_256_to_511_octets += read_mib(mp, 0x2c);
- p->frames_512_to_1023_octets += read_mib(mp, 0x30);
- p->frames_1024_to_max_octets += read_mib(mp, 0x34);
- p->good_octets_sent += read_mib(mp, 0x38);
- p->good_octets_sent += (u64)read_mib(mp, 0x3c) << 32;
- p->good_frames_sent += read_mib(mp, 0x40);
- p->excessive_collision += read_mib(mp, 0x44);
- p->multicast_frames_sent += read_mib(mp, 0x48);
- p->broadcast_frames_sent += read_mib(mp, 0x4c);
- p->unrec_mac_control_received += read_mib(mp, 0x50);
- p->fc_sent += read_mib(mp, 0x54);
- p->good_fc_received += read_mib(mp, 0x58);
- p->bad_fc_received += read_mib(mp, 0x5c);
- p->undersize_received += read_mib(mp, 0x60);
- p->fragments_received += read_mib(mp, 0x64);
- p->oversize_received += read_mib(mp, 0x68);
- p->jabber_received += read_mib(mp, 0x6c);
- p->mac_receive_error += read_mib(mp, 0x70);
- p->bad_crc_event += read_mib(mp, 0x74);
- p->collision += read_mib(mp, 0x78);
- p->late_collision += read_mib(mp, 0x7c);
+ rdl(mep, MIB_COUNTERS(port_num) + i);
+}
+
+static inline u32 read_mib(struct mv643xx_eth_private *mep, int offset)
+{
+ return rdl(mep, MIB_COUNTERS(mep->port_num) + offset);
+}
+
+static void update_mib_counters(struct mv643xx_eth_private *mep)
+{
+ struct mib_counters *p = &mep->mib_counters;
+
+ p->good_octets_received += read_mib(mep, 0x00);
+ p->good_octets_received += (u64)read_mib(mep, 0x04) << 32;
+ p->bad_octets_received += read_mib(mep, 0x08);
+ p->internal_mac_transmit_err += read_mib(mep, 0x0c);
+ p->good_frames_received += read_mib(mep, 0x10);
+ p->bad_frames_received += read_mib(mep, 0x14);
+ p->broadcast_frames_received += read_mib(mep, 0x18);
+ p->multicast_frames_received += read_mib(mep, 0x1c);
+ p->frames_64_octets += read_mib(mep, 0x20);
+ p->frames_65_to_127_octets += read_mib(mep, 0x24);
+ p->frames_128_to_255_octets += read_mib(mep, 0x28);
+ p->frames_256_to_511_octets += read_mib(mep, 0x2c);
+ p->frames_512_to_1023_octets += read_mib(mep, 0x30);
+ p->frames_1024_to_max_octets += read_mib(mep, 0x34);
+ p->good_octets_sent += read_mib(mep, 0x38);
+ p->good_octets_sent += (u64)read_mib(mep, 0x3c) << 32;
+ p->good_frames_sent += read_mib(mep, 0x40);
+ p->excessive_collision += read_mib(mep, 0x44);
+ p->multicast_frames_sent += read_mib(mep, 0x48);
+ p->broadcast_frames_sent += read_mib(mep, 0x4c);
+ p->unrec_mac_control_received += read_mib(mep, 0x50);
+ p->fc_sent += read_mib(mep, 0x54);
+ p->good_fc_received += read_mib(mep, 0x58);
+ p->bad_fc_received += read_mib(mep, 0x5c);
+ p->undersize_received += read_mib(mep, 0x60);
+ p->fragments_received += read_mib(mep, 0x64);
+ p->oversize_received += read_mib(mep, 0x68);
+ p->jabber_received += read_mib(mep, 0x6c);
+ p->mac_receive_error += read_mib(mep, 0x70);
+ p->bad_crc_event += read_mib(mep, 0x74);
+ p->collision += read_mib(mep, 0x78);
+ p->late_collision += read_mib(mep, 0x7c);
}
/* ethtool ******************************************************************/
-struct mv643xx_stats {
+struct mv643xx_eth_stats {
char stat_string[ETH_GSTRING_LEN];
int sizeof_stat;
int stat_offset;
};
-#define MV643XX_STAT(m) FIELD_SIZEOF(struct mv643xx_private, m), \
- offsetof(struct mv643xx_private, m)
-
-static const struct mv643xx_stats mv643xx_gstrings_stats[] = {
- { "rx_packets", MV643XX_STAT(stats.rx_packets) },
- { "tx_packets", MV643XX_STAT(stats.tx_packets) },
- { "rx_bytes", MV643XX_STAT(stats.rx_bytes) },
- { "tx_bytes", MV643XX_STAT(stats.tx_bytes) },
- { "rx_errors", MV643XX_STAT(stats.rx_errors) },
- { "tx_errors", MV643XX_STAT(stats.tx_errors) },
- { "rx_dropped", MV643XX_STAT(stats.rx_dropped) },
- { "tx_dropped", MV643XX_STAT(stats.tx_dropped) },
- { "good_octets_received", MV643XX_STAT(mib_counters.good_octets_received) },
- { "bad_octets_received", MV643XX_STAT(mib_counters.bad_octets_received) },
- { "internal_mac_transmit_err", MV643XX_STAT(mib_counters.internal_mac_transmit_err) },
- { "good_frames_received", MV643XX_STAT(mib_counters.good_frames_received) },
- { "bad_frames_received", MV643XX_STAT(mib_counters.bad_frames_received) },
- { "broadcast_frames_received", MV643XX_STAT(mib_counters.broadcast_frames_received) },
- { "multicast_frames_received", MV643XX_STAT(mib_counters.multicast_frames_received) },
- { "frames_64_octets", MV643XX_STAT(mib_counters.frames_64_octets) },
- { "frames_65_to_127_octets", MV643XX_STAT(mib_counters.frames_65_to_127_octets) },
- { "frames_128_to_255_octets", MV643XX_STAT(mib_counters.frames_128_to_255_octets) },
- { "frames_256_to_511_octets", MV643XX_STAT(mib_counters.frames_256_to_511_octets) },
- { "frames_512_to_1023_octets", MV643XX_STAT(mib_counters.frames_512_to_1023_octets) },
- { "frames_1024_to_max_octets", MV643XX_STAT(mib_counters.frames_1024_to_max_octets) },
- { "good_octets_sent", MV643XX_STAT(mib_counters.good_octets_sent) },
- { "good_frames_sent", MV643XX_STAT(mib_counters.good_frames_sent) },
- { "excessive_collision", MV643XX_STAT(mib_counters.excessive_collision) },
- { "multicast_frames_sent", MV643XX_STAT(mib_counters.multicast_frames_sent) },
- { "broadcast_frames_sent", MV643XX_STAT(mib_counters.broadcast_frames_sent) },
- { "unrec_mac_control_received", MV643XX_STAT(mib_counters.unrec_mac_control_received) },
- { "fc_sent", MV643XX_STAT(mib_counters.fc_sent) },
- { "good_fc_received", MV643XX_STAT(mib_counters.good_fc_received) },
- { "bad_fc_received", MV643XX_STAT(mib_counters.bad_fc_received) },
- { "undersize_received", MV643XX_STAT(mib_counters.undersize_received) },
- { "fragments_received", MV643XX_STAT(mib_counters.fragments_received) },
- { "oversize_received", MV643XX_STAT(mib_counters.oversize_received) },
- { "jabber_received", MV643XX_STAT(mib_counters.jabber_received) },
- { "mac_receive_error", MV643XX_STAT(mib_counters.mac_receive_error) },
- { "bad_crc_event", MV643XX_STAT(mib_counters.bad_crc_event) },
- { "collision", MV643XX_STAT(mib_counters.collision) },
- { "late_collision", MV643XX_STAT(mib_counters.late_collision) },
+#define MV643XX_ETH_STAT(m) FIELD_SIZEOF(struct mv643xx_eth_private, m), \
+ offsetof(struct mv643xx_eth_private, m)
+
+static const struct mv643xx_eth_stats mv643xx_eth_gstrings_stats[] = {
+ { "rx_packets", MV643XX_ETH_STAT(stats.rx_packets) },
+ { "tx_packets", MV643XX_ETH_STAT(stats.tx_packets) },
+ { "rx_bytes", MV643XX_ETH_STAT(stats.rx_bytes) },
+ { "tx_bytes", MV643XX_ETH_STAT(stats.tx_bytes) },
+ { "rx_errors", MV643XX_ETH_STAT(stats.rx_errors) },
+ { "tx_errors", MV643XX_ETH_STAT(stats.tx_errors) },
+ { "rx_dropped", MV643XX_ETH_STAT(stats.rx_dropped) },
+ { "tx_dropped", MV643XX_ETH_STAT(stats.tx_dropped) },
+ { "good_octets_received", MV643XX_ETH_STAT(mib_counters.good_octets_received) },
+ { "bad_octets_received", MV643XX_ETH_STAT(mib_counters.bad_octets_received) },
+ { "internal_mac_transmit_err", MV643XX_ETH_STAT(mib_counters.internal_mac_transmit_err) },
+ { "good_frames_received", MV643XX_ETH_STAT(mib_counters.good_frames_received) },
+ { "bad_frames_received", MV643XX_ETH_STAT(mib_counters.bad_frames_received) },
+ { "broadcast_frames_received", MV643XX_ETH_STAT(mib_counters.broadcast_frames_received) },
+ { "multicast_frames_received", MV643XX_ETH_STAT(mib_counters.multicast_frames_received) },
+ { "frames_64_octets", MV643XX_ETH_STAT(mib_counters.frames_64_octets) },
+ { "frames_65_to_127_octets", MV643XX_ETH_STAT(mib_counters.frames_65_to_127_octets) },
+ { "frames_128_to_255_octets", MV643XX_ETH_STAT(mib_counters.frames_128_to_255_octets) },
+ { "frames_256_to_511_octets", MV643XX_ETH_STAT(mib_counters.frames_256_to_511_octets) },
+ { "frames_512_to_1023_octets", MV643XX_ETH_STAT(mib_counters.frames_512_to_1023_octets) },
+ { "frames_1024_to_max_octets", MV643XX_ETH_STAT(mib_counters.frames_1024_to_max_octets) },
+ { "good_octets_sent", MV643XX_ETH_STAT(mib_counters.good_octets_sent) },
+ { "good_frames_sent", MV643XX_ETH_STAT(mib_counters.good_frames_sent) },
+ { "excessive_collision", MV643XX_ETH_STAT(mib_counters.excessive_collision) },
+ { "multicast_frames_sent", MV643XX_ETH_STAT(mib_counters.multicast_frames_sent) },
+ { "broadcast_frames_sent", MV643XX_ETH_STAT(mib_counters.broadcast_frames_sent) },
+ { "unrec_mac_control_received", MV643XX_ETH_STAT(mib_counters.unrec_mac_control_received) },
+ { "fc_sent", MV643XX_ETH_STAT(mib_counters.fc_sent) },
+ { "good_fc_received", MV643XX_ETH_STAT(mib_counters.good_fc_received) },
+ { "bad_fc_received", MV643XX_ETH_STAT(mib_counters.bad_fc_received) },
+ { "undersize_received", MV643XX_ETH_STAT(mib_counters.undersize_received) },
+ { "fragments_received", MV643XX_ETH_STAT(mib_counters.fragments_received) },
+ { "oversize_received", MV643XX_ETH_STAT(mib_counters.oversize_received) },
+ { "jabber_received", MV643XX_ETH_STAT(mib_counters.jabber_received) },
+ { "mac_receive_error", MV643XX_ETH_STAT(mib_counters.mac_receive_error) },
+ { "bad_crc_event", MV643XX_ETH_STAT(mib_counters.bad_crc_event) },
+ { "collision", MV643XX_ETH_STAT(mib_counters.collision) },
+ { "late_collision", MV643XX_ETH_STAT(mib_counters.late_collision) },
};
-#define MV643XX_STATS_LEN ARRAY_SIZE(mv643xx_gstrings_stats)
+#define MV643XX_ETH_STATS_LEN ARRAY_SIZE(mv643xx_eth_gstrings_stats)
-static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
int err;
- spin_lock_irq(&mp->lock);
- err = mii_ethtool_gset(&mp->mii, cmd);
- spin_unlock_irq(&mp->lock);
+ spin_lock_irq(&mep->lock);
+ err = mii_ethtool_gset(&mep->mii, cmd);
+ spin_unlock_irq(&mep->lock);
/* The PHY may support 1000baseT_Half, but the mv643xx does not */
cmd->supported &= ~SUPPORTED_1000baseT_Half;
@@ -1186,92 +1186,92 @@ static int mv643xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
return err;
}
-static int mv643xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
+static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
int err;
- spin_lock_irq(&mp->lock);
- err = mii_ethtool_sset(&mp->mii, cmd);
- spin_unlock_irq(&mp->lock);
+ spin_lock_irq(&mep->lock);
+ err = mii_ethtool_sset(&mep->mii, cmd);
+ spin_unlock_irq(&mep->lock);
return err;
}
-static void mv643xx_get_drvinfo(struct net_device *netdev,
+static void mv643xx_eth_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *drvinfo)
{
- strncpy(drvinfo->driver, mv643xx_driver_name, 32);
- strncpy(drvinfo->version, mv643xx_driver_version, 32);
+ strncpy(drvinfo->driver, mv643xx_eth_driver_name, 32);
+ strncpy(drvinfo->version, mv643xx_eth_driver_version, 32);
strncpy(drvinfo->fw_version, "N/A", 32);
strncpy(drvinfo->bus_info, "mv643xx", 32);
- drvinfo->n_stats = MV643XX_STATS_LEN;
+ drvinfo->n_stats = MV643XX_ETH_STATS_LEN;
}
static int mv643xx_eth_nway_restart(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
- return mii_nway_restart(&mp->mii);
+ return mii_nway_restart(&mep->mii);
}
static u32 mv643xx_eth_get_link(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
- return mii_link_ok(&mp->mii);
+ return mii_link_ok(&mep->mii);
}
-static void mv643xx_get_strings(struct net_device *netdev, uint32_t stringset,
+static void mv643xx_eth_get_strings(struct net_device *netdev, uint32_t stringset,
uint8_t *data)
{
int i;
switch(stringset) {
case ETH_SS_STATS:
- for (i=0; i < MV643XX_STATS_LEN; i++) {
+ for (i=0; i < MV643XX_ETH_STATS_LEN; i++) {
memcpy(data + i * ETH_GSTRING_LEN,
- mv643xx_gstrings_stats[i].stat_string,
- ETH_GSTRING_LEN);
+ mv643xx_eth_gstrings_stats[i].stat_string,
+ ETH_GSTRING_LEN);
}
break;
}
}
-static void mv643xx_get_ethtool_stats(struct net_device *netdev,
+static void mv643xx_eth_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, uint64_t *data)
{
- struct mv643xx_private *mp = netdev->priv;
+ struct mv643xx_eth_private *mep = netdev->priv;
int i;
- update_mib_counters(mp);
+ update_mib_counters(mep);
- for (i = 0; i < MV643XX_STATS_LEN; i++) {
- char *p = (char *)mp+mv643xx_gstrings_stats[i].stat_offset;
- data[i] = (mv643xx_gstrings_stats[i].sizeof_stat ==
+ for (i = 0; i < MV643XX_ETH_STATS_LEN; i++) {
+ char *p = (char *)mep+mv643xx_eth_gstrings_stats[i].stat_offset;
+ data[i] = (mv643xx_eth_gstrings_stats[i].sizeof_stat ==
sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
}
}
-static int mv643xx_get_sset_count(struct net_device *netdev, int sset)
+static int mv643xx_eth_get_sset_count(struct net_device *netdev, int sset)
{
switch (sset) {
case ETH_SS_STATS:
- return MV643XX_STATS_LEN;
+ return MV643XX_ETH_STATS_LEN;
default:
return -EOPNOTSUPP;
}
}
-static const struct ethtool_ops mv643xx_ethtool_ops = {
- .get_settings = mv643xx_get_settings,
- .set_settings = mv643xx_set_settings,
- .get_drvinfo = mv643xx_get_drvinfo,
+static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
+ .get_settings = mv643xx_eth_get_settings,
+ .set_settings = mv643xx_eth_set_settings,
+ .get_drvinfo = mv643xx_eth_get_drvinfo,
.get_link = mv643xx_eth_get_link,
.set_sg = ethtool_op_set_sg,
- .get_sset_count = mv643xx_get_sset_count,
- .get_ethtool_stats = mv643xx_get_ethtool_stats,
- .get_strings = mv643xx_get_strings,
+ .get_sset_count = mv643xx_eth_get_sset_count,
+ .get_ethtool_stats = mv643xx_eth_get_ethtool_stats,
+ .get_strings = mv643xx_eth_get_strings,
.nway_reset = mv643xx_eth_nway_restart,
};
@@ -1280,14 +1280,14 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
/*
* uc_addr_get - Read the MAC address from the port's hw registers
*/
-static void uc_addr_get(struct mv643xx_private *mp, unsigned char *p_addr)
+static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
- mac_h = rdl(mp, MAC_ADDR_HIGH(port_num));
- mac_l = rdl(mp, MAC_ADDR_LOW(port_num));
+ mac_h = rdl(mep, MAC_ADDR_HIGH(port_num));
+ mac_l = rdl(mep, MAC_ADDR_LOW(port_num));
p_addr[0] = (mac_h >> 24) & 0xff;
p_addr[1] = (mac_h >> 16) & 0xff;
@@ -1305,7 +1305,7 @@ static void uc_addr_get(struct mv643xx_private *mp, unsigned char *p_addr)
* Other Multicast) and set each entry to 0.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* Multicast and Unicast packets are rejected.
@@ -1313,20 +1313,20 @@ static void uc_addr_get(struct mv643xx_private *mp, unsigned char *p_addr)
* RETURN:
* None.
*/
-static void init_mac_tables(struct mv643xx_private *mp)
+static void init_mac_tables(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
int table_index;
/* Clear DA filter unicast table (Ex_dFUT) */
for (table_index = 0; table_index <= 0xC; table_index += 4)
- wrl(mp, UNICAST_TABLE(port_num) + table_index, 0);
+ wrl(mep, UNICAST_TABLE(port_num) + table_index, 0);
for (table_index = 0; table_index <= 0xFC; table_index += 4) {
/* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
+ wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
/* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0);
+ wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0);
}
}
@@ -1339,7 +1339,7 @@ static void init_mac_tables(struct mv643xx_private *mp)
* 3-1 Queue (ETH_Q0=0)
* 7-4 Reserved = 0;
*/
-static void set_filter_table_entry(struct mv643xx_private *mp,
+static void set_filter_table_entry(struct mv643xx_eth_private *mep,
int table, unsigned char entry)
{
unsigned int table_reg;
@@ -1350,17 +1350,17 @@ static void set_filter_table_entry(struct mv643xx_private *mp,
reg_offset = entry % 4; /* Entry offset within the register */
/* Set "accepts frame bit" at specified table entry */
- table_reg = rdl(mp, table + tbl_offset);
+ table_reg = rdl(mep, table + tbl_offset);
table_reg |= 0x01 << (8 * reg_offset);
- wrl(mp, table + tbl_offset, table_reg);
+ wrl(mep, table + tbl_offset, table_reg);
}
/*
* uc_addr_set - Write a MAC address into the port's hw registers
*/
-static void uc_addr_set(struct mv643xx_private *mp, unsigned char *p_addr)
+static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
int table;
@@ -1369,12 +1369,12 @@ static void uc_addr_set(struct mv643xx_private *mp, unsigned char *p_addr)
mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
(p_addr[3] << 0);
- wrl(mp, MAC_ADDR_LOW(port_num), mac_l);
- wrl(mp, MAC_ADDR_HIGH(port_num), mac_h);
+ wrl(mep, MAC_ADDR_LOW(port_num), mac_l);
+ wrl(mep, MAC_ADDR_HIGH(port_num), mac_h);
/* Accept frames with this address */
table = UNICAST_TABLE(port_num);
- set_filter_table_entry(mp, table, p_addr[5] & 0x0f);
+ set_filter_table_entry(mep, table, p_addr[5] & 0x0f);
}
/*
@@ -1387,10 +1387,10 @@ static void uc_addr_set(struct mv643xx_private *mp, unsigned char *p_addr)
*/
static void mv643xx_eth_update_mac_address(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
- init_mac_tables(mp);
- uc_addr_set(mp, dev->dev_addr);
+ init_mac_tables(mep);
+ uc_addr_set(mep, dev->dev_addr);
}
/*
@@ -1429,9 +1429,9 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
* In either case, set_filter_table_entry() is then called
* to set to set the actual table entry.
*/
-static void mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
+static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
unsigned char crc_result = 0;
@@ -1443,7 +1443,7 @@ static void mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
(p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
table = SPECIAL_MCAST_TABLE(port_num);
- set_filter_table_entry(mp, table, p_addr[5]);
+ set_filter_table_entry(mep, table, p_addr[5]);
return;
}
@@ -1516,7 +1516,7 @@ static void mc_addr(struct mv643xx_private *mp, unsigned char *p_addr)
crc_result = crc_result | (crc[i] << i);
table = OTHER_MCAST_TABLE(port_num);
- set_filter_table_entry(mp, table, crc_result);
+ set_filter_table_entry(mep, table, crc_result);
}
/*
@@ -1528,8 +1528,8 @@ static void set_multicast_list(struct net_device *dev)
struct dev_mc_list *mc_list;
int i;
int table_index;
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ unsigned int port_num = mep->port_num;
/* If the device is in promiscuous mode or in all multicast mode,
* we will fully populate both multicast tables with accept.
@@ -1545,7 +1545,7 @@ static void set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0x01010101);
+ wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0x01010101);
/* Set all entries in DA filter other multicast
* table (Ex_dFOMT)
@@ -1555,7 +1555,7 @@ static void set_multicast_list(struct net_device *dev)
* 3-1 Queue ETH_Q0=0
* 7-4 Reserved = 0;
*/
- wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0x01010101);
+ wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0x01010101);
}
return;
}
@@ -1565,10 +1565,10 @@ static void set_multicast_list(struct net_device *dev)
*/
for (table_index = 0; table_index <= 0xFC; table_index += 4) {
/* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mp, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
+ wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
/* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mp, OTHER_MCAST_TABLE(port_num) + table_index, 0);
+ wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0);
}
/* Get pointer to net_device multicast list and add each one... */
@@ -1576,7 +1576,7 @@ static void set_multicast_list(struct net_device *dev)
(i < 256) && (mc_list != NULL) && (i < dev->mc_count);
i++, mc_list = mc_list->next)
if (mc_list->dmi_addrlen == 6)
- mc_addr(mp, mc_list->dmi_addr);
+ mc_addr(mep, mc_list->dmi_addr);
}
/*
@@ -1589,15 +1589,15 @@ static void set_multicast_list(struct net_device *dev)
*/
static void mv643xx_eth_set_rx_mode(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
u32 config_reg;
- config_reg = rdl(mp, PORT_CONFIG(mp->port_num));
+ config_reg = rdl(mep, PORT_CONFIG(mep->port_num));
if (dev->flags & IFF_PROMISC)
config_reg |= 0x00000001;
else
config_reg &= ~0x00000001;
- wrl(mp, PORT_CONFIG(mp->port_num), config_reg);
+ wrl(mep, PORT_CONFIG(mep->port_num), config_reg);
set_multicast_list(dev);
}
@@ -1617,7 +1617,7 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
* with physical addresses.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
*
* OUTPUT:
* The routine updates the Ethernet port control struct with information
@@ -1626,53 +1626,53 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
* RETURN:
* None.
*/
-static void ether_init_rx_desc_ring(struct mv643xx_private *mp)
+static void ether_init_rx_desc_ring(struct mv643xx_eth_private *mep)
{
volatile struct rx_desc *p_rx_desc;
- int rx_desc_num = mp->rx_ring_size;
+ int rx_desc_num = mep->rx_ring_size;
int i;
/* initialize the next_desc_ptr links in the Rx descriptors ring */
- p_rx_desc = (struct rx_desc *)mp->p_rx_desc_area;
+ p_rx_desc = (struct rx_desc *)mep->p_rx_desc_area;
for (i = 0; i < rx_desc_num; i++) {
- p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
+ p_rx_desc[i].next_desc_ptr = mep->rx_desc_dma +
((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
}
/* Save Rx desc pointer to driver struct. */
- mp->rx_curr_desc_q = 0;
- mp->rx_used_desc_q = 0;
+ mep->rx_curr_desc_q = 0;
+ mep->rx_used_desc_q = 0;
- mp->rx_desc_area_size = rx_desc_num * sizeof(struct rx_desc);
+ mep->rx_desc_area_size = rx_desc_num * sizeof(struct rx_desc);
}
static void mv643xx_eth_free_rx_rings(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
int curr;
/* Stop RX Queues */
- mv643xx_eth_port_disable_rx(mp);
+ mv643xx_eth_port_disable_rx(mep);
/* Free preallocated skb's on RX rings */
- for (curr = 0; mp->rx_desc_count && curr < mp->rx_ring_size; curr++) {
- if (mp->rx_skb[curr]) {
- dev_kfree_skb(mp->rx_skb[curr]);
- mp->rx_desc_count--;
+ for (curr = 0; mep->rx_desc_count && curr < mep->rx_ring_size; curr++) {
+ if (mep->rx_skb[curr]) {
+ dev_kfree_skb(mep->rx_skb[curr]);
+ mep->rx_desc_count--;
}
}
- if (mp->rx_desc_count)
+ if (mep->rx_desc_count)
printk(KERN_ERR
"%s: Error in freeing Rx Ring. %d skb's still"
" stuck in RX Ring - ignoring them\n", dev->name,
- mp->rx_desc_count);
+ mep->rx_desc_count);
/* Free RX ring */
- if (mp->rx_sram_size)
- iounmap(mp->p_rx_desc_area);
+ if (mep->rx_sram_size)
+ iounmap(mep->p_rx_desc_area);
else
- dma_free_coherent(NULL, mp->rx_desc_area_size,
- mp->p_rx_desc_area, mp->rx_desc_dma);
+ dma_free_coherent(NULL, mep->rx_desc_area_size,
+ mep->p_rx_desc_area, mep->rx_desc_dma);
}
/*
@@ -1688,7 +1688,7 @@ static void mv643xx_eth_free_rx_rings(struct net_device *dev)
* with physical addresses.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port Control srtuct.
+ * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
*
* OUTPUT:
* The routine updates the Ethernet port control struct with information
@@ -1697,23 +1697,23 @@ static void mv643xx_eth_free_rx_rings(struct net_device *dev)
* RETURN:
* None.
*/
-static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
+static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
{
- int tx_desc_num = mp->tx_ring_size;
+ int tx_desc_num = mep->tx_ring_size;
struct tx_desc *p_tx_desc;
int i;
/* Initialize the next_desc_ptr links in the Tx descriptors ring */
- p_tx_desc = (struct tx_desc *)mp->p_tx_desc_area;
+ p_tx_desc = (struct tx_desc *)mep->p_tx_desc_area;
for (i = 0; i < tx_desc_num; i++) {
- p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
+ p_tx_desc[i].next_desc_ptr = mep->tx_desc_dma +
((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
}
- mp->tx_curr_desc_q = 0;
- mp->tx_used_desc_q = 0;
+ mep->tx_curr_desc_q = 0;
+ mep->tx_used_desc_q = 0;
- mp->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
+ mep->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
}
/**
@@ -1723,7 +1723,7 @@ static void ether_init_tx_desc_ring(struct mv643xx_private *mp)
*/
static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
struct tx_desc *desc;
u32 cmd_sts;
struct sk_buff *skb;
@@ -1733,39 +1733,39 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
int count;
int released = 0;
- while (mp->tx_desc_count > 0) {
- spin_lock_irqsave(&mp->lock, flags);
+ while (mep->tx_desc_count > 0) {
+ spin_lock_irqsave(&mep->lock, flags);
/* tx_desc_count might have changed before acquiring the lock */
- if (mp->tx_desc_count <= 0) {
- spin_unlock_irqrestore(&mp->lock, flags);
+ if (mep->tx_desc_count <= 0) {
+ spin_unlock_irqrestore(&mep->lock, flags);
return released;
}
- tx_index = mp->tx_used_desc_q;
- desc = &mp->p_tx_desc_area[tx_index];
+ tx_index = mep->tx_used_desc_q;
+ desc = &mep->p_tx_desc_area[tx_index];
cmd_sts = desc->cmd_sts;
if (!force && (cmd_sts & BUFFER_OWNED_BY_DMA)) {
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
return released;
}
- mp->tx_used_desc_q = (tx_index + 1) % mp->tx_ring_size;
- mp->tx_desc_count--;
+ mep->tx_used_desc_q = (tx_index + 1) % mep->tx_ring_size;
+ mep->tx_desc_count--;
addr = desc->buf_ptr;
count = desc->byte_cnt;
- skb = mp->tx_skb[tx_index];
+ skb = mep->tx_skb[tx_index];
if (skb)
- mp->tx_skb[tx_index] = NULL;
+ mep->tx_skb[tx_index] = NULL;
if (cmd_sts & ERROR_SUMMARY) {
printk("%s: Error in TX\n", dev->name);
dev->stats.tx_errors++;
}
- spin_unlock_irqrestore(&mp->lock, flags);
+ spin_unlock_irqrestore(&mep->lock, flags);
if (cmd_sts & TX_FIRST_DESC)
dma_unmap_single(NULL, addr, count, DMA_TO_DEVICE);
@@ -1783,10 +1783,10 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
if (mv643xx_eth_free_tx_descs(dev, 0) &&
- mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+ mep->tx_ring_size - mep->tx_desc_count >= MAX_DESCS_PER_SKB)
netif_wake_queue(dev);
}
@@ -1797,38 +1797,38 @@ static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
static void mv643xx_eth_free_tx_rings(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
/* Stop Tx Queues */
- mv643xx_eth_port_disable_tx(mp);
+ mv643xx_eth_port_disable_tx(mep);
/* Free outstanding skb's on TX ring */
mv643xx_eth_free_all_tx_descs(dev);
- BUG_ON(mp->tx_used_desc_q != mp->tx_curr_desc_q);
+ BUG_ON(mep->tx_used_desc_q != mep->tx_curr_desc_q);
/* Free TX ring */
- if (mp->tx_sram_size)
- iounmap(mp->p_tx_desc_area);
+ if (mep->tx_sram_size)
+ iounmap(mep->p_tx_desc_area);
else
- dma_free_coherent(NULL, mp->tx_desc_area_size,
- mp->p_tx_desc_area, mp->tx_desc_dma);
+ dma_free_coherent(NULL, mep->tx_desc_area_size,
+ mep->p_tx_desc_area, mep->tx_desc_dma);
}
/* netdev ops and related ***************************************************/
-static void port_reset(struct mv643xx_private *mp);
+static void port_reset(struct mv643xx_eth_private *mep);
/* Set the mv643xx port configuration register for the speed/duplex mode. */
static void mv643xx_eth_update_pscr(struct net_device *dev,
struct ethtool_cmd *ecmd)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ int port_num = mep->port_num;
u32 o_pscr, n_pscr;
unsigned int queues;
- o_pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
+ o_pscr = rdl(mep, PORT_SERIAL_CONTROL(port_num));
n_pscr = o_pscr;
/* clear speed, duplex and rx buffer size fields */
@@ -1851,16 +1851,16 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
if (n_pscr != o_pscr) {
if ((o_pscr & SERIAL_PORT_ENABLE) == 0)
- wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
else {
- queues = mv643xx_eth_port_disable_tx(mp);
+ queues = mv643xx_eth_port_disable_tx(mep);
o_pscr &= ~SERIAL_PORT_ENABLE;
- wrl(mp, PORT_SERIAL_CONTROL(port_num), o_pscr);
- wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
- wrl(mp, PORT_SERIAL_CONTROL(port_num), n_pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), o_pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
if (queues)
- mv643xx_eth_port_enable_tx(mp, queues);
+ mv643xx_eth_port_enable_tx(mep, queues);
}
}
}
@@ -1879,29 +1879,29 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
u32 int_cause, int_cause_ext = 0;
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
/* Read interrupt cause registers */
- int_cause = rdl(mp, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
+ int_cause = rdl(mep, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
if (int_cause & INT_EXT) {
- int_cause_ext = rdl(mp, INT_CAUSE_EXT(port_num))
+ int_cause_ext = rdl(mep, INT_CAUSE_EXT(port_num))
& (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
- wrl(mp, INT_CAUSE_EXT(port_num), ~int_cause_ext);
+ wrl(mep, INT_CAUSE_EXT(port_num), ~int_cause_ext);
}
/* PHY status changed */
if (int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
struct ethtool_cmd cmd;
- if (mii_link_ok(&mp->mii)) {
- mii_ethtool_gset(&mp->mii, &cmd);
+ if (mii_link_ok(&mep->mii)) {
+ mii_ethtool_gset(&mep->mii, &cmd);
mv643xx_eth_update_pscr(dev, &cmd);
- mv643xx_eth_port_enable_tx(mp, 1);
+ mv643xx_eth_port_enable_tx(mep, 1);
if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev);
- if (mp->tx_ring_size - mp->tx_desc_count >=
+ if (mep->tx_ring_size - mep->tx_desc_count >=
MAX_DESCS_PER_SKB)
netif_wake_queue(dev);
}
@@ -1911,15 +1911,15 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
}
}
-#ifdef MV643XX_NAPI
+#ifdef MV643XX_ETH_NAPI
if (int_cause & INT_RX) {
/* schedule the NAPI poll routine to maintain port */
- wrl(mp, INT_MASK(port_num), 0x00000000);
+ wrl(mep, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
- rdl(mp, INT_MASK(port_num));
+ rdl(mep, INT_MASK(port_num));
- netif_rx_schedule(dev, &mp->napi);
+ netif_rx_schedule(dev, &mep->napi);
}
#else
if (int_cause & INT_RX)
@@ -1945,7 +1945,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
* This routine utilizes the SMI interface to reset the ethernet port PHY.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* The PHY is reset.
@@ -1954,19 +1954,19 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
* None.
*
*/
-static void phy_reset(struct mv643xx_private *mp)
+static void phy_reset(struct mv643xx_eth_private *mep)
{
unsigned int phy_reg_data;
/* Reset the PHY */
- read_smi_reg(mp, 0, &phy_reg_data);
+ read_smi_reg(mep, 0, &phy_reg_data);
phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
- write_smi_reg(mp, 0, phy_reg_data);
+ write_smi_reg(mep, 0, phy_reg_data);
/* wait for PHY to come out of reset */
do {
udelay(1);
- read_smi_reg(mp, 0, &phy_reg_data);
+ read_smi_reg(mep, 0, &phy_reg_data);
} while (phy_reg_data & 0x8000);
}
@@ -1999,40 +1999,40 @@ static void phy_reset(struct mv643xx_private *mp)
*/
static void port_start(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ unsigned int port_num = mep->port_num;
int tx_curr_desc, rx_curr_desc;
u32 pscr;
struct ethtool_cmd ethtool_cmd;
/* Assignment of Tx CTRP of given queue */
- tx_curr_desc = mp->tx_curr_desc_q;
- wrl(mp, TXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct tx_desc *)mp->tx_desc_dma + tx_curr_desc));
+ tx_curr_desc = mep->tx_curr_desc_q;
+ wrl(mep, TXQ_CURRENT_DESC_PTR(port_num),
+ (u32)((struct tx_desc *)mep->tx_desc_dma + tx_curr_desc));
/* Assignment of Rx CRDP of given queue */
- rx_curr_desc = mp->rx_curr_desc_q;
- wrl(mp, RXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct rx_desc *)mp->rx_desc_dma + rx_curr_desc));
+ rx_curr_desc = mep->rx_curr_desc_q;
+ wrl(mep, RXQ_CURRENT_DESC_PTR(port_num),
+ (u32)((struct rx_desc *)mep->rx_desc_dma + rx_curr_desc));
/* Add the assigned Ethernet address to the port's address table */
- uc_addr_set(mp, dev->dev_addr);
+ uc_addr_set(mep, dev->dev_addr);
/*
* Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
* frames to RX queue #0.
*/
- wrl(mp, PORT_CONFIG(port_num), 0x00000000);
+ wrl(mep, PORT_CONFIG(port_num), 0x00000000);
/*
* Treat BPDUs as normal multicasts, and disable partition mode.
*/
- wrl(mp, PORT_CONFIG_EXT(port_num), 0x00000000);
+ wrl(mep, PORT_CONFIG_EXT(port_num), 0x00000000);
- pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));
+ pscr = rdl(mep, PORT_SERIAL_CONTROL(port_num));
pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
DISABLE_AUTO_NEG_SPEED_GMII |
@@ -2040,27 +2040,27 @@ static void port_start(struct net_device *dev)
DO_NOT_FORCE_LINK_FAIL |
SERIAL_PORT_CONTROL_RESERVED;
- wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
pscr |= SERIAL_PORT_ENABLE;
- wrl(mp, PORT_SERIAL_CONTROL(port_num), pscr);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
/* Assign port SDMA configuration */
- wrl(mp, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
+ wrl(mep, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
/* Enable port Rx. */
- mv643xx_eth_port_enable_rx(mp, 1);
+ mv643xx_eth_port_enable_rx(mep, 1);
/* Disable port bandwidth limits by clearing MTU register */
- wrl(mp, TX_BW_MTU(port_num), 0);
+ wrl(mep, TX_BW_MTU(port_num), 0);
/* save phy settings across reset */
- mv643xx_get_settings(dev, ðtool_cmd);
- phy_reset(mp);
- mv643xx_set_settings(dev, ðtool_cmd);
+ mv643xx_eth_get_settings(dev, ðtool_cmd);
+ phy_reset(mep);
+ mv643xx_eth_set_settings(dev, ðtool_cmd);
}
-#ifdef MV643XX_COAL
+#ifdef MV643XX_ETH_COAL
/*
* set_rx_coal - Sets coalescing interrupt mechanism on RX path
@@ -2074,7 +2074,7 @@ static void port_start(struct net_device *dev)
* , and the required delay of the interrupt in usec.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet port
+ * struct mv643xx_eth_private *mep Ethernet port
* unsigned int delay Delay in usec
*
* OUTPUT:
@@ -2084,16 +2084,16 @@ static void port_start(struct net_device *dev)
* The interrupt coalescing value set in the gigE port.
*
*/
-static unsigned int set_rx_coal(struct mv643xx_private *mp,
+static unsigned int set_rx_coal(struct mv643xx_eth_private *mep,
unsigned int delay)
{
- unsigned int port_num = mp->port_num;
- unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
+ unsigned int port_num = mep->port_num;
+ unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
/* Set RX Coalescing mechanism */
- wrl(mp, SDMA_CONFIG(port_num),
+ wrl(mep, SDMA_CONFIG(port_num),
((coal & 0x3fff) << 8) |
- (rdl(mp, SDMA_CONFIG(port_num))
+ (rdl(mep, SDMA_CONFIG(port_num))
& 0xffc000ff));
return coal;
@@ -2112,7 +2112,7 @@ static unsigned int set_rx_coal(struct mv643xx_private *mp,
* MV-643xx chip and the required delay in the interrupt in uSec
*
* INPUT:
- * struct mv643xx_private *mp Ethernet port
+ * struct mv643xx_eth_private *mep Ethernet port
* unsigned int delay Delay in uSeconds
*
* OUTPUT:
@@ -2122,13 +2122,13 @@ static unsigned int set_rx_coal(struct mv643xx_private *mp,
* The interrupt coalescing value set in the gigE port.
*
*/
-static unsigned int set_tx_coal(struct mv643xx_private *mp,
+static unsigned int set_tx_coal(struct mv643xx_eth_private *mep,
unsigned int delay)
{
- unsigned int coal = ((mp->shared->t_clk / 1000000) * delay) / 64;
+ unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
/* Set TX Coalescing mechanism */
- wrl(mp, TX_FIFO_URGENT_THRESHOLD(mp->port_num), coal << 4);
+ wrl(mep, TX_FIFO_URGENT_THRESHOLD(mep->port_num), coal << 4);
return coal;
}
@@ -2149,7 +2149,7 @@ static unsigned int set_tx_coal(struct mv643xx_private *mp,
* struct.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet port control struct
+ * struct mv643xx_eth_private *mep Ethernet port control struct
*
* OUTPUT:
* See description.
@@ -2157,13 +2157,13 @@ static unsigned int set_tx_coal(struct mv643xx_private *mp,
* RETURN:
* None.
*/
-static void port_init(struct mv643xx_private *mp)
+static void port_init(struct mv643xx_eth_private *mep)
{
- mp->rx_resource_err = 0;
+ mep->rx_resource_err = 0;
- port_reset(mp);
+ port_reset(mep);
- init_mac_tables(mp);
+ init_mac_tables(mep);
}
/*
@@ -2181,16 +2181,16 @@ static void port_init(struct mv643xx_private *mp)
static int mv643xx_eth_open(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ unsigned int port_num = mep->port_num;
unsigned int size;
int err;
/* Clear any pending ethernet port interrupts */
- wrl(mp, INT_CAUSE(port_num), 0);
- wrl(mp, INT_CAUSE_EXT(port_num), 0);
+ wrl(mep, INT_CAUSE(port_num), 0);
+ wrl(mep, INT_CAUSE_EXT(port_num), 0);
/* wait for previous write to complete */
- rdl(mp, INT_CAUSE_EXT(port_num));
+ rdl(mep, INT_CAUSE_EXT(port_num));
err = request_irq(dev->irq, mv643xx_eth_int_handler,
IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
@@ -2199,112 +2199,112 @@ static int mv643xx_eth_open(struct net_device *dev)
return -EAGAIN;
}
- port_init(mp);
+ port_init(mep);
- memset(&mp->timeout, 0, sizeof(struct timer_list));
- mp->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
- mp->timeout.data = (unsigned long)dev;
+ memset(&mep->timeout, 0, sizeof(struct timer_list));
+ mep->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
+ mep->timeout.data = (unsigned long)dev;
/* Allocate RX and TX skb rings */
- mp->rx_skb = kmalloc(sizeof(*mp->rx_skb) * mp->rx_ring_size,
+ mep->rx_skb = kmalloc(sizeof(*mep->rx_skb) * mep->rx_ring_size,
GFP_KERNEL);
- if (!mp->rx_skb) {
+ if (!mep->rx_skb) {
printk(KERN_ERR "%s: Cannot allocate Rx skb ring\n", dev->name);
err = -ENOMEM;
goto out_free_irq;
}
- mp->tx_skb = kmalloc(sizeof(*mp->tx_skb) * mp->tx_ring_size,
+ mep->tx_skb = kmalloc(sizeof(*mep->tx_skb) * mep->tx_ring_size,
GFP_KERNEL);
- if (!mp->tx_skb) {
+ if (!mep->tx_skb) {
printk(KERN_ERR "%s: Cannot allocate Tx skb ring\n", dev->name);
err = -ENOMEM;
goto out_free_rx_skb;
}
/* Allocate TX ring */
- mp->tx_desc_count = 0;
- size = mp->tx_ring_size * sizeof(struct tx_desc);
- mp->tx_desc_area_size = size;
-
- if (mp->tx_sram_size) {
- mp->p_tx_desc_area = ioremap(mp->tx_sram_addr,
- mp->tx_sram_size);
- mp->tx_desc_dma = mp->tx_sram_addr;
+ mep->tx_desc_count = 0;
+ size = mep->tx_ring_size * sizeof(struct tx_desc);
+ mep->tx_desc_area_size = size;
+
+ if (mep->tx_sram_size) {
+ mep->p_tx_desc_area = ioremap(mep->tx_sram_addr,
+ mep->tx_sram_size);
+ mep->tx_desc_dma = mep->tx_sram_addr;
} else
- mp->p_tx_desc_area = dma_alloc_coherent(NULL, size,
- &mp->tx_desc_dma,
+ mep->p_tx_desc_area = dma_alloc_coherent(NULL, size,
+ &mep->tx_desc_dma,
GFP_KERNEL);
- if (!mp->p_tx_desc_area) {
+ if (!mep->p_tx_desc_area) {
printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
dev->name, size);
err = -ENOMEM;
goto out_free_tx_skb;
}
- BUG_ON((u32) mp->p_tx_desc_area & 0xf); /* check 16-byte alignment */
- memset((void *)mp->p_tx_desc_area, 0, mp->tx_desc_area_size);
+ BUG_ON((u32) mep->p_tx_desc_area & 0xf); /* check 16-byte alignment */
+ memset((void *)mep->p_tx_desc_area, 0, mep->tx_desc_area_size);
- ether_init_tx_desc_ring(mp);
+ ether_init_tx_desc_ring(mep);
/* Allocate RX ring */
- mp->rx_desc_count = 0;
- size = mp->rx_ring_size * sizeof(struct rx_desc);
- mp->rx_desc_area_size = size;
-
- if (mp->rx_sram_size) {
- mp->p_rx_desc_area = ioremap(mp->rx_sram_addr,
- mp->rx_sram_size);
- mp->rx_desc_dma = mp->rx_sram_addr;
+ mep->rx_desc_count = 0;
+ size = mep->rx_ring_size * sizeof(struct rx_desc);
+ mep->rx_desc_area_size = size;
+
+ if (mep->rx_sram_size) {
+ mep->p_rx_desc_area = ioremap(mep->rx_sram_addr,
+ mep->rx_sram_size);
+ mep->rx_desc_dma = mep->rx_sram_addr;
} else
- mp->p_rx_desc_area = dma_alloc_coherent(NULL, size,
- &mp->rx_desc_dma,
+ mep->p_rx_desc_area = dma_alloc_coherent(NULL, size,
+ &mep->rx_desc_dma,
GFP_KERNEL);
- if (!mp->p_rx_desc_area) {
+ if (!mep->p_rx_desc_area) {
printk(KERN_ERR "%s: Cannot allocate Rx ring (size %d bytes)\n",
dev->name, size);
printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
dev->name);
- if (mp->rx_sram_size)
- iounmap(mp->p_tx_desc_area);
+ if (mep->rx_sram_size)
+ iounmap(mep->p_tx_desc_area);
else
- dma_free_coherent(NULL, mp->tx_desc_area_size,
- mp->p_tx_desc_area, mp->tx_desc_dma);
+ dma_free_coherent(NULL, mep->tx_desc_area_size,
+ mep->p_tx_desc_area, mep->tx_desc_dma);
err = -ENOMEM;
goto out_free_tx_skb;
}
- memset((void *)mp->p_rx_desc_area, 0, size);
+ memset((void *)mep->p_rx_desc_area, 0, size);
- ether_init_rx_desc_ring(mp);
+ ether_init_rx_desc_ring(mep);
mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
-#ifdef MV643XX_NAPI
- napi_enable(&mp->napi);
+#ifdef MV643XX_ETH_NAPI
+ napi_enable(&mep->napi);
#endif
port_start(dev);
/* Interrupt Coalescing */
-#ifdef MV643XX_COAL
- mp->rx_int_coal = set_rx_coal(mp, MV643XX_RX_COAL);
+#ifdef MV643XX_ETH_COAL
+ mep->rx_int_coal = set_rx_coal(mep, MV643XX_ETH_RX_COAL);
#endif
- mp->tx_int_coal = set_tx_coal(mp, MV643XX_TX_COAL);
+ mep->tx_int_coal = set_tx_coal(mep, MV643XX_ETH_TX_COAL);
/* Unmask phy and link status changes interrupts */
- wrl(mp, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
+ wrl(mep, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
/* Unmask RX buffer and TX end interrupt */
- wrl(mp, INT_MASK(port_num), INT_RX | INT_EXT);
+ wrl(mep, INT_MASK(port_num), INT_RX | INT_EXT);
return 0;
out_free_tx_skb:
- kfree(mp->tx_skb);
+ kfree(mep->tx_skb);
out_free_rx_skb:
- kfree(mp->rx_skb);
+ kfree(mep->rx_skb);
out_free_irq:
free_irq(dev->irq, dev);
@@ -2320,7 +2320,7 @@ out_free_irq:
* idle state after this command is performed and the port is disabled.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* Channel activity is halted.
@@ -2329,23 +2329,23 @@ out_free_irq:
* None.
*
*/
-static void port_reset(struct mv643xx_private *mp)
+static void port_reset(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mp->port_num;
+ unsigned int port_num = mep->port_num;
unsigned int reg_data;
- mv643xx_eth_port_disable_tx(mp);
- mv643xx_eth_port_disable_rx(mp);
+ mv643xx_eth_port_disable_tx(mep);
+ mv643xx_eth_port_disable_rx(mep);
/* Clear all MIB counters */
- clear_mib_counters(mp);
+ clear_mib_counters(mep);
/* Reset the Enable bit in the Configuration Register */
- reg_data = rdl(mp, PORT_SERIAL_CONTROL(port_num));
+ reg_data = rdl(mep, PORT_SERIAL_CONTROL(port_num));
reg_data &= ~(SERIAL_PORT_ENABLE |
DO_NOT_FORCE_LINK_FAIL |
FORCE_LINK_PASS);
- wrl(mp, PORT_SERIAL_CONTROL(port_num), reg_data);
+ wrl(mep, PORT_SERIAL_CONTROL(port_num), reg_data);
}
/*
@@ -2360,21 +2360,21 @@ static void port_reset(struct mv643xx_private *mp)
static int mv643xx_eth_stop(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ unsigned int port_num = mep->port_num;
/* Mask all interrupts on ethernet port */
- wrl(mp, INT_MASK(port_num), 0x00000000);
+ wrl(mep, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
- rdl(mp, INT_MASK(port_num));
+ rdl(mep, INT_MASK(port_num));
-#ifdef MV643XX_NAPI
- napi_disable(&mp->napi);
+#ifdef MV643XX_ETH_NAPI
+ napi_disable(&mep->napi);
#endif
netif_carrier_off(dev);
netif_stop_queue(dev);
- port_reset(mp);
+ port_reset(mep);
mv643xx_eth_free_tx_rings(dev);
mv643xx_eth_free_rx_rings(dev);
@@ -2386,9 +2386,9 @@ static int mv643xx_eth_stop(struct net_device *dev)
static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
- return generic_mii_ioctl(&mp->mii, if_mii(ifr), cmd, NULL);
+ return generic_mii_ioctl(&mep->mii, if_mii(ifr), cmd, NULL);
}
/*
@@ -2429,19 +2429,19 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
*/
static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
{
- struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
+ struct mv643xx_eth_private *mep = container_of(ugly, struct mv643xx_eth_private,
tx_timeout_task);
- struct net_device *dev = mp->dev;
+ struct net_device *dev = mep->dev;
if (!netif_running(dev))
return;
netif_stop_queue(dev);
- port_reset(mp);
+ port_reset(mep);
port_start(dev);
- if (mp->tx_ring_size - mp->tx_desc_count >= MAX_DESCS_PER_SKB)
+ if (mep->tx_ring_size - mep->tx_desc_count >= MAX_DESCS_PER_SKB)
netif_wake_queue(dev);
}
@@ -2455,54 +2455,55 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
*/
static void mv643xx_eth_tx_timeout(struct net_device *dev)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
printk(KERN_INFO "%s: TX timeout ", dev->name);
/* Do the reset outside of interrupt context */
- schedule_work(&mp->tx_timeout_task);
+ schedule_work(&mep->tx_timeout_task);
}
#ifdef CONFIG_NET_POLL_CONTROLLER
-static void mv643xx_netpoll(struct net_device *netdev)
+static void mv643xx_eth_netpoll(struct net_device *netdev)
{
- struct mv643xx_private *mp = netdev_priv(netdev);
- int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(netdev);
+ int port_num = mep->port_num;
- wrl(mp, INT_MASK(port_num), 0x00000000);
+ wrl(mep, INT_MASK(port_num), 0x00000000);
/* wait for previous write to complete */
- rdl(mp, INT_MASK(port_num));
+ rdl(mep, INT_MASK(port_num));
mv643xx_eth_int_handler(netdev->irq, netdev);
- wrl(mp, INT_MASK(port_num), INT_RX | INT_CAUSE_EXT);
+ wrl(mep, INT_MASK(port_num), INT_RX | INT_CAUSE_EXT);
}
#endif
/*
* Wrappers for MII support library.
*/
-static int mv643xx_mdio_read(struct net_device *dev, int phy_id, int location)
+static int mv643xx_eth_mdio_read(struct net_device *dev, int phy_id, int location)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
int val;
- read_smi_reg(mp, location, &val);
+ read_smi_reg(mep, location, &val);
return val;
}
-static void mv643xx_mdio_write(struct net_device *dev, int phy_id, int location, int val)
+static void mv643xx_eth_mdio_write(struct net_device *dev, int phy_id, int location, int val)
{
- struct mv643xx_private *mp = netdev_priv(dev);
- write_smi_reg(mp, location, val);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ write_smi_reg(mep, location, val);
}
/* platform glue ************************************************************/
-static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
- struct mbus_dram_target_info *dram)
+static void
+mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *mesp,
+ struct mbus_dram_target_info *dram)
{
- void __iomem *base = msp->base;
+ void __iomem *base = mesp->base;
u32 win_enable;
u32 win_protect;
int i;
@@ -2530,18 +2531,18 @@ static void mv643xx_eth_conf_mbus_windows(struct mv643xx_shared_private *msp,
}
writel(win_enable, base + WINDOW_BAR_ENABLE);
- msp->win_protect = win_protect;
+ mesp->win_protect = win_protect;
}
static int mv643xx_eth_shared_probe(struct platform_device *pdev)
{
- static int mv643xx_version_printed = 0;
+ static int mv643xx_eth_version_printed = 0;
struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
- struct mv643xx_shared_private *msp;
+ struct mv643xx_eth_shared_private *mesp;
struct resource *res;
int ret;
- if (!mv643xx_version_printed++)
+ if (!mv643xx_eth_version_printed++)
printk(KERN_NOTICE "MV-643xx 10/100/1000 Ethernet Driver\n");
ret = -EINVAL;
@@ -2550,40 +2551,40 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
goto out;
ret = -ENOMEM;
- msp = kmalloc(sizeof(*msp), GFP_KERNEL);
- if (msp == NULL)
+ mesp = kmalloc(sizeof(*mesp), GFP_KERNEL);
+ if (mesp == NULL)
goto out;
- memset(msp, 0, sizeof(*msp));
+ memset(mesp, 0, sizeof(*mesp));
- msp->base = ioremap(res->start, res->end - res->start + 1);
- if (msp->base == NULL)
+ mesp->base = ioremap(res->start, res->end - res->start + 1);
+ if (mesp->base == NULL)
goto out_free;
- spin_lock_init(&msp->phy_lock);
- msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
+ spin_lock_init(&mesp->phy_lock);
+ mesp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
- platform_set_drvdata(pdev, msp);
+ platform_set_drvdata(pdev, mesp);
/*
* (Re-)program MBUS remapping windows if we are asked to.
*/
if (pd != NULL && pd->dram != NULL)
- mv643xx_eth_conf_mbus_windows(msp, pd->dram);
+ mv643xx_eth_conf_mbus_windows(mesp, pd->dram);
return 0;
out_free:
- kfree(msp);
+ kfree(mesp);
out:
return ret;
}
static int mv643xx_eth_shared_remove(struct platform_device *pdev)
{
- struct mv643xx_shared_private *msp = platform_get_drvdata(pdev);
+ struct mv643xx_eth_shared_private *mesp = platform_get_drvdata(pdev);
- iounmap(msp->base);
- kfree(msp);
+ iounmap(mesp->base);
+ kfree(mesp);
return 0;
}
@@ -2604,7 +2605,7 @@ static struct platform_driver mv643xx_eth_shared_driver = {
* This routine sets the given ethernet port PHY address.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
* int phy_addr PHY address.
*
* OUTPUT:
@@ -2614,15 +2615,15 @@ static struct platform_driver mv643xx_eth_shared_driver = {
* None.
*
*/
-static void phy_addr_set(struct mv643xx_private *mp, int phy_addr)
+static void phy_addr_set(struct mv643xx_eth_private *mep, int phy_addr)
{
u32 reg_data;
- int addr_shift = 5 * mp->port_num;
+ int addr_shift = 5 * mep->port_num;
- reg_data = rdl(mp, PHY_ADDR);
+ reg_data = rdl(mep, PHY_ADDR);
reg_data &= ~(0x1f << addr_shift);
reg_data |= (phy_addr & 0x1f) << addr_shift;
- wrl(mp, PHY_ADDR, reg_data);
+ wrl(mep, PHY_ADDR, reg_data);
}
/*
@@ -2632,7 +2633,7 @@ static void phy_addr_set(struct mv643xx_private *mp, int phy_addr)
* This routine returns the given ethernet port PHY address.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* None.
@@ -2641,13 +2642,13 @@ static void phy_addr_set(struct mv643xx_private *mp, int phy_addr)
* PHY address.
*
*/
-static int phy_addr_get(struct mv643xx_private *mp)
+static int phy_addr_get(struct mv643xx_eth_private *mep)
{
unsigned int reg_data;
- reg_data = rdl(mp, PHY_ADDR);
+ reg_data = rdl(mep, PHY_ADDR);
- return ((reg_data >> (5 * mp->port_num)) & 0x1f);
+ return ((reg_data >> (5 * mep->port_num)) & 0x1f);
}
/*
@@ -2658,7 +2659,7 @@ static int phy_addr_get(struct mv643xx_private *mp)
* the specified port.
*
* INPUT:
- * struct mv643xx_private *mp Ethernet Port.
+ * struct mv643xx_eth_private *mep Ethernet Port.
*
* OUTPUT:
* None
@@ -2668,22 +2669,22 @@ static int phy_addr_get(struct mv643xx_private *mp)
* -ENODEV on failure
*
*/
-static int phy_detect(struct mv643xx_private *mp)
+static int phy_detect(struct mv643xx_eth_private *mep)
{
unsigned int phy_reg_data0;
int auto_neg;
- read_smi_reg(mp, 0, &phy_reg_data0);
+ read_smi_reg(mep, 0, &phy_reg_data0);
auto_neg = phy_reg_data0 & 0x1000;
phy_reg_data0 ^= 0x1000; /* invert auto_neg */
- write_smi_reg(mp, 0, phy_reg_data0);
+ write_smi_reg(mep, 0, phy_reg_data0);
- read_smi_reg(mp, 0, &phy_reg_data0);
+ read_smi_reg(mep, 0, &phy_reg_data0);
if ((phy_reg_data0 & 0x1000) == auto_neg)
return -ENODEV; /* change didn't take */
phy_reg_data0 ^= 0x1000;
- write_smi_reg(mp, 0, phy_reg_data0);
+ write_smi_reg(mep, 0, phy_reg_data0);
return 0;
}
@@ -2691,7 +2692,7 @@ static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
int speed, int duplex,
struct ethtool_cmd *cmd)
{
- struct mv643xx_private *mp = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
memset(cmd, 0, sizeof(*cmd));
@@ -2707,7 +2708,7 @@ static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half |
ADVERTISED_100baseT_Full;
- if (mp->mii.supports_gmii)
+ if (mep->mii.supports_gmii)
cmd->advertising |= ADVERTISED_1000baseT_Full;
} else {
cmd->autoneg = AUTONEG_DISABLE;
@@ -2731,7 +2732,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
{
struct mv643xx_eth_platform_data *pd;
int port_num;
- struct mv643xx_private *mp;
+ struct mv643xx_eth_private *mep;
struct net_device *dev;
u8 *p;
struct resource *res;
@@ -2752,16 +2753,16 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
return -ENODEV;
}
- dev = alloc_etherdev(sizeof(struct mv643xx_private));
+ dev = alloc_etherdev(sizeof(struct mv643xx_eth_private));
if (!dev)
return -ENOMEM;
platform_set_drvdata(pdev, dev);
- mp = netdev_priv(dev);
- mp->dev = dev;
-#ifdef MV643XX_NAPI
- netif_napi_add(dev, &mp->napi, mv643xx_poll, 64);
+ mep = netdev_priv(dev);
+ mep->dev = dev;
+#ifdef MV643XX_ETH_NAPI
+ netif_napi_add(dev, &mep->napi, mv643xx_eth_poll, 64);
#endif
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
@@ -2778,16 +2779,16 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
dev->tx_timeout = mv643xx_eth_tx_timeout;
#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = mv643xx_netpoll;
+ dev->poll_controller = mv643xx_eth_netpoll;
#endif
dev->watchdog_timeo = 2 * HZ;
dev->base_addr = 0;
dev->change_mtu = mv643xx_eth_change_mtu;
dev->do_ioctl = mv643xx_eth_do_ioctl;
- SET_ETHTOOL_OPS(dev, &mv643xx_ethtool_ops);
+ SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
-#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
#ifdef MAX_SKB_FRAGS
/*
* Zero copy can only work if we use Discovery II memory. Else, we will
@@ -2798,70 +2799,70 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
#endif
/* Configure the timeout task */
- INIT_WORK(&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task);
+ INIT_WORK(&mep->tx_timeout_task, mv643xx_eth_tx_timeout_task);
- spin_lock_init(&mp->lock);
+ spin_lock_init(&mep->lock);
- mp->shared = platform_get_drvdata(pd->shared);
- port_num = mp->port_num = pd->port_number;
+ mep->shared = platform_get_drvdata(pd->shared);
+ port_num = mep->port_num = pd->port_number;
- if (mp->shared->win_protect)
- wrl(mp, WINDOW_PROTECT(port_num), mp->shared->win_protect);
+ if (mep->shared->win_protect)
+ wrl(mep, WINDOW_PROTECT(port_num), mep->shared->win_protect);
- mp->shared_smi = mp->shared;
+ mep->shared_smi = mep->shared;
if (pd->shared_smi != NULL)
- mp->shared_smi = platform_get_drvdata(pd->shared_smi);
+ mep->shared_smi = platform_get_drvdata(pd->shared_smi);
/* set default config values */
- uc_addr_get(mp, dev->dev_addr);
- mp->rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
- mp->tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
+ uc_addr_get(mep, dev->dev_addr);
+ mep->rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
+ mep->tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (is_valid_ether_addr(pd->mac_addr))
memcpy(dev->dev_addr, pd->mac_addr, 6);
if (pd->phy_addr || pd->force_phy_addr)
- phy_addr_set(mp, pd->phy_addr);
+ phy_addr_set(mep, pd->phy_addr);
if (pd->rx_queue_size)
- mp->rx_ring_size = pd->rx_queue_size;
+ mep->rx_ring_size = pd->rx_queue_size;
if (pd->tx_queue_size)
- mp->tx_ring_size = pd->tx_queue_size;
+ mep->tx_ring_size = pd->tx_queue_size;
if (pd->tx_sram_size) {
- mp->tx_sram_size = pd->tx_sram_size;
- mp->tx_sram_addr = pd->tx_sram_addr;
+ mep->tx_sram_size = pd->tx_sram_size;
+ mep->tx_sram_addr = pd->tx_sram_addr;
}
if (pd->rx_sram_size) {
- mp->rx_sram_size = pd->rx_sram_size;
- mp->rx_sram_addr = pd->rx_sram_addr;
+ mep->rx_sram_size = pd->rx_sram_size;
+ mep->rx_sram_addr = pd->rx_sram_addr;
}
duplex = pd->duplex;
speed = pd->speed;
/* Hook up MII support for ethtool */
- mp->mii.dev = dev;
- mp->mii.mdio_read = mv643xx_mdio_read;
- mp->mii.mdio_write = mv643xx_mdio_write;
- mp->mii.phy_id = phy_addr_get(mp);
- mp->mii.phy_id_mask = 0x3f;
- mp->mii.reg_num_mask = 0x1f;
-
- err = phy_detect(mp);
+ mep->mii.dev = dev;
+ mep->mii.mdio_read = mv643xx_eth_mdio_read;
+ mep->mii.mdio_write = mv643xx_eth_mdio_write;
+ mep->mii.phy_id = phy_addr_get(mep);
+ mep->mii.phy_id_mask = 0x3f;
+ mep->mii.reg_num_mask = 0x1f;
+
+ err = phy_detect(mep);
if (err) {
pr_debug("%s: No PHY detected at addr %d\n",
- dev->name, phy_addr_get(mp));
+ dev->name, phy_addr_get(mep));
goto out;
}
- phy_reset(mp);
- mp->mii.supports_gmii = mii_check_gmii_support(&mp->mii);
- mv643xx_init_ethtool_cmd(dev, mp->mii.phy_id, speed, duplex, &cmd);
+ phy_reset(mep);
+ mep->mii.supports_gmii = mii_check_gmii_support(&mep->mii);
+ mv643xx_init_ethtool_cmd(dev, mep->mii.phy_id, speed, duplex, &cmd);
mv643xx_eth_update_pscr(dev, &cmd);
- mv643xx_set_settings(dev, &cmd);
+ mv643xx_eth_set_settings(dev, &cmd);
SET_NETDEV_DEV(dev, &pdev->dev);
err = register_netdev(dev);
@@ -2880,20 +2881,20 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
dev->name);
-#ifdef MV643XX_CHECKSUM_OFFLOAD_TX
+#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
#endif
-#ifdef MV643XX_COAL
+#ifdef MV643XX_ETH_COAL
printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
dev->name);
#endif
-#ifdef MV643XX_NAPI
+#ifdef MV643XX_ETH_NAPI
printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
#endif
- if (mp->tx_sram_size > 0)
+ if (mep->tx_sram_size > 0)
printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
return 0;
@@ -2919,14 +2920,14 @@ static int mv643xx_eth_remove(struct platform_device *pdev)
static void mv643xx_eth_shutdown(struct platform_device *pdev)
{
struct net_device *dev = platform_get_drvdata(pdev);
- struct mv643xx_private *mp = netdev_priv(dev);
- unsigned int port_num = mp->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ unsigned int port_num = mep->port_num;
/* Mask all interrupts on ethernet port */
- wrl(mp, INT_MASK(port_num), 0);
- rdl(mp, INT_MASK(port_num));
+ wrl(mep, INT_MASK(port_num), 0);
+ rdl(mep, INT_MASK(port_num));
- port_reset(mp);
+ port_reset(mep);
}
static struct platform_driver mv643xx_eth_driver = {
@@ -2940,7 +2941,7 @@ static struct platform_driver mv643xx_eth_driver = {
};
/*
- * mv643xx_init_module
+ * mv643xx_eth_init_module
*
* Registers the network drivers into the Linux kernel
*
@@ -2948,7 +2949,7 @@ static struct platform_driver mv643xx_eth_driver = {
*
* Output : N/A
*/
-static int __init mv643xx_init_module(void)
+static int __init mv643xx_eth_init_module(void)
{
int rc;
@@ -2962,7 +2963,7 @@ static int __init mv643xx_init_module(void)
}
/*
- * mv643xx_cleanup_module
+ * mv643xx_eth_cleanup_module
*
* Registers the network drivers into the Linux kernel
*
@@ -2970,14 +2971,14 @@ static int __init mv643xx_init_module(void)
*
* Output : N/A
*/
-static void __exit mv643xx_cleanup_module(void)
+static void __exit mv643xx_eth_cleanup_module(void)
{
platform_driver_unregister(&mv643xx_eth_driver);
platform_driver_unregister(&mv643xx_eth_shared_driver);
}
-module_init(mv643xx_init_module);
-module_exit(mv643xx_cleanup_module);
+module_init(mv643xx_eth_init_module);
+module_exit(mv643xx_eth_cleanup_module);
MODULE_LICENSE("GPL");
MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently
2008-06-03 11:02 ` [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently Lennert Buytenhek
@ 2008-06-05 11:59 ` Dale Farnsworth
2008-06-06 7:09 ` Lennert Buytenhek
0 siblings, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:59 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:32PM +0200, Lennert Buytenhek wrote:
> A bunch of places in the mv643xx_eth driver use the 'mv643xx_'
> prefix. Since the mv643xx is a chip that includes more than just
> ethernet, this patch makes all those places use either no prefix
> (for some internal-use-only functions), or the full 'mv643xx_eth_'
> prefix.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 1169 +++++++++++++++++++++++----------------------
> 1 files changed, 585 insertions(+), 584 deletions(-)
I'm not sure it's worth changing all the local vars from mp to mep,
but it's not a big deal.
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently
2008-06-05 11:59 ` Dale Farnsworth
@ 2008-06-06 7:09 ` Lennert Buytenhek
0 siblings, 0 replies; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-06 7:09 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 04:59:04AM -0700, Dale Farnsworth wrote:
> > A bunch of places in the mv643xx_eth driver use the 'mv643xx_'
> > prefix. Since the mv643xx is a chip that includes more than just
> > ethernet, this patch makes all those places use either no prefix
> > (for some internal-use-only functions), or the full 'mv643xx_eth_'
> > prefix.
> >
> > Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> > ---
> > drivers/net/mv643xx_eth.c | 1169 +++++++++++++++++++++++----------------------
> > 1 files changed, 585 insertions(+), 584 deletions(-)
>
> I'm not sure it's worth changing all the local vars from mp to mep,
> but it's not a big deal.
Well, you're right -- that change is retarded. I'll just pull
that out.
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 18/39] mv643xx_eth: kill superfluous comments
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (16 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 17/39] mv643xx_eth: use 'mv643xx_eth_' prefix consistently Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:03 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 19/39] mv643xx_eth: kill ->rx_resource_err Lennert Buytenhek
` (20 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Half of the functions in the mv643xx_eth driver are prefixed by
useless and baroque comment blocks on _what_ those functions do (which
is obvious from the code itself) rather than why, and there's no point
in keeping those comments around.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 552 ---------------------------------------------
1 files changed, 0 insertions(+), 552 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 15174b9..16dee87 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -436,26 +436,6 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
/* rx ***********************************************************************/
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
-/*
- * rx_return_buff - Returns a Rx buffer back to the Rx ring.
- *
- * DESCRIPTION:
- * This routine returns a Rx buffer back to the Rx ring. It retrieves the
- * next 'used' descriptor and attached the returned buffer to it.
- * In case the Rx ring was in "resource error" condition, where there are
- * no available Rx resources, the function resets the resource error flag.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
- * struct pkt_info *p_pkt_info Information on returned buffer.
- *
- * OUTPUT:
- * New available Rx resource in Rx descriptor ring.
- *
- * RETURN:
- * ETH_ERROR in case the routine can not access Rx desc ring.
- * ETH_OK otherwise.
- */
static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
struct pkt_info *p_pkt_info)
{
@@ -491,14 +471,6 @@ static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
return ETH_OK;
}
-/*
- * mv643xx_eth_rx_refill_descs
- *
- * Fills / refills RX queue on a certain gigabit ethernet port
- *
- * Input : pointer to ethernet interface network device structure
- * Output : N/A
- */
static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -537,44 +509,11 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
}
}
-/*
- * mv643xx_eth_rx_refill_descs_timer_wrapper
- *
- * Timer routine to wake up RX queue filling task. This function is
- * used only in case the RX queue is empty, and all alloc_skb has
- * failed (due to out of memory event).
- *
- * Input : pointer to ethernet interface network device structure
- * Output : N/A
- */
static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
{
mv643xx_eth_rx_refill_descs((struct net_device *)data);
}
-/*
- * port_receive - Get received information from Rx ring.
- *
- * DESCRIPTION:
- * This routine returns the received data to the caller. There is no
- * data copying during routine operation. All information is returned
- * using pointer to packet information struct passed from the caller.
- * If the routine exhausts Rx ring resources then the resource error flag
- * is set.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
- * struct pkt_info *p_pkt_info User packet buffer.
- *
- * OUTPUT:
- * Rx ring current and used indexes are updated.
- *
- * RETURN:
- * ETH_ERROR in case the routine can not access Rx desc ring.
- * ETH_QUEUE_FULL if Rx ring resources are exhausted.
- * ETH_END_OF_JOB if there is no received data.
- * ETH_OK otherwise.
- */
static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
struct pkt_info *p_pkt_info)
{
@@ -630,17 +569,6 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
return ETH_OK;
}
-/*
- * mv643xx_eth_receive
- *
- * This function is forward packets that are received from the port's
- * queues toward kernel core or FastRoute them to another interface.
- *
- * Input : dev - a pointer to the required interface
- * max - maximum number to receive (0 means unlimted)
- *
- * Output : number of served packets
- */
static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -710,11 +638,6 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
}
#ifdef MV643XX_ETH_NAPI
-/*
- * mv643xx_eth_poll
- *
- * This function is used in case of NAPI
- */
static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
{
struct mv643xx_eth_private *mep = container_of(napi, struct mv643xx_eth_private, napi);
@@ -747,13 +670,6 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
/* tx ***********************************************************************/
-/**
- * has_tiny_unaligned_frags - check if skb has any small, unaligned fragments
- *
- * Hardware can't handle unaligned fragments smaller than 9 bytes.
- * This helper function detects that case.
- */
-
static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
{
unsigned int frag;
@@ -767,9 +683,6 @@ static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
return 0;
}
-/**
- * alloc_tx_desc_index - return the index of the next available tx desc
- */
static int alloc_tx_desc_index(struct mv643xx_eth_private *mep)
{
int tx_desc_curr;
@@ -784,12 +697,6 @@ static int alloc_tx_desc_index(struct mv643xx_eth_private *mep)
return tx_desc_curr;
}
-/**
- * tx_fill_frag_descs - fill tx hw descriptors for an skb's fragments.
- *
- * Ensure the data for each fragment to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue.
- */
static void tx_fill_frag_descs(struct mv643xx_eth_private *mep,
struct sk_buff *skb)
{
@@ -828,12 +735,6 @@ static inline __be16 sum16_as_be(__sum16 sum)
return (__force __be16)sum;
}
-/**
- * tx_submit_descs_for_skb - submit data from an skb to the tx hw
- *
- * Ensure the data for an skb to be transmitted is mapped properly,
- * then fill in descriptors in the tx hw queue and start the hardware.
- */
static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
struct sk_buff *skb)
{
@@ -897,10 +798,6 @@ static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
mep->tx_desc_count += nr_frags + 1;
}
-/**
- * mv643xx_eth_start_xmit - queue an skb to the hardware for transmission
- *
- */
static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -942,26 +839,6 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* mii management interface *************************************************/
static int phy_addr_get(struct mv643xx_eth_private *mep);
-/*
- * read_smi_reg - Read PHY registers
- *
- * DESCRIPTION:
- * This routine utilize the SMI interface to interact with the PHY in
- * order to perform PHY register read.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- * unsigned int phy_reg PHY register address offset.
- * unsigned int *value Register value buffer.
- *
- * OUTPUT:
- * Write the value of a specified PHY register into given buffer.
- *
- * RETURN:
- * false if the PHY is busy or read data is not in valid state.
- * true otherwise.
- *
- */
static void read_smi_reg(struct mv643xx_eth_private *mep,
unsigned int phy_reg, unsigned int *value)
{
@@ -998,26 +875,6 @@ out:
spin_unlock_irqrestore(&mep->shared_smi->phy_lock, flags);
}
-/*
- * write_smi_reg - Write to PHY registers
- *
- * DESCRIPTION:
- * This routine utilize the SMI interface to interact with the PHY in
- * order to perform writes to PHY registers.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- * unsigned int phy_reg PHY register address offset.
- * unsigned int value Register value.
- *
- * OUTPUT:
- * Write the given value to the specified PHY register.
- *
- * RETURN:
- * false if the PHY is busy.
- * true otherwise.
- *
- */
static void write_smi_reg(struct mv643xx_eth_private *mep,
unsigned int phy_reg, unsigned int value)
{
@@ -1046,23 +903,6 @@ out:
/* mib counters *************************************************************/
-/*
- * clear_mib_counters - Clear all MIB counters
- *
- * DESCRIPTION:
- * This function clears all MIB counters of a specific ethernet port.
- * A read from the MIB counter will reset the counter.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * After reading all MIB counters, the counters resets.
- *
- * RETURN:
- * MIB counter value.
- *
- */
static void clear_mib_counters(struct mv643xx_eth_private *mep)
{
unsigned int port_num = mep->port_num;
@@ -1277,9 +1117,6 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
/* address handling *********************************************************/
-/*
- * uc_addr_get - Read the MAC address from the port's hw registers
- */
static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
unsigned int port_num = mep->port_num;
@@ -1297,22 +1134,6 @@ static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *p_addr)
p_addr[5] = mac_l & 0xff;
}
-/*
- * init_mac_tables - Clear all entrance in the UC, SMC and OMC tables
- *
- * DESCRIPTION:
- * Go through all the DA filter tables (Unicast, Special Multicast &
- * Other Multicast) and set each entry to 0.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * Multicast and Unicast packets are rejected.
- *
- * RETURN:
- * None.
- */
static void init_mac_tables(struct mv643xx_eth_private *mep)
{
unsigned int port_num = mep->port_num;
@@ -1330,15 +1151,6 @@ static void init_mac_tables(struct mv643xx_eth_private *mep)
}
}
-/*
- * The entries in each table are indexed by a hash of a packet's MAC
- * address. One bit in each entry determines whether the packet is
- * accepted. There are 4 entries (each 8 bits wide) in each register
- * of the table. The bits in each entry are defined as follows:
- * 0 Accept=1, Drop=0
- * 3-1 Queue (ETH_Q0=0)
- * 7-4 Reserved = 0;
- */
static void set_filter_table_entry(struct mv643xx_eth_private *mep,
int table, unsigned char entry)
{
@@ -1355,9 +1167,6 @@ static void set_filter_table_entry(struct mv643xx_eth_private *mep,
wrl(mep, table + tbl_offset, table_reg);
}
-/*
- * uc_addr_set - Write a MAC address into the port's hw registers
- */
static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
unsigned int port_num = mep->port_num;
@@ -1377,14 +1186,6 @@ static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *p_addr)
set_filter_table_entry(mep, table, p_addr[5] & 0x0f);
}
-/*
- * mv643xx_eth_update_mac_address
- *
- * Update the MAC address of the port in the address table
- *
- * Input : pointer to ethernet interface network device structure
- * Output : N/A
- */
static void mv643xx_eth_update_mac_address(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -1393,17 +1194,6 @@ static void mv643xx_eth_update_mac_address(struct net_device *dev)
uc_addr_set(mep, dev->dev_addr);
}
-/*
- * mv643xx_eth_set_mac_address
- *
- * Change the interface's mac address.
- * No special hardware thing should be done because interface is always
- * put in promiscuous mode.
- *
- * Input : pointer to ethernet interface network device structure and
- * a pointer to the designated entry to be added to the cache.
- * Output : zero upon success, negative upon failure
- */
static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
{
int i;
@@ -1415,20 +1205,6 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
return 0;
}
-/*
- * mc_addr - Multicast address settings.
- *
- * The MV device supports multicast using two tables:
- * 1) Special Multicast Table for MAC addresses of the form
- * 0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF).
- * The MAC DA[7:0] bits are used as a pointer to the Special Multicast
- * Table entries in the DA-Filter table.
- * 2) Other Multicast Table for multicast of another type. A CRC-8bit
- * is used as an index to the Other Multicast Table entries in the
- * DA-Filter table. This function calculates the CRC-8bit value.
- * In either case, set_filter_table_entry() is then called
- * to set to set the actual table entry.
- */
static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *p_addr)
{
unsigned int port_num = mep->port_num;
@@ -1519,9 +1295,6 @@ static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *p_addr)
set_filter_table_entry(mep, table, crc_result);
}
-/*
- * Set the entire multicast list based on dev->mc_list.
- */
static void set_multicast_list(struct net_device *dev)
{
@@ -1579,14 +1352,6 @@ static void set_multicast_list(struct net_device *dev)
mc_addr(mep, mc_list->dmi_addr);
}
-/*
- * mv643xx_eth_set_rx_mode
- *
- * Change from promiscuos to regular rx mode
- *
- * Input : pointer to ethernet interface network device structure
- * Output : N/A
- */
static void mv643xx_eth_set_rx_mode(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -1604,28 +1369,6 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
/* rx/tx queue initialisation ***********************************************/
-/*
- * ether_init_rx_desc_ring - Curve a Rx chain desc list and buffer in memory.
- *
- * DESCRIPTION:
- * This function prepares a Rx chained list of descriptors and packet
- * buffers in a form of a ring. The routine must be called after port
- * initialization routine and before port start routine.
- * The Ethernet SDMA engine uses CPU bus addresses to access the various
- * devices in the system (i.e. DRAM). This function uses the ethernet
- * struct 'virtual to physical' routine (set by the user) to set the ring
- * with physical addresses.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
- *
- * OUTPUT:
- * The routine updates the Ethernet port control struct with information
- * regarding the Rx descriptors and buffers.
- *
- * RETURN:
- * None.
- */
static void ether_init_rx_desc_ring(struct mv643xx_eth_private *mep)
{
volatile struct rx_desc *p_rx_desc;
@@ -1675,28 +1418,6 @@ static void mv643xx_eth_free_rx_rings(struct net_device *dev)
mep->p_rx_desc_area, mep->rx_desc_dma);
}
-/*
- * ether_init_tx_desc_ring - Curve a Tx chain desc list and buffer in memory.
- *
- * DESCRIPTION:
- * This function prepares a Tx chained list of descriptors and packet
- * buffers in a form of a ring. The routine must be called after port
- * initialization routine and before port start routine.
- * The Ethernet SDMA engine uses CPU bus addresses to access the various
- * devices in the system (i.e. DRAM). This function uses the ethernet
- * struct 'virtual to physical' routine (set by the user) to set the ring
- * with physical addresses.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port Control srtuct.
- *
- * OUTPUT:
- * The routine updates the Ethernet port control struct with information
- * regarding the Tx descriptors and buffers.
- *
- * RETURN:
- * None.
- */
static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
{
int tx_desc_num = mep->tx_ring_size;
@@ -1716,11 +1437,6 @@ static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
mep->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
}
-/**
- * mv643xx_eth_free_tx_descs - Free the tx desc data for completed descriptors
- *
- * If force is non-zero, frees uncompleted descriptors as well
- */
static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -1819,7 +1535,6 @@ static void mv643xx_eth_free_tx_rings(struct net_device *dev)
/* netdev ops and related ***************************************************/
static void port_reset(struct mv643xx_eth_private *mep);
-/* Set the mv643xx port configuration register for the speed/duplex mode. */
static void mv643xx_eth_update_pscr(struct net_device *dev,
struct ethtool_cmd *ecmd)
{
@@ -1865,17 +1580,6 @@ static void mv643xx_eth_update_pscr(struct net_device *dev,
}
}
-/*
- * mv643xx_eth_int_handler
- *
- * Main interrupt handler for the gigbit ethernet ports
- *
- * Input : irq - irq number (not used)
- * dev_id - a pointer to the required interface's data structure
- * regs - not used
- * Output : N/A
- */
-
static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
@@ -1938,22 +1642,6 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
-/*
- * phy_reset - Reset Ethernet port PHY.
- *
- * DESCRIPTION:
- * This routine utilizes the SMI interface to reset the ethernet port PHY.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * The PHY is reset.
- *
- * RETURN:
- * None.
- *
- */
static void phy_reset(struct mv643xx_eth_private *mep)
{
unsigned int phy_reg_data;
@@ -1970,33 +1658,6 @@ static void phy_reset(struct mv643xx_eth_private *mep)
} while (phy_reg_data & 0x8000);
}
-/*
- * port_start - Start the Ethernet port activity.
- *
- * DESCRIPTION:
- * This routine prepares the Ethernet port for Rx and Tx activity:
- * 1. Initialize Tx and Rx Current Descriptor Pointer for each queue that
- * has been initialized a descriptor's ring (using
- * ether_init_tx_desc_ring for Tx and ether_init_rx_desc_ring for Rx)
- * 2. Initialize and enable the Ethernet configuration port by writing to
- * the port's configuration and command registers.
- * 3. Initialize and enable the SDMA by writing to the SDMA's
- * configuration and command registers. After completing these steps,
- * the ethernet port SDMA can starts to perform Rx and Tx activities.
- *
- * Note: Each Rx and Tx queue descriptor's list must be initialized prior
- * to calling this function (use ether_init_tx_desc_ring for Tx queues
- * and ether_init_rx_desc_ring for Rx queues).
- *
- * INPUT:
- * dev - a pointer to the required interface
- *
- * OUTPUT:
- * Ethernet port is ready to receive and transmit.
- *
- * RETURN:
- * None.
- */
static void port_start(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -2061,29 +1722,6 @@ static void port_start(struct net_device *dev)
}
#ifdef MV643XX_ETH_COAL
-
-/*
- * set_rx_coal - Sets coalescing interrupt mechanism on RX path
- *
- * DESCRIPTION:
- * This routine sets the RX coalescing interrupt mechanism parameter.
- * This parameter is a timeout counter, that counts in 64 t_clk
- * chunks ; that when timeout event occurs a maskable interrupt
- * occurs.
- * The parameter is calculated using the tClk of the MV-643xx chip
- * , and the required delay of the interrupt in usec.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet port
- * unsigned int delay Delay in usec
- *
- * OUTPUT:
- * Interrupt coalescing mechanism value is set in MV-643xx chip.
- *
- * RETURN:
- * The interrupt coalescing value set in the gigE port.
- *
- */
static unsigned int set_rx_coal(struct mv643xx_eth_private *mep,
unsigned int delay)
{
@@ -2100,28 +1738,6 @@ static unsigned int set_rx_coal(struct mv643xx_eth_private *mep,
}
#endif
-/*
- * set_tx_coal - Sets coalescing interrupt mechanism on TX path
- *
- * DESCRIPTION:
- * This routine sets the TX coalescing interrupt mechanism parameter.
- * This parameter is a timeout counter, that counts in 64 t_clk
- * chunks ; that when timeout event occurs a maskable interrupt
- * occurs.
- * The parameter is calculated using the t_cLK frequency of the
- * MV-643xx chip and the required delay in the interrupt in uSec
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet port
- * unsigned int delay Delay in uSeconds
- *
- * OUTPUT:
- * Interrupt coalescing mechanism value is set in MV-643xx chip.
- *
- * RETURN:
- * The interrupt coalescing value set in the gigE port.
- *
- */
static unsigned int set_tx_coal(struct mv643xx_eth_private *mep,
unsigned int delay)
{
@@ -2133,30 +1749,6 @@ static unsigned int set_tx_coal(struct mv643xx_eth_private *mep,
return coal;
}
-/*
- * port_init - Initialize the Ethernet port driver
- *
- * DESCRIPTION:
- * This function prepares the ethernet port to start its activity:
- * 1) Completes the ethernet port driver struct initialization toward port
- * start routine.
- * 2) Resets the device to a quiescent state in case of warm reboot.
- * 3) Enable SDMA access to all four DRAM banks as well as internal SRAM.
- * 4) Clean MAC tables. The reset status of those tables is unknown.
- * 5) Set PHY address.
- * Note: Call this routine prior to port_start routine and after
- * setting user values in the user fields of Ethernet port control
- * struct.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet port control struct
- *
- * OUTPUT:
- * See description.
- *
- * RETURN:
- * None.
- */
static void port_init(struct mv643xx_eth_private *mep)
{
mep->rx_resource_err = 0;
@@ -2166,19 +1758,6 @@ static void port_init(struct mv643xx_eth_private *mep)
init_mac_tables(mep);
}
-/*
- * mv643xx_eth_open
- *
- * This function is called when openning the network device. The function
- * should initialize all the hardware, initialize cyclic Rx/Tx
- * descriptors chain and buffers and allocate an IRQ to the network
- * device.
- *
- * Input : a pointer to the network device structure
- *
- * Output : zero of success , nonzero if fails.
- */
-
static int mv643xx_eth_open(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -2311,24 +1890,6 @@ out_free_irq:
return err;
}
-/*
- * port_reset - Reset Ethernet port
- *
- * DESCRIPTION:
- * This routine resets the chip by aborting any SDMA engine activity and
- * clearing the MIB counters. The Receiver and the Transmit unit are in
- * idle state after this command is performed and the port is disabled.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * Channel activity is halted.
- *
- * RETURN:
- * None.
- *
- */
static void port_reset(struct mv643xx_eth_private *mep)
{
unsigned int port_num = mep->port_num;
@@ -2348,16 +1909,6 @@ static void port_reset(struct mv643xx_eth_private *mep)
wrl(mep, PORT_SERIAL_CONTROL(port_num), reg_data);
}
-/*
- * mv643xx_eth_stop
- *
- * This function is used when closing the network device.
- * It updates the hardware,
- * release all memory that holds buffers and descriptors and release the IRQ.
- * Input : a pointer to the device structure
- * Output : zero if success , nonzero if fails
- */
-
static int mv643xx_eth_stop(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -2391,13 +1942,6 @@ static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int c
return generic_mii_ioctl(&mep->mii, if_mii(ifr), cmd, NULL);
}
-/*
- * Changes MTU (maximum transfer unit) of the gigabit ethenret port
- *
- * Input : pointer to ethernet interface network device structure
- * new mtu size
- * Output : 0 upon success, -EINVAL upon failure
- */
static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
{
if ((new_mtu > 9500) || (new_mtu < 64))
@@ -2422,11 +1966,6 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
return 0;
}
-/*
- * mv643xx_eth_tx_timeout_task
- *
- * Actual routine to reset the adapter when a timeout on Tx has occurred
- */
static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
{
struct mv643xx_eth_private *mep = container_of(ugly, struct mv643xx_eth_private,
@@ -2445,14 +1984,6 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
netif_wake_queue(dev);
}
-/*
- * mv643xx_eth_tx_timeout
- *
- * Called upon a timeout on transmitting a packet
- *
- * Input : pointer to ethernet interface network device structure.
- * Output : N/A
- */
static void mv643xx_eth_tx_timeout(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -2479,9 +2010,6 @@ static void mv643xx_eth_netpoll(struct net_device *netdev)
}
#endif
-/*
- * Wrappers for MII support library.
- */
static int mv643xx_eth_mdio_read(struct net_device *dev, int phy_id, int location)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -2598,23 +2126,6 @@ static struct platform_driver mv643xx_eth_shared_driver = {
},
};
-/*
- * phy_addr_set - Set the ethernet port PHY address.
- *
- * DESCRIPTION:
- * This routine sets the given ethernet port PHY address.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- * int phy_addr PHY address.
- *
- * OUTPUT:
- * None.
- *
- * RETURN:
- * None.
- *
- */
static void phy_addr_set(struct mv643xx_eth_private *mep, int phy_addr)
{
u32 reg_data;
@@ -2626,22 +2137,6 @@ static void phy_addr_set(struct mv643xx_eth_private *mep, int phy_addr)
wrl(mep, PHY_ADDR, reg_data);
}
-/*
- * phy_addr_get - Get the ethernet port PHY address.
- *
- * DESCRIPTION:
- * This routine returns the given ethernet port PHY address.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * None.
- *
- * RETURN:
- * PHY address.
- *
- */
static int phy_addr_get(struct mv643xx_eth_private *mep)
{
unsigned int reg_data;
@@ -2651,24 +2146,6 @@ static int phy_addr_get(struct mv643xx_eth_private *mep)
return ((reg_data >> (5 * mep->port_num)) & 0x1f);
}
-/*
- * phy_detect - Detect whether a phy is present
- *
- * DESCRIPTION:
- * This function tests whether there is a PHY present on
- * the specified port.
- *
- * INPUT:
- * struct mv643xx_eth_private *mep Ethernet Port.
- *
- * OUTPUT:
- * None
- *
- * RETURN:
- * 0 on success
- * -ENODEV on failure
- *
- */
static int phy_detect(struct mv643xx_eth_private *mep)
{
unsigned int phy_reg_data0;
@@ -2717,17 +2194,6 @@ static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
}
}
-/*/
- * mv643xx_eth_probe
- *
- * First function called after registering the network device.
- * It's purpose is to initialize the device as an ethernet device,
- * fill the ethernet device structure with pointers * to functions,
- * and set the MAC address of the interface
- *
- * Input : struct device *
- * Output : -ENOMEM if failed , 0 if success
- */
static int mv643xx_eth_probe(struct platform_device *pdev)
{
struct mv643xx_eth_platform_data *pd;
@@ -2940,15 +2406,6 @@ static struct platform_driver mv643xx_eth_driver = {
},
};
-/*
- * mv643xx_eth_init_module
- *
- * Registers the network drivers into the Linux kernel
- *
- * Input : N/A
- *
- * Output : N/A
- */
static int __init mv643xx_eth_init_module(void)
{
int rc;
@@ -2962,15 +2419,6 @@ static int __init mv643xx_eth_init_module(void)
return rc;
}
-/*
- * mv643xx_eth_cleanup_module
- *
- * Registers the network drivers into the Linux kernel
- *
- * Input : N/A
- *
- * Output : N/A
- */
static void __exit mv643xx_eth_cleanup_module(void)
{
platform_driver_unregister(&mv643xx_eth_driver);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 18/39] mv643xx_eth: kill superfluous comments
2008-06-03 11:02 ` [PATCH 18/39] mv643xx_eth: kill superfluous comments Lennert Buytenhek
@ 2008-06-05 12:03 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:03 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:33PM +0200, Lennert Buytenhek wrote:
> Half of the functions in the mv643xx_eth driver are prefixed by
> useless and baroque comment blocks on _what_ those functions do (which
> is obvious from the code itself) rather than why, and there's no point
> in keeping those comments around.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 552 ---------------------------------------------
> 1 files changed, 0 insertions(+), 552 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 19/39] mv643xx_eth: kill ->rx_resource_err
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (17 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 18/39] mv643xx_eth: kill superfluous comments Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:48 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 20/39] mv643xx_eth: get rid of hungarian variable naming Lennert Buytenhek
` (19 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The ->rx_resource_err variable doesn't serve a useful purpose --
kill it.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 16dee87..cce9686 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -311,8 +311,6 @@ struct mv643xx_eth_private {
u32 tx_sram_addr; /* Base address of tx sram area */
u32 tx_sram_size; /* Size of tx sram area */
- int rx_resource_err; /* Rx ring resource error flag */
-
/* Tx/Rx rings managment indexes fields. For driver use */
/* Next available and first returning Rx resource */
@@ -463,9 +461,6 @@ static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
/* Move the used descriptor pointer to the next descriptor */
mep->rx_used_desc_q = (used_rx_desc + 1) % mep->rx_ring_size;
- /* Any Rx return cancels the Rx resource error status */
- mep->rx_resource_err = 0;
-
spin_unlock_irqrestore(&mep->lock, flags);
return ETH_OK;
@@ -522,10 +517,6 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
unsigned int command_status;
unsigned long flags;
- /* Do not process Rx ring in case of Rx ring resource error */
- if (mep->rx_resource_err)
- return ETH_QUEUE_FULL;
-
spin_lock_irqsave(&mep->lock, flags);
/* Get the Rx Desc ring 'curr and 'used' indexes */
@@ -560,10 +551,6 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
rx_next_curr_desc = (rx_curr_desc + 1) % mep->rx_ring_size;
mep->rx_curr_desc_q = rx_next_curr_desc;
- /* Rx descriptors exhausted. Set the Rx ring resource error flag */
- if (rx_next_curr_desc == rx_used_desc)
- mep->rx_resource_err = 1;
-
spin_unlock_irqrestore(&mep->lock, flags);
return ETH_OK;
@@ -1751,8 +1738,6 @@ static unsigned int set_tx_coal(struct mv643xx_eth_private *mep,
static void port_init(struct mv643xx_eth_private *mep)
{
- mep->rx_resource_err = 0;
-
port_reset(mep);
init_mac_tables(mep);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 20/39] mv643xx_eth: get rid of hungarian variable naming
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (18 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 19/39] mv643xx_eth: kill ->rx_resource_err Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:06 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 21/39] mv643xx_eth: move port_receive() into its only caller Lennert Buytenhek
` (18 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Nuke some Hungarian-esque variable naming conventions:
- p_ prefix for pointers
- _q suffix for variables dealing with rx/tx queue state
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 156 ++++++++++++++++++++++----------------------
1 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index cce9686..15a17e2 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -314,21 +314,21 @@ struct mv643xx_eth_private {
/* Tx/Rx rings managment indexes fields. For driver use */
/* Next available and first returning Rx resource */
- int rx_curr_desc_q, rx_used_desc_q;
+ int rx_curr_desc, rx_used_desc;
/* Next available and first returning Tx resource */
- int tx_curr_desc_q, tx_used_desc_q;
+ int tx_curr_desc, tx_used_desc;
#ifdef MV643XX_ETH_TX_FAST_REFILL
u32 tx_clean_threshold;
#endif
- struct rx_desc *p_rx_desc_area;
+ struct rx_desc *rx_desc_area;
dma_addr_t rx_desc_dma;
int rx_desc_area_size;
struct sk_buff **rx_skb;
- struct tx_desc *p_tx_desc_area;
+ struct tx_desc *tx_desc_area;
dma_addr_t tx_desc_dma;
int tx_desc_area_size;
struct sk_buff **tx_skb;
@@ -435,31 +435,31 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
- struct pkt_info *p_pkt_info)
+ struct pkt_info *pkt_info)
{
int used_rx_desc; /* Where to return Rx resource */
- volatile struct rx_desc *p_used_rx_desc;
+ volatile struct rx_desc *rx_desc;
unsigned long flags;
spin_lock_irqsave(&mep->lock, flags);
/* Get 'used' Rx descriptor */
- used_rx_desc = mep->rx_used_desc_q;
- p_used_rx_desc = &mep->p_rx_desc_area[used_rx_desc];
+ used_rx_desc = mep->rx_used_desc;
+ rx_desc = &mep->rx_desc_area[used_rx_desc];
- p_used_rx_desc->buf_ptr = p_pkt_info->buf_ptr;
- p_used_rx_desc->buf_size = p_pkt_info->byte_cnt;
- mep->rx_skb[used_rx_desc] = p_pkt_info->return_info;
+ rx_desc->buf_ptr = pkt_info->buf_ptr;
+ rx_desc->buf_size = pkt_info->byte_cnt;
+ mep->rx_skb[used_rx_desc] = pkt_info->return_info;
/* Flush the write pipe */
/* Return the descriptor to DMA ownership */
wmb();
- p_used_rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
+ rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
wmb();
/* Move the used descriptor pointer to the next descriptor */
- mep->rx_used_desc_q = (used_rx_desc + 1) % mep->rx_ring_size;
+ mep->rx_used_desc = (used_rx_desc + 1) % mep->rx_ring_size;
spin_unlock_irqrestore(&mep->lock, flags);
@@ -510,23 +510,23 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
}
static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
- struct pkt_info *p_pkt_info)
+ struct pkt_info *pkt_info)
{
int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
- volatile struct rx_desc *p_rx_desc;
+ volatile struct rx_desc *rx_desc;
unsigned int command_status;
unsigned long flags;
spin_lock_irqsave(&mep->lock, flags);
/* Get the Rx Desc ring 'curr and 'used' indexes */
- rx_curr_desc = mep->rx_curr_desc_q;
- rx_used_desc = mep->rx_used_desc_q;
+ rx_curr_desc = mep->rx_curr_desc;
+ rx_used_desc = mep->rx_used_desc;
- p_rx_desc = &mep->p_rx_desc_area[rx_curr_desc];
+ rx_desc = &mep->rx_desc_area[rx_curr_desc];
/* The following parameters are used to save readings from memory */
- command_status = p_rx_desc->cmd_sts;
+ command_status = rx_desc->cmd_sts;
rmb();
/* Nothing to receive... */
@@ -535,11 +535,11 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
return ETH_END_OF_JOB;
}
- p_pkt_info->byte_cnt = p_rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
- p_pkt_info->cmd_sts = command_status;
- p_pkt_info->buf_ptr = p_rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
- p_pkt_info->return_info = mep->rx_skb[rx_curr_desc];
- p_pkt_info->l4i_chk = p_rx_desc->buf_size;
+ pkt_info->byte_cnt = rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
+ pkt_info->cmd_sts = command_status;
+ pkt_info->buf_ptr = rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
+ pkt_info->return_info = mep->rx_skb[rx_curr_desc];
+ pkt_info->l4i_chk = rx_desc->buf_size;
/*
* Clean the return info field to indicate that the
@@ -549,7 +549,7 @@ static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
/* Update current index in data structure */
rx_next_curr_desc = (rx_curr_desc + 1) % mep->rx_ring_size;
- mep->rx_curr_desc_q = rx_next_curr_desc;
+ mep->rx_curr_desc = rx_next_curr_desc;
spin_unlock_irqrestore(&mep->lock, flags);
@@ -641,7 +641,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
work_done = 0;
if ((rdl(mep, RXQ_CURRENT_DESC_PTR(port_num)))
- != (u32) mep->rx_used_desc_q)
+ != (u32) mep->rx_used_desc)
work_done = mv643xx_eth_receive_queue(dev, budget);
if (work_done < budget) {
@@ -676,10 +676,10 @@ static int alloc_tx_desc_index(struct mv643xx_eth_private *mep)
BUG_ON(mep->tx_desc_count >= mep->tx_ring_size);
- tx_desc_curr = mep->tx_curr_desc_q;
- mep->tx_curr_desc_q = (tx_desc_curr + 1) % mep->tx_ring_size;
+ tx_desc_curr = mep->tx_curr_desc;
+ mep->tx_curr_desc = (tx_desc_curr + 1) % mep->tx_ring_size;
- BUG_ON(mep->tx_curr_desc_q == mep->tx_used_desc_q);
+ BUG_ON(mep->tx_curr_desc == mep->tx_used_desc);
return tx_desc_curr;
}
@@ -695,7 +695,7 @@ static void tx_fill_frag_descs(struct mv643xx_eth_private *mep,
skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
tx_index = alloc_tx_desc_index(mep);
- desc = &mep->p_tx_desc_area[tx_index];
+ desc = &mep->tx_desc_area[tx_index];
desc->cmd_sts = BUFFER_OWNED_BY_DMA;
/* Last Frag enables interrupt and frees the skb */
@@ -707,7 +707,7 @@ static void tx_fill_frag_descs(struct mv643xx_eth_private *mep,
} else
mep->tx_skb[tx_index] = NULL;
- desc = &mep->p_tx_desc_area[tx_index];
+ desc = &mep->tx_desc_area[tx_index];
desc->l4i_chk = 0;
desc->byte_cnt = this_frag->size;
desc->buf_ptr = dma_map_page(NULL, this_frag->page,
@@ -734,7 +734,7 @@ static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
cmd_sts = TX_FIRST_DESC | GEN_CRC | BUFFER_OWNED_BY_DMA;
tx_index = alloc_tx_desc_index(mep);
- desc = &mep->p_tx_desc_area[tx_index];
+ desc = &mep->tx_desc_area[tx_index];
if (nr_frags) {
tx_fill_frag_descs(mep, skb);
@@ -1104,7 +1104,7 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
/* address handling *********************************************************/
-static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *p_addr)
+static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *addr)
{
unsigned int port_num = mep->port_num;
unsigned int mac_h;
@@ -1113,12 +1113,12 @@ static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *p_addr)
mac_h = rdl(mep, MAC_ADDR_HIGH(port_num));
mac_l = rdl(mep, MAC_ADDR_LOW(port_num));
- p_addr[0] = (mac_h >> 24) & 0xff;
- p_addr[1] = (mac_h >> 16) & 0xff;
- p_addr[2] = (mac_h >> 8) & 0xff;
- p_addr[3] = mac_h & 0xff;
- p_addr[4] = (mac_l >> 8) & 0xff;
- p_addr[5] = mac_l & 0xff;
+ addr[0] = (mac_h >> 24) & 0xff;
+ addr[1] = (mac_h >> 16) & 0xff;
+ addr[2] = (mac_h >> 8) & 0xff;
+ addr[3] = mac_h & 0xff;
+ addr[4] = (mac_l >> 8) & 0xff;
+ addr[5] = mac_l & 0xff;
}
static void init_mac_tables(struct mv643xx_eth_private *mep)
@@ -1154,23 +1154,23 @@ static void set_filter_table_entry(struct mv643xx_eth_private *mep,
wrl(mep, table + tbl_offset, table_reg);
}
-static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *p_addr)
+static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *addr)
{
unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
int table;
- mac_l = (p_addr[4] << 8) | (p_addr[5]);
- mac_h = (p_addr[0] << 24) | (p_addr[1] << 16) | (p_addr[2] << 8) |
- (p_addr[3] << 0);
+ mac_l = (addr[4] << 8) | (addr[5]);
+ mac_h = (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) |
+ (addr[3] << 0);
wrl(mep, MAC_ADDR_LOW(port_num), mac_l);
wrl(mep, MAC_ADDR_HIGH(port_num), mac_h);
/* Accept frames with this address */
table = UNICAST_TABLE(port_num);
- set_filter_table_entry(mep, table, p_addr[5] & 0x0f);
+ set_filter_table_entry(mep, table, addr[5] & 0x0f);
}
static void mv643xx_eth_update_mac_address(struct net_device *dev)
@@ -1192,7 +1192,7 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
return 0;
}
-static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *p_addr)
+static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *addr)
{
unsigned int port_num = mep->port_num;
unsigned int mac_h;
@@ -1203,17 +1203,17 @@ static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *p_addr)
int crc[8];
int i;
- if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) &&
- (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) {
+ if ((addr[0] == 0x01) && (addr[1] == 0x00) &&
+ (addr[2] == 0x5E) && (addr[3] == 0x00) && (addr[4] == 0x00)) {
table = SPECIAL_MCAST_TABLE(port_num);
- set_filter_table_entry(mep, table, p_addr[5]);
+ set_filter_table_entry(mep, table, addr[5]);
return;
}
/* Calculate CRC-8 out of the given address */
- mac_h = (p_addr[0] << 8) | (p_addr[1]);
- mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) |
- (p_addr[4] << 8) | (p_addr[5] << 0);
+ mac_h = (addr[0] << 8) | (addr[1]);
+ mac_l = (addr[2] << 24) | (addr[3] << 16) |
+ (addr[4] << 8) | (addr[5] << 0);
for (i = 0; i < 32; i++)
mac_array[i] = (mac_l >> i) & 0x1;
@@ -1363,15 +1363,15 @@ static void ether_init_rx_desc_ring(struct mv643xx_eth_private *mep)
int i;
/* initialize the next_desc_ptr links in the Rx descriptors ring */
- p_rx_desc = (struct rx_desc *)mep->p_rx_desc_area;
+ p_rx_desc = (struct rx_desc *)mep->rx_desc_area;
for (i = 0; i < rx_desc_num; i++) {
p_rx_desc[i].next_desc_ptr = mep->rx_desc_dma +
((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
}
/* Save Rx desc pointer to driver struct. */
- mep->rx_curr_desc_q = 0;
- mep->rx_used_desc_q = 0;
+ mep->rx_curr_desc = 0;
+ mep->rx_used_desc = 0;
mep->rx_desc_area_size = rx_desc_num * sizeof(struct rx_desc);
}
@@ -1399,10 +1399,10 @@ static void mv643xx_eth_free_rx_rings(struct net_device *dev)
mep->rx_desc_count);
/* Free RX ring */
if (mep->rx_sram_size)
- iounmap(mep->p_rx_desc_area);
+ iounmap(mep->rx_desc_area);
else
dma_free_coherent(NULL, mep->rx_desc_area_size,
- mep->p_rx_desc_area, mep->rx_desc_dma);
+ mep->rx_desc_area, mep->rx_desc_dma);
}
static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
@@ -1412,14 +1412,14 @@ static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
int i;
/* Initialize the next_desc_ptr links in the Tx descriptors ring */
- p_tx_desc = (struct tx_desc *)mep->p_tx_desc_area;
+ p_tx_desc = (struct tx_desc *)mep->tx_desc_area;
for (i = 0; i < tx_desc_num; i++) {
p_tx_desc[i].next_desc_ptr = mep->tx_desc_dma +
((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
}
- mep->tx_curr_desc_q = 0;
- mep->tx_used_desc_q = 0;
+ mep->tx_curr_desc = 0;
+ mep->tx_used_desc = 0;
mep->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
}
@@ -1445,8 +1445,8 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
return released;
}
- tx_index = mep->tx_used_desc_q;
- desc = &mep->p_tx_desc_area[tx_index];
+ tx_index = mep->tx_used_desc;
+ desc = &mep->tx_desc_area[tx_index];
cmd_sts = desc->cmd_sts;
if (!force && (cmd_sts & BUFFER_OWNED_BY_DMA)) {
@@ -1454,7 +1454,7 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
return released;
}
- mep->tx_used_desc_q = (tx_index + 1) % mep->tx_ring_size;
+ mep->tx_used_desc = (tx_index + 1) % mep->tx_ring_size;
mep->tx_desc_count--;
addr = desc->buf_ptr;
@@ -1508,14 +1508,14 @@ static void mv643xx_eth_free_tx_rings(struct net_device *dev)
/* Free outstanding skb's on TX ring */
mv643xx_eth_free_all_tx_descs(dev);
- BUG_ON(mep->tx_used_desc_q != mep->tx_curr_desc_q);
+ BUG_ON(mep->tx_used_desc != mep->tx_curr_desc);
/* Free TX ring */
if (mep->tx_sram_size)
- iounmap(mep->p_tx_desc_area);
+ iounmap(mep->tx_desc_area);
else
dma_free_coherent(NULL, mep->tx_desc_area_size,
- mep->p_tx_desc_area, mep->tx_desc_dma);
+ mep->tx_desc_area, mep->tx_desc_dma);
}
@@ -1654,12 +1654,12 @@ static void port_start(struct net_device *dev)
struct ethtool_cmd ethtool_cmd;
/* Assignment of Tx CTRP of given queue */
- tx_curr_desc = mep->tx_curr_desc_q;
+ tx_curr_desc = mep->tx_curr_desc;
wrl(mep, TXQ_CURRENT_DESC_PTR(port_num),
(u32)((struct tx_desc *)mep->tx_desc_dma + tx_curr_desc));
/* Assignment of Rx CRDP of given queue */
- rx_curr_desc = mep->rx_curr_desc_q;
+ rx_curr_desc = mep->rx_curr_desc;
wrl(mep, RXQ_CURRENT_DESC_PTR(port_num),
(u32)((struct rx_desc *)mep->rx_desc_dma + rx_curr_desc));
@@ -1791,22 +1791,22 @@ static int mv643xx_eth_open(struct net_device *dev)
mep->tx_desc_area_size = size;
if (mep->tx_sram_size) {
- mep->p_tx_desc_area = ioremap(mep->tx_sram_addr,
+ mep->tx_desc_area = ioremap(mep->tx_sram_addr,
mep->tx_sram_size);
mep->tx_desc_dma = mep->tx_sram_addr;
} else
- mep->p_tx_desc_area = dma_alloc_coherent(NULL, size,
+ mep->tx_desc_area = dma_alloc_coherent(NULL, size,
&mep->tx_desc_dma,
GFP_KERNEL);
- if (!mep->p_tx_desc_area) {
+ if (!mep->tx_desc_area) {
printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
dev->name, size);
err = -ENOMEM;
goto out_free_tx_skb;
}
- BUG_ON((u32) mep->p_tx_desc_area & 0xf); /* check 16-byte alignment */
- memset((void *)mep->p_tx_desc_area, 0, mep->tx_desc_area_size);
+ BUG_ON((u32) mep->tx_desc_area & 0xf); /* check 16-byte alignment */
+ memset((void *)mep->tx_desc_area, 0, mep->tx_desc_area_size);
ether_init_tx_desc_ring(mep);
@@ -1816,28 +1816,28 @@ static int mv643xx_eth_open(struct net_device *dev)
mep->rx_desc_area_size = size;
if (mep->rx_sram_size) {
- mep->p_rx_desc_area = ioremap(mep->rx_sram_addr,
+ mep->rx_desc_area = ioremap(mep->rx_sram_addr,
mep->rx_sram_size);
mep->rx_desc_dma = mep->rx_sram_addr;
} else
- mep->p_rx_desc_area = dma_alloc_coherent(NULL, size,
+ mep->rx_desc_area = dma_alloc_coherent(NULL, size,
&mep->rx_desc_dma,
GFP_KERNEL);
- if (!mep->p_rx_desc_area) {
+ if (!mep->rx_desc_area) {
printk(KERN_ERR "%s: Cannot allocate Rx ring (size %d bytes)\n",
dev->name, size);
printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
dev->name);
if (mep->rx_sram_size)
- iounmap(mep->p_tx_desc_area);
+ iounmap(mep->tx_desc_area);
else
dma_free_coherent(NULL, mep->tx_desc_area_size,
- mep->p_tx_desc_area, mep->tx_desc_dma);
+ mep->tx_desc_area, mep->tx_desc_dma);
err = -ENOMEM;
goto out_free_tx_skb;
}
- memset((void *)mep->p_rx_desc_area, 0, size);
+ memset((void *)mep->rx_desc_area, 0, size);
ether_init_rx_desc_ring(mep);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 21/39] mv643xx_eth: move port_receive() into its only caller
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (19 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 20/39] mv643xx_eth: get rid of hungarian variable naming Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:53 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 22/39] mv643xx_eth: move rx_return_buff() " Lennert Buytenhek
` (17 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The port_receive() function is a remnant of the original mv643xx_eth
HAL split. This patch moves port_receive() into its caller, so that
the top and the bottom half of RX processing no longer communicate
via the HAL FUNC_RET_STATUS/pkt_info mechanism abstraction anymore.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 91 ++++++++++++++++-----------------------------
1 files changed, 32 insertions(+), 59 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 15a17e2..2fac2b6 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -509,64 +509,38 @@ static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
mv643xx_eth_rx_refill_descs((struct net_device *)data);
}
-static FUNC_RET_STATUS port_receive(struct mv643xx_eth_private *mep,
- struct pkt_info *pkt_info)
+static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
{
- int rx_next_curr_desc, rx_curr_desc, rx_used_desc;
- volatile struct rx_desc *rx_desc;
- unsigned int command_status;
- unsigned long flags;
-
- spin_lock_irqsave(&mep->lock, flags);
-
- /* Get the Rx Desc ring 'curr and 'used' indexes */
- rx_curr_desc = mep->rx_curr_desc;
- rx_used_desc = mep->rx_used_desc;
-
- rx_desc = &mep->rx_desc_area[rx_curr_desc];
-
- /* The following parameters are used to save readings from memory */
- command_status = rx_desc->cmd_sts;
- rmb();
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ struct net_device_stats *stats = &dev->stats;
+ unsigned int received_packets = 0;
- /* Nothing to receive... */
- if (command_status & BUFFER_OWNED_BY_DMA) {
- spin_unlock_irqrestore(&mep->lock, flags);
- return ETH_END_OF_JOB;
- }
+ while (budget-- > 0) {
+ struct sk_buff *skb;
+ volatile struct rx_desc *rx_desc;
+ unsigned int cmd_sts;
+ unsigned long flags;
- pkt_info->byte_cnt = rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
- pkt_info->cmd_sts = command_status;
- pkt_info->buf_ptr = rx_desc->buf_ptr + ETH_HW_IP_ALIGN;
- pkt_info->return_info = mep->rx_skb[rx_curr_desc];
- pkt_info->l4i_chk = rx_desc->buf_size;
+ spin_lock_irqsave(&mep->lock, flags);
- /*
- * Clean the return info field to indicate that the
- * packet has been moved to the upper layers
- */
- mep->rx_skb[rx_curr_desc] = NULL;
+ rx_desc = &mep->rx_desc_area[mep->rx_curr_desc];
- /* Update current index in data structure */
- rx_next_curr_desc = (rx_curr_desc + 1) % mep->rx_ring_size;
- mep->rx_curr_desc = rx_next_curr_desc;
+ cmd_sts = rx_desc->cmd_sts;
+ if (cmd_sts & BUFFER_OWNED_BY_DMA) {
+ spin_unlock_irqrestore(&mep->lock, flags);
+ break;
+ }
+ rmb();
- spin_unlock_irqrestore(&mep->lock, flags);
+ skb = mep->rx_skb[mep->rx_curr_desc];
+ mep->rx_skb[mep->rx_curr_desc] = NULL;
- return ETH_OK;
-}
+ mep->rx_curr_desc = (mep->rx_curr_desc + 1) % mep->rx_ring_size;
-static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
-{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- struct net_device_stats *stats = &dev->stats;
- unsigned int received_packets = 0;
- struct sk_buff *skb;
- struct pkt_info pkt_info;
+ spin_unlock_irqrestore(&mep->lock, flags);
- while (budget-- > 0 && port_receive(mep, &pkt_info) == ETH_OK) {
- dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
- DMA_FROM_DEVICE);
+ dma_unmap_single(NULL, rx_desc->buf_ptr + ETH_HW_IP_ALIGN,
+ ETH_RX_SKB_SIZE, DMA_FROM_DEVICE);
mep->rx_desc_count--;
received_packets++;
@@ -575,18 +549,17 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
* Note byte count includes 4 byte CRC count
*/
stats->rx_packets++;
- stats->rx_bytes += pkt_info.byte_cnt;
- skb = pkt_info.return_info;
+ stats->rx_bytes += rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
+
/*
* In case received a packet without first / last bits on OR
* the error summary bit is on, the packets needs to be dropeed.
*/
- if (((pkt_info.cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
+ if (((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
(RX_FIRST_DESC | RX_LAST_DESC))
- || (pkt_info.cmd_sts & ERROR_SUMMARY)) {
+ || (cmd_sts & ERROR_SUMMARY)) {
stats->rx_dropped++;
- if ((pkt_info.cmd_sts & (RX_FIRST_DESC |
- RX_LAST_DESC)) !=
+ if ((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
(RX_FIRST_DESC | RX_LAST_DESC)) {
if (net_ratelimit())
printk(KERN_ERR
@@ -594,7 +567,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
"on multiple descriptors\n",
dev->name);
}
- if (pkt_info.cmd_sts & ERROR_SUMMARY)
+ if (cmd_sts & ERROR_SUMMARY)
stats->rx_errors++;
dev_kfree_skb_irq(skb);
@@ -603,12 +576,12 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
* The -4 is for the CRC in the trailer of the
* received packet
*/
- skb_put(skb, pkt_info.byte_cnt - 4);
+ skb_put(skb, rx_desc->byte_cnt - ETH_HW_IP_ALIGN - 4);
- if (pkt_info.cmd_sts & LAYER_4_CHECKSUM_OK) {
+ if (cmd_sts & LAYER_4_CHECKSUM_OK) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->csum = htons(
- (pkt_info.cmd_sts & 0x0007fff8) >> 3);
+ (cmd_sts & 0x0007fff8) >> 3);
}
skb->protocol = eth_type_trans(skb, dev);
#ifdef MV643XX_ETH_NAPI
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 21/39] mv643xx_eth: move port_receive() into its only caller
2008-06-03 11:02 ` [PATCH 21/39] mv643xx_eth: move port_receive() into its only caller Lennert Buytenhek
@ 2008-06-05 11:53 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:53 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:36PM +0200, Lennert Buytenhek wrote:
> The port_receive() function is a remnant of the original mv643xx_eth
> HAL split. This patch moves port_receive() into its caller, so that
> the top and the bottom half of RX processing no longer communicate
> via the HAL FUNC_RET_STATUS/pkt_info mechanism abstraction anymore.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 91 ++++++++++++++++-----------------------------
> 1 files changed, 32 insertions(+), 59 deletions(-)
Hooray!
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 22/39] mv643xx_eth: move rx_return_buff() into its only caller
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (20 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 21/39] mv643xx_eth: move port_receive() into its only caller Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:01 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 23/39] mv643xx_eth: kill FUNC_RET_STATUS/pkt_info Lennert Buytenhek
` (16 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
rx_return_buff() is also a remnant of the HAL layering that the
original mv643xx_eth driver used. Moving it into its caller kills
the last reference to FUNC_RET_STATUS/pkt_info.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 80 ++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 52 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 2fac2b6..a54c342 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -434,74 +434,50 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
/* rx ***********************************************************************/
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
-static FUNC_RET_STATUS rx_return_buff(struct mv643xx_eth_private *mep,
- struct pkt_info *pkt_info)
+static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
{
- int used_rx_desc; /* Where to return Rx resource */
- volatile struct rx_desc *rx_desc;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
unsigned long flags;
spin_lock_irqsave(&mep->lock, flags);
- /* Get 'used' Rx descriptor */
- used_rx_desc = mep->rx_used_desc;
- rx_desc = &mep->rx_desc_area[used_rx_desc];
-
- rx_desc->buf_ptr = pkt_info->buf_ptr;
- rx_desc->buf_size = pkt_info->byte_cnt;
- mep->rx_skb[used_rx_desc] = pkt_info->return_info;
-
- /* Flush the write pipe */
-
- /* Return the descriptor to DMA ownership */
- wmb();
- rx_desc->cmd_sts = BUFFER_OWNED_BY_DMA | RX_ENABLE_INTERRUPT;
- wmb();
-
- /* Move the used descriptor pointer to the next descriptor */
- mep->rx_used_desc = (used_rx_desc + 1) % mep->rx_ring_size;
-
- spin_unlock_irqrestore(&mep->lock, flags);
-
- return ETH_OK;
-}
-
-static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
-{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- struct pkt_info pkt_info;
- struct sk_buff *skb;
- int unaligned;
-
while (mep->rx_desc_count < mep->rx_ring_size) {
+ struct sk_buff *skb;
+ int unaligned;
+ int rx;
+
skb = dev_alloc_skb(ETH_RX_SKB_SIZE + dma_get_cache_alignment());
- if (!skb)
+ if (skb == NULL)
break;
- mep->rx_desc_count++;
+
unaligned = (u32)skb->data & (dma_get_cache_alignment() - 1);
if (unaligned)
skb_reserve(skb, dma_get_cache_alignment() - unaligned);
- pkt_info.cmd_sts = RX_ENABLE_INTERRUPT;
- pkt_info.byte_cnt = ETH_RX_SKB_SIZE;
- pkt_info.buf_ptr = dma_map_single(NULL, skb->data,
- ETH_RX_SKB_SIZE, DMA_FROM_DEVICE);
- pkt_info.return_info = skb;
- if (rx_return_buff(mep, &pkt_info) != ETH_OK) {
- printk(KERN_ERR
- "%s: Error allocating RX Ring\n", dev->name);
- break;
- }
+
+ mep->rx_desc_count++;
+ rx = mep->rx_used_desc;
+ mep->rx_used_desc = (rx + 1) % mep->rx_ring_size;
+
+ mep->rx_desc_area[rx].buf_ptr = dma_map_single(NULL,
+ skb->data,
+ ETH_RX_SKB_SIZE,
+ DMA_FROM_DEVICE);
+ mep->rx_desc_area[rx].buf_size = ETH_RX_SKB_SIZE;
+ mep->rx_skb[rx] = skb;
+ wmb();
+ mep->rx_desc_area[rx].cmd_sts = BUFFER_OWNED_BY_DMA |
+ RX_ENABLE_INTERRUPT;
+ wmb();
+
skb_reserve(skb, ETH_HW_IP_ALIGN);
}
- /*
- * If RX ring is empty of SKB, set a timer to try allocating
- * again at a later time.
- */
+
if (mep->rx_desc_count == 0) {
- printk(KERN_INFO "%s: Rx ring is empty\n", dev->name);
- mep->timeout.expires = jiffies + (HZ / 10); /* 100 mSec */
+ mep->timeout.expires = jiffies + (HZ / 10);
add_timer(&mep->timeout);
}
+
+ spin_unlock_irqrestore(&mep->lock, flags);
}
static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 22/39] mv643xx_eth: move rx_return_buff() into its only caller
2008-06-03 11:02 ` [PATCH 22/39] mv643xx_eth: move rx_return_buff() " Lennert Buytenhek
@ 2008-06-05 12:01 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:01 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:37PM +0200, Lennert Buytenhek wrote:
> rx_return_buff() is also a remnant of the HAL layering that the
> original mv643xx_eth driver used. Moving it into its caller kills
> the last reference to FUNC_RET_STATUS/pkt_info.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 80 ++++++++++++++++-----------------------------
> 1 files changed, 28 insertions(+), 52 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 23/39] mv643xx_eth: kill FUNC_RET_STATUS/pkt_info
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (21 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 22/39] mv643xx_eth: move rx_return_buff() " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 11:59 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 24/39] mv643xx_eth: kill private unused instance of struct net_device_stats Lennert Buytenhek
` (15 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Since they are no longer used, kill enum FUNC_RET_STATUS and
struct pkt_info (which were a rather roundabout way of communicating
RX/TX status within the same driver).
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a54c342..d68780a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -167,16 +167,6 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define SMI_OPCODE_WRITE 0 /* Completion of Read */
#define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */
-/* typedefs */
-
-typedef enum _func_ret_status {
- ETH_OK, /* Returned as expected. */
- ETH_ERROR, /* Fundamental error. */
- ETH_RETRY, /* Could not process request. Try later.*/
- ETH_END_OF_JOB, /* Ring has nothing to process. */
- ETH_QUEUE_FULL, /* Ring resource error. */
- ETH_QUEUE_LAST_RESOURCE /* Ring resources about to exhaust. */
-} FUNC_RET_STATUS;
/*
* RX/TX descriptors.
@@ -242,17 +232,6 @@ struct tx_desc {
#define TX_IHL_SHIFT 11
-/* Unified struct for Rx and Tx operations. The user is not required to */
-/* be familier with neither Tx nor Rx descriptors. */
-struct pkt_info {
- unsigned short byte_cnt; /* Descriptor buffer byte count */
- unsigned short l4i_chk; /* Tx CPU provided TCP Checksum */
- unsigned int cmd_sts; /* Descriptor command status */
- dma_addr_t buf_ptr; /* Descriptor buffer pointer */
- struct sk_buff *return_info; /* User resource return information */
-};
-
-
/* global *******************************************************************/
struct mv643xx_eth_shared_private {
void __iomem *base;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 23/39] mv643xx_eth: kill FUNC_RET_STATUS/pkt_info
2008-06-03 11:02 ` [PATCH 23/39] mv643xx_eth: kill FUNC_RET_STATUS/pkt_info Lennert Buytenhek
@ 2008-06-05 11:59 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 11:59 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:38PM +0200, Lennert Buytenhek wrote:
> Since they are no longer used, kill enum FUNC_RET_STATUS and
> struct pkt_info (which were a rather roundabout way of communicating
> RX/TX status within the same driver).
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 21 ---------------------
> 1 files changed, 0 insertions(+), 21 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 24/39] mv643xx_eth: kill private unused instance of struct net_device_stats
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (22 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 23/39] mv643xx_eth: kill FUNC_RET_STATUS/pkt_info Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:08 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation Lennert Buytenhek
` (14 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The per-port mv643xx_eth_private struct had a private instance
of struct net_device_stats that was never ever written to, only
read (via the ethtool statistics interface). This patch gets
rid of the private instance, and tweaks the ethtool statistics
code in mv643xx_eth to use the statistics in struct net_device
instead.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 120 +++++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 54 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d68780a..b3be8fe 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -316,7 +316,6 @@ struct mv643xx_eth_private {
struct net_device *dev;
struct napi_struct napi;
- struct net_device_stats stats;
struct mib_counters mib_counters;
spinlock_t lock;
/* Size of Tx Ring per queue */
@@ -876,55 +875,59 @@ static void update_mib_counters(struct mv643xx_eth_private *mep)
struct mv643xx_eth_stats {
char stat_string[ETH_GSTRING_LEN];
int sizeof_stat;
- int stat_offset;
+ int netdev_off;
+ int mep_off;
};
-#define MV643XX_ETH_STAT(m) FIELD_SIZEOF(struct mv643xx_eth_private, m), \
- offsetof(struct mv643xx_eth_private, m)
-
-static const struct mv643xx_eth_stats mv643xx_eth_gstrings_stats[] = {
- { "rx_packets", MV643XX_ETH_STAT(stats.rx_packets) },
- { "tx_packets", MV643XX_ETH_STAT(stats.tx_packets) },
- { "rx_bytes", MV643XX_ETH_STAT(stats.rx_bytes) },
- { "tx_bytes", MV643XX_ETH_STAT(stats.tx_bytes) },
- { "rx_errors", MV643XX_ETH_STAT(stats.rx_errors) },
- { "tx_errors", MV643XX_ETH_STAT(stats.tx_errors) },
- { "rx_dropped", MV643XX_ETH_STAT(stats.rx_dropped) },
- { "tx_dropped", MV643XX_ETH_STAT(stats.tx_dropped) },
- { "good_octets_received", MV643XX_ETH_STAT(mib_counters.good_octets_received) },
- { "bad_octets_received", MV643XX_ETH_STAT(mib_counters.bad_octets_received) },
- { "internal_mac_transmit_err", MV643XX_ETH_STAT(mib_counters.internal_mac_transmit_err) },
- { "good_frames_received", MV643XX_ETH_STAT(mib_counters.good_frames_received) },
- { "bad_frames_received", MV643XX_ETH_STAT(mib_counters.bad_frames_received) },
- { "broadcast_frames_received", MV643XX_ETH_STAT(mib_counters.broadcast_frames_received) },
- { "multicast_frames_received", MV643XX_ETH_STAT(mib_counters.multicast_frames_received) },
- { "frames_64_octets", MV643XX_ETH_STAT(mib_counters.frames_64_octets) },
- { "frames_65_to_127_octets", MV643XX_ETH_STAT(mib_counters.frames_65_to_127_octets) },
- { "frames_128_to_255_octets", MV643XX_ETH_STAT(mib_counters.frames_128_to_255_octets) },
- { "frames_256_to_511_octets", MV643XX_ETH_STAT(mib_counters.frames_256_to_511_octets) },
- { "frames_512_to_1023_octets", MV643XX_ETH_STAT(mib_counters.frames_512_to_1023_octets) },
- { "frames_1024_to_max_octets", MV643XX_ETH_STAT(mib_counters.frames_1024_to_max_octets) },
- { "good_octets_sent", MV643XX_ETH_STAT(mib_counters.good_octets_sent) },
- { "good_frames_sent", MV643XX_ETH_STAT(mib_counters.good_frames_sent) },
- { "excessive_collision", MV643XX_ETH_STAT(mib_counters.excessive_collision) },
- { "multicast_frames_sent", MV643XX_ETH_STAT(mib_counters.multicast_frames_sent) },
- { "broadcast_frames_sent", MV643XX_ETH_STAT(mib_counters.broadcast_frames_sent) },
- { "unrec_mac_control_received", MV643XX_ETH_STAT(mib_counters.unrec_mac_control_received) },
- { "fc_sent", MV643XX_ETH_STAT(mib_counters.fc_sent) },
- { "good_fc_received", MV643XX_ETH_STAT(mib_counters.good_fc_received) },
- { "bad_fc_received", MV643XX_ETH_STAT(mib_counters.bad_fc_received) },
- { "undersize_received", MV643XX_ETH_STAT(mib_counters.undersize_received) },
- { "fragments_received", MV643XX_ETH_STAT(mib_counters.fragments_received) },
- { "oversize_received", MV643XX_ETH_STAT(mib_counters.oversize_received) },
- { "jabber_received", MV643XX_ETH_STAT(mib_counters.jabber_received) },
- { "mac_receive_error", MV643XX_ETH_STAT(mib_counters.mac_receive_error) },
- { "bad_crc_event", MV643XX_ETH_STAT(mib_counters.bad_crc_event) },
- { "collision", MV643XX_ETH_STAT(mib_counters.collision) },
- { "late_collision", MV643XX_ETH_STAT(mib_counters.late_collision) },
+#define SSTAT(m) \
+ { #m, FIELD_SIZEOF(struct net_device_stats, m), \
+ offsetof(struct net_device, stats.m), -1 }
+
+#define MIBSTAT(m) \
+ { #m, FIELD_SIZEOF(struct mib_counters, m), \
+ -1, offsetof(struct mv643xx_eth_private, mib_counters.m) }
+
+static const struct mv643xx_eth_stats mv643xx_eth_stats[] = {
+ SSTAT(rx_packets),
+ SSTAT(tx_packets),
+ SSTAT(rx_bytes),
+ SSTAT(tx_bytes),
+ SSTAT(rx_errors),
+ SSTAT(tx_errors),
+ SSTAT(rx_dropped),
+ SSTAT(tx_dropped),
+ MIBSTAT(good_octets_received),
+ MIBSTAT(bad_octets_received),
+ MIBSTAT(internal_mac_transmit_err),
+ MIBSTAT(good_frames_received),
+ MIBSTAT(bad_frames_received),
+ MIBSTAT(broadcast_frames_received),
+ MIBSTAT(multicast_frames_received),
+ MIBSTAT(frames_64_octets),
+ MIBSTAT(frames_65_to_127_octets),
+ MIBSTAT(frames_128_to_255_octets),
+ MIBSTAT(frames_256_to_511_octets),
+ MIBSTAT(frames_512_to_1023_octets),
+ MIBSTAT(frames_1024_to_max_octets),
+ MIBSTAT(good_octets_sent),
+ MIBSTAT(good_frames_sent),
+ MIBSTAT(excessive_collision),
+ MIBSTAT(multicast_frames_sent),
+ MIBSTAT(broadcast_frames_sent),
+ MIBSTAT(unrec_mac_control_received),
+ MIBSTAT(fc_sent),
+ MIBSTAT(good_fc_received),
+ MIBSTAT(bad_fc_received),
+ MIBSTAT(undersize_received),
+ MIBSTAT(fragments_received),
+ MIBSTAT(oversize_received),
+ MIBSTAT(jabber_received),
+ MIBSTAT(mac_receive_error),
+ MIBSTAT(bad_crc_event),
+ MIBSTAT(collision),
+ MIBSTAT(late_collision),
};
-#define MV643XX_ETH_STATS_LEN ARRAY_SIZE(mv643xx_eth_gstrings_stats)
-
static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -960,7 +963,7 @@ static void mv643xx_eth_get_drvinfo(struct net_device *netdev,
strncpy(drvinfo->version, mv643xx_eth_driver_version, 32);
strncpy(drvinfo->fw_version, "N/A", 32);
strncpy(drvinfo->bus_info, "mv643xx", 32);
- drvinfo->n_stats = MV643XX_ETH_STATS_LEN;
+ drvinfo->n_stats = ARRAY_SIZE(mv643xx_eth_stats);
}
static int mv643xx_eth_nway_restart(struct net_device *dev)
@@ -984,9 +987,9 @@ static void mv643xx_eth_get_strings(struct net_device *netdev, uint32_t stringse
switch(stringset) {
case ETH_SS_STATS:
- for (i=0; i < MV643XX_ETH_STATS_LEN; i++) {
+ for (i=0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
memcpy(data + i * ETH_GSTRING_LEN,
- mv643xx_eth_gstrings_stats[i].stat_string,
+ mv643xx_eth_stats[i].stat_string,
ETH_GSTRING_LEN);
}
break;
@@ -1001,10 +1004,19 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *netdev,
update_mib_counters(mep);
- for (i = 0; i < MV643XX_ETH_STATS_LEN; i++) {
- char *p = (char *)mep+mv643xx_eth_gstrings_stats[i].stat_offset;
- data[i] = (mv643xx_eth_gstrings_stats[i].sizeof_stat ==
- sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p;
+ for (i = 0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
+ const struct mv643xx_eth_stats *stat;
+ void *p;
+
+ stat = mv643xx_eth_stats + i;
+
+ if (stat->netdev_off >= 0)
+ p = ((void *)mep->dev) + stat->netdev_off;
+ else
+ p = ((void *)mep) + stat->mep_off;
+
+ data[i] = (stat->sizeof_stat == 8) ?
+ *(uint64_t *)p : *(uint32_t *)p;
}
}
@@ -1012,7 +1024,7 @@ static int mv643xx_eth_get_sset_count(struct net_device *netdev, int sset)
{
switch (sset) {
case ETH_SS_STATS:
- return MV643XX_ETH_STATS_LEN;
+ return ARRAY_SIZE(mv643xx_eth_stats);
default:
return -EOPNOTSUPP;
}
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 24/39] mv643xx_eth: kill private unused instance of struct net_device_stats
2008-06-03 11:02 ` [PATCH 24/39] mv643xx_eth: kill private unused instance of struct net_device_stats Lennert Buytenhek
@ 2008-06-05 12:08 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:08 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:39PM +0200, Lennert Buytenhek wrote:
> The per-port mv643xx_eth_private struct had a private instance
> of struct net_device_stats that was never ever written to, only
> read (via the ethtool statistics interface). This patch gets
> rid of the private instance, and tweaks the ethtool statistics
> code in mv643xx_eth to use the statistics in struct net_device
> instead.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 120 +++++++++++++++++++++++++--------------------
> 1 files changed, 66 insertions(+), 54 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (23 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 24/39] mv643xx_eth: kill private unused instance of struct net_device_stats Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:05 ` Dale Farnsworth
2008-06-05 14:08 ` Brent Cook
2008-06-03 11:02 ` [PATCH 26/39] mv643xx_eth: split out rx queue state Lennert Buytenhek
` (13 subsequent siblings)
38 siblings, 2 replies; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Replace the 70-line crc8 computation (used for multicast address
filtering tables) by a 5-line version.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 95 ++++++++++-----------------------------------
1 files changed, 21 insertions(+), 74 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b3be8fe..beb4cf9 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1132,16 +1132,29 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
return 0;
}
+static int addr_crc(unsigned char *addr)
+{
+ int crc = 0;
+ int i;
+
+ for (i = 0; i < 6; i++) {
+ int j;
+
+ crc = (crc ^ addr[i]) << 8;
+ for (j = 7; j >= 0; j--) {
+ if (crc & (0x100 << j))
+ crc ^= 0x107 << j;
+ }
+ }
+
+ return crc;
+}
+
static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *addr)
{
unsigned int port_num = mep->port_num;
- unsigned int mac_h;
- unsigned int mac_l;
- unsigned char crc_result = 0;
int table;
- int mac_array[48];
- int crc[8];
- int i;
+ int crc;
if ((addr[0] == 0x01) && (addr[1] == 0x00) &&
(addr[2] == 0x5E) && (addr[3] == 0x00) && (addr[4] == 0x00)) {
@@ -1150,76 +1163,10 @@ static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *addr)
return;
}
- /* Calculate CRC-8 out of the given address */
- mac_h = (addr[0] << 8) | (addr[1]);
- mac_l = (addr[2] << 24) | (addr[3] << 16) |
- (addr[4] << 8) | (addr[5] << 0);
-
- for (i = 0; i < 32; i++)
- mac_array[i] = (mac_l >> i) & 0x1;
- for (i = 32; i < 48; i++)
- mac_array[i] = (mac_h >> (i - 32)) & 0x1;
-
- crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
- mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
- mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
- mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
- mac_array[8] ^ mac_array[7] ^ mac_array[6] ^ mac_array[0];
-
- crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
- mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
- mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
- mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
- mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
- mac_array[9] ^ mac_array[6] ^ mac_array[1] ^ mac_array[0];
-
- crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^
- mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^
- mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^
- mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8] ^
- mac_array[6] ^ mac_array[2] ^ mac_array[1] ^ mac_array[0];
-
- crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^
- mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^
- mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^
- mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[7] ^
- mac_array[3] ^ mac_array[2] ^ mac_array[1];
-
- crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^
- mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^
- mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^
- mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^
- mac_array[12] ^ mac_array[10] ^ mac_array[8] ^ mac_array[4] ^
- mac_array[3] ^ mac_array[2];
-
- crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^
- mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^
- mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^
- mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^
- mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[5] ^
- mac_array[4] ^ mac_array[3];
-
- crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^
- mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^
- mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^
- mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^
- mac_array[12] ^ mac_array[10] ^ mac_array[6] ^ mac_array[5] ^
- mac_array[4];
-
- crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^
- mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^
- mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^
- mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^
- mac_array[11] ^ mac_array[7] ^ mac_array[6] ^ mac_array[5];
-
- for (i = 0; i < 8; i++)
- crc_result = crc_result | (crc[i] << i);
+ crc = addr_crc(addr);
table = OTHER_MCAST_TABLE(port_num);
- set_filter_table_entry(mep, table, crc_result);
+ set_filter_table_entry(mep, table, crc);
}
static void set_multicast_list(struct net_device *dev)
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation
2008-06-03 11:02 ` [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation Lennert Buytenhek
@ 2008-06-05 12:05 ` Dale Farnsworth
2008-06-05 14:08 ` Brent Cook
1 sibling, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:05 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:40PM +0200, Lennert Buytenhek wrote:
> Replace the 70-line crc8 computation (used for multicast address
> filtering tables) by a 5-line version.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 95 ++++++++++-----------------------------------
> 1 files changed, 21 insertions(+), 74 deletions(-)
Wow!
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation
2008-06-03 11:02 ` [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation Lennert Buytenhek
2008-06-05 12:05 ` Dale Farnsworth
@ 2008-06-05 14:08 ` Brent Cook
2008-06-05 20:44 ` Lennert Buytenhek
1 sibling, 1 reply; 92+ messages in thread
From: Brent Cook @ 2008-06-05 14:08 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: Dale Farnsworth, netdev
On Tuesday 03 June 2008 06:02:40 Lennert Buytenhek wrote:
> Replace the 70-line crc8 computation (used for multicast address
> filtering tables) by a 5-line version.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 95
> ++++++++++----------------------------------- 1 files changed, 21
> insertions(+), 74 deletions(-)
>
The original looks like someone ported Verilog code to C.
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation
2008-06-05 14:08 ` Brent Cook
@ 2008-06-05 20:44 ` Lennert Buytenhek
0 siblings, 0 replies; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-05 20:44 UTC (permalink / raw)
To: Brent Cook; +Cc: Dale Farnsworth, netdev
On Thu, Jun 05, 2008 at 09:08:56AM -0500, Brent Cook wrote:
> > Replace the 70-line crc8 computation (used for multicast address
> > filtering tables) by a 5-line version.
>
> The original looks like someone ported Verilog code to C.
E.g. the EASICS crc web tool (http://www.easics.com/webtools/crctool)
gives you pretty much that same code. :-)
I.e.:
NewCRC[0] = D[45] ^ D[43] ^ D[40] ^ D[39] ^ D[35] ^ D[34] ^ D[31] ^
D[30] ^ D[28] ^ D[23] ^ D[21] ^ D[19] ^ D[18] ^ D[16] ^
D[14] ^ D[12] ^ D[8] ^ D[7] ^ D[6] ^ D[0] ^ C[0] ^
C[3] ^ C[5];
NewCRC[1] = D[46] ^ D[45] ^ D[44] ^ D[43] ^ D[41] ^ D[39] ^ D[36] ^
D[34] ^ D[32] ^ D[30] ^ D[29] ^ D[28] ^ D[24] ^ D[23] ^
D[22] ^ D[21] ^ D[20] ^ D[18] ^ D[17] ^ D[16] ^ D[15] ^
D[14] ^ D[13] ^ D[12] ^ D[9] ^ D[6] ^ D[1] ^ D[0] ^
C[1] ^ C[3] ^ C[4] ^ C[5] ^ C[6];
versus mv643xx_eth's:
- crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^
- mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^
- mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^
- mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^
- mac_array[8] ^ mac_array[7] ^ mac_array[6] ^ mac_array[0];
-
- crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^
- mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^
- mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^
- mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^
- mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^
- mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^
- mac_array[9] ^ mac_array[6] ^ mac_array[1] ^ mac_array[0];
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 26/39] mv643xx_eth: split out rx queue state
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (24 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 25/39] mv643xx_eth: massively simplify multicast address crc8 computation Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:39 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 27/39] mv643xx_eth: split out tx " Lennert Buytenhek
` (12 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Split all RX queue related state into 'struct rx_queue', in
preparation for multiple RX queue support.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 441 +++++++++++++++++++++++----------------------
1 files changed, 225 insertions(+), 216 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index beb4cf9..39de2db 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -65,13 +65,7 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define MAX_DESCS_PER_SKB 1
#endif
-#define ETH_VLAN_HLEN 4
-#define ETH_FCS_LEN 4
-#define ETH_HW_IP_ALIGN 2 /* hw aligns IP header */
-#define ETH_WRAPPER_LEN (ETH_HW_IP_ALIGN + ETH_HLEN + \
- ETH_VLAN_HLEN + ETH_FCS_LEN)
-#define ETH_RX_SKB_SIZE (dev->mtu + ETH_WRAPPER_LEN + \
- dma_get_cache_alignment())
+#define ETH_HW_IP_ALIGN 2
/*
* Registers shared between all ports.
@@ -279,22 +273,32 @@ struct mib_counters {
u32 late_collision;
};
+struct rx_queue {
+ int rx_ring_size;
+
+ int rx_desc_count;
+ int rx_curr_desc;
+ int rx_used_desc;
+
+ struct rx_desc *rx_desc_area;
+ dma_addr_t rx_desc_dma;
+ int rx_desc_area_size;
+ struct sk_buff **rx_skb;
+
+ struct timer_list rx_oom;
+};
+
struct mv643xx_eth_private {
struct mv643xx_eth_shared_private *shared;
int port_num; /* User Ethernet port number */
struct mv643xx_eth_shared_private *shared_smi;
- u32 rx_sram_addr; /* Base address of rx sram area */
- u32 rx_sram_size; /* Size of rx sram area */
u32 tx_sram_addr; /* Base address of tx sram area */
u32 tx_sram_size; /* Size of tx sram area */
/* Tx/Rx rings managment indexes fields. For driver use */
- /* Next available and first returning Rx resource */
- int rx_curr_desc, rx_used_desc;
-
/* Next available and first returning Tx resource */
int tx_curr_desc, tx_used_desc;
@@ -302,11 +306,6 @@ struct mv643xx_eth_private {
u32 tx_clean_threshold;
#endif
- struct rx_desc *rx_desc_area;
- dma_addr_t rx_desc_dma;
- int rx_desc_area_size;
- struct sk_buff **rx_skb;
-
struct tx_desc *tx_desc_area;
dma_addr_t tx_desc_dma;
int tx_desc_area_size;
@@ -315,27 +314,25 @@ struct mv643xx_eth_private {
struct work_struct tx_timeout_task;
struct net_device *dev;
- struct napi_struct napi;
struct mib_counters mib_counters;
spinlock_t lock;
/* Size of Tx Ring per queue */
int tx_ring_size;
/* Number of tx descriptors in use */
int tx_desc_count;
- /* Size of Rx Ring per queue */
- int rx_ring_size;
- /* Number of rx descriptors in use */
- int rx_desc_count;
-
- /*
- * Used in case RX Ring is empty, which can be caused when
- * system does not have resources (skb's)
- */
- struct timer_list timeout;
u32 rx_int_coal;
u32 tx_int_coal;
struct mii_if_info mii;
+
+ /*
+ * RX state.
+ */
+ int default_rx_ring_size;
+ unsigned long rx_desc_sram_addr;
+ int rx_desc_sram_size;
+ struct napi_struct napi;
+ struct rx_queue rxq[1];
};
@@ -352,30 +349,25 @@ static inline void wrl(struct mv643xx_eth_private *mep, int offset, u32 data)
/* rxq/txq helper functions *************************************************/
-static void mv643xx_eth_port_enable_rx(struct mv643xx_eth_private *mep,
- unsigned int queues)
+static struct mv643xx_eth_private *rxq_to_mep(struct rx_queue *rxq)
{
- wrl(mep, RXQ_COMMAND(mep->port_num), queues);
+ return container_of(rxq, struct mv643xx_eth_private, rxq[0]);
}
-static unsigned int mv643xx_eth_port_disable_rx(struct mv643xx_eth_private *mep)
+static void rxq_enable(struct rx_queue *rxq)
{
- unsigned int port_num = mep->port_num;
- u32 queues;
-
- /* Stop Rx port activity. Check port Rx activity. */
- queues = rdl(mep, RXQ_COMMAND(port_num)) & 0xFF;
- if (queues) {
- /* Issue stop command for active queues only */
- wrl(mep, RXQ_COMMAND(port_num), (queues << 8));
+ struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
+ wrl(mep, RXQ_COMMAND(mep->port_num), 1);
+}
- /* Wait for all Rx activity to terminate. */
- /* Check port cause register that all Rx queues are stopped */
- while (rdl(mep, RXQ_COMMAND(port_num)) & 0xFF)
- udelay(10);
- }
+static void rxq_disable(struct rx_queue *rxq)
+{
+ struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
+ u8 mask = 1;
- return queues;
+ wrl(mep, RXQ_COMMAND(mep->port_num), mask << 8);
+ while (rdl(mep, RXQ_COMMAND(mep->port_num)) & mask)
+ udelay(10);
}
static void mv643xx_eth_port_enable_tx(struct mv643xx_eth_private *mep,
@@ -412,19 +404,29 @@ static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
/* rx ***********************************************************************/
static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
-static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
+static void rxq_refill(struct rx_queue *rxq)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
+ struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
unsigned long flags;
spin_lock_irqsave(&mep->lock, flags);
- while (mep->rx_desc_count < mep->rx_ring_size) {
+ while (rxq->rx_desc_count < rxq->rx_ring_size) {
+ int skb_size;
struct sk_buff *skb;
int unaligned;
int rx;
- skb = dev_alloc_skb(ETH_RX_SKB_SIZE + dma_get_cache_alignment());
+ /*
+ * Reserve 2+14 bytes for an ethernet header (the
+ * hardware automatically prepends 2 bytes of dummy
+ * data to each received packet), 4 bytes for a VLAN
+ * header, and 4 bytes for the trailing FCS -- 24
+ * bytes total.
+ */
+ skb_size = mep->dev->mtu + 24;
+
+ skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1);
if (skb == NULL)
break;
@@ -432,44 +434,43 @@ static void mv643xx_eth_rx_refill_descs(struct net_device *dev)
if (unaligned)
skb_reserve(skb, dma_get_cache_alignment() - unaligned);
- mep->rx_desc_count++;
- rx = mep->rx_used_desc;
- mep->rx_used_desc = (rx + 1) % mep->rx_ring_size;
+ rxq->rx_desc_count++;
+ rx = rxq->rx_used_desc;
+ rxq->rx_used_desc = (rx + 1) % rxq->rx_ring_size;
- mep->rx_desc_area[rx].buf_ptr = dma_map_single(NULL,
- skb->data,
- ETH_RX_SKB_SIZE,
- DMA_FROM_DEVICE);
- mep->rx_desc_area[rx].buf_size = ETH_RX_SKB_SIZE;
- mep->rx_skb[rx] = skb;
+ rxq->rx_desc_area[rx].buf_ptr = dma_map_single(NULL, skb->data,
+ skb_size, DMA_FROM_DEVICE);
+ rxq->rx_desc_area[rx].buf_size = skb_size;
+ rxq->rx_skb[rx] = skb;
wmb();
- mep->rx_desc_area[rx].cmd_sts = BUFFER_OWNED_BY_DMA |
+ rxq->rx_desc_area[rx].cmd_sts = BUFFER_OWNED_BY_DMA |
RX_ENABLE_INTERRUPT;
wmb();
skb_reserve(skb, ETH_HW_IP_ALIGN);
}
- if (mep->rx_desc_count == 0) {
- mep->timeout.expires = jiffies + (HZ / 10);
- add_timer(&mep->timeout);
+ if (rxq->rx_desc_count == 0) {
+ rxq->rx_oom.expires = jiffies + (HZ / 10);
+ add_timer(&rxq->rx_oom);
}
spin_unlock_irqrestore(&mep->lock, flags);
}
-static inline void mv643xx_eth_rx_refill_descs_timer_wrapper(unsigned long data)
+static inline void rxq_refill_timer_wrapper(unsigned long data)
{
- mv643xx_eth_rx_refill_descs((struct net_device *)data);
+ rxq_refill((struct rx_queue *)data);
}
-static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
+static int rxq_process(struct rx_queue *rxq, int budget)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- struct net_device_stats *stats = &dev->stats;
- unsigned int received_packets = 0;
+ struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
+ struct net_device_stats *stats = &mep->dev->stats;
+ int rx;
- while (budget-- > 0) {
+ rx = 0;
+ while (rx < budget) {
struct sk_buff *skb;
volatile struct rx_desc *rx_desc;
unsigned int cmd_sts;
@@ -477,7 +478,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
spin_lock_irqsave(&mep->lock, flags);
- rx_desc = &mep->rx_desc_area[mep->rx_curr_desc];
+ rx_desc = &rxq->rx_desc_area[rxq->rx_curr_desc];
cmd_sts = rx_desc->cmd_sts;
if (cmd_sts & BUFFER_OWNED_BY_DMA) {
@@ -486,17 +487,17 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
}
rmb();
- skb = mep->rx_skb[mep->rx_curr_desc];
- mep->rx_skb[mep->rx_curr_desc] = NULL;
+ skb = rxq->rx_skb[rxq->rx_curr_desc];
+ rxq->rx_skb[rxq->rx_curr_desc] = NULL;
- mep->rx_curr_desc = (mep->rx_curr_desc + 1) % mep->rx_ring_size;
+ rxq->rx_curr_desc = (rxq->rx_curr_desc + 1) % rxq->rx_ring_size;
spin_unlock_irqrestore(&mep->lock, flags);
dma_unmap_single(NULL, rx_desc->buf_ptr + ETH_HW_IP_ALIGN,
- ETH_RX_SKB_SIZE, DMA_FROM_DEVICE);
- mep->rx_desc_count--;
- received_packets++;
+ mep->dev->mtu + 24, DMA_FROM_DEVICE);
+ rxq->rx_desc_count--;
+ rx++;
/*
* Update statistics.
@@ -519,7 +520,7 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
printk(KERN_ERR
"%s: Received packet spread "
"on multiple descriptors\n",
- dev->name);
+ mep->dev->name);
}
if (cmd_sts & ERROR_SUMMARY)
stats->rx_errors++;
@@ -537,48 +538,45 @@ static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
skb->csum = htons(
(cmd_sts & 0x0007fff8) >> 3);
}
- skb->protocol = eth_type_trans(skb, dev);
+ skb->protocol = eth_type_trans(skb, mep->dev);
#ifdef MV643XX_ETH_NAPI
netif_receive_skb(skb);
#else
netif_rx(skb);
#endif
}
- dev->last_rx = jiffies;
+ mep->dev->last_rx = jiffies;
}
- mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
+ rxq_refill(rxq);
- return received_packets;
+ return rx;
}
#ifdef MV643XX_ETH_NAPI
static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
{
- struct mv643xx_eth_private *mep = container_of(napi, struct mv643xx_eth_private, napi);
- struct net_device *dev = mep->dev;
- unsigned int port_num = mep->port_num;
- int work_done;
+ struct mv643xx_eth_private *mep;
+ int rx;
+
+ mep = container_of(napi, struct mv643xx_eth_private, napi);
#ifdef MV643XX_ETH_TX_FAST_REFILL
if (++mep->tx_clean_threshold > 5) {
- mv643xx_eth_free_completed_tx_descs(dev);
+ mv643xx_eth_free_completed_tx_descs(mep->dev);
mep->tx_clean_threshold = 0;
}
#endif
- work_done = 0;
- if ((rdl(mep, RXQ_CURRENT_DESC_PTR(port_num)))
- != (u32) mep->rx_used_desc)
- work_done = mv643xx_eth_receive_queue(dev, budget);
+ rx = rxq_process(mep->rxq, budget);
- if (work_done < budget) {
- netif_rx_complete(dev, napi);
- wrl(mep, INT_CAUSE(port_num), 0);
- wrl(mep, INT_CAUSE_EXT(port_num), 0);
- wrl(mep, INT_MASK(port_num), INT_RX | INT_EXT);
+ if (rx < budget) {
+ netif_rx_complete(mep->dev, napi);
+ wrl(mep, INT_CAUSE(mep->port_num), 0);
+ wrl(mep, INT_CAUSE_EXT(mep->port_num), 0);
+ wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_EXT);
}
- return work_done;
+ return rx;
}
#endif
@@ -1243,53 +1241,102 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
/* rx/tx queue initialisation ***********************************************/
-static void ether_init_rx_desc_ring(struct mv643xx_eth_private *mep)
+static int rxq_init(struct mv643xx_eth_private *mep)
{
- volatile struct rx_desc *p_rx_desc;
- int rx_desc_num = mep->rx_ring_size;
+ struct rx_queue *rxq = mep->rxq;
+ struct rx_desc *rx_desc;
+ int size;
int i;
- /* initialize the next_desc_ptr links in the Rx descriptors ring */
- p_rx_desc = (struct rx_desc *)mep->rx_desc_area;
- for (i = 0; i < rx_desc_num; i++) {
- p_rx_desc[i].next_desc_ptr = mep->rx_desc_dma +
- ((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
+ rxq->rx_ring_size = mep->default_rx_ring_size;
+
+ rxq->rx_desc_count = 0;
+ rxq->rx_curr_desc = 0;
+ rxq->rx_used_desc = 0;
+
+ size = rxq->rx_ring_size * sizeof(struct rx_desc);
+
+ if (size <= mep->rx_desc_sram_size) {
+ rxq->rx_desc_area = ioremap(mep->rx_desc_sram_addr,
+ mep->rx_desc_sram_size);
+ rxq->rx_desc_dma = mep->rx_desc_sram_addr;
+ } else {
+ rxq->rx_desc_area = dma_alloc_coherent(NULL, size,
+ &rxq->rx_desc_dma,
+ GFP_KERNEL);
+ }
+
+ if (rxq->rx_desc_area == NULL) {
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "can't allocate rx ring (%d bytes)\n", size);
+ goto out;
+ }
+ memset(rxq->rx_desc_area, 0, size);
+
+ rxq->rx_desc_area_size = size;
+ rxq->rx_skb = kmalloc(rxq->rx_ring_size * sizeof(*rxq->rx_skb),
+ GFP_KERNEL);
+ if (rxq->rx_skb == NULL) {
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "can't allocate rx skb ring\n");
+ goto out_free;
+ }
+
+ rx_desc = (struct rx_desc *)rxq->rx_desc_area;
+ for (i = 0; i < rxq->rx_ring_size; i++) {
+ int nexti = (i + 1) % rxq->rx_ring_size;
+ rx_desc[i].next_desc_ptr = rxq->rx_desc_dma +
+ nexti * sizeof(struct rx_desc);
}
- /* Save Rx desc pointer to driver struct. */
- mep->rx_curr_desc = 0;
- mep->rx_used_desc = 0;
+ init_timer(&rxq->rx_oom);
+ rxq->rx_oom.data = (unsigned long)rxq;
+ rxq->rx_oom.function = rxq_refill_timer_wrapper;
+
+ return 0;
+
+
+out_free:
+ if (size <= mep->rx_desc_sram_size)
+ iounmap(rxq->rx_desc_area);
+ else
+ dma_free_coherent(NULL, size,
+ rxq->rx_desc_area,
+ rxq->rx_desc_dma);
- mep->rx_desc_area_size = rx_desc_num * sizeof(struct rx_desc);
+out:
+ return -ENOMEM;
}
-static void mv643xx_eth_free_rx_rings(struct net_device *dev)
+static void rxq_deinit(struct rx_queue *rxq)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- int curr;
+ struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
+ int i;
+
+ rxq_disable(rxq);
- /* Stop RX Queues */
- mv643xx_eth_port_disable_rx(mep);
+ del_timer_sync(&rxq->rx_oom);
- /* Free preallocated skb's on RX rings */
- for (curr = 0; mep->rx_desc_count && curr < mep->rx_ring_size; curr++) {
- if (mep->rx_skb[curr]) {
- dev_kfree_skb(mep->rx_skb[curr]);
- mep->rx_desc_count--;
+ for (i = 0; i < rxq->rx_ring_size; i++) {
+ if (rxq->rx_skb[i]) {
+ dev_kfree_skb(rxq->rx_skb[i]);
+ rxq->rx_desc_count--;
}
}
- if (mep->rx_desc_count)
- printk(KERN_ERR
- "%s: Error in freeing Rx Ring. %d skb's still"
- " stuck in RX Ring - ignoring them\n", dev->name,
- mep->rx_desc_count);
- /* Free RX ring */
- if (mep->rx_sram_size)
- iounmap(mep->rx_desc_area);
+ if (rxq->rx_desc_count) {
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "error freeing rx ring -- %d skbs stuck\n",
+ rxq->rx_desc_count);
+ }
+
+ if (rxq->rx_desc_area_size <= mep->rx_desc_sram_size)
+ iounmap(rxq->rx_desc_area);
else
- dma_free_coherent(NULL, mep->rx_desc_area_size,
- mep->rx_desc_area, mep->rx_desc_dma);
+ dma_free_coherent(NULL, rxq->rx_desc_area_size,
+ rxq->rx_desc_area, rxq->rx_desc_dma);
+
+ kfree(rxq->rx_skb);
}
static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
@@ -1501,7 +1548,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
}
#else
if (int_cause & INT_RX)
- mv643xx_eth_receive_queue(dev, INT_MAX);
+ rxq_process(mep->rxq, INT_MAX);
#endif
if (int_cause_ext & INT_EXT_TX)
mv643xx_eth_free_completed_tx_descs(dev);
@@ -1535,20 +1582,30 @@ static void phy_reset(struct mv643xx_eth_private *mep)
static void port_start(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- unsigned int port_num = mep->port_num;
- int tx_curr_desc, rx_curr_desc;
u32 pscr;
struct ethtool_cmd ethtool_cmd;
+ int i;
- /* Assignment of Tx CTRP of given queue */
- tx_curr_desc = mep->tx_curr_desc;
- wrl(mep, TXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct tx_desc *)mep->tx_desc_dma + tx_curr_desc));
+ /*
+ * Configure basic link parameters.
+ */
+ pscr = rdl(mep, PORT_SERIAL_CONTROL(mep->port_num));
+ pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr);
+ pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
+ DISABLE_AUTO_NEG_SPEED_GMII |
+ DISABLE_AUTO_NEG_FOR_DUPLEX |
+ DO_NOT_FORCE_LINK_FAIL |
+ SERIAL_PORT_CONTROL_RESERVED;
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr);
+ pscr |= SERIAL_PORT_ENABLE;
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr);
- /* Assignment of Rx CRDP of given queue */
- rx_curr_desc = mep->rx_curr_desc;
- wrl(mep, RXQ_CURRENT_DESC_PTR(port_num),
- (u32)((struct rx_desc *)mep->rx_desc_dma + rx_curr_desc));
+ wrl(mep, SDMA_CONFIG(mep->port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
+
+ mv643xx_eth_get_settings(dev, ðtool_cmd);
+ phy_reset(mep);
+ mv643xx_eth_set_settings(dev, ðtool_cmd);
/* Add the assigned Ethernet address to the port's address table */
uc_addr_set(mep, dev->dev_addr);
@@ -1557,42 +1614,34 @@ static void port_start(struct net_device *dev)
* Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
* frames to RX queue #0.
*/
- wrl(mep, PORT_CONFIG(port_num), 0x00000000);
+ wrl(mep, PORT_CONFIG(mep->port_num), 0x00000000);
/*
* Treat BPDUs as normal multicasts, and disable partition mode.
*/
- wrl(mep, PORT_CONFIG_EXT(port_num), 0x00000000);
-
- pscr = rdl(mep, PORT_SERIAL_CONTROL(port_num));
-
- pscr &= ~(SERIAL_PORT_ENABLE | FORCE_LINK_PASS);
- wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
+ wrl(mep, PORT_CONFIG_EXT(mep->port_num), 0x00000000);
- pscr |= DISABLE_AUTO_NEG_FOR_FLOW_CTRL |
- DISABLE_AUTO_NEG_SPEED_GMII |
- DISABLE_AUTO_NEG_FOR_DUPLEX |
- DO_NOT_FORCE_LINK_FAIL |
- SERIAL_PORT_CONTROL_RESERVED;
+ /*
+ * Enable the receive queue.
+ */
+ for (i = 0; i < 1; i++) {
+ struct rx_queue *rxq = mep->rxq;
+ int off = RXQ_CURRENT_DESC_PTR(mep->port_num);
+ u32 addr;
- wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
+ addr = (u32)rxq->rx_desc_dma;
+ addr += rxq->rx_curr_desc * sizeof(struct rx_desc);
+ wrl(mep, off, addr);
- pscr |= SERIAL_PORT_ENABLE;
- wrl(mep, PORT_SERIAL_CONTROL(port_num), pscr);
+ rxq_enable(rxq);
+ }
- /* Assign port SDMA configuration */
- wrl(mep, SDMA_CONFIG(port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
- /* Enable port Rx. */
- mv643xx_eth_port_enable_rx(mep, 1);
+ wrl(mep, TXQ_CURRENT_DESC_PTR(mep->port_num),
+ (u32)((struct tx_desc *)mep->tx_desc_dma + mep->tx_curr_desc));
/* Disable port bandwidth limits by clearing MTU register */
- wrl(mep, TX_BW_MTU(port_num), 0);
-
- /* save phy settings across reset */
- mv643xx_eth_get_settings(dev, ðtool_cmd);
- phy_reset(mep);
- mv643xx_eth_set_settings(dev, ðtool_cmd);
+ wrl(mep, TX_BW_MTU(mep->port_num), 0);
}
#ifdef MV643XX_ETH_COAL
@@ -1652,18 +1701,11 @@ static int mv643xx_eth_open(struct net_device *dev)
port_init(mep);
- memset(&mep->timeout, 0, sizeof(struct timer_list));
- mep->timeout.function = mv643xx_eth_rx_refill_descs_timer_wrapper;
- mep->timeout.data = (unsigned long)dev;
-
- /* Allocate RX and TX skb rings */
- mep->rx_skb = kmalloc(sizeof(*mep->rx_skb) * mep->rx_ring_size,
- GFP_KERNEL);
- if (!mep->rx_skb) {
- printk(KERN_ERR "%s: Cannot allocate Rx skb ring\n", dev->name);
- err = -ENOMEM;
+ err = rxq_init(mep);
+ if (err)
goto out_free_irq;
- }
+ rxq_refill(mep->rxq);
+
mep->tx_skb = kmalloc(sizeof(*mep->tx_skb) * mep->tx_ring_size,
GFP_KERNEL);
if (!mep->tx_skb) {
@@ -1697,39 +1739,6 @@ static int mv643xx_eth_open(struct net_device *dev)
ether_init_tx_desc_ring(mep);
- /* Allocate RX ring */
- mep->rx_desc_count = 0;
- size = mep->rx_ring_size * sizeof(struct rx_desc);
- mep->rx_desc_area_size = size;
-
- if (mep->rx_sram_size) {
- mep->rx_desc_area = ioremap(mep->rx_sram_addr,
- mep->rx_sram_size);
- mep->rx_desc_dma = mep->rx_sram_addr;
- } else
- mep->rx_desc_area = dma_alloc_coherent(NULL, size,
- &mep->rx_desc_dma,
- GFP_KERNEL);
-
- if (!mep->rx_desc_area) {
- printk(KERN_ERR "%s: Cannot allocate Rx ring (size %d bytes)\n",
- dev->name, size);
- printk(KERN_ERR "%s: Freeing previously allocated TX queues...",
- dev->name);
- if (mep->rx_sram_size)
- iounmap(mep->tx_desc_area);
- else
- dma_free_coherent(NULL, mep->tx_desc_area_size,
- mep->tx_desc_area, mep->tx_desc_dma);
- err = -ENOMEM;
- goto out_free_tx_skb;
- }
- memset((void *)mep->rx_desc_area, 0, size);
-
- ether_init_rx_desc_ring(mep);
-
- mv643xx_eth_rx_refill_descs(dev); /* Fill RX ring with skb's */
-
#ifdef MV643XX_ETH_NAPI
napi_enable(&mep->napi);
#endif
@@ -1755,7 +1764,7 @@ static int mv643xx_eth_open(struct net_device *dev)
out_free_tx_skb:
kfree(mep->tx_skb);
out_free_rx_skb:
- kfree(mep->rx_skb);
+ rxq_deinit(mep->rxq);
out_free_irq:
free_irq(dev->irq, dev);
@@ -1768,7 +1777,7 @@ static void port_reset(struct mv643xx_eth_private *mep)
unsigned int reg_data;
mv643xx_eth_port_disable_tx(mep);
- mv643xx_eth_port_disable_rx(mep);
+ rxq_disable(mep->rxq);
/* Clear all MIB counters */
clear_mib_counters(mep);
@@ -1800,7 +1809,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
port_reset(mep);
mv643xx_eth_free_tx_rings(dev);
- mv643xx_eth_free_rx_rings(dev);
+ rxq_deinit(mep->rxq);
free_irq(dev->irq, dev);
@@ -2153,7 +2162,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
/* set default config values */
uc_addr_get(mep, dev->dev_addr);
- mep->rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
mep->tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (is_valid_ether_addr(pd->mac_addr))
@@ -2162,8 +2170,9 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
if (pd->phy_addr || pd->force_phy_addr)
phy_addr_set(mep, pd->phy_addr);
+ mep->default_rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
if (pd->rx_queue_size)
- mep->rx_ring_size = pd->rx_queue_size;
+ mep->default_rx_ring_size = pd->rx_queue_size;
if (pd->tx_queue_size)
mep->tx_ring_size = pd->tx_queue_size;
@@ -2174,8 +2183,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
}
if (pd->rx_sram_size) {
- mep->rx_sram_size = pd->rx_sram_size;
- mep->rx_sram_addr = pd->rx_sram_addr;
+ mep->rx_desc_sram_addr = pd->rx_sram_addr;
+ mep->rx_desc_sram_size = pd->rx_sram_size;
}
duplex = pd->duplex;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 27/39] mv643xx_eth: split out tx queue state
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (25 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 26/39] mv643xx_eth: split out rx queue state Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:09 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 28/39] mv643xx_eth: remove write-only interrupt coalescing variables Lennert Buytenhek
` (11 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Split all TX queue related state into 'struct tx_queue', in
preparation for multiple TX queue support.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 510 ++++++++++++++++++++++-----------------------
1 files changed, 254 insertions(+), 256 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 39de2db..beeadcf 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -288,38 +288,30 @@ struct rx_queue {
struct timer_list rx_oom;
};
-struct mv643xx_eth_private {
- struct mv643xx_eth_shared_private *shared;
- int port_num; /* User Ethernet port number */
-
- struct mv643xx_eth_shared_private *shared_smi;
-
- u32 tx_sram_addr; /* Base address of tx sram area */
- u32 tx_sram_size; /* Size of tx sram area */
-
- /* Tx/Rx rings managment indexes fields. For driver use */
-
- /* Next available and first returning Tx resource */
- int tx_curr_desc, tx_used_desc;
+struct tx_queue {
+ int tx_ring_size;
-#ifdef MV643XX_ETH_TX_FAST_REFILL
- u32 tx_clean_threshold;
-#endif
+ int tx_desc_count;
+ int tx_curr_desc;
+ int tx_used_desc;
struct tx_desc *tx_desc_area;
dma_addr_t tx_desc_dma;
int tx_desc_area_size;
struct sk_buff **tx_skb;
+};
+
+struct mv643xx_eth_private {
+ struct mv643xx_eth_shared_private *shared;
+ int port_num; /* User Ethernet port number */
+
+ struct mv643xx_eth_shared_private *shared_smi;
struct work_struct tx_timeout_task;
struct net_device *dev;
struct mib_counters mib_counters;
spinlock_t lock;
- /* Size of Tx Ring per queue */
- int tx_ring_size;
- /* Number of tx descriptors in use */
- int tx_desc_count;
u32 rx_int_coal;
u32 tx_int_coal;
@@ -333,6 +325,17 @@ struct mv643xx_eth_private {
int rx_desc_sram_size;
struct napi_struct napi;
struct rx_queue rxq[1];
+
+ /*
+ * TX state.
+ */
+ int default_tx_ring_size;
+ unsigned long tx_desc_sram_addr;
+ int tx_desc_sram_size;
+ struct tx_queue txq[1];
+#ifdef MV643XX_ETH_TX_FAST_REFILL
+ int tx_clean_threshold;
+#endif
};
@@ -354,6 +357,11 @@ static struct mv643xx_eth_private *rxq_to_mep(struct rx_queue *rxq)
return container_of(rxq, struct mv643xx_eth_private, rxq[0]);
}
+static struct mv643xx_eth_private *txq_to_mep(struct tx_queue *txq)
+{
+ return container_of(txq, struct mv643xx_eth_private, txq[0]);
+}
+
static void rxq_enable(struct rx_queue *rxq)
{
struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
@@ -370,39 +378,33 @@ static void rxq_disable(struct rx_queue *rxq)
udelay(10);
}
-static void mv643xx_eth_port_enable_tx(struct mv643xx_eth_private *mep,
- unsigned int queues)
+static void txq_enable(struct tx_queue *txq)
{
- wrl(mep, TXQ_COMMAND(mep->port_num), queues);
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ wrl(mep, TXQ_COMMAND(mep->port_num), 1);
}
-static unsigned int mv643xx_eth_port_disable_tx(struct mv643xx_eth_private *mep)
+static void txq_disable(struct tx_queue *txq)
{
- unsigned int port_num = mep->port_num;
- u32 queues;
-
- /* Stop Tx port activity. Check port Tx activity. */
- queues = rdl(mep, TXQ_COMMAND(port_num)) & 0xFF;
- if (queues) {
- /* Issue stop command for active queues only */
- wrl(mep, TXQ_COMMAND(port_num), (queues << 8));
-
- /* Wait for all Tx activity to terminate. */
- /* Check port cause register that all Tx queues are stopped */
- while (rdl(mep, TXQ_COMMAND(port_num)) & 0xFF)
- udelay(10);
-
- /* Wait for Tx FIFO to empty */
- while (rdl(mep, PORT_STATUS(port_num)) & TX_FIFO_EMPTY)
- udelay(10);
- }
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ u8 mask = 1;
- return queues;
+ wrl(mep, TXQ_COMMAND(mep->port_num), mask << 8);
+ while (rdl(mep, TXQ_COMMAND(mep->port_num)) & mask)
+ udelay(10);
+}
+
+static void __txq_maybe_wake(struct tx_queue *txq)
+{
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+
+ if (txq->tx_ring_size - txq->tx_desc_count >= MAX_DESCS_PER_SKB)
+ netif_wake_queue(mep->dev);
}
/* rx ***********************************************************************/
-static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev);
+static void txq_reclaim(struct tx_queue *txq, int force);
static void rxq_refill(struct rx_queue *rxq)
{
@@ -562,7 +564,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
#ifdef MV643XX_ETH_TX_FAST_REFILL
if (++mep->tx_clean_threshold > 5) {
- mv643xx_eth_free_completed_tx_descs(mep->dev);
+ txq_reclaim(mep->txq, 0);
mep->tx_clean_threshold = 0;
}
#endif
@@ -584,55 +586,59 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
/* tx ***********************************************************************/
static inline unsigned int has_tiny_unaligned_frags(struct sk_buff *skb)
{
- unsigned int frag;
- skb_frag_t *fragp;
+ int frag;
for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
- fragp = &skb_shinfo(skb)->frags[frag];
- if (fragp->size <= 8 && fragp->page_offset & 0x7)
+ skb_frag_t *fragp = &skb_shinfo(skb)->frags[frag];
+ if (fragp->size <= 8 && fragp->page_offset & 7)
return 1;
}
+
return 0;
}
-static int alloc_tx_desc_index(struct mv643xx_eth_private *mep)
+static int txq_alloc_desc_index(struct tx_queue *txq)
{
int tx_desc_curr;
- BUG_ON(mep->tx_desc_count >= mep->tx_ring_size);
+ BUG_ON(txq->tx_desc_count >= txq->tx_ring_size);
- tx_desc_curr = mep->tx_curr_desc;
- mep->tx_curr_desc = (tx_desc_curr + 1) % mep->tx_ring_size;
+ tx_desc_curr = txq->tx_curr_desc;
+ txq->tx_curr_desc = (tx_desc_curr + 1) % txq->tx_ring_size;
- BUG_ON(mep->tx_curr_desc == mep->tx_used_desc);
+ BUG_ON(txq->tx_curr_desc == txq->tx_used_desc);
return tx_desc_curr;
}
-static void tx_fill_frag_descs(struct mv643xx_eth_private *mep,
- struct sk_buff *skb)
+static void txq_submit_frag_skb(struct tx_queue *txq, struct sk_buff *skb)
{
+ int nr_frags = skb_shinfo(skb)->nr_frags;
int frag;
- int tx_index;
- struct tx_desc *desc;
- for (frag = 0; frag < skb_shinfo(skb)->nr_frags; frag++) {
- skb_frag_t *this_frag = &skb_shinfo(skb)->frags[frag];
-
- tx_index = alloc_tx_desc_index(mep);
- desc = &mep->tx_desc_area[tx_index];
-
- desc->cmd_sts = BUFFER_OWNED_BY_DMA;
- /* Last Frag enables interrupt and frees the skb */
- if (frag == (skb_shinfo(skb)->nr_frags - 1)) {
- desc->cmd_sts |= ZERO_PADDING |
- TX_LAST_DESC |
- TX_ENABLE_INTERRUPT;
- mep->tx_skb[tx_index] = skb;
- } else
- mep->tx_skb[tx_index] = NULL;
-
- desc = &mep->tx_desc_area[tx_index];
+ for (frag = 0; frag < nr_frags; frag++) {
+ skb_frag_t *this_frag;
+ int tx_index;
+ struct tx_desc *desc;
+
+ this_frag = &skb_shinfo(skb)->frags[frag];
+ tx_index = txq_alloc_desc_index(txq);
+ desc = &txq->tx_desc_area[tx_index];
+
+ /*
+ * The last fragment will generate an interrupt
+ * which will free the skb on TX completion.
+ */
+ if (frag == nr_frags - 1) {
+ desc->cmd_sts = BUFFER_OWNED_BY_DMA |
+ ZERO_PADDING | TX_LAST_DESC |
+ TX_ENABLE_INTERRUPT;
+ txq->tx_skb[tx_index] = skb;
+ } else {
+ desc->cmd_sts = BUFFER_OWNED_BY_DMA;
+ txq->tx_skb[tx_index] = NULL;
+ }
+
desc->l4i_chk = 0;
desc->byte_cnt = this_frag->size;
desc->buf_ptr = dma_map_page(NULL, this_frag->page,
@@ -647,29 +653,28 @@ static inline __be16 sum16_as_be(__sum16 sum)
return (__force __be16)sum;
}
-static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
- struct sk_buff *skb)
+static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
{
+ int nr_frags = skb_shinfo(skb)->nr_frags;
int tx_index;
struct tx_desc *desc;
u32 cmd_sts;
int length;
- int nr_frags = skb_shinfo(skb)->nr_frags;
cmd_sts = TX_FIRST_DESC | GEN_CRC | BUFFER_OWNED_BY_DMA;
- tx_index = alloc_tx_desc_index(mep);
- desc = &mep->tx_desc_area[tx_index];
+ tx_index = txq_alloc_desc_index(txq);
+ desc = &txq->tx_desc_area[tx_index];
if (nr_frags) {
- tx_fill_frag_descs(mep, skb);
+ txq_submit_frag_skb(txq, skb);
length = skb_headlen(skb);
- mep->tx_skb[tx_index] = NULL;
+ txq->tx_skb[tx_index] = NULL;
} else {
cmd_sts |= ZERO_PADDING | TX_LAST_DESC | TX_ENABLE_INTERRUPT;
length = skb->len;
- mep->tx_skb[tx_index] = skb;
+ txq->tx_skb[tx_index] = skb;
}
desc->byte_cnt = length;
@@ -705,15 +710,16 @@ static void tx_submit_descs_for_skb(struct mv643xx_eth_private *mep,
/* ensure all descriptors are written before poking hardware */
wmb();
- mv643xx_eth_port_enable_tx(mep, 1);
+ txq_enable(txq);
- mep->tx_desc_count += nr_frags + 1;
+ txq->tx_desc_count += nr_frags + 1;
}
static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
+ struct tx_queue *txq;
unsigned long flags;
BUG_ON(netif_queue_stopped(dev));
@@ -727,19 +733,21 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_lock_irqsave(&mep->lock, flags);
- if (mep->tx_ring_size - mep->tx_desc_count < MAX_DESCS_PER_SKB) {
+ txq = mep->txq;
+
+ if (txq->tx_ring_size - txq->tx_desc_count < MAX_DESCS_PER_SKB) {
printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
netif_stop_queue(dev);
spin_unlock_irqrestore(&mep->lock, flags);
return NETDEV_TX_BUSY;
}
- tx_submit_descs_for_skb(mep, skb);
+ txq_submit_skb(txq, skb);
stats->tx_bytes += skb->len;
stats->tx_packets++;
dev->trans_start = jiffies;
- if (mep->tx_ring_size - mep->tx_desc_count < MAX_DESCS_PER_SKB)
+ if (txq->tx_ring_size - txq->tx_desc_count < MAX_DESCS_PER_SKB)
netif_stop_queue(dev);
spin_unlock_irqrestore(&mep->lock, flags);
@@ -1339,69 +1347,106 @@ static void rxq_deinit(struct rx_queue *rxq)
kfree(rxq->rx_skb);
}
-static void ether_init_tx_desc_ring(struct mv643xx_eth_private *mep)
+static int txq_init(struct mv643xx_eth_private *mep)
{
- int tx_desc_num = mep->tx_ring_size;
- struct tx_desc *p_tx_desc;
+ struct tx_queue *txq = mep->txq;
+ struct tx_desc *tx_desc;
+ int size;
int i;
- /* Initialize the next_desc_ptr links in the Tx descriptors ring */
- p_tx_desc = (struct tx_desc *)mep->tx_desc_area;
- for (i = 0; i < tx_desc_num; i++) {
- p_tx_desc[i].next_desc_ptr = mep->tx_desc_dma +
- ((i + 1) % tx_desc_num) * sizeof(struct tx_desc);
+ txq->tx_ring_size = mep->default_tx_ring_size;
+
+ txq->tx_desc_count = 0;
+ txq->tx_curr_desc = 0;
+ txq->tx_used_desc = 0;
+
+ size = txq->tx_ring_size * sizeof(struct tx_desc);
+
+ if (size <= mep->tx_desc_sram_size) {
+ txq->tx_desc_area = ioremap(mep->tx_desc_sram_addr,
+ mep->tx_desc_sram_size);
+ txq->tx_desc_dma = mep->tx_desc_sram_addr;
+ } else {
+ txq->tx_desc_area = dma_alloc_coherent(NULL, size,
+ &txq->tx_desc_dma,
+ GFP_KERNEL);
+ }
+
+ if (txq->tx_desc_area == NULL) {
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "can't allocate tx ring (%d bytes)\n", size);
+ goto out;
}
+ memset(txq->tx_desc_area, 0, size);
+
+ txq->tx_desc_area_size = size;
+ txq->tx_skb = kmalloc(txq->tx_ring_size * sizeof(*txq->tx_skb),
+ GFP_KERNEL);
+ if (txq->tx_skb == NULL) {
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "can't allocate tx skb ring\n");
+ goto out_free;
+ }
+
+ tx_desc = (struct tx_desc *)txq->tx_desc_area;
+ for (i = 0; i < txq->tx_ring_size; i++) {
+ int nexti = (i + 1) % txq->tx_ring_size;
+ tx_desc[i].next_desc_ptr = txq->tx_desc_dma +
+ nexti * sizeof(struct tx_desc);
+ }
+
+ return 0;
+
- mep->tx_curr_desc = 0;
- mep->tx_used_desc = 0;
+out_free:
+ if (size <= mep->tx_desc_sram_size)
+ iounmap(txq->tx_desc_area);
+ else
+ dma_free_coherent(NULL, size,
+ txq->tx_desc_area,
+ txq->tx_desc_dma);
- mep->tx_desc_area_size = tx_desc_num * sizeof(struct tx_desc);
+out:
+ return -ENOMEM;
}
-static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
+static void txq_reclaim(struct tx_queue *txq, int force)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- struct tx_desc *desc;
- u32 cmd_sts;
- struct sk_buff *skb;
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
unsigned long flags;
- int tx_index;
- dma_addr_t addr;
- int count;
- int released = 0;
- while (mep->tx_desc_count > 0) {
- spin_lock_irqsave(&mep->lock, flags);
-
- /* tx_desc_count might have changed before acquiring the lock */
- if (mep->tx_desc_count <= 0) {
- spin_unlock_irqrestore(&mep->lock, flags);
- return released;
- }
+ spin_lock_irqsave(&mep->lock, flags);
+ while (txq->tx_desc_count > 0) {
+ int tx_index;
+ struct tx_desc *desc;
+ u32 cmd_sts;
+ struct sk_buff *skb;
+ dma_addr_t addr;
+ int count;
- tx_index = mep->tx_used_desc;
- desc = &mep->tx_desc_area[tx_index];
+ tx_index = txq->tx_used_desc;
+ desc = &txq->tx_desc_area[tx_index];
cmd_sts = desc->cmd_sts;
- if (!force && (cmd_sts & BUFFER_OWNED_BY_DMA)) {
- spin_unlock_irqrestore(&mep->lock, flags);
- return released;
- }
+ if (!force && (cmd_sts & BUFFER_OWNED_BY_DMA))
+ break;
- mep->tx_used_desc = (tx_index + 1) % mep->tx_ring_size;
- mep->tx_desc_count--;
+ txq->tx_used_desc = (tx_index + 1) % txq->tx_ring_size;
+ txq->tx_desc_count--;
addr = desc->buf_ptr;
count = desc->byte_cnt;
- skb = mep->tx_skb[tx_index];
- if (skb)
- mep->tx_skb[tx_index] = NULL;
+ skb = txq->tx_skb[tx_index];
+ txq->tx_skb[tx_index] = NULL;
if (cmd_sts & ERROR_SUMMARY) {
- printk("%s: Error in TX\n", dev->name);
- dev->stats.tx_errors++;
+ dev_printk(KERN_INFO, &mep->dev->dev, "tx error\n");
+ mep->dev->stats.tx_errors++;
}
+ /*
+ * Drop mep->lock while we free the skb.
+ */
spin_unlock_irqrestore(&mep->lock, flags);
if (cmd_sts & TX_FIRST_DESC)
@@ -1412,91 +1457,68 @@ static int mv643xx_eth_free_tx_descs(struct net_device *dev, int force)
if (skb)
dev_kfree_skb_irq(skb);
- released = 1;
+ spin_lock_irqsave(&mep->lock, flags);
}
-
- return released;
-}
-
-static void mv643xx_eth_free_completed_tx_descs(struct net_device *dev)
-{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
-
- if (mv643xx_eth_free_tx_descs(dev, 0) &&
- mep->tx_ring_size - mep->tx_desc_count >= MAX_DESCS_PER_SKB)
- netif_wake_queue(dev);
-}
-
-static void mv643xx_eth_free_all_tx_descs(struct net_device *dev)
-{
- mv643xx_eth_free_tx_descs(dev, 1);
+ spin_unlock_irqrestore(&mep->lock, flags);
}
-static void mv643xx_eth_free_tx_rings(struct net_device *dev)
+static void txq_deinit(struct tx_queue *txq)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
-
- /* Stop Tx Queues */
- mv643xx_eth_port_disable_tx(mep);
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
- /* Free outstanding skb's on TX ring */
- mv643xx_eth_free_all_tx_descs(dev);
+ txq_disable(txq);
+ txq_reclaim(txq, 1);
- BUG_ON(mep->tx_used_desc != mep->tx_curr_desc);
+ BUG_ON(txq->tx_used_desc != txq->tx_curr_desc);
- /* Free TX ring */
- if (mep->tx_sram_size)
- iounmap(mep->tx_desc_area);
+ if (txq->tx_desc_area_size <= mep->tx_desc_sram_size)
+ iounmap(txq->tx_desc_area);
else
- dma_free_coherent(NULL, mep->tx_desc_area_size,
- mep->tx_desc_area, mep->tx_desc_dma);
+ dma_free_coherent(NULL, txq->tx_desc_area_size,
+ txq->tx_desc_area, txq->tx_desc_dma);
+
+ kfree(txq->tx_skb);
}
/* netdev ops and related ***************************************************/
static void port_reset(struct mv643xx_eth_private *mep);
-static void mv643xx_eth_update_pscr(struct net_device *dev,
+static void mv643xx_eth_update_pscr(struct mv643xx_eth_private *mep,
struct ethtool_cmd *ecmd)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- int port_num = mep->port_num;
- u32 o_pscr, n_pscr;
- unsigned int queues;
+ u32 pscr_o;
+ u32 pscr_n;
- o_pscr = rdl(mep, PORT_SERIAL_CONTROL(port_num));
- n_pscr = o_pscr;
+ pscr_o = rdl(mep, PORT_SERIAL_CONTROL(mep->port_num));
/* clear speed, duplex and rx buffer size fields */
- n_pscr &= ~(SET_MII_SPEED_TO_100 |
- SET_GMII_SPEED_TO_1000 |
- SET_FULL_DUPLEX_MODE |
- MAX_RX_PACKET_MASK);
-
- if (ecmd->duplex == DUPLEX_FULL)
- n_pscr |= SET_FULL_DUPLEX_MODE;
+ pscr_n = pscr_o & ~(SET_MII_SPEED_TO_100 |
+ SET_GMII_SPEED_TO_1000 |
+ SET_FULL_DUPLEX_MODE |
+ MAX_RX_PACKET_MASK);
- if (ecmd->speed == SPEED_1000)
- n_pscr |= SET_GMII_SPEED_TO_1000 |
- MAX_RX_PACKET_9700BYTE;
- else {
+ if (ecmd->speed == SPEED_1000) {
+ pscr_n |= SET_GMII_SPEED_TO_1000 | MAX_RX_PACKET_9700BYTE;
+ } else {
if (ecmd->speed == SPEED_100)
- n_pscr |= SET_MII_SPEED_TO_100;
- n_pscr |= MAX_RX_PACKET_1522BYTE;
+ pscr_n |= SET_MII_SPEED_TO_100;
+ pscr_n |= MAX_RX_PACKET_1522BYTE;
}
- if (n_pscr != o_pscr) {
- if ((o_pscr & SERIAL_PORT_ENABLE) == 0)
- wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
+ if (ecmd->duplex == DUPLEX_FULL)
+ pscr_n |= SET_FULL_DUPLEX_MODE;
+
+ if (pscr_n != pscr_o) {
+ if ((pscr_o & SERIAL_PORT_ENABLE) == 0)
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
else {
- queues = mv643xx_eth_port_disable_tx(mep);
-
- o_pscr &= ~SERIAL_PORT_ENABLE;
- wrl(mep, PORT_SERIAL_CONTROL(port_num), o_pscr);
- wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
- wrl(mep, PORT_SERIAL_CONTROL(port_num), n_pscr);
- if (queues)
- mv643xx_eth_port_enable_tx(mep, queues);
+ txq_disable(mep->txq);
+ pscr_o &= ~SERIAL_PORT_ENABLE;
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_o);
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
+ txq_enable(mep->txq);
}
}
}
@@ -1506,29 +1528,26 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
struct net_device *dev = (struct net_device *)dev_id;
struct mv643xx_eth_private *mep = netdev_priv(dev);
u32 int_cause, int_cause_ext = 0;
- unsigned int port_num = mep->port_num;
/* Read interrupt cause registers */
- int_cause = rdl(mep, INT_CAUSE(port_num)) & (INT_RX | INT_EXT);
+ int_cause = rdl(mep, INT_CAUSE(mep->port_num)) & (INT_RX | INT_EXT);
if (int_cause & INT_EXT) {
- int_cause_ext = rdl(mep, INT_CAUSE_EXT(port_num))
+ int_cause_ext = rdl(mep, INT_CAUSE_EXT(mep->port_num))
& (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
- wrl(mep, INT_CAUSE_EXT(port_num), ~int_cause_ext);
+ wrl(mep, INT_CAUSE_EXT(mep->port_num), ~int_cause_ext);
}
/* PHY status changed */
if (int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
- struct ethtool_cmd cmd;
-
if (mii_link_ok(&mep->mii)) {
+ struct ethtool_cmd cmd;
+
mii_ethtool_gset(&mep->mii, &cmd);
- mv643xx_eth_update_pscr(dev, &cmd);
- mv643xx_eth_port_enable_tx(mep, 1);
+ mv643xx_eth_update_pscr(mep, &cmd);
+ txq_enable(mep->txq);
if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev);
- if (mep->tx_ring_size - mep->tx_desc_count >=
- MAX_DESCS_PER_SKB)
- netif_wake_queue(dev);
+ __txq_maybe_wake(mep->txq);
}
} else if (netif_carrier_ok(dev)) {
netif_stop_queue(dev);
@@ -1539,10 +1558,10 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
#ifdef MV643XX_ETH_NAPI
if (int_cause & INT_RX) {
/* schedule the NAPI poll routine to maintain port */
- wrl(mep, INT_MASK(port_num), 0x00000000);
+ wrl(mep, INT_MASK(mep->port_num), 0x00000000);
/* wait for previous write to complete */
- rdl(mep, INT_MASK(port_num));
+ rdl(mep, INT_MASK(mep->port_num));
netif_rx_schedule(dev, &mep->napi);
}
@@ -1550,8 +1569,10 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
if (int_cause & INT_RX)
rxq_process(mep->rxq, INT_MAX);
#endif
- if (int_cause_ext & INT_EXT_TX)
- mv643xx_eth_free_completed_tx_descs(dev);
+ if (int_cause_ext & INT_EXT_TX) {
+ txq_reclaim(mep->txq, 0);
+ __txq_maybe_wake(mep->txq);
+ }
/*
* If no real interrupt occured, exit.
@@ -1607,6 +1628,20 @@ static void port_start(struct net_device *dev)
phy_reset(mep);
mv643xx_eth_set_settings(dev, ðtool_cmd);
+ /*
+ * Configure TX path and queues.
+ */
+ wrl(mep, TX_BW_MTU(mep->port_num), 0);
+ for (i = 0; i < 1; i++) {
+ struct tx_queue *txq = mep->txq;
+ int off = TXQ_CURRENT_DESC_PTR(mep->port_num);
+ u32 addr;
+
+ addr = (u32)txq->tx_desc_dma;
+ addr += txq->tx_curr_desc * sizeof(struct tx_desc);
+ wrl(mep, off, addr);
+ }
+
/* Add the assigned Ethernet address to the port's address table */
uc_addr_set(mep, dev->dev_addr);
@@ -1635,13 +1670,6 @@ static void port_start(struct net_device *dev)
rxq_enable(rxq);
}
-
-
- wrl(mep, TXQ_CURRENT_DESC_PTR(mep->port_num),
- (u32)((struct tx_desc *)mep->tx_desc_dma + mep->tx_curr_desc));
-
- /* Disable port bandwidth limits by clearing MTU register */
- wrl(mep, TX_BW_MTU(mep->port_num), 0);
}
#ifdef MV643XX_ETH_COAL
@@ -1683,7 +1711,6 @@ static int mv643xx_eth_open(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
unsigned int port_num = mep->port_num;
- unsigned int size;
int err;
/* Clear any pending ethernet port interrupts */
@@ -1706,38 +1733,9 @@ static int mv643xx_eth_open(struct net_device *dev)
goto out_free_irq;
rxq_refill(mep->rxq);
- mep->tx_skb = kmalloc(sizeof(*mep->tx_skb) * mep->tx_ring_size,
- GFP_KERNEL);
- if (!mep->tx_skb) {
- printk(KERN_ERR "%s: Cannot allocate Tx skb ring\n", dev->name);
- err = -ENOMEM;
+ err = txq_init(mep);
+ if (err)
goto out_free_rx_skb;
- }
-
- /* Allocate TX ring */
- mep->tx_desc_count = 0;
- size = mep->tx_ring_size * sizeof(struct tx_desc);
- mep->tx_desc_area_size = size;
-
- if (mep->tx_sram_size) {
- mep->tx_desc_area = ioremap(mep->tx_sram_addr,
- mep->tx_sram_size);
- mep->tx_desc_dma = mep->tx_sram_addr;
- } else
- mep->tx_desc_area = dma_alloc_coherent(NULL, size,
- &mep->tx_desc_dma,
- GFP_KERNEL);
-
- if (!mep->tx_desc_area) {
- printk(KERN_ERR "%s: Cannot allocate Tx Ring (size %d bytes)\n",
- dev->name, size);
- err = -ENOMEM;
- goto out_free_tx_skb;
- }
- BUG_ON((u32) mep->tx_desc_area & 0xf); /* check 16-byte alignment */
- memset((void *)mep->tx_desc_area, 0, mep->tx_desc_area_size);
-
- ether_init_tx_desc_ring(mep);
#ifdef MV643XX_ETH_NAPI
napi_enable(&mep->napi);
@@ -1761,8 +1759,7 @@ static int mv643xx_eth_open(struct net_device *dev)
return 0;
-out_free_tx_skb:
- kfree(mep->tx_skb);
+
out_free_rx_skb:
rxq_deinit(mep->rxq);
out_free_irq:
@@ -1776,8 +1773,10 @@ static void port_reset(struct mv643xx_eth_private *mep)
unsigned int port_num = mep->port_num;
unsigned int reg_data;
- mv643xx_eth_port_disable_tx(mep);
+ txq_disable(mep->txq);
rxq_disable(mep->rxq);
+ while (!(rdl(mep, PORT_STATUS(mep->port_num)) & TX_FIFO_EMPTY))
+ udelay(10);
/* Clear all MIB counters */
clear_mib_counters(mep);
@@ -1808,7 +1807,7 @@ static int mv643xx_eth_stop(struct net_device *dev)
port_reset(mep);
- mv643xx_eth_free_tx_rings(dev);
+ txq_deinit(mep->txq);
rxq_deinit(mep->rxq);
free_irq(dev->irq, dev);
@@ -1861,8 +1860,7 @@ static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
port_reset(mep);
port_start(dev);
- if (mep->tx_ring_size - mep->tx_desc_count >= MAX_DESCS_PER_SKB)
- netif_wake_queue(dev);
+ __txq_maybe_wake(mep->txq);
}
static void mv643xx_eth_tx_timeout(struct net_device *dev)
@@ -2162,7 +2160,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
/* set default config values */
uc_addr_get(mep, dev->dev_addr);
- mep->tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (is_valid_ether_addr(pd->mac_addr))
memcpy(dev->dev_addr, pd->mac_addr, 6);
@@ -2174,12 +2171,13 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
if (pd->rx_queue_size)
mep->default_rx_ring_size = pd->rx_queue_size;
+ mep->default_tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (pd->tx_queue_size)
- mep->tx_ring_size = pd->tx_queue_size;
+ mep->default_tx_ring_size = pd->tx_queue_size;
if (pd->tx_sram_size) {
- mep->tx_sram_size = pd->tx_sram_size;
- mep->tx_sram_addr = pd->tx_sram_addr;
+ mep->tx_desc_sram_size = pd->tx_sram_size;
+ mep->tx_desc_sram_addr = pd->tx_sram_addr;
}
if (pd->rx_sram_size) {
@@ -2208,7 +2206,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
phy_reset(mep);
mep->mii.supports_gmii = mii_check_gmii_support(&mep->mii);
mv643xx_init_ethtool_cmd(dev, mep->mii.phy_id, speed, duplex, &cmd);
- mv643xx_eth_update_pscr(dev, &cmd);
+ mv643xx_eth_update_pscr(mep, &cmd);
mv643xx_eth_set_settings(dev, &cmd);
SET_NETDEV_DEV(dev, &pdev->dev);
@@ -2241,7 +2239,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
#endif
- if (mep->tx_sram_size > 0)
+ if (mep->tx_desc_sram_size > 0)
printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
return 0;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 27/39] mv643xx_eth: split out tx queue state
2008-06-03 11:02 ` [PATCH 27/39] mv643xx_eth: split out tx " Lennert Buytenhek
@ 2008-06-05 12:09 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:09 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:42PM +0200, Lennert Buytenhek wrote:
> Split all TX queue related state into 'struct tx_queue', in
> preparation for multiple TX queue support.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 510 ++++++++++++++++++++++-----------------------
> 1 files changed, 254 insertions(+), 256 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 28/39] mv643xx_eth: remove write-only interrupt coalescing variables
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (26 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 27/39] mv643xx_eth: split out tx " Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:53 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 29/39] mv643xx_eth: general cleanup Lennert Buytenhek
` (10 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Remove the write-only ->[rt]x_int_coal members from struct
mv643xx_eth_private. In the process, tweak the RX/TX interrupt
mitigation code so that it is compiled by default, and set the
default coalescing delays to 0 usec.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index beeadcf..ef1c461 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -52,12 +52,6 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define MV643XX_ETH_CHECKSUM_OFFLOAD_TX
#define MV643XX_ETH_NAPI
#define MV643XX_ETH_TX_FAST_REFILL
-#undef MV643XX_ETH_COAL
-
-#define MV643XX_ETH_TX_COAL 100
-#ifdef MV643XX_ETH_COAL
-#define MV643XX_ETH_RX_COAL 100
-#endif
#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
#define MAX_DESCS_PER_SKB (MAX_SKB_FRAGS + 1)
@@ -313,8 +307,6 @@ struct mv643xx_eth_private {
struct mib_counters mib_counters;
spinlock_t lock;
- u32 rx_int_coal;
- u32 tx_int_coal;
struct mii_if_info mii;
/*
@@ -1672,9 +1664,7 @@ static void port_start(struct net_device *dev)
}
}
-#ifdef MV643XX_ETH_COAL
-static unsigned int set_rx_coal(struct mv643xx_eth_private *mep,
- unsigned int delay)
+static void set_rx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
{
unsigned int port_num = mep->port_num;
unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
@@ -1684,20 +1674,14 @@ static unsigned int set_rx_coal(struct mv643xx_eth_private *mep,
((coal & 0x3fff) << 8) |
(rdl(mep, SDMA_CONFIG(port_num))
& 0xffc000ff));
-
- return coal;
}
-#endif
-static unsigned int set_tx_coal(struct mv643xx_eth_private *mep,
- unsigned int delay)
+static void set_tx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
{
unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
/* Set TX Coalescing mechanism */
wrl(mep, TX_FIFO_URGENT_THRESHOLD(mep->port_num), coal << 4);
-
- return coal;
}
static void port_init(struct mv643xx_eth_private *mep)
@@ -1743,13 +1727,8 @@ static int mv643xx_eth_open(struct net_device *dev)
port_start(dev);
- /* Interrupt Coalescing */
-
-#ifdef MV643XX_ETH_COAL
- mep->rx_int_coal = set_rx_coal(mep, MV643XX_ETH_RX_COAL);
-#endif
-
- mep->tx_int_coal = set_tx_coal(mep, MV643XX_ETH_TX_COAL);
+ set_rx_coal(mep, 0);
+ set_tx_coal(mep, 0);
/* Unmask phy and link status changes interrupts */
wrl(mep, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 28/39] mv643xx_eth: remove write-only interrupt coalescing variables
2008-06-03 11:02 ` [PATCH 28/39] mv643xx_eth: remove write-only interrupt coalescing variables Lennert Buytenhek
@ 2008-06-05 12:53 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:53 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:43PM +0200, Lennert Buytenhek wrote:
> Remove the write-only ->[rt]x_int_coal members from struct
> mv643xx_eth_private. In the process, tweak the RX/TX interrupt
> mitigation code so that it is compiled by default, and set the
> default coalescing delays to 0 usec.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 29 ++++-------------------------
> 1 files changed, 4 insertions(+), 25 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 29/39] mv643xx_eth: general cleanup
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (27 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 28/39] mv643xx_eth: remove write-only interrupt coalescing variables Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:33 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 30/39] mv643xx_eth: add tx rate control Lennert Buytenhek
` (9 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
General cleanup of the mv643xx_eth driver. Mainly fixes coding
style / indentation issues, get rid of some useless 'volatile's,
kill some more superfluous comments, and such.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 939 ++++++++++++++++++++-----------------------
include/linux/mv643xx_eth.h | 59 ++-
2 files changed, 469 insertions(+), 529 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index ef1c461..ff31cd8 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -59,8 +59,6 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define MAX_DESCS_PER_SKB 1
#endif
-#define ETH_HW_IP_ALIGN 2
-
/*
* Registers shared between all ports.
*/
@@ -149,12 +147,6 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define DEFAULT_RX_QUEUE_SIZE 400
#define DEFAULT_TX_QUEUE_SIZE 800
-/* SMI reg */
-#define SMI_BUSY 0x10000000 /* 0 - Write, 1 - Read */
-#define SMI_READ_VALID 0x08000000 /* 0 - Write, 1 - Read */
-#define SMI_OPCODE_WRITE 0 /* Completion of Read */
-#define SMI_OPCODE_READ 0x04000000 /* Operation is in progress */
-
/*
* RX/TX descriptors.
@@ -222,13 +214,24 @@ struct tx_desc {
/* global *******************************************************************/
struct mv643xx_eth_shared_private {
+ /*
+ * Ethernet controller base address.
+ */
void __iomem *base;
- /* used to protect SMI_REG, which is shared across ports */
+ /*
+ * Protects access to SMI_REG, which is shared between ports.
+ */
spinlock_t phy_lock;
+ /*
+ * Per-port MBUS window access register value.
+ */
u32 win_protect;
+ /*
+ * Hardware-specific parameters.
+ */
unsigned int t_clk;
};
@@ -297,16 +300,17 @@ struct tx_queue {
struct mv643xx_eth_private {
struct mv643xx_eth_shared_private *shared;
- int port_num; /* User Ethernet port number */
+ int port_num;
- struct mv643xx_eth_shared_private *shared_smi;
+ struct net_device *dev;
- struct work_struct tx_timeout_task;
+ struct mv643xx_eth_shared_private *shared_smi;
+ int phy_addr;
- struct net_device *dev;
- struct mib_counters mib_counters;
spinlock_t lock;
+ struct mib_counters mib_counters;
+ struct work_struct tx_timeout_task;
struct mii_if_info mii;
/*
@@ -441,7 +445,7 @@ static void rxq_refill(struct rx_queue *rxq)
RX_ENABLE_INTERRUPT;
wmb();
- skb_reserve(skb, ETH_HW_IP_ALIGN);
+ skb_reserve(skb, 2);
}
if (rxq->rx_desc_count == 0) {
@@ -465,9 +469,9 @@ static int rxq_process(struct rx_queue *rxq, int budget)
rx = 0;
while (rx < budget) {
- struct sk_buff *skb;
- volatile struct rx_desc *rx_desc;
+ struct rx_desc *rx_desc;
unsigned int cmd_sts;
+ struct sk_buff *skb;
unsigned long flags;
spin_lock_irqsave(&mep->lock, flags);
@@ -488,8 +492,8 @@ static int rxq_process(struct rx_queue *rxq, int budget)
spin_unlock_irqrestore(&mep->lock, flags);
- dma_unmap_single(NULL, rx_desc->buf_ptr + ETH_HW_IP_ALIGN,
- mep->dev->mtu + 24, DMA_FROM_DEVICE);
+ dma_unmap_single(NULL, rx_desc->buf_ptr + 2,
+ mep->dev->mtu + 24, DMA_FROM_DEVICE);
rxq->rx_desc_count--;
rx++;
@@ -498,24 +502,26 @@ static int rxq_process(struct rx_queue *rxq, int budget)
* Note byte count includes 4 byte CRC count
*/
stats->rx_packets++;
- stats->rx_bytes += rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
+ stats->rx_bytes += rx_desc->byte_cnt - 2;
/*
- * In case received a packet without first / last bits on OR
- * the error summary bit is on, the packets needs to be dropeed.
+ * In case we received a packet without first / last bits
+ * on, or the error summary bit is set, the packet needs
+ * to be dropped.
*/
if (((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
(RX_FIRST_DESC | RX_LAST_DESC))
|| (cmd_sts & ERROR_SUMMARY)) {
stats->rx_dropped++;
+
if ((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
(RX_FIRST_DESC | RX_LAST_DESC)) {
if (net_ratelimit())
- printk(KERN_ERR
- "%s: Received packet spread "
- "on multiple descriptors\n",
- mep->dev->name);
+ dev_printk(KERN_ERR, &mep->dev->dev,
+ "received packet spanning "
+ "multiple descriptors\n");
}
+
if (cmd_sts & ERROR_SUMMARY)
stats->rx_errors++;
@@ -525,7 +531,7 @@ static int rxq_process(struct rx_queue *rxq, int budget)
* The -4 is for the CRC in the trailer of the
* received packet
*/
- skb_put(skb, rx_desc->byte_cnt - ETH_HW_IP_ALIGN - 4);
+ skb_put(skb, rx_desc->byte_cnt - 2 - 4);
if (cmd_sts & LAYER_4_CHECKSUM_OK) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -539,8 +545,10 @@ static int rxq_process(struct rx_queue *rxq, int budget)
netif_rx(skb);
#endif
}
+
mep->dev->last_rx = jiffies;
}
+
rxq_refill(rxq);
return rx;
@@ -707,7 +715,7 @@ static void txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
txq->tx_desc_count += nr_frags + 1;
}
-static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
struct net_device_stats *stats = &dev->stats;
@@ -718,8 +726,9 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
stats->tx_dropped++;
- printk(KERN_DEBUG "%s: failed to linearize tiny "
- "unaligned fragment\n", dev->name);
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "failed to linearize skb with tiny "
+ "unaligned fragment\n");
return NETDEV_TX_BUSY;
}
@@ -749,13 +758,15 @@ static int mv643xx_eth_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* mii management interface *************************************************/
-static int phy_addr_get(struct mv643xx_eth_private *mep);
+#define SMI_BUSY 0x10000000
+#define SMI_READ_VALID 0x08000000
+#define SMI_OPCODE_READ 0x04000000
+#define SMI_OPCODE_WRITE 0x00000000
-static void read_smi_reg(struct mv643xx_eth_private *mep,
- unsigned int phy_reg, unsigned int *value)
+static void smi_reg_read(struct mv643xx_eth_private *mep, unsigned int addr,
+ unsigned int reg, unsigned int *value)
{
void __iomem *smi_reg = mep->shared_smi->base + SMI_REG;
- int phy_addr = phy_addr_get(mep);
unsigned long flags;
int i;
@@ -771,7 +782,7 @@ static void read_smi_reg(struct mv643xx_eth_private *mep,
udelay(10);
}
- writel((phy_addr << 16) | (phy_reg << 21) | SMI_OPCODE_READ, smi_reg);
+ writel(SMI_OPCODE_READ | (reg << 21) | (addr << 16), smi_reg);
/* now wait for the data to be valid */
for (i = 0; !(readl(smi_reg) & SMI_READ_VALID); i++) {
@@ -787,11 +798,11 @@ out:
spin_unlock_irqrestore(&mep->shared_smi->phy_lock, flags);
}
-static void write_smi_reg(struct mv643xx_eth_private *mep,
- unsigned int phy_reg, unsigned int value)
+static void smi_reg_write(struct mv643xx_eth_private *mep,
+ unsigned int addr,
+ unsigned int reg, unsigned int value)
{
void __iomem *smi_reg = mep->shared_smi->base + SMI_REG;
- int phy_addr = phy_addr_get(mep);
unsigned long flags;
int i;
@@ -807,65 +818,63 @@ static void write_smi_reg(struct mv643xx_eth_private *mep,
udelay(10);
}
- writel((phy_addr << 16) | (phy_reg << 21) |
- SMI_OPCODE_WRITE | (value & 0xffff), smi_reg);
+ writel(SMI_OPCODE_WRITE | (reg << 21) |
+ (addr << 16) | (value & 0xffff), smi_reg);
out:
spin_unlock_irqrestore(&mep->shared_smi->phy_lock, flags);
}
/* mib counters *************************************************************/
-static void clear_mib_counters(struct mv643xx_eth_private *mep)
+static inline u32 mib_read(struct mv643xx_eth_private *mep, int offset)
{
- unsigned int port_num = mep->port_num;
- int i;
-
- /* Perform dummy reads from MIB counters */
- for (i = 0; i < 0x80; i += 4)
- rdl(mep, MIB_COUNTERS(port_num) + i);
+ return rdl(mep, MIB_COUNTERS(mep->port_num) + offset);
}
-static inline u32 read_mib(struct mv643xx_eth_private *mep, int offset)
+static void mib_counters_clear(struct mv643xx_eth_private *mep)
{
- return rdl(mep, MIB_COUNTERS(mep->port_num) + offset);
+ int i;
+
+ for (i = 0; i < 0x80; i += 4)
+ mib_read(mep, i);
}
-static void update_mib_counters(struct mv643xx_eth_private *mep)
+static void mib_counters_update(struct mv643xx_eth_private *mep)
{
struct mib_counters *p = &mep->mib_counters;
- p->good_octets_received += read_mib(mep, 0x00);
- p->good_octets_received += (u64)read_mib(mep, 0x04) << 32;
- p->bad_octets_received += read_mib(mep, 0x08);
- p->internal_mac_transmit_err += read_mib(mep, 0x0c);
- p->good_frames_received += read_mib(mep, 0x10);
- p->bad_frames_received += read_mib(mep, 0x14);
- p->broadcast_frames_received += read_mib(mep, 0x18);
- p->multicast_frames_received += read_mib(mep, 0x1c);
- p->frames_64_octets += read_mib(mep, 0x20);
- p->frames_65_to_127_octets += read_mib(mep, 0x24);
- p->frames_128_to_255_octets += read_mib(mep, 0x28);
- p->frames_256_to_511_octets += read_mib(mep, 0x2c);
- p->frames_512_to_1023_octets += read_mib(mep, 0x30);
- p->frames_1024_to_max_octets += read_mib(mep, 0x34);
- p->good_octets_sent += read_mib(mep, 0x38);
- p->good_octets_sent += (u64)read_mib(mep, 0x3c) << 32;
- p->good_frames_sent += read_mib(mep, 0x40);
- p->excessive_collision += read_mib(mep, 0x44);
- p->multicast_frames_sent += read_mib(mep, 0x48);
- p->broadcast_frames_sent += read_mib(mep, 0x4c);
- p->unrec_mac_control_received += read_mib(mep, 0x50);
- p->fc_sent += read_mib(mep, 0x54);
- p->good_fc_received += read_mib(mep, 0x58);
- p->bad_fc_received += read_mib(mep, 0x5c);
- p->undersize_received += read_mib(mep, 0x60);
- p->fragments_received += read_mib(mep, 0x64);
- p->oversize_received += read_mib(mep, 0x68);
- p->jabber_received += read_mib(mep, 0x6c);
- p->mac_receive_error += read_mib(mep, 0x70);
- p->bad_crc_event += read_mib(mep, 0x74);
- p->collision += read_mib(mep, 0x78);
- p->late_collision += read_mib(mep, 0x7c);
+ p->good_octets_received += mib_read(mep, 0x00);
+ p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
+ p->bad_octets_received += mib_read(mep, 0x08);
+ p->internal_mac_transmit_err += mib_read(mep, 0x0c);
+ p->good_frames_received += mib_read(mep, 0x10);
+ p->bad_frames_received += mib_read(mep, 0x14);
+ p->broadcast_frames_received += mib_read(mep, 0x18);
+ p->multicast_frames_received += mib_read(mep, 0x1c);
+ p->frames_64_octets += mib_read(mep, 0x20);
+ p->frames_65_to_127_octets += mib_read(mep, 0x24);
+ p->frames_128_to_255_octets += mib_read(mep, 0x28);
+ p->frames_256_to_511_octets += mib_read(mep, 0x2c);
+ p->frames_512_to_1023_octets += mib_read(mep, 0x30);
+ p->frames_1024_to_max_octets += mib_read(mep, 0x34);
+ p->good_octets_sent += mib_read(mep, 0x38);
+ p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
+ p->good_frames_sent += mib_read(mep, 0x40);
+ p->excessive_collision += mib_read(mep, 0x44);
+ p->multicast_frames_sent += mib_read(mep, 0x48);
+ p->broadcast_frames_sent += mib_read(mep, 0x4c);
+ p->unrec_mac_control_received += mib_read(mep, 0x50);
+ p->fc_sent += mib_read(mep, 0x54);
+ p->good_fc_received += mib_read(mep, 0x58);
+ p->bad_fc_received += mib_read(mep, 0x5c);
+ p->undersize_received += mib_read(mep, 0x60);
+ p->fragments_received += mib_read(mep, 0x64);
+ p->oversize_received += mib_read(mep, 0x68);
+ p->jabber_received += mib_read(mep, 0x6c);
+ p->mac_receive_error += mib_read(mep, 0x70);
+ p->bad_crc_event += mib_read(mep, 0x74);
+ p->collision += mib_read(mep, 0x78);
+ p->late_collision += mib_read(mep, 0x7c);
}
@@ -935,7 +944,9 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *
err = mii_ethtool_gset(&mep->mii, cmd);
spin_unlock_irq(&mep->lock);
- /* The PHY may support 1000baseT_Half, but the mv643xx does not */
+ /*
+ * The MAC does not support 1000baseT_Half.
+ */
cmd->supported &= ~SUPPORTED_1000baseT_Half;
cmd->advertising &= ~ADVERTISED_1000baseT_Half;
@@ -947,6 +958,11 @@ static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *
struct mv643xx_eth_private *mep = netdev_priv(dev);
int err;
+ /*
+ * The MAC does not support 1000baseT_Half.
+ */
+ cmd->advertising &= ~ADVERTISED_1000baseT_Half;
+
spin_lock_irq(&mep->lock);
err = mii_ethtool_sset(&mep->mii, cmd);
spin_unlock_irq(&mep->lock);
@@ -954,17 +970,17 @@ static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *
return err;
}
-static void mv643xx_eth_get_drvinfo(struct net_device *netdev,
- struct ethtool_drvinfo *drvinfo)
+static void mv643xx_eth_get_drvinfo(struct net_device *dev,
+ struct ethtool_drvinfo *drvinfo)
{
strncpy(drvinfo->driver, mv643xx_eth_driver_name, 32);
strncpy(drvinfo->version, mv643xx_eth_driver_version, 32);
strncpy(drvinfo->fw_version, "N/A", 32);
- strncpy(drvinfo->bus_info, "mv643xx", 32);
+ strncpy(drvinfo->bus_info, "platform", 32);
drvinfo->n_stats = ARRAY_SIZE(mv643xx_eth_stats);
}
-static int mv643xx_eth_nway_restart(struct net_device *dev)
+static int mv643xx_eth_nway_reset(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -974,33 +990,31 @@ static int mv643xx_eth_nway_restart(struct net_device *dev)
static u32 mv643xx_eth_get_link(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
-
return mii_link_ok(&mep->mii);
}
-static void mv643xx_eth_get_strings(struct net_device *netdev, uint32_t stringset,
- uint8_t *data)
+static void mv643xx_eth_get_strings(struct net_device *dev,
+ uint32_t stringset, uint8_t *data)
{
int i;
- switch(stringset) {
- case ETH_SS_STATS:
- for (i=0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
+ if (stringset == ETH_SS_STATS) {
+ for (i = 0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
memcpy(data + i * ETH_GSTRING_LEN,
mv643xx_eth_stats[i].stat_string,
ETH_GSTRING_LEN);
}
- break;
}
}
-static void mv643xx_eth_get_ethtool_stats(struct net_device *netdev,
- struct ethtool_stats *stats, uint64_t *data)
+static void mv643xx_eth_get_ethtool_stats(struct net_device *dev,
+ struct ethtool_stats *stats,
+ uint64_t *data)
{
- struct mv643xx_eth_private *mep = netdev->priv;
+ struct mv643xx_eth_private *mep = dev->priv;
int i;
- update_mib_counters(mep);
+ mib_counters_update(mep);
for (i = 0; i < ARRAY_SIZE(mv643xx_eth_stats); i++) {
const struct mv643xx_eth_stats *stat;
@@ -1018,38 +1032,35 @@ static void mv643xx_eth_get_ethtool_stats(struct net_device *netdev,
}
}
-static int mv643xx_eth_get_sset_count(struct net_device *netdev, int sset)
+static int mv643xx_eth_get_sset_count(struct net_device *dev, int sset)
{
- switch (sset) {
- case ETH_SS_STATS:
+ if (sset == ETH_SS_STATS)
return ARRAY_SIZE(mv643xx_eth_stats);
- default:
- return -EOPNOTSUPP;
- }
+
+ return -EOPNOTSUPP;
}
static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
- .get_settings = mv643xx_eth_get_settings,
- .set_settings = mv643xx_eth_set_settings,
- .get_drvinfo = mv643xx_eth_get_drvinfo,
- .get_link = mv643xx_eth_get_link,
+ .get_settings = mv643xx_eth_get_settings,
+ .set_settings = mv643xx_eth_set_settings,
+ .get_drvinfo = mv643xx_eth_get_drvinfo,
+ .nway_reset = mv643xx_eth_nway_reset,
+ .get_link = mv643xx_eth_get_link,
.set_sg = ethtool_op_set_sg,
+ .get_strings = mv643xx_eth_get_strings,
+ .get_ethtool_stats = mv643xx_eth_get_ethtool_stats,
.get_sset_count = mv643xx_eth_get_sset_count,
- .get_ethtool_stats = mv643xx_eth_get_ethtool_stats,
- .get_strings = mv643xx_eth_get_strings,
- .nway_reset = mv643xx_eth_nway_restart,
};
/* address handling *********************************************************/
static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *addr)
{
- unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
- mac_h = rdl(mep, MAC_ADDR_HIGH(port_num));
- mac_l = rdl(mep, MAC_ADDR_LOW(port_num));
+ mac_h = rdl(mep, MAC_ADDR_HIGH(mep->port_num));
+ mac_l = rdl(mep, MAC_ADDR_LOW(mep->port_num));
addr[0] = (mac_h >> 24) & 0xff;
addr[1] = (mac_h >> 16) & 0xff;
@@ -1061,72 +1072,54 @@ static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *addr)
static void init_mac_tables(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mep->port_num;
- int table_index;
-
- /* Clear DA filter unicast table (Ex_dFUT) */
- for (table_index = 0; table_index <= 0xC; table_index += 4)
- wrl(mep, UNICAST_TABLE(port_num) + table_index, 0);
+ int i;
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
- /* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0);
+ for (i = 0; i < 0x100; i += 4) {
+ wrl(mep, SPECIAL_MCAST_TABLE(mep->port_num) + i, 0);
+ wrl(mep, OTHER_MCAST_TABLE(mep->port_num) + i, 0);
}
+
+ for (i = 0; i < 0x10; i += 4)
+ wrl(mep, UNICAST_TABLE(mep->port_num) + i, 0);
}
static void set_filter_table_entry(struct mv643xx_eth_private *mep,
- int table, unsigned char entry)
+ int table, unsigned char entry)
{
unsigned int table_reg;
- unsigned int tbl_offset;
- unsigned int reg_offset;
-
- tbl_offset = (entry / 4) * 4; /* Register offset of DA table entry */
- reg_offset = entry % 4; /* Entry offset within the register */
/* Set "accepts frame bit" at specified table entry */
- table_reg = rdl(mep, table + tbl_offset);
- table_reg |= 0x01 << (8 * reg_offset);
- wrl(mep, table + tbl_offset, table_reg);
+ table_reg = rdl(mep, table + (entry & 0xfc));
+ table_reg |= 0x01 << (8 * (entry & 3));
+ wrl(mep, table + (entry & 0xfc), table_reg);
}
static void uc_addr_set(struct mv643xx_eth_private *mep, unsigned char *addr)
{
- unsigned int port_num = mep->port_num;
unsigned int mac_h;
unsigned int mac_l;
int table;
- mac_l = (addr[4] << 8) | (addr[5]);
- mac_h = (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) |
- (addr[3] << 0);
+ mac_l = (addr[4] << 8) | addr[5];
+ mac_h = (addr[0] << 24) | (addr[1] << 16) | (addr[2] << 8) | addr[3];
- wrl(mep, MAC_ADDR_LOW(port_num), mac_l);
- wrl(mep, MAC_ADDR_HIGH(port_num), mac_h);
+ wrl(mep, MAC_ADDR_LOW(mep->port_num), mac_l);
+ wrl(mep, MAC_ADDR_HIGH(mep->port_num), mac_h);
- /* Accept frames with this address */
- table = UNICAST_TABLE(port_num);
+ table = UNICAST_TABLE(mep->port_num);
set_filter_table_entry(mep, table, addr[5] & 0x0f);
}
-static void mv643xx_eth_update_mac_address(struct net_device *dev)
+static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
+ /* +2 is for the offset of the HW addr type */
+ memcpy(dev->dev_addr, addr + 2, 6);
+
init_mac_tables(mep);
uc_addr_set(mep, dev->dev_addr);
-}
-
-static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr)
-{
- int i;
- for (i = 0; i < 6; i++)
- /* +2 is for the offset of the HW addr type */
- dev->dev_addr[i] = ((unsigned char *)addr)[i + 2];
- mv643xx_eth_update_mac_address(dev);
return 0;
}
@@ -1148,95 +1141,53 @@ static int addr_crc(unsigned char *addr)
return crc;
}
-static void mc_addr(struct mv643xx_eth_private *mep, unsigned char *addr)
+static void mv643xx_eth_set_rx_mode(struct net_device *dev)
{
- unsigned int port_num = mep->port_num;
- int table;
- int crc;
-
- if ((addr[0] == 0x01) && (addr[1] == 0x00) &&
- (addr[2] == 0x5E) && (addr[3] == 0x00) && (addr[4] == 0x00)) {
- table = SPECIAL_MCAST_TABLE(port_num);
- set_filter_table_entry(mep, table, addr[5]);
- return;
- }
-
- crc = addr_crc(addr);
-
- table = OTHER_MCAST_TABLE(port_num);
- set_filter_table_entry(mep, table, crc);
-}
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+ u32 port_config;
+ struct dev_addr_list *addr;
+ int i;
-static void set_multicast_list(struct net_device *dev)
-{
+ port_config = rdl(mep, PORT_CONFIG(mep->port_num));
+ if (dev->flags & IFF_PROMISC)
+ port_config |= 0x00000001;
+ else
+ port_config &= ~0x00000001;
+ wrl(mep, PORT_CONFIG(mep->port_num), port_config);
- struct dev_mc_list *mc_list;
- int i;
- int table_index;
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- unsigned int port_num = mep->port_num;
+ if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) {
+ int port_num = mep->port_num;
+ u32 accept = 0x01010101;
- /* If the device is in promiscuous mode or in all multicast mode,
- * we will fully populate both multicast tables with accept.
- * This is guaranteed to yield a match on all multicast addresses...
- */
- if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) {
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Set all entries in DA filter special multicast
- * table (Ex_dFSMT)
- * Set for ETH_Q0 for now
- * Bits
- * 0 Accept=1, Drop=0
- * 3-1 Queue ETH_Q0=0
- * 7-4 Reserved = 0;
- */
- wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0x01010101);
-
- /* Set all entries in DA filter other multicast
- * table (Ex_dFOMT)
- * Set for ETH_Q0 for now
- * Bits
- * 0 Accept=1, Drop=0
- * 3-1 Queue ETH_Q0=0
- * 7-4 Reserved = 0;
- */
- wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0x01010101);
+ for (i = 0; i < 0x100; i += 4) {
+ wrl(mep, SPECIAL_MCAST_TABLE(port_num) + i, accept);
+ wrl(mep, OTHER_MCAST_TABLE(port_num) + i, accept);
}
return;
}
- /* We will clear out multicast tables every time we get the list.
- * Then add the entire new list...
- */
- for (table_index = 0; table_index <= 0xFC; table_index += 4) {
- /* Clear DA filter special multicast table (Ex_dFSMT) */
- wrl(mep, SPECIAL_MCAST_TABLE(port_num) + table_index, 0);
-
- /* Clear DA filter other multicast table (Ex_dFOMT) */
- wrl(mep, OTHER_MCAST_TABLE(port_num) + table_index, 0);
+ for (i = 0; i < 0x100; i += 4) {
+ wrl(mep, SPECIAL_MCAST_TABLE(mep->port_num) + i, 0);
+ wrl(mep, OTHER_MCAST_TABLE(mep->port_num) + i, 0);
}
- /* Get pointer to net_device multicast list and add each one... */
- for (i = 0, mc_list = dev->mc_list;
- (i < 256) && (mc_list != NULL) && (i < dev->mc_count);
- i++, mc_list = mc_list->next)
- if (mc_list->dmi_addrlen == 6)
- mc_addr(mep, mc_list->dmi_addr);
-}
+ for (addr = dev->mc_list; addr != NULL; addr = addr->next) {
+ u8 *a = addr->da_addr;
+ int table;
-static void mv643xx_eth_set_rx_mode(struct net_device *dev)
-{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- u32 config_reg;
+ if (addr->da_addrlen != 6)
+ continue;
- config_reg = rdl(mep, PORT_CONFIG(mep->port_num));
- if (dev->flags & IFF_PROMISC)
- config_reg |= 0x00000001;
- else
- config_reg &= ~0x00000001;
- wrl(mep, PORT_CONFIG(mep->port_num), config_reg);
+ if (memcmp(a, "\x01\x00\x5e\x00\x00", 5) == 0) {
+ table = SPECIAL_MCAST_TABLE(mep->port_num);
+ set_filter_table_entry(mep, table, a[5]);
+ } else {
+ int crc = addr_crc(a);
- set_multicast_list(dev);
+ table = OTHER_MCAST_TABLE(mep->port_num);
+ set_filter_table_entry(mep, table, crc);
+ }
+ }
}
@@ -1474,10 +1425,7 @@ static void txq_deinit(struct tx_queue *txq)
/* netdev ops and related ***************************************************/
-static void port_reset(struct mv643xx_eth_private *mep);
-
-static void mv643xx_eth_update_pscr(struct mv643xx_eth_private *mep,
- struct ethtool_cmd *ecmd)
+static void update_pscr(struct mv643xx_eth_private *mep, int speed, int duplex)
{
u32 pscr_o;
u32 pscr_n;
@@ -1490,15 +1438,15 @@ static void mv643xx_eth_update_pscr(struct mv643xx_eth_private *mep,
SET_FULL_DUPLEX_MODE |
MAX_RX_PACKET_MASK);
- if (ecmd->speed == SPEED_1000) {
+ if (speed == SPEED_1000) {
pscr_n |= SET_GMII_SPEED_TO_1000 | MAX_RX_PACKET_9700BYTE;
} else {
- if (ecmd->speed == SPEED_100)
+ if (speed == SPEED_100)
pscr_n |= SET_MII_SPEED_TO_100;
pscr_n |= MAX_RX_PACKET_1522BYTE;
}
- if (ecmd->duplex == DUPLEX_FULL)
+ if (duplex == DUPLEX_FULL)
pscr_n |= SET_FULL_DUPLEX_MODE;
if (pscr_n != pscr_o) {
@@ -1515,27 +1463,30 @@ static void mv643xx_eth_update_pscr(struct mv643xx_eth_private *mep,
}
}
-static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
+static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct mv643xx_eth_private *mep = netdev_priv(dev);
- u32 int_cause, int_cause_ext = 0;
+ u32 int_cause;
+ u32 int_cause_ext;
- /* Read interrupt cause registers */
int_cause = rdl(mep, INT_CAUSE(mep->port_num)) & (INT_RX | INT_EXT);
+ if (int_cause == 0)
+ return IRQ_NONE;
+
+ int_cause_ext = 0;
if (int_cause & INT_EXT) {
int_cause_ext = rdl(mep, INT_CAUSE_EXT(mep->port_num))
& (INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
wrl(mep, INT_CAUSE_EXT(mep->port_num), ~int_cause_ext);
}
- /* PHY status changed */
- if (int_cause_ext & (INT_EXT_LINK | INT_EXT_PHY)) {
+ if (int_cause_ext & (INT_EXT_PHY | INT_EXT_LINK)) {
if (mii_link_ok(&mep->mii)) {
struct ethtool_cmd cmd;
mii_ethtool_gset(&mep->mii, &cmd);
- mv643xx_eth_update_pscr(mep, &cmd);
+ update_pscr(mep, cmd.speed, cmd.duplex);
txq_enable(mep->txq);
if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev);
@@ -1549,10 +1500,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
#ifdef MV643XX_ETH_NAPI
if (int_cause & INT_RX) {
- /* schedule the NAPI poll routine to maintain port */
wrl(mep, INT_MASK(mep->port_num), 0x00000000);
-
- /* wait for previous write to complete */
rdl(mep, INT_MASK(mep->port_num));
netif_rx_schedule(dev, &mep->napi);
@@ -1561,40 +1509,31 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
if (int_cause & INT_RX)
rxq_process(mep->rxq, INT_MAX);
#endif
+
if (int_cause_ext & INT_EXT_TX) {
txq_reclaim(mep->txq, 0);
__txq_maybe_wake(mep->txq);
}
- /*
- * If no real interrupt occured, exit.
- * This can happen when using gigE interrupt coalescing mechanism.
- */
- if ((int_cause == 0x0) && (int_cause_ext == 0x0))
- return IRQ_NONE;
-
return IRQ_HANDLED;
}
static void phy_reset(struct mv643xx_eth_private *mep)
{
- unsigned int phy_reg_data;
+ unsigned int data;
- /* Reset the PHY */
- read_smi_reg(mep, 0, &phy_reg_data);
- phy_reg_data |= 0x8000; /* Set bit 15 to reset the PHY */
- write_smi_reg(mep, 0, phy_reg_data);
+ smi_reg_read(mep, mep->phy_addr, 0, &data);
+ data |= 0x8000;
+ smi_reg_write(mep, mep->phy_addr, 0, data);
- /* wait for PHY to come out of reset */
do {
udelay(1);
- read_smi_reg(mep, 0, &phy_reg_data);
- } while (phy_reg_data & 0x8000);
+ smi_reg_read(mep, mep->phy_addr, 0, &data);
+ } while (data & 0x8000);
}
-static void port_start(struct net_device *dev)
+static void port_start(struct mv643xx_eth_private *mep)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
u32 pscr;
struct ethtool_cmd ethtool_cmd;
int i;
@@ -1616,9 +1555,9 @@ static void port_start(struct net_device *dev)
wrl(mep, SDMA_CONFIG(mep->port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
- mv643xx_eth_get_settings(dev, ðtool_cmd);
+ mv643xx_eth_get_settings(mep->dev, ðtool_cmd);
phy_reset(mep);
- mv643xx_eth_set_settings(dev, ðtool_cmd);
+ mv643xx_eth_set_settings(mep->dev, ðtool_cmd);
/*
* Configure TX path and queues.
@@ -1634,8 +1573,10 @@ static void port_start(struct net_device *dev)
wrl(mep, off, addr);
}
- /* Add the assigned Ethernet address to the port's address table */
- uc_addr_set(mep, dev->dev_addr);
+ /*
+ * Add configured unicast address to address filter table.
+ */
+ uc_addr_set(mep, mep->dev->dev_addr);
/*
* Receive all unmatched unicast, TCP, UDP, BPDU and broadcast
@@ -1666,13 +1607,14 @@ static void port_start(struct net_device *dev)
static void set_rx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
{
- unsigned int port_num = mep->port_num;
unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
- /* Set RX Coalescing mechanism */
- wrl(mep, SDMA_CONFIG(port_num),
+ if (coal > 0x3fff)
+ coal = 0x3fff;
+
+ wrl(mep, SDMA_CONFIG(mep->port_num),
((coal & 0x3fff) << 8) |
- (rdl(mep, SDMA_CONFIG(port_num))
+ (rdl(mep, SDMA_CONFIG(mep->port_num))
& 0xffc000ff));
}
@@ -1680,68 +1622,59 @@ static void set_tx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
{
unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
- /* Set TX Coalescing mechanism */
- wrl(mep, TX_FIFO_URGENT_THRESHOLD(mep->port_num), coal << 4);
-}
-
-static void port_init(struct mv643xx_eth_private *mep)
-{
- port_reset(mep);
-
- init_mac_tables(mep);
+ if (coal > 0x3fff)
+ coal = 0x3fff;
+ wrl(mep, TX_FIFO_URGENT_THRESHOLD(mep->port_num), (coal & 0x3fff) << 4);
}
static int mv643xx_eth_open(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- unsigned int port_num = mep->port_num;
int err;
- /* Clear any pending ethernet port interrupts */
- wrl(mep, INT_CAUSE(port_num), 0);
- wrl(mep, INT_CAUSE_EXT(port_num), 0);
- /* wait for previous write to complete */
- rdl(mep, INT_CAUSE_EXT(port_num));
+ wrl(mep, INT_CAUSE(mep->port_num), 0);
+ wrl(mep, INT_CAUSE_EXT(mep->port_num), 0);
+ rdl(mep, INT_CAUSE_EXT(mep->port_num));
- err = request_irq(dev->irq, mv643xx_eth_int_handler,
- IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
+ err = request_irq(dev->irq, mv643xx_eth_irq,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+ dev->name, dev);
if (err) {
- printk(KERN_ERR "%s: Can not assign IRQ\n", dev->name);
+ dev_printk(KERN_ERR, &dev->dev, "can't assign irq\n");
return -EAGAIN;
}
- port_init(mep);
+ init_mac_tables(mep);
err = rxq_init(mep);
if (err)
- goto out_free_irq;
+ goto out;
rxq_refill(mep->rxq);
err = txq_init(mep);
if (err)
- goto out_free_rx_skb;
+ goto out_free;
#ifdef MV643XX_ETH_NAPI
napi_enable(&mep->napi);
#endif
- port_start(dev);
+ port_start(mep);
set_rx_coal(mep, 0);
set_tx_coal(mep, 0);
- /* Unmask phy and link status changes interrupts */
- wrl(mep, INT_MASK_EXT(port_num), INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
+ wrl(mep, INT_MASK_EXT(mep->port_num),
+ INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
- /* Unmask RX buffer and TX end interrupt */
- wrl(mep, INT_MASK(port_num), INT_RX | INT_EXT);
+ wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_EXT);
return 0;
-out_free_rx_skb:
+out_free:
rxq_deinit(mep->rxq);
-out_free_irq:
+out:
free_irq(dev->irq, dev);
return err;
@@ -1749,34 +1682,27 @@ out_free_irq:
static void port_reset(struct mv643xx_eth_private *mep)
{
- unsigned int port_num = mep->port_num;
- unsigned int reg_data;
+ unsigned int data;
txq_disable(mep->txq);
rxq_disable(mep->rxq);
while (!(rdl(mep, PORT_STATUS(mep->port_num)) & TX_FIFO_EMPTY))
udelay(10);
- /* Clear all MIB counters */
- clear_mib_counters(mep);
-
/* Reset the Enable bit in the Configuration Register */
- reg_data = rdl(mep, PORT_SERIAL_CONTROL(port_num));
- reg_data &= ~(SERIAL_PORT_ENABLE |
- DO_NOT_FORCE_LINK_FAIL |
- FORCE_LINK_PASS);
- wrl(mep, PORT_SERIAL_CONTROL(port_num), reg_data);
+ data = rdl(mep, PORT_SERIAL_CONTROL(mep->port_num));
+ data &= ~(SERIAL_PORT_ENABLE |
+ DO_NOT_FORCE_LINK_FAIL |
+ FORCE_LINK_PASS);
+ wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), data);
}
static int mv643xx_eth_stop(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- unsigned int port_num = mep->port_num;
- /* Mask all interrupts on ethernet port */
- wrl(mep, INT_MASK(port_num), 0x00000000);
- /* wait for previous write to complete */
- rdl(mep, INT_MASK(port_num));
+ wrl(mep, INT_MASK(mep->port_num), 0x00000000);
+ rdl(mep, INT_MASK(mep->port_num));
#ifdef MV643XX_ETH_NAPI
napi_disable(&mep->napi);
@@ -1784,17 +1710,18 @@ static int mv643xx_eth_stop(struct net_device *dev)
netif_carrier_off(dev);
netif_stop_queue(dev);
+ free_irq(dev->irq, dev);
+
port_reset(mep);
+ mib_counters_update(mep);
txq_deinit(mep->txq);
rxq_deinit(mep->rxq);
- free_irq(dev->irq, dev);
-
return 0;
}
-static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -1803,7 +1730,7 @@ static int mv643xx_eth_do_ioctl(struct net_device *dev, struct ifreq *ifr, int c
static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
{
- if ((new_mtu > 9500) || (new_mtu < 64))
+ if (new_mtu < 64 || new_mtu > 9500)
return -EINVAL;
dev->mtu = new_mtu;
@@ -1814,73 +1741,70 @@ static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
* Stop and then re-open the interface. This will allocate RX
* skbs of the new MTU.
* There is a possible danger that the open will not succeed,
- * due to memory being full, which might fail the open function.
+ * due to memory being full.
*/
mv643xx_eth_stop(dev);
if (mv643xx_eth_open(dev)) {
- printk(KERN_ERR "%s: Fatal error on opening device\n",
- dev->name);
+ dev_printk(KERN_ERR, &dev->dev,
+ "fatal error on re-opening device after "
+ "MTU change\n");
}
return 0;
}
-static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
+static void tx_timeout_task(struct work_struct *ugly)
{
- struct mv643xx_eth_private *mep = container_of(ugly, struct mv643xx_eth_private,
- tx_timeout_task);
- struct net_device *dev = mep->dev;
-
- if (!netif_running(dev))
- return;
+ struct mv643xx_eth_private *mep;
- netif_stop_queue(dev);
+ mep = container_of(ugly, struct mv643xx_eth_private, tx_timeout_task);
+ if (netif_running(mep->dev)) {
+ netif_stop_queue(mep->dev);
- port_reset(mep);
- port_start(dev);
+ port_reset(mep);
+ port_start(mep);
- __txq_maybe_wake(mep->txq);
+ __txq_maybe_wake(mep->txq);
+ }
}
static void mv643xx_eth_tx_timeout(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- printk(KERN_INFO "%s: TX timeout ", dev->name);
+ dev_printk(KERN_INFO, &dev->dev, "tx timeout\n");
- /* Do the reset outside of interrupt context */
schedule_work(&mep->tx_timeout_task);
}
#ifdef CONFIG_NET_POLL_CONTROLLER
-static void mv643xx_eth_netpoll(struct net_device *netdev)
+static void mv643xx_eth_netpoll(struct net_device *dev)
{
- struct mv643xx_eth_private *mep = netdev_priv(netdev);
- int port_num = mep->port_num;
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
- wrl(mep, INT_MASK(port_num), 0x00000000);
- /* wait for previous write to complete */
- rdl(mep, INT_MASK(port_num));
+ wrl(mep, INT_MASK(mep->port_num), 0x00000000);
+ rdl(mep, INT_MASK(mep->port_num));
- mv643xx_eth_int_handler(netdev->irq, netdev);
+ mv643xx_eth_irq(dev->irq, dev);
- wrl(mep, INT_MASK(port_num), INT_RX | INT_CAUSE_EXT);
+ wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_CAUSE_EXT);
}
#endif
-static int mv643xx_eth_mdio_read(struct net_device *dev, int phy_id, int location)
+static int mv643xx_eth_mdio_read(struct net_device *dev, int addr, int reg)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
int val;
- read_smi_reg(mep, location, &val);
+ smi_reg_read(mep, addr, reg, &val);
+
return val;
}
-static void mv643xx_eth_mdio_write(struct net_device *dev, int phy_id, int location, int val)
+static void mv643xx_eth_mdio_write(struct net_device *dev, int addr, int reg, int val)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- write_smi_reg(mep, location, val);
+ smi_reg_write(mep, addr, reg, val);
}
@@ -1947,9 +1871,6 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
goto out_free;
spin_lock_init(&mesp->phy_lock);
- mesp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
-
- platform_set_drvdata(pdev, mesp);
/*
* (Re-)program MBUS remapping windows if we are asked to.
@@ -1957,6 +1878,13 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
if (pd != NULL && pd->dram != NULL)
mv643xx_eth_conf_mbus_windows(mesp, pd->dram);
+ /*
+ * Detect hardware parameters.
+ */
+ mesp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
+
+ platform_set_drvdata(pdev, mesp);
+
return 0;
out_free:
@@ -1976,104 +1904,158 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev)
}
static struct platform_driver mv643xx_eth_shared_driver = {
- .probe = mv643xx_eth_shared_probe,
- .remove = mv643xx_eth_shared_remove,
+ .probe = mv643xx_eth_shared_probe,
+ .remove = mv643xx_eth_shared_remove,
.driver = {
- .name = MV643XX_ETH_SHARED_NAME,
+ .name = MV643XX_ETH_SHARED_NAME,
.owner = THIS_MODULE,
},
};
static void phy_addr_set(struct mv643xx_eth_private *mep, int phy_addr)
{
- u32 reg_data;
int addr_shift = 5 * mep->port_num;
+ u32 data;
- reg_data = rdl(mep, PHY_ADDR);
- reg_data &= ~(0x1f << addr_shift);
- reg_data |= (phy_addr & 0x1f) << addr_shift;
- wrl(mep, PHY_ADDR, reg_data);
+ data = rdl(mep, PHY_ADDR);
+ data &= ~(0x1f << addr_shift);
+ data |= (phy_addr & 0x1f) << addr_shift;
+ wrl(mep, PHY_ADDR, data);
}
static int phy_addr_get(struct mv643xx_eth_private *mep)
{
- unsigned int reg_data;
+ unsigned int data;
+
+ data = rdl(mep, PHY_ADDR);
+
+ return (data >> (5 * mep->port_num)) & 0x1f;
+}
+
+static void set_params(struct mv643xx_eth_private *mep,
+ struct mv643xx_eth_platform_data *pd)
+{
+ struct net_device *dev = mep->dev;
+
+ if (is_valid_ether_addr(pd->mac_addr))
+ memcpy(dev->dev_addr, pd->mac_addr, 6);
+ else
+ uc_addr_get(mep, dev->dev_addr);
+
+ if (pd->phy_addr == -1) {
+ mep->shared_smi = NULL;
+ mep->phy_addr = -1;
+ } else {
+ mep->shared_smi = mep->shared;
+ if (pd->shared_smi != NULL)
+ mep->shared_smi = platform_get_drvdata(pd->shared_smi);
+
+ if (pd->force_phy_addr || pd->phy_addr) {
+ mep->phy_addr = pd->phy_addr & 0x3f;
+ phy_addr_set(mep, mep->phy_addr);
+ } else {
+ mep->phy_addr = phy_addr_get(mep);
+ }
+ }
- reg_data = rdl(mep, PHY_ADDR);
+ mep->default_rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
+ if (pd->rx_queue_size)
+ mep->default_rx_ring_size = pd->rx_queue_size;
+ mep->rx_desc_sram_addr = pd->rx_sram_addr;
+ mep->rx_desc_sram_size = pd->rx_sram_size;
- return ((reg_data >> (5 * mep->port_num)) & 0x1f);
+ mep->default_tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
+ if (pd->tx_queue_size)
+ mep->default_tx_ring_size = pd->tx_queue_size;
+ mep->tx_desc_sram_addr = pd->tx_sram_addr;
+ mep->tx_desc_sram_size = pd->tx_sram_size;
}
static int phy_detect(struct mv643xx_eth_private *mep)
{
- unsigned int phy_reg_data0;
- int auto_neg;
+ unsigned int data;
+ unsigned int data2;
+
+ smi_reg_read(mep, mep->phy_addr, 0, &data);
+ smi_reg_write(mep, mep->phy_addr, 0, data ^ 0x1000);
- read_smi_reg(mep, 0, &phy_reg_data0);
- auto_neg = phy_reg_data0 & 0x1000;
- phy_reg_data0 ^= 0x1000; /* invert auto_neg */
- write_smi_reg(mep, 0, phy_reg_data0);
+ smi_reg_read(mep, mep->phy_addr, 0, &data2);
+ if (((data ^ data2) & 0x1000) == 0)
+ return -ENODEV;
- read_smi_reg(mep, 0, &phy_reg_data0);
- if ((phy_reg_data0 & 0x1000) == auto_neg)
- return -ENODEV; /* change didn't take */
+ smi_reg_write(mep, mep->phy_addr, 0, data);
- phy_reg_data0 ^= 0x1000;
- write_smi_reg(mep, 0, phy_reg_data0);
return 0;
}
-static void mv643xx_init_ethtool_cmd(struct net_device *dev, int phy_address,
- int speed, int duplex,
- struct ethtool_cmd *cmd)
+static int phy_init(struct mv643xx_eth_private *mep,
+ struct mv643xx_eth_platform_data *pd)
{
- struct mv643xx_eth_private *mep = netdev_priv(dev);
+ struct ethtool_cmd cmd;
+ int err;
- memset(cmd, 0, sizeof(*cmd));
+ err = phy_detect(mep);
+ if (err) {
+ dev_printk(KERN_INFO, &mep->dev->dev,
+ "no PHY detected at addr %d\n", mep->phy_addr);
+ return err;
+ }
+ phy_reset(mep);
+
+ mep->mii.phy_id = mep->phy_addr;
+ mep->mii.phy_id_mask = 0x3f;
+ mep->mii.reg_num_mask = 0x1f;
+ mep->mii.dev = mep->dev;
+ mep->mii.mdio_read = mv643xx_eth_mdio_read;
+ mep->mii.mdio_write = mv643xx_eth_mdio_write;
- cmd->port = PORT_MII;
- cmd->transceiver = XCVR_INTERNAL;
- cmd->phy_address = phy_address;
+ mep->mii.supports_gmii = mii_check_gmii_support(&mep->mii);
- if (speed == 0) {
- cmd->autoneg = AUTONEG_ENABLE;
- /* mii lib checks, but doesn't use speed on AUTONEG_ENABLE */
- cmd->speed = SPEED_100;
- cmd->advertising = ADVERTISED_10baseT_Half |
- ADVERTISED_10baseT_Full |
- ADVERTISED_100baseT_Half |
- ADVERTISED_100baseT_Full;
+ memset(&cmd, 0, sizeof(cmd));
+
+ cmd.port = PORT_MII;
+ cmd.transceiver = XCVR_INTERNAL;
+ cmd.phy_address = mep->phy_addr;
+ if (pd->speed == 0) {
+ cmd.autoneg = AUTONEG_ENABLE;
+ cmd.speed = SPEED_100;
+ cmd.advertising = ADVERTISED_10baseT_Half |
+ ADVERTISED_10baseT_Full |
+ ADVERTISED_100baseT_Half |
+ ADVERTISED_100baseT_Full;
if (mep->mii.supports_gmii)
- cmd->advertising |= ADVERTISED_1000baseT_Full;
+ cmd.advertising |= ADVERTISED_1000baseT_Full;
} else {
- cmd->autoneg = AUTONEG_DISABLE;
- cmd->speed = speed;
- cmd->duplex = duplex;
+ cmd.autoneg = AUTONEG_DISABLE;
+ cmd.speed = pd->speed;
+ cmd.duplex = pd->duplex;
}
+
+ update_pscr(mep, cmd.speed, cmd.duplex);
+ mv643xx_eth_set_settings(mep->dev, &cmd);
+
+ return 0;
}
static int mv643xx_eth_probe(struct platform_device *pdev)
{
struct mv643xx_eth_platform_data *pd;
- int port_num;
struct mv643xx_eth_private *mep;
struct net_device *dev;
- u8 *p;
struct resource *res;
- int err;
- struct ethtool_cmd cmd;
- int duplex = DUPLEX_HALF;
- int speed = 0; /* default to auto-negotiation */
DECLARE_MAC_BUF(mac);
+ int err;
pd = pdev->dev.platform_data;
if (pd == NULL) {
- printk(KERN_ERR "No mv643xx_eth_platform_data\n");
+ dev_printk(KERN_ERR, &pdev->dev,
+ "no mv643xx_eth_platform_data\n");
return -ENODEV;
}
if (pd->shared == NULL) {
- printk(KERN_ERR "No mv643xx_eth_platform_data->shared\n");
+ dev_printk(KERN_ERR, &pdev->dev,
+ "no mv643xx_eth_platform_data->shared\n");
return -ENODEV;
}
@@ -2081,145 +2063,80 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
if (!dev)
return -ENOMEM;
- platform_set_drvdata(pdev, dev);
-
mep = netdev_priv(dev);
+ platform_set_drvdata(pdev, mep);
+
+ mep->shared = platform_get_drvdata(pd->shared);
+ mep->port_num = pd->port_number;
+
mep->dev = dev;
#ifdef MV643XX_ETH_NAPI
netif_napi_add(dev, &mep->napi, mv643xx_eth_poll, 64);
#endif
+ set_params(mep, pd);
+
+ spin_lock_init(&mep->lock);
+
+ mib_counters_clear(mep);
+ INIT_WORK(&mep->tx_timeout_task, tx_timeout_task);
+
+ err = phy_init(mep, pd);
+ if (err)
+ goto out;
+ SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
+
+
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
BUG_ON(!res);
dev->irq = res->start;
+ dev->hard_start_xmit = mv643xx_eth_xmit;
dev->open = mv643xx_eth_open;
dev->stop = mv643xx_eth_stop;
- dev->hard_start_xmit = mv643xx_eth_start_xmit;
- dev->set_mac_address = mv643xx_eth_set_mac_address;
dev->set_multicast_list = mv643xx_eth_set_rx_mode;
-
- /* No need to Tx Timeout */
+ dev->set_mac_address = mv643xx_eth_set_mac_address;
+ dev->do_ioctl = mv643xx_eth_ioctl;
+ dev->change_mtu = mv643xx_eth_change_mtu;
dev->tx_timeout = mv643xx_eth_tx_timeout;
-
#ifdef CONFIG_NET_POLL_CONTROLLER
dev->poll_controller = mv643xx_eth_netpoll;
#endif
-
dev->watchdog_timeo = 2 * HZ;
dev->base_addr = 0;
- dev->change_mtu = mv643xx_eth_change_mtu;
- dev->do_ioctl = mv643xx_eth_do_ioctl;
- SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
-#ifdef MAX_SKB_FRAGS
/*
* Zero copy can only work if we use Discovery II memory. Else, we will
* have to map the buffers to ISA memory which is only 16 MB
*/
dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
#endif
-#endif
- /* Configure the timeout task */
- INIT_WORK(&mep->tx_timeout_task, mv643xx_eth_tx_timeout_task);
-
- spin_lock_init(&mep->lock);
-
- mep->shared = platform_get_drvdata(pd->shared);
- port_num = mep->port_num = pd->port_number;
+ SET_NETDEV_DEV(dev, &pdev->dev);
if (mep->shared->win_protect)
- wrl(mep, WINDOW_PROTECT(port_num), mep->shared->win_protect);
-
- mep->shared_smi = mep->shared;
- if (pd->shared_smi != NULL)
- mep->shared_smi = platform_get_drvdata(pd->shared_smi);
-
- /* set default config values */
- uc_addr_get(mep, dev->dev_addr);
-
- if (is_valid_ether_addr(pd->mac_addr))
- memcpy(dev->dev_addr, pd->mac_addr, 6);
-
- if (pd->phy_addr || pd->force_phy_addr)
- phy_addr_set(mep, pd->phy_addr);
-
- mep->default_rx_ring_size = DEFAULT_RX_QUEUE_SIZE;
- if (pd->rx_queue_size)
- mep->default_rx_ring_size = pd->rx_queue_size;
-
- mep->default_tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
- if (pd->tx_queue_size)
- mep->default_tx_ring_size = pd->tx_queue_size;
-
- if (pd->tx_sram_size) {
- mep->tx_desc_sram_size = pd->tx_sram_size;
- mep->tx_desc_sram_addr = pd->tx_sram_addr;
- }
-
- if (pd->rx_sram_size) {
- mep->rx_desc_sram_addr = pd->rx_sram_addr;
- mep->rx_desc_sram_size = pd->rx_sram_size;
- }
-
- duplex = pd->duplex;
- speed = pd->speed;
+ wrl(mep, WINDOW_PROTECT(mep->port_num), mep->shared->win_protect);
- /* Hook up MII support for ethtool */
- mep->mii.dev = dev;
- mep->mii.mdio_read = mv643xx_eth_mdio_read;
- mep->mii.mdio_write = mv643xx_eth_mdio_write;
- mep->mii.phy_id = phy_addr_get(mep);
- mep->mii.phy_id_mask = 0x3f;
- mep->mii.reg_num_mask = 0x1f;
-
- err = phy_detect(mep);
- if (err) {
- pr_debug("%s: No PHY detected at addr %d\n",
- dev->name, phy_addr_get(mep));
- goto out;
- }
-
- phy_reset(mep);
- mep->mii.supports_gmii = mii_check_gmii_support(&mep->mii);
- mv643xx_init_ethtool_cmd(dev, mep->mii.phy_id, speed, duplex, &cmd);
- mv643xx_eth_update_pscr(mep, &cmd);
- mv643xx_eth_set_settings(dev, &cmd);
-
- SET_NETDEV_DEV(dev, &pdev->dev);
err = register_netdev(dev);
if (err)
goto out;
- p = dev->dev_addr;
- printk(KERN_NOTICE
- "%s: port %d with MAC address %s\n",
- dev->name, port_num, print_mac(mac, p));
+ dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %s\n",
+ mep->port_num, print_mac(mac, dev->dev_addr));
if (dev->features & NETIF_F_SG)
- printk(KERN_NOTICE "%s: Scatter Gather Enabled\n", dev->name);
+ dev_printk(KERN_NOTICE, &dev->dev, "scatter/gather enabled\n");
if (dev->features & NETIF_F_IP_CSUM)
- printk(KERN_NOTICE "%s: TX TCP/IP Checksumming Supported\n",
- dev->name);
-
-#ifdef MV643XX_ETH_CHECKSUM_OFFLOAD_TX
- printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
-#endif
-
-#ifdef MV643XX_ETH_COAL
- printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
- dev->name);
-#endif
+ dev_printk(KERN_NOTICE, &dev->dev, "tx checksum offload\n");
#ifdef MV643XX_ETH_NAPI
- printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
+ dev_printk(KERN_NOTICE, &dev->dev, "napi enabled\n");
#endif
if (mep->tx_desc_sram_size > 0)
- printk(KERN_NOTICE "%s: Using SRAM\n", dev->name);
+ dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");
return 0;
@@ -2231,35 +2148,35 @@ out:
static int mv643xx_eth_remove(struct platform_device *pdev)
{
- struct net_device *dev = platform_get_drvdata(pdev);
+ struct mv643xx_eth_private *mep = platform_get_drvdata(pdev);
- unregister_netdev(dev);
+ unregister_netdev(mep->dev);
flush_scheduled_work();
+ free_netdev(mep->dev);
- free_netdev(dev);
platform_set_drvdata(pdev, NULL);
+
return 0;
}
static void mv643xx_eth_shutdown(struct platform_device *pdev)
{
- struct net_device *dev = platform_get_drvdata(pdev);
- struct mv643xx_eth_private *mep = netdev_priv(dev);
- unsigned int port_num = mep->port_num;
+ struct mv643xx_eth_private *mep = platform_get_drvdata(pdev);
/* Mask all interrupts on ethernet port */
- wrl(mep, INT_MASK(port_num), 0);
- rdl(mep, INT_MASK(port_num));
+ wrl(mep, INT_MASK(mep->port_num), 0);
+ rdl(mep, INT_MASK(mep->port_num));
- port_reset(mep);
+ if (netif_running(mep->dev))
+ port_reset(mep);
}
static struct platform_driver mv643xx_eth_driver = {
- .probe = mv643xx_eth_probe,
- .remove = mv643xx_eth_remove,
- .shutdown = mv643xx_eth_shutdown,
+ .probe = mv643xx_eth_probe,
+ .remove = mv643xx_eth_remove,
+ .shutdown = mv643xx_eth_shutdown,
.driver = {
- .name = MV643XX_ETH_NAME,
+ .name = MV643XX_ETH_NAME,
.owner = THIS_MODULE,
},
};
@@ -2274,21 +2191,21 @@ static int __init mv643xx_eth_init_module(void)
if (rc)
platform_driver_unregister(&mv643xx_eth_shared_driver);
}
+
return rc;
}
+module_init(mv643xx_eth_init_module);
static void __exit mv643xx_eth_cleanup_module(void)
{
platform_driver_unregister(&mv643xx_eth_driver);
platform_driver_unregister(&mv643xx_eth_shared_driver);
}
-
-module_init(mv643xx_eth_init_module);
module_exit(mv643xx_eth_cleanup_module);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani"
- " and Dale Farnsworth");
+MODULE_AUTHOR("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani "
+ "and Dale Farnsworth");
MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
-MODULE_ALIAS("platform:" MV643XX_ETH_NAME);
+MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" MV643XX_ETH_SHARED_NAME);
+MODULE_ALIAS("platform:" MV643XX_ETH_NAME);
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index a15cdd4..6461776 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -17,30 +17,53 @@
struct mv643xx_eth_shared_platform_data {
struct mbus_dram_target_info *dram;
- unsigned int t_clk;
+ unsigned int t_clk;
};
struct mv643xx_eth_platform_data {
+ /*
+ * Pointer back to our parent instance, and our port number.
+ */
struct platform_device *shared;
- int port_number;
+ int port_number;
+ /*
+ * Whether a PHY is present, and if yes, at which address.
+ */
struct platform_device *shared_smi;
+ int force_phy_addr;
+ int phy_addr;
- u16 force_phy_addr; /* force override if phy_addr == 0 */
- u16 phy_addr;
-
- /* If speed is 0, then speed and duplex are autonegotiated. */
- int speed; /* 0, SPEED_10, SPEED_100, SPEED_1000 */
- int duplex; /* DUPLEX_HALF or DUPLEX_FULL */
-
- /* non-zero values of the following fields override defaults */
- u32 tx_queue_size;
- u32 rx_queue_size;
- u32 tx_sram_addr;
- u32 tx_sram_size;
- u32 rx_sram_addr;
- u32 rx_sram_size;
- u8 mac_addr[6]; /* mac address if non-zero*/
+ /*
+ * Use this MAC address if it is valid, overriding the
+ * address that is already in the hardware.
+ */
+ u8 mac_addr[6];
+
+ /*
+ * If speed is 0, autonegotiation is enabled.
+ * Valid values for speed: 0, SPEED_10, SPEED_100, SPEED_1000.
+ * Valid values for duplex: DUPLEX_HALF, DUPLEX_FULL.
+ */
+ int speed;
+ int duplex;
+
+ /*
+ * Override default RX/TX queue sizes if nonzero.
+ */
+ int rx_queue_size;
+ int tx_queue_size;
+
+ /*
+ * Use on-chip SRAM for RX/TX descriptors if size is nonzero
+ * and sufficient to contain all descriptors for the requested
+ * ring sizes.
+ */
+ unsigned long rx_sram_addr;
+ int rx_sram_size;
+ unsigned long tx_sram_addr;
+ int tx_sram_size;
};
-#endif /* __LINUX_MV643XX_ETH_H */
+
+#endif
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 29/39] mv643xx_eth: general cleanup
2008-06-03 11:02 ` [PATCH 29/39] mv643xx_eth: general cleanup Lennert Buytenhek
@ 2008-06-05 12:33 ` Dale Farnsworth
2008-06-06 8:24 ` Lennert Buytenhek
0 siblings, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:33 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:44PM +0200, Lennert Buytenhek wrote:
> General cleanup of the mv643xx_eth driver. Mainly fixes coding
> style / indentation issues, get rid of some useless 'volatile's,
> kill some more superfluous comments, and such.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 939 ++++++++++++++++++++-----------------------
> include/linux/mv643xx_eth.h | 59 ++-
> 2 files changed, 469 insertions(+), 529 deletions(-)
[snip]
> @@ -441,7 +445,7 @@ static void rxq_refill(struct rx_queue *rxq)
> RX_ENABLE_INTERRUPT;
> wmb();
>
> - skb_reserve(skb, ETH_HW_IP_ALIGN);
> + skb_reserve(skb, 2);
I think you've removed some useful documentation here. Either keep the
define or add a comment explaining what the 2 is for.
> }
>
> if (rxq->rx_desc_count == 0) {
[snip]
> @@ -498,24 +502,26 @@ static int rxq_process(struct rx_queue *rxq, int budget)
> * Note byte count includes 4 byte CRC count
> */
> stats->rx_packets++;
> - stats->rx_bytes += rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
> + stats->rx_bytes += rx_desc->byte_cnt - 2;
Same comment here.
> /*
> - * In case received a packet without first / last bits on OR
> - * the error summary bit is on, the packets needs to be dropeed.
> + * In case we received a packet without first / last bits
> + * on, or the error summary bit is set, the packet needs
> + * to be dropped.
> */
> if (((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
> (RX_FIRST_DESC | RX_LAST_DESC))
> || (cmd_sts & ERROR_SUMMARY)) {
> stats->rx_dropped++;
> +
> if ((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
> (RX_FIRST_DESC | RX_LAST_DESC)) {
> if (net_ratelimit())
> - printk(KERN_ERR
> - "%s: Received packet spread "
> - "on multiple descriptors\n",
> - mep->dev->name);
> + dev_printk(KERN_ERR, &mep->dev->dev,
> + "received packet spanning "
> + "multiple descriptors\n");
> }
> +
> if (cmd_sts & ERROR_SUMMARY)
> stats->rx_errors++;
>
[snip]
> @@ -974,33 +990,31 @@ static int mv643xx_eth_nway_restart(struct net_device *dev)
> static u32 mv643xx_eth_get_link(struct net_device *dev)
> {
> struct mv643xx_eth_private *mep = netdev_priv(dev);
> -
> return mii_link_ok(&mep->mii);
> }
Keep the blank line, IMHO.
[snip]
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread* Re: [PATCH 29/39] mv643xx_eth: general cleanup
2008-06-05 12:33 ` Dale Farnsworth
@ 2008-06-06 8:24 ` Lennert Buytenhek
2008-06-06 10:59 ` Dale Farnsworth
0 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-06 8:24 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 05:33:06AM -0700, Dale Farnsworth wrote:
> > @@ -441,7 +445,7 @@ static void rxq_refill(struct rx_queue *rxq)
> > RX_ENABLE_INTERRUPT;
> > wmb();
> >
> > - skb_reserve(skb, ETH_HW_IP_ALIGN);
> > + skb_reserve(skb, 2);
>
> I think you've removed some useful documentation here. Either keep the
> define or add a comment explaining what the 2 is for.
>
> > }
> >
> > if (rxq->rx_desc_count == 0) {
>
> [snip]
>
> > @@ -498,24 +502,26 @@ static int rxq_process(struct rx_queue *rxq, int budget)
> > * Note byte count includes 4 byte CRC count
> > */
> > stats->rx_packets++;
> > - stats->rx_bytes += rx_desc->byte_cnt - ETH_HW_IP_ALIGN;
> > + stats->rx_bytes += rx_desc->byte_cnt - 2;
>
> Same comment here.
>
> > /*
> > - * In case received a packet without first / last bits on OR
> > - * the error summary bit is on, the packets needs to be dropeed.
> > + * In case we received a packet without first / last bits
> > + * on, or the error summary bit is set, the packet needs
> > + * to be dropped.
> > */
> > if (((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
> > (RX_FIRST_DESC | RX_LAST_DESC))
> > || (cmd_sts & ERROR_SUMMARY)) {
> > stats->rx_dropped++;
> > +
> > if ((cmd_sts & (RX_FIRST_DESC | RX_LAST_DESC)) !=
> > (RX_FIRST_DESC | RX_LAST_DESC)) {
> > if (net_ratelimit())
> > - printk(KERN_ERR
> > - "%s: Received packet spread "
> > - "on multiple descriptors\n",
> > - mep->dev->name);
> > + dev_printk(KERN_ERR, &mep->dev->dev,
> > + "received packet spanning "
> > + "multiple descriptors\n");
> > }
> > +
> > if (cmd_sts & ERROR_SUMMARY)
> > stats->rx_errors++;
> >
>
> [snip]
>
> > @@ -974,33 +990,31 @@ static int mv643xx_eth_nway_restart(struct net_device *dev)
> > static u32 mv643xx_eth_get_link(struct net_device *dev)
> > {
> > struct mv643xx_eth_private *mep = netdev_priv(dev);
> > -
> > return mii_link_ok(&mep->mii);
> > }
>
> Keep the blank line, IMHO.
I've folded the following patch into the patch. OK?
Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
===================================================================
--- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c
+++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
@@ -454,6 +454,11 @@ static void rxq_refill(struct rx_queue *
RX_ENABLE_INTERRUPT;
wmb();
+ /*
+ * The hardware automatically prepends 2 bytes of
+ * dummy data to each received packet, so that the
+ * IP header ends up 16-byte aligned.
+ */
skb_reserve(skb, 2);
}
@@ -508,7 +513,11 @@ static int rxq_process(struct rx_queue *
/*
* Update statistics.
- * Note byte count includes 4 byte CRC count
+ *
+ * Note that the descriptor byte count includes 2 dummy
+ * bytes automatically inserted by the hardware at the
+ * start of the packet (which we don't count), and a 4
+ * byte CRC at the end of the packet (which we do count).
*/
stats->rx_packets++;
stats->rx_bytes += rx_desc->byte_cnt - 2;
@@ -999,6 +1008,7 @@ static int mv643xx_eth_nway_reset(struct
static u32 mv643xx_eth_get_link(struct net_device *dev)
{
struct mv643xx_eth_private *mp = netdev_priv(dev);
+
return mii_link_ok(&mp->mii);
}
^ permalink raw reply [flat|nested] 92+ messages in thread* Re: [PATCH 29/39] mv643xx_eth: general cleanup
2008-06-06 8:24 ` Lennert Buytenhek
@ 2008-06-06 10:59 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-06 10:59 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Fri, Jun 06, 2008 at 10:24:35AM +0200, Lennert Buytenhek wrote:
> On Thu, Jun 05, 2008 at 05:33:06AM -0700, Dale Farnsworth wrote:
>
> > > @@ -441,7 +445,7 @@ static void rxq_refill(struct rx_queue *rxq)
> > > RX_ENABLE_INTERRUPT;
> > > wmb();
> > >
> > > - skb_reserve(skb, ETH_HW_IP_ALIGN);
> > > + skb_reserve(skb, 2);
> >
> > I think you've removed some useful documentation here. Either keep the
> > define or add a comment explaining what the 2 is for.
[snip]
> I've folded the following patch into the patch. OK?
> Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
> ===================================================================
> --- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c
> +++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c
> @@ -454,6 +454,11 @@ static void rxq_refill(struct rx_queue *
> RX_ENABLE_INTERRUPT;
> wmb();
>
> + /*
> + * The hardware automatically prepends 2 bytes of
> + * dummy data to each received packet, so that the
> + * IP header ends up 16-byte aligned.
> + */
> skb_reserve(skb, 2);
> }
>
> @@ -508,7 +513,11 @@ static int rxq_process(struct rx_queue *
>
> /*
> * Update statistics.
> - * Note byte count includes 4 byte CRC count
> + *
> + * Note that the descriptor byte count includes 2 dummy
> + * bytes automatically inserted by the hardware at the
> + * start of the packet (which we don't count), and a 4
> + * byte CRC at the end of the packet (which we do count).
> */
> stats->rx_packets++;
> stats->rx_bytes += rx_desc->byte_cnt - 2;
> @@ -999,6 +1008,7 @@ static int mv643xx_eth_nway_reset(struct
> static u32 mv643xx_eth_get_link(struct net_device *dev)
> {
> struct mv643xx_eth_private *mp = netdev_priv(dev);
> +
> return mii_link_ok(&mp->mii);
> }
Looks good.
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 30/39] mv643xx_eth: add tx rate control
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (28 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 29/39] mv643xx_eth: general cleanup Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:51 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 31/39] mv643xx_eth: allow multiple RX queues Lennert Buytenhek
` (8 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Add an interface for the hardware's per-port and per-subqueue
TX rate control. In this stage, this is mainly so that we can
disable the bandwidth limits during initialisation of the port.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 104 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index ff31cd8..24426fc 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -82,7 +82,10 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define PORT_STATUS(p) (0x0444 + ((p) << 10))
#define TX_FIFO_EMPTY 0x00000400
#define TXQ_COMMAND(p) (0x0448 + ((p) << 10))
+#define TXQ_FIX_PRIO_CONF(p) (0x044c + ((p) << 10))
+#define TX_BW_RATE(p) (0x0450 + ((p) << 10))
#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
+#define TX_BW_BURST(p) (0x045c + ((p) << 10))
#define INT_CAUSE(p) (0x0460 + ((p) << 10))
#define INT_RX 0x00000804
#define INT_EXT 0x00000002
@@ -98,6 +101,9 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define RXQ_CURRENT_DESC_PTR(p) (0x060c + ((p) << 10))
#define RXQ_COMMAND(p) (0x0680 + ((p) << 10))
#define TXQ_CURRENT_DESC_PTR(p) (0x06c0 + ((p) << 10))
+#define TXQ_BW_TOKENS(p) (0x0700 + ((p) << 10))
+#define TXQ_BW_CONF(p) (0x0704 + ((p) << 10))
+#define TXQ_BW_WRR_CONF(p) (0x0708 + ((p) << 10))
#define MIB_COUNTERS(p) (0x1000 + ((p) << 7))
#define SPECIAL_MCAST_TABLE(p) (0x1400 + ((p) << 10))
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
@@ -757,6 +763,95 @@ static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
}
+/* tx rate control **********************************************************/
+/*
+ * Set total maximum TX rate (shared by all TX queues for this port)
+ * to 'rate' bits per second, with a maximum burst of 'burst' bytes.
+ */
+static void tx_set_rate(struct mv643xx_eth_private *mep, int rate, int burst)
+{
+ int token_rate;
+ int mtu;
+ int bucket_size;
+
+ token_rate = ((rate / 1000) * 64) / (mep->shared->t_clk / 1000);
+ if (token_rate > 1023)
+ token_rate = 1023;
+
+ mtu = (mep->dev->mtu + 255) >> 8;
+ if (mtu > 63)
+ mtu = 63;
+
+ bucket_size = (burst + 255) >> 8;
+ if (bucket_size > 65535)
+ bucket_size = 65535;
+
+ wrl(mep, TX_BW_RATE(mep->port_num), token_rate);
+ wrl(mep, TX_BW_MTU(mep->port_num), mtu);
+ wrl(mep, TX_BW_BURST(mep->port_num), bucket_size);
+}
+
+static void txq_set_rate(struct tx_queue *txq, int rate, int burst)
+{
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ int token_rate;
+ int bucket_size;
+
+ token_rate = ((rate / 1000) * 64) / (mep->shared->t_clk / 1000);
+ if (token_rate > 1023)
+ token_rate = 1023;
+
+ bucket_size = (burst + 255) >> 8;
+ if (bucket_size > 65535)
+ bucket_size = 65535;
+
+ wrl(mep, TXQ_BW_TOKENS(mep->port_num), token_rate << 14);
+ wrl(mep, TXQ_BW_CONF(mep->port_num),
+ (bucket_size << 10) | token_rate);
+}
+
+static void txq_set_fixed_prio_mode(struct tx_queue *txq)
+{
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ int off;
+ u32 val;
+
+ /*
+ * Turn on fixed priority mode.
+ */
+ off = TXQ_FIX_PRIO_CONF(mep->port_num);
+
+ val = rdl(mep, off);
+ val |= 1;
+ wrl(mep, off, val);
+}
+
+static void txq_set_wrr(struct tx_queue *txq, int weight)
+{
+ struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ int off;
+ u32 val;
+
+ /*
+ * Turn off fixed priority mode.
+ */
+ off = TXQ_FIX_PRIO_CONF(mep->port_num);
+
+ val = rdl(mep, off);
+ val &= ~1;
+ wrl(mep, off, val);
+
+ /*
+ * Configure WRR weight for this queue.
+ */
+ off = TXQ_BW_WRR_CONF(mep->port_num);
+
+ val = rdl(mep, off);
+ val = (val & ~0xff) | (weight & 0xff);
+ wrl(mep, off, val);
+}
+
+
/* mii management interface *************************************************/
#define SMI_BUSY 0x10000000
#define SMI_READ_VALID 0x08000000
@@ -1562,7 +1657,7 @@ static void port_start(struct mv643xx_eth_private *mep)
/*
* Configure TX path and queues.
*/
- wrl(mep, TX_BW_MTU(mep->port_num), 0);
+ tx_set_rate(mep, 1000000000, 16777216);
for (i = 0; i < 1; i++) {
struct tx_queue *txq = mep->txq;
int off = TXQ_CURRENT_DESC_PTR(mep->port_num);
@@ -1571,6 +1666,9 @@ static void port_start(struct mv643xx_eth_private *mep)
addr = (u32)txq->tx_desc_dma;
addr += txq->tx_curr_desc * sizeof(struct tx_desc);
wrl(mep, off, addr);
+
+ txq_set_rate(txq, 1000000000, 16777216);
+ txq_set_fixed_prio_mode(txq);
}
/*
@@ -1730,10 +1828,14 @@ static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
{
+ struct mv643xx_eth_private *mep = netdev_priv(dev);
+
if (new_mtu < 64 || new_mtu > 9500)
return -EINVAL;
dev->mtu = new_mtu;
+ tx_set_rate(mep, 1000000000, 16777216);
+
if (!netif_running(dev))
return 0;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 30/39] mv643xx_eth: add tx rate control
2008-06-03 11:02 ` [PATCH 30/39] mv643xx_eth: add tx rate control Lennert Buytenhek
@ 2008-06-05 12:51 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:51 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:45PM +0200, Lennert Buytenhek wrote:
> Add an interface for the hardware's per-port and per-subqueue
> TX rate control. In this stage, this is mainly so that we can
> disable the bandwidth limits during initialisation of the port.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 104 ++++++++++++++++++++++++++++++++++++++++++++-
> 1 files changed, 103 insertions(+), 1 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 31/39] mv643xx_eth: allow multiple RX queues
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (29 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 30/39] mv643xx_eth: add tx rate control Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:35 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 32/39] mv643xx_eth: allow multiple TX queues Lennert Buytenhek
` (7 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Allow the platform code to specify that we are running on hardware
that is capable of supporting multiple RX queues. If this option
is used, initialise all of the given RX queues instead of just RX
queue zero.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 99 ++++++++++++++++++++++++++++++++-----------
include/linux/mv643xx_eth.h | 5 ++
2 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 24426fc..267768c 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -87,7 +87,7 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
#define TX_BW_BURST(p) (0x045c + ((p) << 10))
#define INT_CAUSE(p) (0x0460 + ((p) << 10))
-#define INT_RX 0x00000804
+#define INT_RX 0x0007fbfc
#define INT_EXT 0x00000002
#define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
#define INT_EXT_LINK 0x00100000
@@ -98,7 +98,7 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define INT_MASK(p) (0x0468 + ((p) << 10))
#define INT_MASK_EXT(p) (0x046c + ((p) << 10))
#define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
-#define RXQ_CURRENT_DESC_PTR(p) (0x060c + ((p) << 10))
+#define RXQ_CURRENT_DESC_PTR(p, q) (0x060c + ((p) << 10) + ((q) << 4))
#define RXQ_COMMAND(p) (0x0680 + ((p) << 10))
#define TXQ_CURRENT_DESC_PTR(p) (0x06c0 + ((p) << 10))
#define TXQ_BW_TOKENS(p) (0x0700 + ((p) << 10))
@@ -277,6 +277,8 @@ struct mib_counters {
};
struct rx_queue {
+ int index;
+
int rx_ring_size;
int rx_desc_count;
@@ -325,8 +327,10 @@ struct mv643xx_eth_private {
int default_rx_ring_size;
unsigned long rx_desc_sram_addr;
int rx_desc_sram_size;
+ u8 rxq_mask;
+ int rxq_primary;
struct napi_struct napi;
- struct rx_queue rxq[1];
+ struct rx_queue rxq[8];
/*
* TX state.
@@ -356,7 +360,7 @@ static inline void wrl(struct mv643xx_eth_private *mep, int offset, u32 data)
/* rxq/txq helper functions *************************************************/
static struct mv643xx_eth_private *rxq_to_mep(struct rx_queue *rxq)
{
- return container_of(rxq, struct mv643xx_eth_private, rxq[0]);
+ return container_of(rxq, struct mv643xx_eth_private, rxq[rxq->index]);
}
static struct mv643xx_eth_private *txq_to_mep(struct tx_queue *txq)
@@ -367,13 +371,13 @@ static struct mv643xx_eth_private *txq_to_mep(struct tx_queue *txq)
static void rxq_enable(struct rx_queue *rxq)
{
struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
- wrl(mep, RXQ_COMMAND(mep->port_num), 1);
+ wrl(mep, RXQ_COMMAND(mep->port_num), 1 << rxq->index);
}
static void rxq_disable(struct rx_queue *rxq)
{
struct mv643xx_eth_private *mep = rxq_to_mep(rxq);
- u8 mask = 1;
+ u8 mask = 1 << rxq->index;
wrl(mep, RXQ_COMMAND(mep->port_num), mask << 8);
while (rdl(mep, RXQ_COMMAND(mep->port_num)) & mask)
@@ -565,6 +569,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
{
struct mv643xx_eth_private *mep;
int rx;
+ int i;
mep = container_of(napi, struct mv643xx_eth_private, napi);
@@ -575,7 +580,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
}
#endif
- rx = rxq_process(mep->rxq, budget);
+ rx = 0;
+ for (i = 7; rx < budget && i >= 0; i--)
+ if (mep->rxq_mask & (1 << i))
+ rx += rxq_process(mep->rxq + i, budget - rx);
if (rx < budget) {
netif_rx_complete(mep->dev, napi);
@@ -1287,13 +1295,15 @@ static void mv643xx_eth_set_rx_mode(struct net_device *dev)
/* rx/tx queue initialisation ***********************************************/
-static int rxq_init(struct mv643xx_eth_private *mep)
+static int rxq_init(struct mv643xx_eth_private *mep, int index)
{
- struct rx_queue *rxq = mep->rxq;
+ struct rx_queue *rxq = mep->rxq + index;
struct rx_desc *rx_desc;
int size;
int i;
+ rxq->index = index;
+
rxq->rx_ring_size = mep->default_rx_ring_size;
rxq->rx_desc_count = 0;
@@ -1302,7 +1312,7 @@ static int rxq_init(struct mv643xx_eth_private *mep)
size = rxq->rx_ring_size * sizeof(struct rx_desc);
- if (size <= mep->rx_desc_sram_size) {
+ if (index == mep->rxq_primary && size <= mep->rx_desc_sram_size) {
rxq->rx_desc_area = ioremap(mep->rx_desc_sram_addr,
mep->rx_desc_sram_size);
rxq->rx_desc_dma = mep->rx_desc_sram_addr;
@@ -1343,7 +1353,7 @@ static int rxq_init(struct mv643xx_eth_private *mep)
out_free:
- if (size <= mep->rx_desc_sram_size)
+ if (index == mep->rxq_primary && size <= mep->rx_desc_sram_size)
iounmap(rxq->rx_desc_area);
else
dma_free_coherent(NULL, size,
@@ -1376,7 +1386,8 @@ static void rxq_deinit(struct rx_queue *rxq)
rxq->rx_desc_count);
}
- if (rxq->rx_desc_area_size <= mep->rx_desc_sram_size)
+ if (rxq->index == mep->rxq_primary &&
+ rxq->rx_desc_area_size <= mep->rx_desc_sram_size)
iounmap(rxq->rx_desc_area);
else
dma_free_coherent(NULL, rxq->rx_desc_area_size,
@@ -1593,6 +1604,9 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
}
}
+ /*
+ * RxBuffer or RxError set for any of the 8 queues?
+ */
#ifdef MV643XX_ETH_NAPI
if (int_cause & INT_RX) {
wrl(mep, INT_MASK(mep->port_num), 0x00000000);
@@ -1601,8 +1615,13 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
netif_rx_schedule(dev, &mep->napi);
}
#else
- if (int_cause & INT_RX)
- rxq_process(mep->rxq, INT_MAX);
+ if (int_cause & INT_RX) {
+ int i;
+
+ for (i = 7; i >= 0; i--)
+ if (mep->rxq_mask & (1 << i))
+ rxq_process(mep->rxq + i, INT_MAX);
+ }
#endif
if (int_cause_ext & INT_EXT_TX) {
@@ -1688,13 +1707,16 @@ static void port_start(struct mv643xx_eth_private *mep)
wrl(mep, PORT_CONFIG_EXT(mep->port_num), 0x00000000);
/*
- * Enable the receive queue.
+ * Enable the receive queues.
*/
- for (i = 0; i < 1; i++) {
- struct rx_queue *rxq = mep->rxq;
- int off = RXQ_CURRENT_DESC_PTR(mep->port_num);
+ for (i = 0; i < 8; i++) {
+ struct rx_queue *rxq = mep->rxq + i;
+ int off = RXQ_CURRENT_DESC_PTR(mep->port_num, i);
u32 addr;
+ if ((mep->rxq_mask & (1 << i)) == 0)
+ continue;
+
addr = (u32)rxq->rx_desc_dma;
addr += rxq->rx_curr_desc * sizeof(struct rx_desc);
wrl(mep, off, addr);
@@ -1729,6 +1751,7 @@ static int mv643xx_eth_open(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
int err;
+ int i;
wrl(mep, INT_CAUSE(mep->port_num), 0);
wrl(mep, INT_CAUSE_EXT(mep->port_num), 0);
@@ -1744,10 +1767,20 @@ static int mv643xx_eth_open(struct net_device *dev)
init_mac_tables(mep);
- err = rxq_init(mep);
- if (err)
- goto out;
- rxq_refill(mep->rxq);
+ for (i = 0; i < 8; i++) {
+ if ((mep->rxq_mask & (1 << i)) == 0)
+ continue;
+
+ err = rxq_init(mep, i);
+ if (err) {
+ while (--i >= 0)
+ if (mep->rxq_mask & (1 << i))
+ rxq_deinit(mep->rxq + i);
+ goto out;
+ }
+
+ rxq_refill(mep->rxq + i);
+ }
err = txq_init(mep);
if (err)
@@ -1771,7 +1804,9 @@ static int mv643xx_eth_open(struct net_device *dev)
out_free:
- rxq_deinit(mep->rxq);
+ for (i = 0; i < 8; i++)
+ if (mep->rxq_mask & (1 << i))
+ rxq_deinit(mep->rxq + i);
out:
free_irq(dev->irq, dev);
@@ -1781,9 +1816,13 @@ out:
static void port_reset(struct mv643xx_eth_private *mep)
{
unsigned int data;
+ int i;
+ for (i = 0; i < 8; i++) {
+ if (mep->rxq_mask & (1 << i))
+ rxq_disable(mep->rxq + i);
+ }
txq_disable(mep->txq);
- rxq_disable(mep->rxq);
while (!(rdl(mep, PORT_STATUS(mep->port_num)) & TX_FIFO_EMPTY))
udelay(10);
@@ -1798,6 +1837,7 @@ static void port_reset(struct mv643xx_eth_private *mep)
static int mv643xx_eth_stop(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
+ int i;
wrl(mep, INT_MASK(mep->port_num), 0x00000000);
rdl(mep, INT_MASK(mep->port_num));
@@ -1813,8 +1853,11 @@ static int mv643xx_eth_stop(struct net_device *dev)
port_reset(mep);
mib_counters_update(mep);
+ for (i = 0; i < 8; i++) {
+ if (mep->rxq_mask & (1 << i))
+ rxq_deinit(mep->rxq + i);
+ }
txq_deinit(mep->txq);
- rxq_deinit(mep->rxq);
return 0;
}
@@ -2066,6 +2109,12 @@ static void set_params(struct mv643xx_eth_private *mep,
mep->rx_desc_sram_addr = pd->rx_sram_addr;
mep->rx_desc_sram_size = pd->rx_sram_size;
+ if (pd->rx_queue_mask)
+ mep->rxq_mask = pd->rx_queue_mask;
+ else
+ mep->rxq_mask = 0x01;
+ mep->rxq_primary = fls(mep->rxq_mask) - 1;
+
mep->default_tx_ring_size = DEFAULT_TX_QUEUE_SIZE;
if (pd->tx_queue_size)
mep->default_tx_ring_size = pd->tx_queue_size;
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 6461776..1afd7ba 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -49,6 +49,11 @@ struct mv643xx_eth_platform_data {
int duplex;
/*
+ * Which RX queues to use.
+ */
+ int rx_queue_mask;
+
+ /*
* Override default RX/TX queue sizes if nonzero.
*/
int rx_queue_size;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 31/39] mv643xx_eth: allow multiple RX queues
2008-06-03 11:02 ` [PATCH 31/39] mv643xx_eth: allow multiple RX queues Lennert Buytenhek
@ 2008-06-05 12:35 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:35 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:46PM +0200, Lennert Buytenhek wrote:
> Allow the platform code to specify that we are running on hardware
> that is capable of supporting multiple RX queues. If this option
> is used, initialise all of the given RX queues instead of just RX
> queue zero.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 99 ++++++++++++++++++++++++++++++++-----------
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 32/39] mv643xx_eth: allow multiple TX queues
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (30 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 31/39] mv643xx_eth: allow multiple RX queues Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:41 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 33/39] mv643xx_eth: work around TX hang hardware issue Lennert Buytenhek
` (6 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
As with the multiple RX queue support, allow the platform code to
specify that the hardware we are running on supports multiple TX
queues. This patch only uses the highest-numbered enabled queue
to send packets to for now, this can be extended later to enable
QoS and such.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 146 ++++++++++++++++++++++++++++++-------------
include/linux/mv643xx_eth.h | 3 +-
2 files changed, 105 insertions(+), 44 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 267768c..fd9e492 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -94,16 +94,16 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define INT_EXT_PHY 0x00010000
#define INT_EXT_TX_ERROR_0 0x00000100
#define INT_EXT_TX_0 0x00000001
-#define INT_EXT_TX 0x00000101
+#define INT_EXT_TX 0x0000ffff
#define INT_MASK(p) (0x0468 + ((p) << 10))
#define INT_MASK_EXT(p) (0x046c + ((p) << 10))
#define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
#define RXQ_CURRENT_DESC_PTR(p, q) (0x060c + ((p) << 10) + ((q) << 4))
#define RXQ_COMMAND(p) (0x0680 + ((p) << 10))
-#define TXQ_CURRENT_DESC_PTR(p) (0x06c0 + ((p) << 10))
-#define TXQ_BW_TOKENS(p) (0x0700 + ((p) << 10))
-#define TXQ_BW_CONF(p) (0x0704 + ((p) << 10))
-#define TXQ_BW_WRR_CONF(p) (0x0708 + ((p) << 10))
+#define TXQ_CURRENT_DESC_PTR(p, q) (0x06c0 + ((p) << 10) + ((q) << 2))
+#define TXQ_BW_TOKENS(p, q) (0x0700 + ((p) << 10) + ((q) << 4))
+#define TXQ_BW_CONF(p, q) (0x0704 + ((p) << 10) + ((q) << 4))
+#define TXQ_BW_WRR_CONF(p, q) (0x0708 + ((p) << 10) + ((q) << 4))
#define MIB_COUNTERS(p) (0x1000 + ((p) << 7))
#define SPECIAL_MCAST_TABLE(p) (0x1400 + ((p) << 10))
#define OTHER_MCAST_TABLE(p) (0x1500 + ((p) << 10))
@@ -294,6 +294,8 @@ struct rx_queue {
};
struct tx_queue {
+ int index;
+
int tx_ring_size;
int tx_desc_count;
@@ -338,7 +340,9 @@ struct mv643xx_eth_private {
int default_tx_ring_size;
unsigned long tx_desc_sram_addr;
int tx_desc_sram_size;
- struct tx_queue txq[1];
+ u8 txq_mask;
+ int txq_primary;
+ struct tx_queue txq[8];
#ifdef MV643XX_ETH_TX_FAST_REFILL
int tx_clean_threshold;
#endif
@@ -365,7 +369,7 @@ static struct mv643xx_eth_private *rxq_to_mep(struct rx_queue *rxq)
static struct mv643xx_eth_private *txq_to_mep(struct tx_queue *txq)
{
- return container_of(txq, struct mv643xx_eth_private, txq[0]);
+ return container_of(txq, struct mv643xx_eth_private, txq[txq->index]);
}
static void rxq_enable(struct rx_queue *rxq)
@@ -387,13 +391,13 @@ static void rxq_disable(struct rx_queue *rxq)
static void txq_enable(struct tx_queue *txq)
{
struct mv643xx_eth_private *mep = txq_to_mep(txq);
- wrl(mep, TXQ_COMMAND(mep->port_num), 1);
+ wrl(mep, TXQ_COMMAND(mep->port_num), 1 << txq->index);
}
static void txq_disable(struct tx_queue *txq)
{
struct mv643xx_eth_private *mep = txq_to_mep(txq);
- u8 mask = 1;
+ u8 mask = 1 << txq->index;
wrl(mep, TXQ_COMMAND(mep->port_num), mask << 8);
while (rdl(mep, TXQ_COMMAND(mep->port_num)) & mask)
@@ -404,6 +408,12 @@ static void __txq_maybe_wake(struct tx_queue *txq)
{
struct mv643xx_eth_private *mep = txq_to_mep(txq);
+ /*
+ * netif_{stop,wake}_queue() flow control only applies to
+ * the primary queue.
+ */
+ BUG_ON(txq->index != mep->txq_primary);
+
if (txq->tx_ring_size - txq->tx_desc_count >= MAX_DESCS_PER_SKB)
netif_wake_queue(mep->dev);
}
@@ -575,8 +585,10 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
#ifdef MV643XX_ETH_TX_FAST_REFILL
if (++mep->tx_clean_threshold > 5) {
- txq_reclaim(mep->txq, 0);
mep->tx_clean_threshold = 0;
+ for (i = 0; i < 8; i++)
+ if (mep->txq_mask & (1 << i))
+ txq_reclaim(mep->txq + i, 0);
}
#endif
@@ -736,8 +748,6 @@ static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
struct tx_queue *txq;
unsigned long flags;
- BUG_ON(netif_queue_stopped(dev));
-
if (has_tiny_unaligned_frags(skb) && __skb_linearize(skb)) {
stats->tx_dropped++;
dev_printk(KERN_DEBUG, &dev->dev,
@@ -748,13 +758,15 @@ static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
spin_lock_irqsave(&mep->lock, flags);
- txq = mep->txq;
+ txq = mep->txq + mep->txq_primary;
if (txq->tx_ring_size - txq->tx_desc_count < MAX_DESCS_PER_SKB) {
- printk(KERN_ERR "%s: transmit with queue full\n", dev->name);
- netif_stop_queue(dev);
spin_unlock_irqrestore(&mep->lock, flags);
- return NETDEV_TX_BUSY;
+ if (txq->index == mep->txq_primary && net_ratelimit())
+ dev_printk(KERN_ERR, &dev->dev,
+ "primary tx queue full?!\n");
+ kfree_skb(skb);
+ return NETDEV_TX_OK;
}
txq_submit_skb(txq, skb);
@@ -762,8 +774,13 @@ static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
stats->tx_packets++;
dev->trans_start = jiffies;
- if (txq->tx_ring_size - txq->tx_desc_count < MAX_DESCS_PER_SKB)
- netif_stop_queue(dev);
+ if (txq->index == mep->txq_primary) {
+ int entries_left;
+
+ entries_left = txq->tx_ring_size - txq->tx_desc_count;
+ if (entries_left < MAX_DESCS_PER_SKB)
+ netif_stop_queue(dev);
+ }
spin_unlock_irqrestore(&mep->lock, flags);
@@ -813,8 +830,8 @@ static void txq_set_rate(struct tx_queue *txq, int rate, int burst)
if (bucket_size > 65535)
bucket_size = 65535;
- wrl(mep, TXQ_BW_TOKENS(mep->port_num), token_rate << 14);
- wrl(mep, TXQ_BW_CONF(mep->port_num),
+ wrl(mep, TXQ_BW_TOKENS(mep->port_num, txq->index), token_rate << 14);
+ wrl(mep, TXQ_BW_CONF(mep->port_num, txq->index),
(bucket_size << 10) | token_rate);
}
@@ -830,7 +847,7 @@ static void txq_set_fixed_prio_mode(struct tx_queue *txq)
off = TXQ_FIX_PRIO_CONF(mep->port_num);
val = rdl(mep, off);
- val |= 1;
+ val |= 1 << txq->index;
wrl(mep, off, val);
}
@@ -846,13 +863,13 @@ static void txq_set_wrr(struct tx_queue *txq, int weight)
off = TXQ_FIX_PRIO_CONF(mep->port_num);
val = rdl(mep, off);
- val &= ~1;
+ val &= ~(1 << txq->index);
wrl(mep, off, val);
/*
* Configure WRR weight for this queue.
*/
- off = TXQ_BW_WRR_CONF(mep->port_num);
+ off = TXQ_BW_WRR_CONF(mep->port_num, txq->index);
val = rdl(mep, off);
val = (val & ~0xff) | (weight & 0xff);
@@ -1396,13 +1413,15 @@ static void rxq_deinit(struct rx_queue *rxq)
kfree(rxq->rx_skb);
}
-static int txq_init(struct mv643xx_eth_private *mep)
+static int txq_init(struct mv643xx_eth_private *mep, int index)
{
- struct tx_queue *txq = mep->txq;
+ struct tx_queue *txq = mep->txq + index;
struct tx_desc *tx_desc;
int size;
int i;
+ txq->index = index;
+
txq->tx_ring_size = mep->default_tx_ring_size;
txq->tx_desc_count = 0;
@@ -1411,7 +1430,7 @@ static int txq_init(struct mv643xx_eth_private *mep)
size = txq->tx_ring_size * sizeof(struct tx_desc);
- if (size <= mep->tx_desc_sram_size) {
+ if (index == mep->txq_primary && size <= mep->tx_desc_sram_size) {
txq->tx_desc_area = ioremap(mep->tx_desc_sram_addr,
mep->tx_desc_sram_size);
txq->tx_desc_dma = mep->tx_desc_sram_addr;
@@ -1448,7 +1467,7 @@ static int txq_init(struct mv643xx_eth_private *mep)
out_free:
- if (size <= mep->tx_desc_sram_size)
+ if (index == mep->txq_primary && size <= mep->tx_desc_sram_size)
iounmap(txq->tx_desc_area);
else
dma_free_coherent(NULL, size,
@@ -1520,7 +1539,8 @@ static void txq_deinit(struct tx_queue *txq)
BUG_ON(txq->tx_used_desc != txq->tx_curr_desc);
- if (txq->tx_desc_area_size <= mep->tx_desc_sram_size)
+ if (txq->index == mep->txq_primary &&
+ txq->tx_desc_area_size <= mep->tx_desc_sram_size)
iounmap(txq->tx_desc_area);
else
dma_free_coherent(NULL, txq->tx_desc_area_size,
@@ -1559,12 +1579,20 @@ static void update_pscr(struct mv643xx_eth_private *mep, int speed, int duplex)
if ((pscr_o & SERIAL_PORT_ENABLE) == 0)
wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
else {
- txq_disable(mep->txq);
+ int i;
+
+ for (i = 0; i < 8; i++)
+ if (mep->txq_mask & (1 << i))
+ txq_disable(mep->txq + i);
+
pscr_o &= ~SERIAL_PORT_ENABLE;
wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_o);
wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
wrl(mep, PORT_SERIAL_CONTROL(mep->port_num), pscr_n);
- txq_enable(mep->txq);
+
+ for (i = 0; i < 8; i++)
+ if (mep->txq_mask & (1 << i))
+ txq_enable(mep->txq + i);
}
}
}
@@ -1590,13 +1618,17 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
if (int_cause_ext & (INT_EXT_PHY | INT_EXT_LINK)) {
if (mii_link_ok(&mep->mii)) {
struct ethtool_cmd cmd;
+ int i;
mii_ethtool_gset(&mep->mii, &cmd);
update_pscr(mep, cmd.speed, cmd.duplex);
- txq_enable(mep->txq);
+ for (i = 0; i < 8; i++)
+ if (mep->txq_mask & (1 << i))
+ txq_enable(mep->txq + i);
+
if (!netif_carrier_ok(dev)) {
netif_carrier_on(dev);
- __txq_maybe_wake(mep->txq);
+ __txq_maybe_wake(mep->txq + mep->txq_primary);
}
} else if (netif_carrier_ok(dev)) {
netif_stop_queue(dev);
@@ -1624,9 +1656,17 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
}
#endif
+ /*
+ * TxBuffer or TxError set for any of the 8 queues?
+ */
if (int_cause_ext & INT_EXT_TX) {
- txq_reclaim(mep->txq, 0);
- __txq_maybe_wake(mep->txq);
+ int i;
+
+ for (i = 0; i < 8; i++)
+ if (mep->txq_mask & (1 << i))
+ txq_reclaim(mep->txq + i, 0);
+
+ __txq_maybe_wake(mep->txq + mep->txq_primary);
}
return IRQ_HANDLED;
@@ -1677,11 +1717,14 @@ static void port_start(struct mv643xx_eth_private *mep)
* Configure TX path and queues.
*/
tx_set_rate(mep, 1000000000, 16777216);
- for (i = 0; i < 1; i++) {
- struct tx_queue *txq = mep->txq;
- int off = TXQ_CURRENT_DESC_PTR(mep->port_num);
+ for (i = 0; i < 8; i++) {
+ struct tx_queue *txq = mep->txq + i;
+ int off = TXQ_CURRENT_DESC_PTR(mep->port_num, i);
u32 addr;
+ if ((mep->txq_mask & (1 << i)) == 0)
+ continue;
+
addr = (u32)txq->tx_desc_dma;
addr += txq->tx_curr_desc * sizeof(struct tx_desc);
wrl(mep, off, addr);
@@ -1782,9 +1825,18 @@ static int mv643xx_eth_open(struct net_device *dev)
rxq_refill(mep->rxq + i);
}
- err = txq_init(mep);
- if (err)
- goto out_free;
+ for (i = 0; i < 8; i++) {
+ if ((mep->txq_mask & (1 << i)) == 0)
+ continue;
+
+ err = txq_init(mep, i);
+ if (err) {
+ while (--i >= 0)
+ if (mep->txq_mask & (1 << i))
+ txq_deinit(mep->txq + i);
+ goto out_free;
+ }
+ }
#ifdef MV643XX_ETH_NAPI
napi_enable(&mep->napi);
@@ -1821,8 +1873,9 @@ static void port_reset(struct mv643xx_eth_private *mep)
for (i = 0; i < 8; i++) {
if (mep->rxq_mask & (1 << i))
rxq_disable(mep->rxq + i);
+ if (mep->txq_mask & (1 << i))
+ txq_disable(mep->txq + i);
}
- txq_disable(mep->txq);
while (!(rdl(mep, PORT_STATUS(mep->port_num)) & TX_FIFO_EMPTY))
udelay(10);
@@ -1856,8 +1909,9 @@ static int mv643xx_eth_stop(struct net_device *dev)
for (i = 0; i < 8; i++) {
if (mep->rxq_mask & (1 << i))
rxq_deinit(mep->rxq + i);
+ if (mep->txq_mask & (1 << i))
+ txq_deinit(mep->txq + i);
}
- txq_deinit(mep->txq);
return 0;
}
@@ -1909,7 +1963,7 @@ static void tx_timeout_task(struct work_struct *ugly)
port_reset(mep);
port_start(mep);
- __txq_maybe_wake(mep->txq);
+ __txq_maybe_wake(mep->txq + mep->txq_primary);
}
}
@@ -2120,6 +2174,12 @@ static void set_params(struct mv643xx_eth_private *mep,
mep->default_tx_ring_size = pd->tx_queue_size;
mep->tx_desc_sram_addr = pd->tx_sram_addr;
mep->tx_desc_sram_size = pd->tx_sram_size;
+
+ if (pd->tx_queue_mask)
+ mep->txq_mask = pd->tx_queue_mask;
+ else
+ mep->txq_mask = 0x01;
+ mep->txq_primary = fls(mep->txq_mask) - 1;
}
static int phy_detect(struct mv643xx_eth_private *mep)
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 1afd7ba..1207857 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -49,9 +49,10 @@ struct mv643xx_eth_platform_data {
int duplex;
/*
- * Which RX queues to use.
+ * Which RX/TX queues to use.
*/
int rx_queue_mask;
+ int tx_queue_mask;
/*
* Override default RX/TX queue sizes if nonzero.
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 32/39] mv643xx_eth: allow multiple TX queues
2008-06-03 11:02 ` [PATCH 32/39] mv643xx_eth: allow multiple TX queues Lennert Buytenhek
@ 2008-06-05 12:41 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:41 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:47PM +0200, Lennert Buytenhek wrote:
> As with the multiple RX queue support, allow the platform code to
> specify that the hardware we are running on supports multiple TX
> queues. This patch only uses the highest-numbered enabled queue
> to send packets to for now, this can be extended later to enable
> QoS and such.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 146 ++++++++++++++++++++++++++++++-------------
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 33/39] mv643xx_eth: work around TX hang hardware issue
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (31 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 32/39] mv643xx_eth: allow multiple TX queues Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:37 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 34/39] mv643xx_eth: detect extended rx coal register field Lennert Buytenhek
` (5 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Under some conditions, the TXQ ('TX queue being served') bit can clear
before all packets queued for that TX queue have been transmitted.
This patch enables TXend interrupts, and uses those to re-kick TX
queues that claim to be idle but still have queued descriptors from
the interrupt handler.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index fd9e492..8e4ca2b 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -87,6 +87,7 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define TX_BW_MTU(p) (0x0458 + ((p) << 10))
#define TX_BW_BURST(p) (0x045c + ((p) << 10))
#define INT_CAUSE(p) (0x0460 + ((p) << 10))
+#define INT_TX_END 0x07f80000
#define INT_RX 0x0007fbfc
#define INT_EXT 0x00000002
#define INT_CAUSE_EXT(p) (0x0464 + ((p) << 10))
@@ -601,7 +602,7 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
netif_rx_complete(mep->dev, napi);
wrl(mep, INT_CAUSE(mep->port_num), 0);
wrl(mep, INT_CAUSE_EXT(mep->port_num), 0);
- wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_EXT);
+ wrl(mep, INT_MASK(mep->port_num), INT_TX_END | INT_RX | INT_EXT);
}
return rx;
@@ -1603,8 +1604,10 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
struct mv643xx_eth_private *mep = netdev_priv(dev);
u32 int_cause;
u32 int_cause_ext;
+ u32 txq_active;
- int_cause = rdl(mep, INT_CAUSE(mep->port_num)) & (INT_RX | INT_EXT);
+ int_cause = rdl(mep, INT_CAUSE(mep->port_num)) &
+ (INT_TX_END | INT_RX | INT_EXT);
if (int_cause == 0)
return IRQ_NONE;
@@ -1656,6 +1659,8 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
}
#endif
+ txq_active = rdl(mep, TXQ_COMMAND(mep->port_num));
+
/*
* TxBuffer or TxError set for any of the 8 queues?
*/
@@ -1665,8 +1670,28 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
for (i = 0; i < 8; i++)
if (mep->txq_mask & (1 << i))
txq_reclaim(mep->txq + i, 0);
+ }
- __txq_maybe_wake(mep->txq + mep->txq_primary);
+ /*
+ * Any TxEnd interrupts?
+ */
+ if (int_cause & INT_TX_END) {
+ int i;
+
+ wrl(mep, INT_CAUSE(mep->port_num), ~(int_cause & INT_TX_END));
+ for (i = 0; i < 8; i++) {
+ struct tx_queue *txq = mep->txq + i;
+ if (txq->tx_desc_count && !((txq_active >> i) & 1))
+ txq_enable(txq);
+ }
+ }
+
+ /*
+ * Enough space again in the primary TX queue for a full packet?
+ */
+ if (int_cause_ext & INT_EXT_TX) {
+ struct tx_queue *txq = mep->txq + mep->txq_primary;
+ __txq_maybe_wake(txq);
}
return IRQ_HANDLED;
@@ -1850,7 +1875,7 @@ static int mv643xx_eth_open(struct net_device *dev)
wrl(mep, INT_MASK_EXT(mep->port_num),
INT_EXT_LINK | INT_EXT_PHY | INT_EXT_TX);
- wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_EXT);
+ wrl(mep, INT_MASK(mep->port_num), INT_TX_END | INT_RX | INT_EXT);
return 0;
@@ -1986,7 +2011,7 @@ static void mv643xx_eth_netpoll(struct net_device *dev)
mv643xx_eth_irq(dev->irq, dev);
- wrl(mep, INT_MASK(mep->port_num), INT_RX | INT_CAUSE_EXT);
+ wrl(mep, INT_MASK(mep->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT);
}
#endif
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 33/39] mv643xx_eth: work around TX hang hardware issue
2008-06-03 11:02 ` [PATCH 33/39] mv643xx_eth: work around TX hang hardware issue Lennert Buytenhek
@ 2008-06-05 12:37 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:37 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:48PM +0200, Lennert Buytenhek wrote:
> Under some conditions, the TXQ ('TX queue being served') bit can clear
> before all packets queued for that TX queue have been transmitted.
> This patch enables TXend interrupts, and uses those to re-kick TX
> queues that claim to be idle but still have queued descriptors from
> the interrupt handler.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 35 ++++++++++++++++++++++++++++++-----
> 1 files changed, 30 insertions(+), 5 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 34/39] mv643xx_eth: detect extended rx coal register field
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (32 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 33/39] mv643xx_eth: work around TX hang hardware issue Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:50 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 35/39] mv643xx_eth: detect alternate TX BW control register location Lennert Buytenhek
` (4 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Newer hardware has a 16-bit instead of a 14-bit RX coalescing
count field in the SDMA_CONFIG register. This patch adds a run-time
check for which of the two we have, and adjusts further writes to the
rx coal count field accordingly.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 8e4ca2b..4168a8a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -240,6 +240,7 @@ struct mv643xx_eth_shared_private {
* Hardware-specific parameters.
*/
unsigned int t_clk;
+ int extended_rx_coal_limit;
};
@@ -1796,14 +1797,22 @@ static void port_start(struct mv643xx_eth_private *mep)
static void set_rx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
{
unsigned int coal = ((mep->shared->t_clk / 1000000) * delay) / 64;
+ u32 val;
- if (coal > 0x3fff)
- coal = 0x3fff;
-
- wrl(mep, SDMA_CONFIG(mep->port_num),
- ((coal & 0x3fff) << 8) |
- (rdl(mep, SDMA_CONFIG(mep->port_num))
- & 0xffc000ff));
+ val = rdl(mep, SDMA_CONFIG(mep->port_num));
+ if (mep->shared->extended_rx_coal_limit) {
+ if (coal > 0xffff)
+ coal = 0xffff;
+ val &= ~0x023fff80;
+ val |= (coal & 0x8000) << 10;
+ val |= (coal & 0x7fff) << 7;
+ } else {
+ if (coal > 0x3fff)
+ coal = 0x3fff;
+ val &= ~0x003fff00;
+ val |= (coal & 0x3fff) << 8;
+ }
+ wrl(mep, SDMA_CONFIG(mep->port_num), val);
}
static void set_tx_coal(struct mv643xx_eth_private *mep, unsigned int delay)
@@ -2068,6 +2077,20 @@ mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *mesp,
mesp->win_protect = win_protect;
}
+static void infer_hw_params(struct mv643xx_eth_shared_private *mesp)
+{
+ /*
+ * Check whether we have a 14-bit coal limit field in bits
+ * [21:8], or a 16-bit coal limit in bits [25,21:7] of the
+ * SDMA config register.
+ */
+ writel(0x02000000, mesp->base + SDMA_CONFIG(0));
+ if (readl(mesp->base + SDMA_CONFIG(0)) & 0x02000000)
+ mesp->extended_rx_coal_limit = 1;
+ else
+ mesp->extended_rx_coal_limit = 0;
+}
+
static int mv643xx_eth_shared_probe(struct platform_device *pdev)
{
static int mv643xx_eth_version_printed = 0;
@@ -2106,6 +2129,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
* Detect hardware parameters.
*/
mesp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
+ infer_hw_params(mesp);
platform_set_drvdata(pdev, mesp);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 34/39] mv643xx_eth: detect extended rx coal register field
2008-06-03 11:02 ` [PATCH 34/39] mv643xx_eth: detect extended rx coal register field Lennert Buytenhek
@ 2008-06-05 12:50 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:50 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:49PM +0200, Lennert Buytenhek wrote:
> Newer hardware has a 16-bit instead of a 14-bit RX coalescing
> count field in the SDMA_CONFIG register. This patch adds a run-time
> check for which of the two we have, and adjusts further writes to the
> rx coal count field accordingly.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 38 +++++++++++++++++++++++++++++++-------
> 1 files changed, 31 insertions(+), 7 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 35/39] mv643xx_eth: detect alternate TX BW control register location
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (33 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 34/39] mv643xx_eth: detect extended rx coal register field Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:40 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 36/39] mv643xx_eth: be more agressive about RX refill Lennert Buytenhek
` (3 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Some SoCs have the TX bandwidth control registers in a slightly
different place. This patch detects that case at run time, and
re-directs accesses to those registers to the proper place at
run time if needed.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 4168a8a..a7c5421 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -99,6 +99,10 @@ static char mv643xx_eth_driver_version[] = "1.0";
#define INT_MASK(p) (0x0468 + ((p) << 10))
#define INT_MASK_EXT(p) (0x046c + ((p) << 10))
#define TX_FIFO_URGENT_THRESHOLD(p) (0x0474 + ((p) << 10))
+#define TXQ_FIX_PRIO_CONF_MOVED(p) (0x04dc + ((p) << 10))
+#define TX_BW_RATE_MOVED(p) (0x04e0 + ((p) << 10))
+#define TX_BW_MTU_MOVED(p) (0x04e8 + ((p) << 10))
+#define TX_BW_BURST_MOVED(p) (0x04ec + ((p) << 10))
#define RXQ_CURRENT_DESC_PTR(p, q) (0x060c + ((p) << 10) + ((q) << 4))
#define RXQ_COMMAND(p) (0x0680 + ((p) << 10))
#define TXQ_CURRENT_DESC_PTR(p, q) (0x06c0 + ((p) << 10) + ((q) << 2))
@@ -241,6 +245,7 @@ struct mv643xx_eth_shared_private {
*/
unsigned int t_clk;
int extended_rx_coal_limit;
+ int tx_bw_control_moved;
};
@@ -813,9 +818,15 @@ static void tx_set_rate(struct mv643xx_eth_private *mep, int rate, int burst)
if (bucket_size > 65535)
bucket_size = 65535;
- wrl(mep, TX_BW_RATE(mep->port_num), token_rate);
- wrl(mep, TX_BW_MTU(mep->port_num), mtu);
- wrl(mep, TX_BW_BURST(mep->port_num), bucket_size);
+ if (mep->shared->tx_bw_control_moved) {
+ wrl(mep, TX_BW_RATE_MOVED(mep->port_num), token_rate);
+ wrl(mep, TX_BW_MTU_MOVED(mep->port_num), mtu);
+ wrl(mep, TX_BW_BURST_MOVED(mep->port_num), bucket_size);
+ } else {
+ wrl(mep, TX_BW_RATE(mep->port_num), token_rate);
+ wrl(mep, TX_BW_MTU(mep->port_num), mtu);
+ wrl(mep, TX_BW_BURST(mep->port_num), bucket_size);
+ }
}
static void txq_set_rate(struct tx_queue *txq, int rate, int burst)
@@ -846,7 +857,10 @@ static void txq_set_fixed_prio_mode(struct tx_queue *txq)
/*
* Turn on fixed priority mode.
*/
- off = TXQ_FIX_PRIO_CONF(mep->port_num);
+ if (mep->shared->tx_bw_control_moved)
+ off = TXQ_FIX_PRIO_CONF_MOVED(mep->port_num);
+ else
+ off = TXQ_FIX_PRIO_CONF(mep->port_num);
val = rdl(mep, off);
val |= 1 << txq->index;
@@ -862,7 +876,10 @@ static void txq_set_wrr(struct tx_queue *txq, int weight)
/*
* Turn off fixed priority mode.
*/
- off = TXQ_FIX_PRIO_CONF(mep->port_num);
+ if (mep->shared->tx_bw_control_moved)
+ off = TXQ_FIX_PRIO_CONF_MOVED(mep->port_num);
+ else
+ off = TXQ_FIX_PRIO_CONF(mep->port_num);
val = rdl(mep, off);
val &= ~(1 << txq->index);
@@ -2089,6 +2106,16 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *mesp)
mesp->extended_rx_coal_limit = 1;
else
mesp->extended_rx_coal_limit = 0;
+
+ /*
+ * Check whether the TX rate control registers are in the
+ * old or the new place.
+ */
+ writel(1, mesp->base + TX_BW_MTU_MOVED(0));
+ if (readl(mesp->base + TX_BW_MTU_MOVED(0)) & 1)
+ mesp->tx_bw_control_moved = 1;
+ else
+ mesp->tx_bw_control_moved = 0;
}
static int mv643xx_eth_shared_probe(struct platform_device *pdev)
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 35/39] mv643xx_eth: detect alternate TX BW control register location
2008-06-03 11:02 ` [PATCH 35/39] mv643xx_eth: detect alternate TX BW control register location Lennert Buytenhek
@ 2008-06-05 12:40 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:40 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:50PM +0200, Lennert Buytenhek wrote:
> Some SoCs have the TX bandwidth control registers in a slightly
> different place. This patch detects that case at run time, and
> re-directs accesses to those registers to the proper place at
> run time if needed.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 37 ++++++++++++++++++++++++++++++++-----
> 1 files changed, 32 insertions(+), 5 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 36/39] mv643xx_eth: be more agressive about RX refill
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (34 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 35/39] mv643xx_eth: detect alternate TX BW control register location Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:48 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers Lennert Buytenhek
` (2 subsequent siblings)
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
During OOM, instead of stopping RX refill when the rx desc ring is
not empty, keep trying to refill the ring as long as it is not full
instead.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a7c5421..0f8e79f 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -475,7 +475,7 @@ static void rxq_refill(struct rx_queue *rxq)
skb_reserve(skb, 2);
}
- if (rxq->rx_desc_count == 0) {
+ if (rxq->rx_desc_count != rxq->rx_ring_size) {
rxq->rx_oom.expires = jiffies + (HZ / 10);
add_timer(&rxq->rx_oom);
}
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (35 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 36/39] mv643xx_eth: be more agressive about RX refill Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:46 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 38/39] mv643xx_eth: add PHY-less mode Lennert Buytenhek
2008-06-03 11:02 ` [PATCH 39/39] mv643xx_eth: update driver version and author fields Lennert Buytenhek
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
The two 64-bit MIB registers (good_octets_received and
good_octets_sent) can trigger weird behavior if reads are done
from their 32-bit top parts. This patch avoids reading the top
halves entirely.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 0f8e79f..54c9c76 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -983,7 +983,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
struct mib_counters *p = &mep->mib_counters;
p->good_octets_received += mib_read(mep, 0x00);
- p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
+// p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
p->bad_octets_received += mib_read(mep, 0x08);
p->internal_mac_transmit_err += mib_read(mep, 0x0c);
p->good_frames_received += mib_read(mep, 0x10);
@@ -997,7 +997,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
p->frames_512_to_1023_octets += mib_read(mep, 0x30);
p->frames_1024_to_max_octets += mib_read(mep, 0x34);
p->good_octets_sent += mib_read(mep, 0x38);
- p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
+// p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
p->good_frames_sent += mib_read(mep, 0x40);
p->excessive_collision += mib_read(mep, 0x44);
p->multicast_frames_sent += mib_read(mep, 0x48);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers
2008-06-03 11:02 ` [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers Lennert Buytenhek
@ 2008-06-05 12:46 ` Dale Farnsworth
2008-06-06 7:45 ` Lennert Buytenhek
0 siblings, 1 reply; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:46 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:52PM +0200, Lennert Buytenhek wrote:
> The two 64-bit MIB registers (good_octets_received and
> good_octets_sent) can trigger weird behavior if reads are done
> from their 32-bit top parts. This patch avoids reading the top
> halves entirely.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> index 0f8e79f..54c9c76 100644
> --- a/drivers/net/mv643xx_eth.c
> +++ b/drivers/net/mv643xx_eth.c
> @@ -983,7 +983,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
> struct mib_counters *p = &mep->mib_counters;
>
> p->good_octets_received += mib_read(mep, 0x00);
> - p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
> +// p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
> p->bad_octets_received += mib_read(mep, 0x08);
> p->internal_mac_transmit_err += mib_read(mep, 0x0c);
> p->good_frames_received += mib_read(mep, 0x10);
> @@ -997,7 +997,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
> p->frames_512_to_1023_octets += mib_read(mep, 0x30);
> p->frames_1024_to_max_octets += mib_read(mep, 0x34);
> p->good_octets_sent += mib_read(mep, 0x38);
> - p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
> +// p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
> p->good_frames_sent += mib_read(mep, 0x40);
> p->excessive_collision += mib_read(mep, 0x44);
> p->multicast_frames_sent += mib_read(mep, 0x48);
I'd add a comment referring to the weird behavior. Also, aren't
C++-style comments discouraged?
-Dale
^ permalink raw reply [flat|nested] 92+ messages in thread
* Re: [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers
2008-06-05 12:46 ` Dale Farnsworth
@ 2008-06-06 7:45 ` Lennert Buytenhek
0 siblings, 0 replies; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-06 7:45 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On Thu, Jun 05, 2008 at 05:46:58AM -0700, Dale Farnsworth wrote:
> > The two 64-bit MIB registers (good_octets_received and
> > good_octets_sent) can trigger weird behavior if reads are done
> > from their 32-bit top parts. This patch avoids reading the top
> > halves entirely.
> >
> > Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> > ---
> > drivers/net/mv643xx_eth.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
> > index 0f8e79f..54c9c76 100644
> > --- a/drivers/net/mv643xx_eth.c
> > +++ b/drivers/net/mv643xx_eth.c
> > @@ -983,7 +983,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
> > struct mib_counters *p = &mep->mib_counters;
> >
> > p->good_octets_received += mib_read(mep, 0x00);
> > - p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
> > +// p->good_octets_received += (u64)mib_read(mep, 0x04) << 32;
> > p->bad_octets_received += mib_read(mep, 0x08);
> > p->internal_mac_transmit_err += mib_read(mep, 0x0c);
> > p->good_frames_received += mib_read(mep, 0x10);
> > @@ -997,7 +997,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mep)
> > p->frames_512_to_1023_octets += mib_read(mep, 0x30);
> > p->frames_1024_to_max_octets += mib_read(mep, 0x34);
> > p->good_octets_sent += mib_read(mep, 0x38);
> > - p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
> > +// p->good_octets_sent += (u64)mib_read(mep, 0x3c) << 32;
> > p->good_frames_sent += mib_read(mep, 0x40);
> > p->excessive_collision += mib_read(mep, 0x44);
> > p->multicast_frames_sent += mib_read(mep, 0x48);
>
> I'd add a comment referring to the weird behavior. Also, aren't
> C++-style comments discouraged?
ACK. Let me pull out this patch for now and come up with a better one.
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 38/39] mv643xx_eth: add PHY-less mode
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (36 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 37/39] mv643xx_eth: don't read from upper parts of 64-bit mib registers Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:49 ` Dale Farnsworth
2008-06-03 11:02 ` [PATCH 39/39] mv643xx_eth: update driver version and author fields Lennert Buytenhek
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
On some boards, the mv643xx_eth MAC isn't connected to a PHY but
directly (via the MII/GMII/RGMII interface) to another MAC-layer
device. This patch allows specifying ->phy_addr = -1 to skip all
PHY-related initialisation and run-time poking in that case.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 87 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 54c9c76..4b6c810 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1092,6 +1092,22 @@ static int mv643xx_eth_get_settings(struct net_device *dev, struct ethtool_cmd *
return err;
}
+static int mv643xx_eth_get_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ cmd->supported = SUPPORTED_MII;
+ cmd->advertising = ADVERTISED_MII;
+ cmd->speed = SPEED_1000;
+ cmd->duplex = DUPLEX_FULL;
+ cmd->port = PORT_MII;
+ cmd->phy_address = 0;
+ cmd->transceiver = XCVR_INTERNAL;
+ cmd->autoneg = AUTONEG_DISABLE;
+ cmd->maxtxpkt = 1;
+ cmd->maxrxpkt = 1;
+
+ return 0;
+}
+
static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
@@ -1109,6 +1125,11 @@ static int mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *
return err;
}
+static int mv643xx_eth_set_settings_phyless(struct net_device *dev, struct ethtool_cmd *cmd)
+{
+ return -EINVAL;
+}
+
static void mv643xx_eth_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *drvinfo)
{
@@ -1126,12 +1147,22 @@ static int mv643xx_eth_nway_reset(struct net_device *dev)
return mii_nway_restart(&mep->mii);
}
+static int mv643xx_eth_nway_reset_phyless(struct net_device *dev)
+{
+ return -EINVAL;
+}
+
static u32 mv643xx_eth_get_link(struct net_device *dev)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
return mii_link_ok(&mep->mii);
}
+static u32 mv643xx_eth_get_link_phyless(struct net_device *dev)
+{
+ return 1;
+}
+
static void mv643xx_eth_get_strings(struct net_device *dev,
uint32_t stringset, uint8_t *data)
{
@@ -1191,6 +1222,18 @@ static const struct ethtool_ops mv643xx_eth_ethtool_ops = {
.get_sset_count = mv643xx_eth_get_sset_count,
};
+static const struct ethtool_ops mv643xx_eth_ethtool_ops_phyless = {
+ .get_settings = mv643xx_eth_get_settings_phyless,
+ .set_settings = mv643xx_eth_set_settings_phyless,
+ .get_drvinfo = mv643xx_eth_get_drvinfo,
+ .nway_reset = mv643xx_eth_nway_reset_phyless,
+ .get_link = mv643xx_eth_get_link_phyless,
+ .set_sg = ethtool_op_set_sg,
+ .get_strings = mv643xx_eth_get_strings,
+ .get_ethtool_stats = mv643xx_eth_get_ethtool_stats,
+ .get_sset_count = mv643xx_eth_get_sset_count,
+};
+
/* address handling *********************************************************/
static void uc_addr_get(struct mv643xx_eth_private *mep, unsigned char *addr)
@@ -1637,12 +1680,16 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id)
}
if (int_cause_ext & (INT_EXT_PHY | INT_EXT_LINK)) {
- if (mii_link_ok(&mep->mii)) {
- struct ethtool_cmd cmd;
+ if (mep->phy_addr == -1 || mii_link_ok(&mep->mii)) {
int i;
- mii_ethtool_gset(&mep->mii, &cmd);
- update_pscr(mep, cmd.speed, cmd.duplex);
+ if (mep->phy_addr != -1) {
+ struct ethtool_cmd cmd;
+
+ mii_ethtool_gset(&mep->mii, &cmd);
+ update_pscr(mep, cmd.speed, cmd.duplex);
+ }
+
for (i = 0; i < 8; i++)
if (mep->txq_mask & (1 << i))
txq_enable(mep->txq + i);
@@ -1732,7 +1779,6 @@ static void phy_reset(struct mv643xx_eth_private *mep)
static void port_start(struct mv643xx_eth_private *mep)
{
u32 pscr;
- struct ethtool_cmd ethtool_cmd;
int i;
/*
@@ -1752,9 +1798,16 @@ static void port_start(struct mv643xx_eth_private *mep)
wrl(mep, SDMA_CONFIG(mep->port_num), PORT_SDMA_CONFIG_DEFAULT_VALUE);
- mv643xx_eth_get_settings(mep->dev, ðtool_cmd);
- phy_reset(mep);
- mv643xx_eth_set_settings(mep->dev, ðtool_cmd);
+ /*
+ * Perform PHY reset, if there is a PHY.
+ */
+ if (mep->phy_addr != -1) {
+ struct ethtool_cmd cmd;
+
+ mv643xx_eth_get_settings(mep->dev, &cmd);
+ phy_reset(mep);
+ mv643xx_eth_set_settings(mep->dev, &cmd);
+ }
/*
* Configure TX path and queues.
@@ -1971,7 +2024,10 @@ static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mv643xx_eth_private *mep = netdev_priv(dev);
- return generic_mii_ioctl(&mep->mii, if_mii(ifr), cmd, NULL);
+ if (mep->phy_addr != -1)
+ return generic_mii_ioctl(&mep->mii, if_mii(ifr), cmd, NULL);
+
+ return -EOPNOTSUPP;
}
static int mv643xx_eth_change_mtu(struct net_device *dev, int new_mtu)
@@ -2368,10 +2424,15 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
mib_counters_clear(mep);
INIT_WORK(&mep->tx_timeout_task, tx_timeout_task);
- err = phy_init(mep, pd);
- if (err)
- goto out;
- SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
+ if (mep->phy_addr != -1) {
+ err = phy_init(mep, pd);
+ if (err)
+ goto out;
+
+ SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops);
+ } else {
+ SET_ETHTOOL_OPS(dev, &mv643xx_eth_ethtool_ops_phyless);
+ }
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread* Re: [PATCH 38/39] mv643xx_eth: add PHY-less mode
2008-06-03 11:02 ` [PATCH 38/39] mv643xx_eth: add PHY-less mode Lennert Buytenhek
@ 2008-06-05 12:49 ` Dale Farnsworth
0 siblings, 0 replies; 92+ messages in thread
From: Dale Farnsworth @ 2008-06-05 12:49 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev
On Tue, Jun 03, 2008 at 01:02:53PM +0200, Lennert Buytenhek wrote:
> On some boards, the mv643xx_eth MAC isn't connected to a PHY but
> directly (via the MII/GMII/RGMII interface) to another MAC-layer
> device. This patch allows specifying ->phy_addr = -1 to skip all
> PHY-related initialisation and run-time poking in that case.
>
> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
> ---
> drivers/net/mv643xx_eth.c | 87 ++++++++++++++++++++++++++++++++++++++-------
> 1 files changed, 74 insertions(+), 13 deletions(-)
Acked-by: Dale Farnsworth <dale@farnsworth.org>
^ permalink raw reply [flat|nested] 92+ messages in thread
* [PATCH 39/39] mv643xx_eth: update driver version and author fields
2008-06-03 11:02 [PATCH 00/39] mv643xx_eth: complete overhaul Lennert Buytenhek
` (37 preceding siblings ...)
2008-06-03 11:02 ` [PATCH 38/39] mv643xx_eth: add PHY-less mode Lennert Buytenhek
@ 2008-06-03 11:02 ` Lennert Buytenhek
2008-06-05 12:48 ` Dale Farnsworth
38 siblings, 1 reply; 92+ messages in thread
From: Lennert Buytenhek @ 2008-06-03 11:02 UTC (permalink / raw)
To: Dale Farnsworth; +Cc: netdev
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
---
drivers/net/mv643xx_eth.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 4b6c810..cd85222 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -47,7 +47,7 @@
#include <linux/mv643xx_eth.h>
static char mv643xx_eth_driver_name[] = "mv643xx_eth";
-static char mv643xx_eth_driver_version[] = "1.0";
+static char mv643xx_eth_driver_version[] = "1.1";
#define MV643XX_ETH_CHECKSUM_OFFLOAD_TX
#define MV643XX_ETH_NAPI
@@ -2551,8 +2551,8 @@ static void __exit mv643xx_eth_cleanup_module(void)
}
module_exit(mv643xx_eth_cleanup_module);
-MODULE_AUTHOR("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani "
- "and Dale Farnsworth");
+MODULE_AUTHOR("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, "
+ "Manish Lachwani, Dale Farnsworth and Lennert Buytenhek");
MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:" MV643XX_ETH_SHARED_NAME);
--
1.5.3.4
^ permalink raw reply related [flat|nested] 92+ messages in thread