system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: systemport: Pre-calculate and utilize cb->bd_addr

Browse source 
There is a 1:1 mapping between the software maintained control block in
priv->rx_cbs and the buffer address in priv->rx_bds, such that there is
no need to keep computing the buffer address when refiling a control
block.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2015-05-28 15:24:42 -07:00 committed by David S. Miller
parent 3d2f6d41d1
commit baf387a8ed
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/ethernet/broadcom/bcmsysport.c
View file

@ -549,12 +549,7 @@ static int bcm_sysport_rx_refill(struct bcm_sysport_priv *priv,
} }
dma_unmap_addr_set(cb, dma_addr, mapping); dma_unmap_addr_set(cb, dma_addr, mapping);
dma_desc_set_addr(priv, priv->rx_bd_assign_ptr, mapping); dma_desc_set_addr(priv, cb->bd_addr, mapping);
priv->rx_bd_assign_index++;
priv->rx_bd_assign_index &= (priv->num_rx_bds - 1);
priv->rx_bd_assign_ptr = priv->rx_bds +
(priv->rx_bd_assign_index * DESC_SIZE);
netif_dbg(priv, rx_status, ndev, "RX refill\n"); netif_dbg(priv, rx_status, ndev, "RX refill\n");
@ -568,7 +563,7 @@ static int bcm_sysport_alloc_rx_bufs(struct bcm_sysport_priv *priv)
unsigned int i; unsigned int i;
for (i = 0; i < priv->num_rx_bds; i++) { for (i = 0; i < priv->num_rx_bds; i++) {
cb = &priv->rx_cbs[priv->rx_bd_assign_index]; cb = &priv->rx_cbs[i];
if (cb->skb) if (cb->skb)
continue; continue;
@ -1330,14 +1325,14 @@ static inline int tdma_enable_set(struct bcm_sysport_priv *priv,
static int bcm_sysport_init_rx_ring(struct bcm_sysport_priv *priv) static int bcm_sysport_init_rx_ring(struct bcm_sysport_priv *priv)
{ {
struct bcm_sysport_cb *cb;
u32 reg; u32 reg;
int ret; int ret;
int i;
/* Initialize SW view of the RX ring */ /* Initialize SW view of the RX ring */
priv->num_rx_bds = NUM_RX_DESC; priv->num_rx_bds = NUM_RX_DESC;
priv->rx_bds = priv->base + SYS_PORT_RDMA_OFFSET; priv->rx_bds = priv->base + SYS_PORT_RDMA_OFFSET;
priv->rx_bd_assign_ptr = priv->rx_bds;
priv->rx_bd_assign_index = 0;
priv->rx_c_index = 0; priv->rx_c_index = 0;
priv->rx_read_ptr = 0; priv->rx_read_ptr = 0;
priv->rx_cbs = kcalloc(priv->num_rx_bds, sizeof(struct bcm_sysport_cb), priv->rx_cbs = kcalloc(priv->num_rx_bds, sizeof(struct bcm_sysport_cb),
@ -1347,6 +1342,11 @@ static int bcm_sysport_init_rx_ring(struct bcm_sysport_priv *priv)
return -ENOMEM; return -ENOMEM;
} }
for (i = 0; i < priv->num_rx_bds; i++) {
cb = priv->rx_cbs + i;
cb->bd_addr = priv->rx_bds + i * DESC_SIZE;
}
ret = bcm_sysport_alloc_rx_bufs(priv); ret = bcm_sysport_alloc_rx_bufs(priv);
if (ret) { if (ret) {
netif_err(priv, hw, priv->netdev, "SKB allocation failed\n"); netif_err(priv, hw, priv->netdev, "SKB allocation failed\n");

2
drivers/net/ethernet/broadcom/bcmsysport.h
View file

@ -663,8 +663,6 @@ struct bcm_sysport_priv {
/* Receive queue */ /* Receive queue */
void __iomem *rx_bds; void __iomem *rx_bds;
void __iomem *rx_bd_assign_ptr;
unsigned int rx_bd_assign_index;
struct bcm_sysport_cb *rx_cbs; struct bcm_sysport_cb *rx_cbs;
unsigned int num_rx_bds; unsigned int num_rx_bds;
unsigned int rx_read_ptr; unsigned int rx_read_ptr;