src: update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

Makefile

@@ -1,20 +1,119 @@
 # SPDX-License-Identifier: GPL-2.0-only
+################################################################################
 #
-# Makefile for the Realtek network device drivers.
+# r8169 is the Linux device driver released for RealTek RTL8169S/8110S,
+# RTL8169SB/8110SB, and RTL8110SC Gigabit Ethernet controllers with
+# PCI interface.
 #
+# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Author:
+# Realtek NIC software team <nicfae@realtek.com>
+# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
+#
+################################################################################
 
-CONFIG_R8169 = m
+################################################################################
+# This product is covered by one or more of the following patents:
+# US5,307,459, US5,434,872, US5,732,094, US6,570,884, US6,115,776, and US6,327,625.
+################################################################################
 
-ENABLE_INCLUDE_R8168 = y
+ENABLE_S5_KEEP_CURR_MAC = n
-ENABLE_INCLUDE_R8125 = n
+
+ifneq ($(KERNELRELEASE),)
+	obj-m := r8169.o
+	r8169-objs := r8169_n.o
+	EXTRA_CFLAGS += -DCONFIG_R8169_NAPI
+	EXTRA_CFLAGS += -DCONFIG_R8169_VLAN
+	ifeq ($(ENABLE_S5_KEEP_CURR_MAC), y)
+		EXTRA_CFLAGS += -DENABLE_S5_KEEP_CURR_MAC
+	endif
+else
+	BASEDIR := /lib/modules/$(shell uname -r)
+	KERNELDIR ?= $(BASEDIR)/build
+	PWD :=$(shell pwd)
+	DRIVERDIR := $(shell find $(BASEDIR)/kernel/drivers/net/ethernet -name realtek -type d)
+	ifeq ($(DRIVERDIR),)
+		DRIVERDIR := $(shell find $(BASEDIR)/kernel/drivers/net -name realtek -type d)
+	endif
+	ifeq ($(DRIVERDIR),)
+		DRIVERDIR := $(BASEDIR)/kernel/drivers/net
+	endif
+	RTKDIR := $(subst $(BASEDIR)/,,$(DRIVERDIR))
+
+	KERNEL_GCC_VERSION := $(shell cat /proc/version | sed -n 's/.*gcc version \([[:digit:]]\.[[:digit:]]\.[[:digit:]]\).*/\1/p')
+	CCVERSION = $(shell $(CC) -dumpversion)
+
+	KVER = $(shell uname -r)
+	KMAJ = $(shell echo $(KVER) | \
+	sed -e 's/^\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*.*/\1/')
+	KMIN = $(shell echo $(KVER) | \
+	sed -e 's/^[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*.*/\1/')
+	KREV = $(shell echo $(KVER) | \
+	sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\).*/\1/')
+
+	kver_ge = $(shell \
+	echo test | awk '{if($(KMAJ) < $(1)) {print 0} else { \
+	if($(KMAJ) > $(1)) {print 1} else { \
+	if($(KMIN) < $(2)) {print 0} else { \
+	if($(KMIN) > $(2)) {print 1} else { \
+	if($(KREV) < $(3)) {print 0} else { print 1 } \
+	}}}}}' \
+	)
+
+.PHONY: all
+all: print_vars clean modules install
+
+print_vars:
+	@echo
+	@echo "CC: " $(CC)
+	@echo "CCVERSION: " $(CCVERSION)
+	@echo "KERNEL_GCC_VERSION: " $(KERNEL_GCC_VERSION)
+	@echo "KVER: " $(KVER)
+	@echo "KMAJ: " $(KMAJ)
+	@echo "KMIN: " $(KMIN)
+	@echo "KREV: " $(KREV)
+	@echo "BASEDIR: " $(BASEDIR)
+	@echo "DRIVERDIR: " $(DRIVERDIR)
+	@echo "PWD: " $(PWD)
+	@echo "RTKDIR: " $(RTKDIR)
+	@echo
+
+.PHONY:modules
+modules:
+#ifeq ($(call kver_ge,5,0,0),1)
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+#else
+#	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+#endif
+
+.PHONY:clean
+clean:
+#ifeq ($(call kver_ge,5,0,0),1)
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+#else
+#	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) clean
+#endif
+
+.PHONY:install
+install:
+#ifeq ($(call kver_ge,5,0,0),1)
+	$(MAKE) -C $(KERNELDIR) M=$(PWD) INSTALL_MOD_DIR=$(RTKDIR) modules_install
+#else
+#	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) INSTALL_MOD_DIR=$(RTKDIR) modules_install
+#endif
 
