[RFC] [PATCH net-next v7 3/4] r8169: Use mutex to guard config register locking
flat view
STALE1824d
From: Kai-Heng Feng <hidden>
Date: 2021-10-16 07:55:18
Also in:
linux-pci, lkml
Subsystem:
8169 10/100/1000 gigabit ethernet driver, networking drivers, the rest · Maintainers:
Heiner Kallweit, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v7 of 4 in this series.
Revisions (4)
- v3 [diff vs current]
- v5 [diff vs current]
- v6 [diff vs current]
- v7 current
Right now r8169 doesn't have parallel access to its config register, but the next patch will access config register at anytime. So add a mutex to prevent the race. Signed-off-by: Kai-Heng Feng <redacted> --- v7: - This is a new patch. drivers/net/ethernet/realtek/r8169_main.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 53936ebb3b3a6..b91de853e60f0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c@@ -621,6 +621,8 @@ struct rtl8169_private { struct work_struct work; } wk; + struct mutex config_lock; + unsigned supports_gmii:1; dma_addr_t counters_phys_addr; struct rtl8169_counters *counters;
@@ -670,12 +672,14 @@ static inline struct device *tp_to_dev(struct rtl8169_private *tp) static void rtl_lock_config_regs(struct rtl8169_private *tp) { + mutex_lock(&tp->config_lock); RTL_W8(tp, Cfg9346, Cfg9346_Lock); } static void rtl_unlock_config_regs(struct rtl8169_private *tp) { RTL_W8(tp, Cfg9346, Cfg9346_Unlock); + mutex_unlock(&tp->config_lock); } static void rtl_pci_commit(struct rtl8169_private *tp)
@@ -5307,6 +5311,8 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return rc; } + mutex_init(&tp->config_lock); + tp->mmio_addr = pcim_iomap_table(pdev)[region]; xid = (RTL_R32(tp, TxConfig) >> 20) & 0xfcf;
--
2.32.0