From: Paul Burton <paul.burton@mips.com>
To: <netdev@vger.kernel.org>
Cc: Hassan Naveed <hassan.naveed@mips.com>,
Matt Redfearn <matt.redfearn@mips.com>,
"David S . Miller" <davem@davemloft.net>,
<linux-mips@linux-mips.org>, Paul Burton <paul.burton@mips.com>
Subject: [PATCH v5 08/14] net: pch_gbe: Fold pch_gbe_setup_[rt]ctl into pch_gbe_configure_[rt]x
Date: Sat, 17 Feb 2018 12:10:31 -0800 [thread overview]
Message-ID: <20180217201037.3006-9-paul.burton@mips.com> (raw)
In-Reply-To: <20180217201037.3006-1-paul.burton@mips.com>
The pch_gbe driver splits configuration of the receive path between
pch_gbe_setup_rctl() & pch_gbe_configure_rx(), which are always called
together and in that order. The split between the two functions seems
somewhat arbitrary, as both are configuring registers for the receive
path. Fold pch_gbe_setup_rctl() into pch_gbe_configure_rx() such that
callers only need to call one function to configure the receive path
registers.
Similarly configuration of transmit path registers is split between
pch_gbe_setup_tctl() & pch_gbe_configure_tx(), and we fold the former
into the latter in the same way.
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
---
Changes in v5:
- New patch.
Changes in v4: None
Changes in v3: None
Changes in v2: None
.../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 52 ++++++----------------
1 file changed, 13 insertions(+), 39 deletions(-)
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 60e91c0fc98b..2d6980603ee4 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -831,39 +831,26 @@ static void pch_gbe_irq_enable(struct pch_gbe_adapter *adapter)
ioread32(&hw->reg->INT_EN));
}
-
-
/**
- * pch_gbe_setup_tctl - configure the Transmit control registers
+ * pch_gbe_configure_tx - Configure Transmit Unit after Reset
* @adapter: Board private structure
*/
-static void pch_gbe_setup_tctl(struct pch_gbe_adapter *adapter)
+static void pch_gbe_configure_tx(struct pch_gbe_adapter *adapter)
{
struct pch_gbe_hw *hw = &adapter->hw;
- u32 tx_mode, tcpip;
+ u32 tdba, tdlen, dctrl, tx_mode, tcpip;
tx_mode = PCH_GBE_TM_LONG_PKT |
PCH_GBE_TM_ST_AND_FD |
PCH_GBE_TM_SHORT_PKT |
PCH_GBE_TM_TH_TX_STRT_8 |
- PCH_GBE_TM_TH_ALM_EMP_4 | PCH_GBE_TM_TH_ALM_FULL_8;
-
+ PCH_GBE_TM_TH_ALM_EMP_4 |
+ PCH_GBE_TM_TH_ALM_FULL_8;
iowrite32(tx_mode, &hw->reg->TX_MODE);
tcpip = ioread32(&hw->reg->TCPIP_ACC);
tcpip |= PCH_GBE_TX_TCPIPACC_EN;
iowrite32(tcpip, &hw->reg->TCPIP_ACC);
- return;
-}
-
-/**
- * pch_gbe_configure_tx - Configure Transmit Unit after Reset
- * @adapter: Board private structure
- */
-static void pch_gbe_configure_tx(struct pch_gbe_adapter *adapter)
-{
- struct pch_gbe_hw *hw = &adapter->hw;
- u32 tdba, tdlen, dctrl;
netdev_dbg(adapter->netdev, "dma addr = 0x%08llx size = 0x%08x\n",
(unsigned long long)adapter->tx_ring->dma,
@@ -883,35 +870,25 @@ static void pch_gbe_configure_tx(struct pch_gbe_adapter *adapter)
}
/**
- * pch_gbe_setup_rctl - Configure the receive control registers
+ * pch_gbe_configure_rx - Configure Receive Unit after Reset
* @adapter: Board private structure
*/
-static void pch_gbe_setup_rctl(struct pch_gbe_adapter *adapter)
+static void pch_gbe_configure_rx(struct pch_gbe_adapter *adapter)
{
struct pch_gbe_hw *hw = &adapter->hw;
- u32 rx_mode, tcpip;
-
- rx_mode = PCH_GBE_ADD_FIL_EN | PCH_GBE_MLT_FIL_EN |
- PCH_GBE_RH_ALM_EMP_4 | PCH_GBE_RH_ALM_FULL_4 | PCH_GBE_RH_RD_TRG_8;
+ u32 rdba, rdlen, rxdma, rx_mode, tcpip;
+ rx_mode = PCH_GBE_ADD_FIL_EN |
+ PCH_GBE_MLT_FIL_EN |
+ PCH_GBE_RH_ALM_EMP_4 |
+ PCH_GBE_RH_ALM_FULL_4 |
+ PCH_GBE_RH_RD_TRG_8;
iowrite32(rx_mode, &hw->reg->RX_MODE);
tcpip = ioread32(&hw->reg->TCPIP_ACC);
-
tcpip |= PCH_GBE_RX_TCPIPACC_OFF;
tcpip &= ~PCH_GBE_RX_TCPIPACC_EN;
iowrite32(tcpip, &hw->reg->TCPIP_ACC);
- return;
-}
-
-/**
- * pch_gbe_configure_rx - Configure Receive Unit after Reset
- * @adapter: Board private structure
- */
-static void pch_gbe_configure_rx(struct pch_gbe_adapter *adapter)
-{
- struct pch_gbe_hw *hw = &adapter->hw;
- u32 rdba, rdlen, rxdma;
netdev_dbg(adapter->netdev, "dma adr = 0x%08llx size = 0x%08x\n",
(unsigned long long)adapter->rx_ring->dma,
@@ -1954,9 +1931,7 @@ int pch_gbe_up(struct pch_gbe_adapter *adapter)
/* hardware has been reset, we need to reload some things */
pch_gbe_set_multi(netdev);
- pch_gbe_setup_tctl(adapter);
pch_gbe_configure_tx(adapter);
- pch_gbe_setup_rctl(adapter);
pch_gbe_configure_rx(adapter);
err = pch_gbe_request_irq(adapter);
@@ -2486,7 +2461,6 @@ static int __pch_gbe_suspend(struct pci_dev *pdev)
pch_gbe_down(adapter);
if (wufc) {
pch_gbe_set_multi(netdev);
- pch_gbe_setup_rctl(adapter);
pch_gbe_configure_rx(adapter);
pch_gbe_set_rgmii_ctrl(adapter, hw->mac.link_speed,
hw->mac.link_duplex);
--
2.16.1
next prev parent reply other threads:[~2018-02-17 20:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-17 20:10 [PATCH v5 00/14] net: pch_gbe: Fixes & MIPS support Paul Burton
2018-02-17 20:10 ` [PATCH v5 01/14] net: pch_gbe: Mark Minnow PHY reset GPIO active low Paul Burton
2018-02-17 22:14 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 02/14] net: pch_gbe: Pull PHY GPIO handling out of Minnow code Paul Burton
2018-02-17 22:29 ` Andrew Lunn
2018-02-17 22:50 ` Paul Burton
2018-02-17 23:34 ` Andrew Lunn
2018-02-18 15:51 ` Paul Burton
2018-02-18 16:14 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 03/14] dt-bindings: net: Document Intel pch_gbe binding Paul Burton
[not found] ` <20180217201037.3006-4-paul.burton-8NJIiSa5LzA@public.gmane.org>
2018-02-17 22:32 ` Andrew Lunn
2018-02-17 20:10 ` [PATCH v5 04/14] net: pch_gbe: Add device tree support Paul Burton
2018-02-17 20:10 ` [PATCH v5 05/14] net: pch_gbe: Always reset PHY along with MAC Paul Burton
2018-02-17 20:10 ` [PATCH v5 06/14] net: pch_gbe: Allow longer for resets Paul Burton
2018-02-18 15:29 ` kbuild test robot
2018-02-17 20:10 ` [PATCH v5 07/14] net: pch_gbe: Fix handling of TX padding Paul Burton
2018-02-19 14:01 ` David Laight
2018-02-19 16:42 ` Paul Burton
2018-02-19 16:41 ` David Miller
2018-02-17 20:10 ` Paul Burton [this message]
2018-02-17 20:10 ` [PATCH v5 09/14] net: pch_gbe: Use pch_gbe_disable_dma_rx() in pch_gbe_configure_rx() Paul Burton
2018-02-17 20:10 ` [PATCH v5 10/14] net: pch_gbe: Disable TX DMA whilst configuring descriptors Paul Burton
2018-02-17 20:10 ` [PATCH v5 11/14] net: pch_gbe: Ensure DMA is ordered with descriptor writes Paul Burton
2018-02-17 20:10 ` [PATCH v5 12/14] net: pch_gbe: Fix TX RX descriptor accesses for big endian systems Paul Burton
2018-02-18 16:01 ` kbuild test robot
2018-02-17 20:10 ` [PATCH v5 13/14] ptp: pch: Allow build on MIPS platforms Paul Burton
2018-02-17 20:10 ` [PATCH v5 14/14] net: pch_gbe: " Paul Burton
2018-02-18 15:31 ` [PATCH v5 00/14] net: pch_gbe: Fixes & MIPS support David Miller
2018-02-18 17:03 ` Paul Burton
2018-02-18 17:56 ` Andrew Lunn
2018-02-18 22:09 ` Paul Burton
2018-02-19 1:15 ` David Miller
2018-02-19 2:17 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180217201037.3006-9-paul.burton@mips.com \
--to=paul.burton@mips.com \
--cc=davem@davemloft.net \
--cc=hassan.naveed@mips.com \
--cc=linux-mips@linux-mips.org \
--cc=matt.redfearn@mips.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).