-ifeq ($(ENABLE_INCLUDE_R8168), y)
-	EXTRA_CFLAGS += -DINCLUDE_R8168
 endif
-
-ifeq ($(ENABLE_INCLUDE_R8125), y)
-	EXTRA_CFLAGS += -DINCLUDE_R8125
-endif
-
-r8169-objs += r8169_main.o r8169_firmware.o r8169_phy_config.o
-obj-$(CONFIG_R8169) += r8169.o

Makefile_linux24x

@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0-only
+################################################################################
+#
+# r8169 is the Linux device driver released for RealTek RTL8169S/8110S,
+# RTL8169SB/8110SB, and RTL8110SC Gigabit Ethernet controllers with
+# PCI interface.
+#
+# Copyright(c) 2022 Realtek Semiconductor Corp. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Author:
+# Realtek NIC software team <nicfae@realtek.com>
+# No. 2, Innovation Road II, Hsinchu Science Park, Hsinchu 300, Taiwan
+#
+################################################################################
+
+################################################################################
+# This product is covered by one or more of the following patents:
+# US5,307,459, US5,434,872, US5,732,094, US6,570,884, US6,115,776, and US6,327,625.
+################################################################################
+
+CC		:= gcc
+LD		:= ld
+ARCH		:= $(shell uname -m | sed 's/i.86/i386/')
+KSRC		:= /lib/modules/$(shell uname -r)/build
+CONFIG_FILE	:= $(KSRC)/include/linux/autoconf.h
+KMISC		:= /lib/modules/$(shell uname -r)/kernel/drivers/net/
+
+
+ifeq ($(ARCH),x86_64)
+   MODCFLAGS	+= -mcmodel=kernel -mno-red-zone
+endif
+
+#standard flags for module builds
+MODCFLAGS	+= -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall
+MODCFLAGS	+= -I$(KSRC)/include -I.
+MODCFLAGS	+= -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h
+ifeq ($(RTL_IOCTL),y)
+   SOURCE	:= r8169_n.c rtl_ioctl.c
+else
+   SOURCE	:= r8169_n.c
+endif
+OBJS		:= $(SOURCE:.c=.o)
+
+
+SMP		:= $(shell $(CC) $(MODCFLAGS) -E -dM $(CONFIG_FILE) | \
+   grep CONFIG_SMP | awk '{print $$3}')
+
+ifneq ($(SMP),1)
+   SMP		:= 0
+endif
+
+ifeq ($(SMP),1)
+   MODCFLAGS	+= -D__SMP__
+endif
+
+modules: $(OBJS)
+	$(LD) -r $^ -o r8169.o
+	strip --strip-debug r8169.o
+
+%.o: %.c
+	$(CC) $(MODCFLAGS) -c $< -o $@
+
+clean:
+	rm *.o -f
+
+install:
+	install -m 744 -c r8169.o $(KMISC)

README.md

@@ -1 +0,0 @@
-# r8169

r8169_firmware.c

