diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-04-12 13:27:07 +1000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-04-12 10:17:02 -0400 |
| commit | 8eecf7caad8687eae2812fc6467f156a8909eb12 (patch) | |
| tree | adbd794ce40af6cb068be1852d9e5779fd2d3b23 /drivers/net/ethernet/faraday/ftgmac100.c | |
| parent | ftgmac100: Rename ftgmac100_setup_mac to ftgmac100_initial_mac (diff) | |
| download | linux-dev-8eecf7caad8687eae2812fc6467f156a8909eb12.tar.xz linux-dev-8eecf7caad8687eae2812fc6467f156a8909eb12.zip | |
ftgmac100: Open code remaining register writes
The helpers just take space but don't provide much value. Simple
one line comments are more explanatory.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index d9c5ede53606..f14700f67d67 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -95,29 +95,6 @@ struct ftgmac100 { bool is_aspeed; }; -static void ftgmac100_set_rx_ring_base(struct ftgmac100 *priv, dma_addr_t addr) -{ - iowrite32(addr, priv->base + FTGMAC100_OFFSET_RXR_BADR); -} - -static void ftgmac100_set_rx_buffer_size(struct ftgmac100 *priv, - unsigned int size) -{ - size = FTGMAC100_RBSR_SIZE(size); - iowrite32(size, priv->base + FTGMAC100_OFFSET_RBSR); -} - -static void ftgmac100_set_normal_prio_tx_ring_base(struct ftgmac100 *priv, - dma_addr_t addr) -{ - iowrite32(addr, priv->base + FTGMAC100_OFFSET_NPTXR_BADR); -} - -static void ftgmac100_txdma_normal_prio_start_polling(struct ftgmac100 *priv) -{ - iowrite32(1, priv->base + FTGMAC100_OFFSET_NPTXPD); -} - static int ftgmac100_reset_mac(struct ftgmac100 *priv, u32 maccr) { struct net_device *netdev = priv->netdev; @@ -235,18 +212,27 @@ static int ftgmac100_set_mac_addr(struct net_device *dev, void *p) static void ftgmac100_init_hw(struct ftgmac100 *priv) { - /* setup ring buffer base registers */ - ftgmac100_set_rx_ring_base(priv, - priv->descs_dma_addr + - offsetof(struct ftgmac100_descs, rxdes)); - ftgmac100_set_normal_prio_tx_ring_base(priv, - priv->descs_dma_addr + - offsetof(struct ftgmac100_descs, txdes)); - ftgmac100_set_rx_buffer_size(priv, RX_BUF_SIZE); - iowrite32(FTGMAC100_APTC_RXPOLL_CNT(1), priv->base + FTGMAC100_OFFSET_APTC); + /* Setup RX ring buffer base */ + iowrite32(priv->descs_dma_addr + + offsetof(struct ftgmac100_descs, rxdes), + priv->base + FTGMAC100_OFFSET_RXR_BADR); + /* Setup TX ring buffer base */ + iowrite32(priv->descs_dma_addr + + offsetof(struct ftgmac100_descs, txdes), + priv->base + FTGMAC100_OFFSET_NPTXR_BADR); + + /* Configure RX buffer size */ + iowrite32(FTGMAC100_RBSR_SIZE(RX_BUF_SIZE), + priv->base + FTGMAC100_OFFSET_RBSR); + + /* Set RX descriptor autopoll */ + iowrite32(FTGMAC100_APTC_RXPOLL_CNT(1), + priv->base + FTGMAC100_OFFSET_APTC); + + /* Write MAC address */ ftgmac100_write_mac_addr(priv, priv->netdev->dev_addr); } @@ -706,7 +692,8 @@ static int ftgmac100_hard_start_xmit(struct sk_buff *skb, netif_wake_queue(netdev); } - ftgmac100_txdma_normal_prio_start_polling(priv); + /* Poke transmitter to read the updated TX descriptors */ + iowrite32(1, priv->base + FTGMAC100_OFFSET_NPTXPD); return NETDEV_TX_OK; |