* [PATCH net-next 0/2] r8169: replace some magic with more speaking functions
@ 2019-05-05 10:32 Heiner Kallweit
2019-05-05 10:33 ` [PATCH net-next 1/2] r8169: add rtl_set_fifo_size Heiner Kallweit
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Heiner Kallweit @ 2019-05-05 10:32 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
Based on info from Realtek replace some magic with speaking functions
even though the exact meaning of certain values isn't known.
Heiner Kallweit (2):
r8169: add rtl_set_fifo_size
r8169: add rtl8168g_set_pause_thresholds
drivers/net/ethernet/realtek/r8169.c | 45 +++++++++++++++++-----------
1 file changed, 27 insertions(+), 18 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] r8169: add rtl_set_fifo_size
2019-05-05 10:32 [PATCH net-next 0/2] r8169: replace some magic with more speaking functions Heiner Kallweit
@ 2019-05-05 10:33 ` Heiner Kallweit
2019-05-05 10:34 ` [PATCH net-next 2/2] r8169: add rtl8168g_set_pause_thresholds Heiner Kallweit
2019-05-06 4:58 ` [PATCH net-next 0/2] r8169: replace some magic with more speaking functions David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Heiner Kallweit @ 2019-05-05 10:33 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
Based on info from Realtek replace FIFO size config magic with
a function.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 75c99c392..ed63c98a6 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4756,6 +4756,16 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
udelay(10);
}
+static void rtl_set_fifo_size(struct rtl8169_private *tp, u16 rx_stat,
+ u16 tx_stat, u16 rx_dyn, u16 tx_dyn)
+{
+ /* Usage of dynamic vs. static FIFO is controlled by bit
+ * TXCFG_AUTO_FIFO. Exact meaning of FIFO values isn't known.
+ */
+ rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, (rx_stat << 16) | rx_dyn);
+ rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, (tx_stat << 16) | tx_dyn);
+}
+
static void rtl_hw_start_8168bb(struct rtl8169_private *tp)
{
RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
@@ -4982,8 +4992,7 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)
rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006);
+ rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);
rtl_eri_write(tp, 0xcc, ERIAR_MASK_1111, 0x00000050);
rtl_eri_write(tp, 0xd0, ERIAR_MASK_1111, 0x07ff0060);
rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_0001, BIT(4));
@@ -5012,8 +5021,7 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)
rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00100002);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006);
+ rtl_set_fifo_size(tp, 0x10, 0x10, 0x02, 0x06);
rtl_reset_packet_filter(tp);
rtl_eri_set_bits(tp, 0x1b0, ERIAR_MASK_0001, BIT(4));
rtl_eri_set_bits(tp, 0x1d0, ERIAR_MASK_0001, BIT(4));
@@ -5067,10 +5075,9 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)
static void rtl_hw_start_8168g(struct rtl8169_private *tp)
{
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x080002);
+ rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38);
rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006);
rtl_set_def_aspm_entry_latency(tp);
@@ -5162,10 +5169,9 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
rtl_hw_aspm_clkreq_enable(tp, false);
rtl_ephy_init(tp, e_info_8168h_1);
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x00080002);
+ rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38);
rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006);
rtl_set_def_aspm_entry_latency(tp);
@@ -5242,10 +5248,9 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)
{
rtl8168ep_stop_cmac(tp);
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_0101, 0x00080002);
+ rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x2f);
rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x5f);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00100006);
rtl_set_def_aspm_entry_latency(tp);
@@ -5445,8 +5450,7 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)
rtl_tx_performance_tweak(tp, PCI_EXP_DEVCTL_READRQ_4096B);
- rtl_eri_write(tp, 0xc8, ERIAR_MASK_1111, 0x00000002);
- rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, 0x00000006);
+ rtl_set_fifo_size(tp, 0x00, 0x00, 0x02, 0x06);
rtl_reset_packet_filter(tp);
rtl_eri_write(tp, 0xc0, ERIAR_MASK_0011, 0x0000);
rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] r8169: add rtl8168g_set_pause_thresholds
2019-05-05 10:32 [PATCH net-next 0/2] r8169: replace some magic with more speaking functions Heiner Kallweit
2019-05-05 10:33 ` [PATCH net-next 1/2] r8169: add rtl_set_fifo_size Heiner Kallweit
@ 2019-05-05 10:34 ` Heiner Kallweit
2019-05-06 4:58 ` [PATCH net-next 0/2] r8169: replace some magic with more speaking functions David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Heiner Kallweit @ 2019-05-05 10:34 UTC (permalink / raw)
To: Realtek linux nic maintainers, David Miller; +Cc: netdev
Based on info from Realtek add a function for defining the thresholds
controlling ethernet flow control.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index ed63c98a6..2e20334b7 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4766,6 +4766,14 @@ static void rtl_set_fifo_size(struct rtl8169_private *tp, u16 rx_stat,
rtl_eri_write(tp, 0xe8, ERIAR_MASK_1111, (tx_stat << 16) | tx_dyn);
}
+static void rtl8168g_set_pause_thresholds(struct rtl8169_private *tp,
+ u8 low, u8 high)
+{
+ /* FIFO thresholds for pause flow control */
+ rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, low);
+ rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, high);
+}
+
static void rtl_hw_start_8168bb(struct rtl8169_private *tp)
{
RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Beacon_en);
@@ -5076,8 +5084,7 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)
static void rtl_hw_start_8168g(struct rtl8169_private *tp)
{
rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
- rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38);
- rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48);
+ rtl8168g_set_pause_thresholds(tp, 0x38, 0x48);
rtl_set_def_aspm_entry_latency(tp);
@@ -5170,8 +5177,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
rtl_ephy_init(tp, e_info_8168h_1);
rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
- rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x38);
- rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x48);
+ rtl8168g_set_pause_thresholds(tp, 0x38, 0x48);
rtl_set_def_aspm_entry_latency(tp);
@@ -5249,8 +5255,7 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)
rtl8168ep_stop_cmac(tp);
rtl_set_fifo_size(tp, 0x08, 0x10, 0x02, 0x06);
- rtl_eri_write(tp, 0xcc, ERIAR_MASK_0001, 0x2f);
- rtl_eri_write(tp, 0xd0, ERIAR_MASK_0001, 0x5f);
+ rtl8168g_set_pause_thresholds(tp, 0x2f, 0x5f);
rtl_set_def_aspm_entry_latency(tp);
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] r8169: replace some magic with more speaking functions
2019-05-05 10:32 [PATCH net-next 0/2] r8169: replace some magic with more speaking functions Heiner Kallweit
2019-05-05 10:33 ` [PATCH net-next 1/2] r8169: add rtl_set_fifo_size Heiner Kallweit
2019-05-05 10:34 ` [PATCH net-next 2/2] r8169: add rtl8168g_set_pause_thresholds Heiner Kallweit
@ 2019-05-06 4:58 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-05-06 4:58 UTC (permalink / raw)
To: hkallweit1; +Cc: nic_swsd, netdev
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 5 May 2019 12:32:29 +0200
> Based on info from Realtek replace some magic with speaking functions
> even though the exact meaning of certain values isn't known.
Series applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-06 4:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-05 10:32 [PATCH net-next 0/2] r8169: replace some magic with more speaking functions Heiner Kallweit
2019-05-05 10:33 ` [PATCH net-next 1/2] r8169: add rtl_set_fifo_size Heiner Kallweit
2019-05-05 10:34 ` [PATCH net-next 2/2] r8169: add rtl8168g_set_pause_thresholds Heiner Kallweit
2019-05-06 4:58 ` [PATCH net-next 0/2] r8169: replace some magic with more speaking functions David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.