Skip to contentSkip to conversation

r8169: factor out firmware handling

PATCH In review Heiner Kallweit 2 participants 4 messages Jun 5, 2019

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

v2 cover r8169: factor out firmware handling

Let's factor out firmware handling into a separate source code file. This simplifies reading the code and makes clearer what the interface between driver and firmware handling is.

v2:
- fix small whitespace issue in patch 2

Heiner Kallweit (2):
r8169: rename r8169.c to r8169_main.c
r8169: factor out firmware handling

 drivers/net/ethernet/realtek/Makefile         |   1 +
 drivers/net/ethernet/realtek/r8169_firmware.c | 231 +++++++++++++++++
 drivers/net/ethernet/realtek/r8169_firmware.h |  39 +++
 .../realtek/{r8169.c => r8169_main.c}         | 243 +-----------------
 4 files changed, 274 insertions(+), 240 deletions(-)
 create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.c
 create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.h
 rename drivers/net/ethernet/realtek/{r8169.c => r8169_main.c} (97%)
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH v2 1/2 r8169: rename r8169.c to r8169_main.c

In preparation of factoring out firmware handling rename r8169.c to r8169_main.c.

---
v2:
- no changes

---
 drivers/net/ethernet/realtek/Makefile                  | 1 +
 drivers/net/ethernet/realtek/{r8169.c => r8169_main.c} | 0
 2 files changed, 1 insertion(+)
 rename drivers/net/ethernet/realtek/{r8169.c => r8169_main.c} (100%)
drivers/net/ethernet/realtek/Makefile +1 -0
index 33be8c5ad..c36cd2167 100644
@@ -6,4 +6,5 @@
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ATP) += atp.o
+r8169-objs += r8169_main.o
 obj-$(CONFIG_R8169) += r8169.o
drivers/net/ethernet/realtek/r8169_main.c renamed from drivers/net/ethernet/realtek/r8169.c +0 -0
similarity index 100%
rename from drivers/net/ethernet/realtek/r8169.c
rename to drivers/net/ethernet/realtek/r8169_main.c
Signature · 1 line
2.21.0
author maintainer
#2 lore raw

PATCH v2 2/2 r8169: factor out firmware handling

In reply to Heiner Kallweit

Let's factor out firmware handling into a separate source code file. This simplifies reading the code and makes clearer what the interface between driver and firmware handling is.

---
v2:
- fix small whitespace issue

---
 drivers/net/ethernet/realtek/Makefile         |   2 +-
 drivers/net/ethernet/realtek/r8169_firmware.c | 231 +++++++++++++++++
 drivers/net/ethernet/realtek/r8169_firmware.h |  39 +++
 drivers/net/ethernet/realtek/r8169_main.c     | 243 +-----------------
 4 files changed, 274 insertions(+), 241 deletions(-)
 create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.c
 create mode 100644 drivers/net/ethernet/realtek/r8169_firmware.h
drivers/net/ethernet/realtek/Makefile +1 -1
index c36cd2167..d5304bad2 100644
@@ -6,5 +6,5 @@
 obj-$(CONFIG_8139CP) += 8139cp.o
 obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ATP) += atp.o
-r8169-objs += r8169_main.o
+r8169-objs += r8169_main.o r8169_firmware.o
 obj-$(CONFIG_R8169) += r8169.o
drivers/net/ethernet/realtek/r8169_firmware.c new file +231 -0

231 lines not on this page · raw message

drivers/net/ethernet/realtek/r8169_firmware.h new file +39 -0
new file mode 100644
index 000000000..7dc348ed8
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/* r8169_firmware.h: RealTek 8169/8168/8101 ethernet driver.
+ *
+ * Copyright (c) 2002 ShuChen <[email protected]>
+ * Copyright (c) 2003 - 2007 Francois Romieu <[email protected]>
+ * Copyright (c) a lot of people too. Please respect their work.
+ *
+ * See MAINTAINERS file for support contact information.
+ */
+
+#include <linux/device.h>
+#include <linux/firmware.h>
+
+struct rtl8169_private;
+typedef void (*rtl_fw_write_t)(struct rtl8169_private *tp, int reg, int val);
+typedef int (*rtl_fw_read_t)(struct rtl8169_private *tp, int reg);
+
+#define RTL_VER_SIZE		32
+
+struct rtl_fw {
+	rtl_fw_write_t phy_write;
+	rtl_fw_read_t phy_read;
+	rtl_fw_write_t mac_mcu_write;
+	rtl_fw_read_t mac_mcu_read;
+	const struct firmware *fw;
+	const char *fw_name;
+	struct device *dev;
+
+	char version[RTL_VER_SIZE];
+
+	struct rtl_fw_phy_action {
+		__le32 *code;
+		size_t size;
+	} phy_action;
+};
+
+int rtl_fw_request_firmware(struct rtl_fw *rtl_fw);
+void rtl_fw_release_firmware(struct rtl_fw *rtl_fw);
+void rtl_fw_write_firmware(struct rtl8169_private *tp, struct rtl_fw *rtl_fw);
drivers/net/ethernet/realtek/r8169_main.c +3 -240

278 lines not on this page · raw message

Signature · 1 line
2.21.0
maintainer
#3 lore raw
In reply to Heiner Kallweit

From: Heiner Kallweit <[email protected]>
Date: Wed, 5 Jun 2019 07:59:02 +0200

Quoted 6 lines

Let's factor out firmware handling into a separate source code file. This simplifies reading the code and makes clearer what the interface between driver and firmware handling is.

v2:
- fix small whitespace issue in patch 2

Series applied, thanks Heiner.