* [PATCH net-next 0/3] r8169: series with smaller improvements
@ 2018-09-25 5:55 Heiner Kallweit
2018-09-25 5:56 ` [PATCH net-next 1/3] r8169: use default watchdog timeout Heiner Kallweit
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Heiner Kallweit @ 2018-09-25 5:55 UTC (permalink / raw)
To: David Miller, Realtek linux nic maintainers; +Cc: netdev@vger.kernel.org
This series includes smaller improvements, nothing exciting.
Heiner Kallweit (3):
r8169: use default watchdog timeout
r8169: improve rtl8169_irq_mask_and_ack
r8169: improve a check in rtl_init_one
drivers/net/ethernet/realtek/r8169.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
--
2.19.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next 1/3] r8169: use default watchdog timeout
2018-09-25 5:55 [PATCH net-next 0/3] r8169: series with smaller improvements Heiner Kallweit
@ 2018-09-25 5:56 ` Heiner Kallweit
2018-09-25 5:58 ` [PATCH net-next 2/3] r8169: improve rtl8169_irq_mask_and_ack Heiner Kallweit
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2018-09-25 5:56 UTC (permalink / raw)
To: David Miller, Realtek linux nic maintainers; +Cc: netdev@vger.kernel.org
The networking core has a default watchdog timeout of 5s. I see no
need to define an own timeout of 6s which is basically the same.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 1843fafb6..dd5822673 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -77,8 +77,6 @@ static const int multicast_filter_limit = 32;
#define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
-#define RTL8169_TX_TIMEOUT (6*HZ)
-
/* write/read MMIO register */
#define RTL_W8(tp, reg, val8) writeb((val8), tp->mmio_addr + (reg))
#define RTL_W16(tp, reg, val16) writew((val16), tp->mmio_addr + (reg))
@@ -7414,7 +7412,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
dev->ethtool_ops = &rtl8169_ethtool_ops;
- dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT);
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 2/3] r8169: improve rtl8169_irq_mask_and_ack
2018-09-25 5:55 [PATCH net-next 0/3] r8169: series with smaller improvements Heiner Kallweit
2018-09-25 5:56 ` [PATCH net-next 1/3] r8169: use default watchdog timeout Heiner Kallweit
@ 2018-09-25 5:58 ` Heiner Kallweit
2018-09-25 5:59 ` [PATCH net-next 3/3] r8169: improve a check in rtl_init_one Heiner Kallweit
2018-09-25 17:36 ` [PATCH net-next 0/3] r8169: series with smaller improvements David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2018-09-25 5:58 UTC (permalink / raw)
To: David Miller, Realtek linux nic maintainers; +Cc: netdev@vger.kernel.org
Code can be slightly simplified by acking even events we're not
interested in. In addition add a comment making clear that the
read has no functional purpose and is just a PCI commit.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index dd5822673..2d9e6c186 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1352,7 +1352,8 @@ static void rtl_irq_enable_all(struct rtl8169_private *tp)
static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp)
{
rtl_irq_disable(tp);
- rtl_ack_events(tp, RTL_EVENT_NAPI | tp->event_slow);
+ rtl_ack_events(tp, 0xffff);
+ /* PCI commit */
RTL_R8(tp, ChipCmd);
}
@@ -7365,14 +7366,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
rtl_init_rxcfg(tp);
- rtl_irq_disable(tp);
+ rtl8169_irq_mask_and_ack(tp);
rtl_hw_initialize(tp);
rtl_hw_reset(tp);
- rtl_ack_events(tp, 0xffff);
-
pci_set_master(pdev);
rtl_init_mdio_ops(tp);
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 3/3] r8169: improve a check in rtl_init_one
2018-09-25 5:55 [PATCH net-next 0/3] r8169: series with smaller improvements Heiner Kallweit
2018-09-25 5:56 ` [PATCH net-next 1/3] r8169: use default watchdog timeout Heiner Kallweit
2018-09-25 5:58 ` [PATCH net-next 2/3] r8169: improve rtl8169_irq_mask_and_ack Heiner Kallweit
@ 2018-09-25 5:59 ` Heiner Kallweit
2018-09-25 17:36 ` [PATCH net-next 0/3] r8169: series with smaller improvements David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2018-09-25 5:59 UTC (permalink / raw)
To: David Miller, Realtek linux nic maintainers; +Cc: netdev@vger.kernel.org
The check for pci_is_pcie() is redundant here because all
chip versions >=18 are PCIe only anyway. In addition use
dma_set_mask_and_coherent() instead of separate calls to
pci_set_dma_mask() and pci_set_consistent_dma_mask().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 2d9e6c186..f882be49f 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7346,11 +7346,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
tp->cp_cmd = RTL_R16(tp, CPlusCmd);
- if ((sizeof(dma_addr_t) > 4) &&
- (use_dac == 1 || (use_dac == -1 && pci_is_pcie(pdev) &&
- tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
- !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
- !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
+ if (sizeof(dma_addr_t) > 4 && (use_dac == 1 || (use_dac == -1 &&
+ tp->mac_version >= RTL_GIGA_MAC_VER_18)) &&
+ !dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {
/* CPlusCmd Dual Access Cycle is only needed for non-PCIe */
if (!pci_is_pcie(pdev))
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/3] r8169: series with smaller improvements
2018-09-25 5:55 [PATCH net-next 0/3] r8169: series with smaller improvements Heiner Kallweit
` (2 preceding siblings ...)
2018-09-25 5:59 ` [PATCH net-next 3/3] r8169: improve a check in rtl_init_one Heiner Kallweit
@ 2018-09-25 17:36 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2018-09-25 17:36 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Tue, 25 Sep 2018 07:55:36 +0200
> This series includes smaller improvements, nothing exciting.
Series applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-09-25 23:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-25 5:55 [PATCH net-next 0/3] r8169: series with smaller improvements Heiner Kallweit
2018-09-25 5:56 ` [PATCH net-next 1/3] r8169: use default watchdog timeout Heiner Kallweit
2018-09-25 5:58 ` [PATCH net-next 2/3] r8169: improve rtl8169_irq_mask_and_ack Heiner Kallweit
2018-09-25 5:59 ` [PATCH net-next 3/3] r8169: improve a check in rtl_init_one Heiner Kallweit
2018-09-25 17:36 ` [PATCH net-next 0/3] r8169: series with smaller improvements David Miller
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).