@@ -1,236 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* r8169_firmware.c: RealTek 8169/8168/8101 ethernet driver.
- *
- * Copyright (c) 2002 ShuChen <shuchen@realtek.com.tw>
- * Copyright (c) 2003 - 2007 Francois Romieu <romieu@fr.zoreil.com>
- * Copyright (c) a lot of people too. Please respect their work.
- *
- * See MAINTAINERS file for support contact information.
- */
-
-#include <linux/delay.h>
-#include <linux/firmware.h>
-
-#include "r8169_firmware.h"
-
-enum rtl_fw_opcode {
-	PHY_READ		= 0x0,
-	PHY_DATA_OR		= 0x1,
-	PHY_DATA_AND		= 0x2,
-	PHY_BJMPN		= 0x3,
-	PHY_MDIO_CHG		= 0x4,
-	PHY_CLEAR_READCOUNT	= 0x7,
-	PHY_WRITE		= 0x8,
-	PHY_READCOUNT_EQ_SKIP	= 0x9,
-	PHY_COMP_EQ_SKIPN	= 0xa,
-	PHY_COMP_NEQ_SKIPN	= 0xb,
-	PHY_WRITE_PREVIOUS	= 0xc,
-	PHY_SKIPN		= 0xd,
-	PHY_DELAY_MS		= 0xe,
-};
-
-struct fw_info {
-	u32	magic;
-	char	version[RTL_VER_SIZE];
-	__le32	fw_start;
-	__le32	fw_len;
-	u8	chksum;
-} __packed;
-
-#define FW_OPCODE_SIZE sizeof_field(struct rtl_fw_phy_action, code[0])
-
-static bool rtl_fw_format_ok(struct rtl_fw *rtl_fw)
-{
-	const struct firmware *fw = rtl_fw->fw;
-	struct fw_info *fw_info = (struct fw_info *)fw->data;
-	struct rtl_fw_phy_action *pa = &rtl_fw->phy_action;
-
-	if (fw->size < FW_OPCODE_SIZE)
-		return false;
-
-	if (!fw_info->magic) {
-		size_t i, size, start;
-		u8 checksum = 0;
-
-		if (fw->size < sizeof(*fw_info))
-			return false;
-
-		for (i = 0; i < fw->size; i++)
-			checksum += fw->data[i];
-		if (checksum != 0)
-			return false;
-
-		start = le32_to_cpu(fw_info->fw_start);
-		if (start > fw->size)
-			return false;
-
-		size = le32_to_cpu(fw_info->fw_len);
-		if (size > (fw->size - start) / FW_OPCODE_SIZE)
-			return false;
-
-		strscpy(rtl_fw->version, fw_info->version, RTL_VER_SIZE);
-
-		pa->code = (__le32 *)(fw->data + start);
-		pa->size = size;
-	} else {
-		if (fw->size % FW_OPCODE_SIZE)
-			return false;
-
-		strscpy(rtl_fw->version, rtl_fw->fw_name, RTL_VER_SIZE);
-
-		pa->code = (__le32 *)fw->data;
-		pa->size = fw->size / FW_OPCODE_SIZE;
-	}
-
-	return true;
-}
-
-static bool rtl_fw_data_ok(struct rtl_fw *rtl_fw)
-{
-	struct rtl_fw_phy_action *pa = &rtl_fw->phy_action;
-	size_t index;
-
-	for (index = 0; index < pa->size; index++) {
-		u32 action = le32_to_cpu(pa->code[index]);
-		u32 val = action & 0x0000ffff;
-		u32 regno = (action & 0x0fff0000) >> 16;
-
-		switch (action >> 28) {
-		case PHY_READ:
-		case PHY_DATA_OR:
-		case PHY_DATA_AND:
-		case PHY_CLEAR_READCOUNT:
-		case PHY_WRITE:
-		case PHY_WRITE_PREVIOUS:
-		case PHY_DELAY_MS:
-			break;
-
-		case PHY_MDIO_CHG:
-			if (val > 1)
-				goto out;
-			break;
-
-		case PHY_BJMPN:
-			if (regno > index)
-				goto out;
-			break;
-		case PHY_READCOUNT_EQ_SKIP:
-			if (index + 2 >= pa->size)
-				goto out;
-			break;
-		case PHY_COMP_EQ_SKIPN:
-		case PHY_COMP_NEQ_SKIPN:
-		case PHY_SKIPN:
-			if (index + 1 + regno >= pa->size)
-				goto out;
-			break;
-
-		default:
-			dev_err(rtl_fw->dev, "Invalid action 0x%08x\n", action);
-			return false;
-		}
-	}
-
-	return true;
-out:
-	dev_err(rtl_fw->dev, "Out of range of firmware\n");
-	return false;
-}
-
-void rtl_fw_write_firmware(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)
-{
-	struct rtl_fw_phy_action *pa = &rtl_fw->phy_action;
-	rtl_fw_write_t fw_write = rtl_fw->phy_write;
-	rtl_fw_read_t fw_read = rtl_fw->phy_read;
-	int predata = 0, count = 0;
-	size_t index;
-
-	for (index = 0; index < pa->size; index++) {
-		u32 action = le32_to_cpu(pa->code[index]);
-		u32 data = action & 0x0000ffff;
-		u32 regno = (action & 0x0fff0000) >> 16;
-		enum rtl_fw_opcode opcode = action >> 28;
-
-		if (!action)
-			break;
-
-		switch (opcode) {
-		case PHY_READ:
-			predata = fw_read(tp, regno);
-			count++;
-			break;
-		case PHY_DATA_OR:
-			predata |= data;
-			break;
-		case PHY_DATA_AND:
-			predata &= data;
-			break;
-		case PHY_BJMPN:
-			index -= (regno + 1);
-			break;
-		case PHY_MDIO_CHG:
-			if (data) {
-				fw_write = rtl_fw->mac_mcu_write;
-				fw_read = rtl_fw->mac_mcu_read;
-			} else {
-				fw_write = rtl_fw->phy_write;
-				fw_read = rtl_fw->phy_read;
-			}
-
-			break;
-		case PHY_CLEAR_READCOUNT:
-			count = 0;
-			break;
-		case PHY_WRITE:
-			fw_write(tp, regno, data);
-			break;
-		case PHY_READCOUNT_EQ_SKIP:
-			if (count == data)
-				index++;
-			break;
-		case PHY_COMP_EQ_SKIPN:
-			if (predata == data)
-				index += regno;
-			break;
-		case PHY_COMP_NEQ_SKIPN:
-			if (predata != data)
-				index += regno;
-			break;
-		case PHY_WRITE_PREVIOUS:
-			fw_write(tp, regno, predata);
-			break;
-		case PHY_SKIPN:
-			index += regno;
-			break;
-		case PHY_DELAY_MS:
-			msleep(data);
-			break;
-		}
-	}
-}
-
-void rtl_fw_release_firmware(struct rtl_fw *rtl_fw)
-{
-	release_firmware(rtl_fw->fw);
-}
-
-int rtl_fw_request_firmware(struct rtl_fw *rtl_fw)
-{
-	int rc;
-
-	rc = request_firmware(&rtl_fw->fw, rtl_fw->fw_name, rtl_fw->dev);
-	if (rc < 0)
-		goto out;
-
-	if (!rtl_fw_format_ok(rtl_fw) || !rtl_fw_data_ok(rtl_fw)) {
-		release_firmware(rtl_fw->fw);
-		rc = -EINVAL;
-		goto out;
-	}
-
-	return 0;
-out:
-	dev_err(rtl_fw->dev, "Unable to load firmware %s (%d)\n",
-		rtl_fw->fw_name, rc);
-	return rc;
-}

r8169_firmware.h

@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* r8169_firmware.h: RealTek 8169/8168/8101 ethernet driver.
- *
- * Copyright (c) 2002 ShuChen <shuchen@realtek.com.tw>
- * Copyright (c) 2003 - 2007 Francois Romieu <romieu@fr.zoreil.com>
- * 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);