* [gentoo-commits] repo/gentoo:master commit in: net-misc/r8125/, net-misc/r8125/files/
@ 2022-06-16 16:36 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-16 16:36 UTC (permalink / raw
To: gentoo-commits
commit: b6c29fdb0d3795cffabca4805bf11ac51b633351
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Thu Jun 16 11:14:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:35:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c29fdb
net-misc/r8125: fixed build with kernel 5.18+
Bug: https://bugs.gentoo.org/852311
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../r8125/files/r8125-9.008.00-linux-5.18.patch | 31 ++++++++++++++++++++++
net-misc/r8125/r8125-9.008.00.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
new file mode 100644
index 000000000000..6da1bdae6b6a
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
@@ -0,0 +1,31 @@
+Added compatibility with Linux Kernel 5.18+.
+
+Author: Karlson2k (Evgeny Grin)
+Gentoo bug: https://bugs.gentoo.org/852311
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
+
+ if ((sizeof(dma_addr_t) > 4) &&
+ use_dac &&
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+ !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+ dev->features |= NETIF_F_HIGHDMA;
+ } else {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
+ if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+ if (netif_msg_probe(tp))
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index 7b0093e09b81..b848421ede7e 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -22,6 +22,7 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
+ "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
)
CONFIG_CHECK="~!R8169"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/r8125/, net-misc/r8125/files/
@ 2023-04-15 12:41 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2023-04-15 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 8212d430a2de8bbe74e842ad54ec744b81463384
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Mon Apr 3 15:52:22 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 12:41:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8212d430
net-misc/r8125: Fixes for kernels 5.19 and 6.1
Closes: https://bugs.gentoo.org/890714
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Closes: https://github.com/gentoo/gentoo/pull/30461
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../r8125/files/r8125-9.009.01-linux-5.19.patch | 35 ++++++++++++++++++++++
net-misc/r8125/r8125-9.008.00.ebuild | 2 ++
net-misc/r8125/r8125-9.009.01.ebuild | 2 ++
net-misc/r8125/r8125-9.009.02.ebuild | 4 +++
4 files changed, 43 insertions(+)
diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
new file mode 100644
index 000000000000..8dc3f8749a11
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
@@ -0,0 +1,35 @@
+From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Mon, 3 Apr 2023 18:17:24 +0300
+Subject: [PATCH] Backport kernel 5.19 compatibility
+
+---
+ src/r8125_n.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/r8125_n.c b/src/r8125_n.c
+index 0bc5eec..e35e557 100644
+--- a/src/r8125_n.c
++++ b/src/r8125_n.c
+@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev,
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+ dev->features |= NETIF_F_IPV6_CSUM;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
++ netif_set_tso_max_size(dev, LSO_64K);
++ netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
++#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
+ netif_set_gso_max_size(dev, LSO_64K);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
+@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev,
+ dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
+ #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
+
+ #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+ #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+--
+2.40.0
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index b848421ede7e..d3d593df5844 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -23,6 +23,8 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+ "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
+ "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
index 2a1b7c235358..6c64d2ff981b 100644
--- a/net-misc/r8125/r8125-9.009.01.ebuild
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -20,6 +20,8 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
+ "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
+ "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
index 9178eeaa64df..60221798a097 100644
--- a/net-misc/r8125/r8125-9.009.02.ebuild
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -18,6 +18,10 @@ MODULE_NAMES="r8125(net:${S}/src)"
BUILD_TARGETS="modules"
IUSE="+multi-tx-q ptp +rss use-firmware"
+PATCHES=(
+ "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+)
+
CONFIG_CHECK="~!R8169"
WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/r8125/, net-misc/r8125/files/
@ 2023-07-20 19:07 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-07-20 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 3ac79141575343cbbde2a1e97ad29b6c20c4956e
Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
AuthorDate: Tue Jun 27 14:31:09 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 18:57:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac79141
net-misc/r8125: fix build with PTP for Linux >=6.2
Bug: https://bugs.gentoo.org/908645
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../r8125/files/r8125-9.011.01-linux-6.2.patch | 42 ++++++++++++++++++++++
net-misc/r8125/r8125-9.008.00.ebuild | 1 +
net-misc/r8125/r8125-9.009.01.ebuild | 1 +
net-misc/r8125/r8125-9.009.02.ebuild | 1 +
net-misc/r8125/r8125-9.011.01.ebuild | 7 +++-
5 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
new file mode 100644
index 000000000000..26bb8620fbfd
--- /dev/null
+++ b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
@@ -0,0 +1,42 @@
+From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001
+From: Evgeny Grin <k2k@narod.ru>
+Date: Tue, 27 Jun 2023 11:16:26 +0300
+Subject: [PATCH] Patched PTP functionality for Linux 6.2+
+
+---
+ src/r8125_ptp.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
+index 6010a18..b92fb18 100644
+--- a/src/r8125_ptp.c
++++ b/src/r8125_ptp.c
+@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta)
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
++static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
++{
++ return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm));
++}
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++
+ static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64)
+ {
+ struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info);
+@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = {
+ .n_per_out = 0,
+ .n_pins = 0,
+ .pps = 1,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
+ .adjfreq = rtl8125_phc_adjfreq,
++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
++ .adjfine = rtl8125_phc_adjfine,
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
+ .adjtime = rtl8125_phc_adjtime,
+ .gettime64 = rtl8125_phc_gettime,
+ .settime64 = rtl8125_phc_settime,
+--
+2.41.0.windows.1
+
diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild
index ba9eb264d3da..378ced667e5b 100644
--- a/net-misc/r8125/r8125-9.008.00.ebuild
+++ b/net-misc/r8125/r8125-9.008.00.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+ "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.01.ebuild b/net-misc/r8125/r8125-9.009.01.ebuild
index a88080038413..d85f17950eeb 100644
--- a/net-misc/r8125/r8125-9.009.01.ebuild
+++ b/net-misc/r8125/r8125-9.009.01.ebuild
@@ -22,6 +22,7 @@ PATCHES=(
"${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
"${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+ "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.009.02.ebuild b/net-misc/r8125/r8125-9.009.02.ebuild
index bdeb5b0245c5..922d00c7e9d0 100644
--- a/net-misc/r8125/r8125-9.009.02.ebuild
+++ b/net-misc/r8125/r8125-9.009.02.ebuild
@@ -20,6 +20,7 @@ IUSE="+multi-tx-q ptp +rss use-firmware"
PATCHES=(
"${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
+ "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
)
CONFIG_CHECK="~!R8169"
diff --git a/net-misc/r8125/r8125-9.011.01.ebuild b/net-misc/r8125/r8125-9.011.01.ebuild
index d09aaaa2e674..bc1351818977 100644
--- a/net-misc/r8125/r8125-9.011.01.ebuild
+++ b/net-misc/r8125/r8125-9.011.01.ebuild
@@ -18,6 +18,10 @@ MODULE_NAMES="r8125(net:${S}/src)"
BUILD_TARGETS="modules"
IUSE="+multi-tx-q ptp +rss use-firmware"
+PATCHES=(
+ "${FILESDIR}/${P}-linux-6.2.patch" # bug 908645
+)
+
CONFIG_CHECK="~!R8169"
WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
@@ -28,7 +32,8 @@ pkg_setup() {
BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)"
BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)"
BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
- BUILD_PARAMS+=" ENABLE_PAGE_REUSE=y ENABLE_RX_PACKET_FRAGMENT=y"
+ BUILD_PARAMS+=" ENABLE_PAGE_REUSE=$(usex ptp n y)" # Not compatible with PTP
+ BUILD_PARAMS+=" ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y)" # Not compatible with PTP
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/r8125/, net-misc/r8125/files/
@ 2024-11-01 15:41 Andreas K. Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas K. Hüttel @ 2024-11-01 15:41 UTC (permalink / raw
To: gentoo-commits
commit: ea7d391e6ddcf0bd579ed5ed8d954d8285639039
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 14:54:17 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 15:41:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7d391e
net-misc/r8125: drop versions
Bug: https://bugs.gentoo.org/928303
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
net-misc/r8125/Manifest | 4 -
.../r8125/files/r8125-9.008.00-linux-5.17.patch | 115 ---------------------
.../r8125/files/r8125-9.008.00-linux-5.18.patch | 31 ------
.../r8125/files/r8125-9.009.01-linux-5.19.patch | 35 -------
.../r8125/files/r8125-9.011.00-linux-6.1.patch | 28 -----
.../r8125/files/r8125-9.011.01-linux-6.2.patch | 42 --------
net-misc/r8125/r8125-9.008.00-r1.ebuild | 45 --------
net-misc/r8125/r8125-9.009.01-r1.ebuild | 42 --------
net-misc/r8125/r8125-9.009.02-r1.ebuild | 40 -------
net-misc/r8125/r8125-9.011.01-r1.ebuild | 41 --------
10 files changed, 423 deletions(-)
diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest
index e6a6b380d23b..dfd10434a30c 100644
--- a/net-misc/r8125/Manifest
+++ b/net-misc/r8125/Manifest
@@ -1,5 +1 @@
-DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6
-DIST r8125-9.009.01.tar.bz2 89897 BLAKE2B 65f64f504cedc7244bdae10fd1638e031eb103f562cd71d32b5f36b15541704086df8cea16829b289e8be61bacf3de559616884d1672a4d6b8e47211816de8d3 SHA512 8b717447e2048df0d88d8350da2edb58f704e893498fbebea4aa2a3ac45ea050d70e73e78d41ab94562228b9c01e6fe59810c501c5bb880db446c05b9b6aee0d
-DIST r8125-9.009.02.tar.bz2 89916 BLAKE2B 2dd8ad226f8ad9dd4e6646cdce66f0c12a6a657aa39c6e91892f410780ed245046fc94f247939958db7b950aa045e011716ecd7f6ebb6099ca3d9ffc54cfd0de SHA512 29bfe60410727f09b004f172e5046292eff511dfca5af8a21c24719e4068925103ba12af0ce808316ef206b329ce886693e7330c1c68d8e77fc50ab40bd7dcfe
-DIST r8125-9.011.01.tar.bz2 97867 BLAKE2B 0981c71795d3e839b97f7b41dbaddcc0743676c6bd0b656258e6e9b2e0879128ae4869e9ab3ab837d0ae10eb8c963177c3779b4e4a69d8a5c3d95b7b8d54f9c5 SHA512 833199cc0ce8179ef93c202fc89d4c4368b73e9515d1ef2550ebb209243dd2c8943aa9f267903d8fa21c46304b7703410f1c354d4ce1b6f6aee7ece97017dba2
DIST r8125-9.013.02.tar.bz2 105923 BLAKE2B 0ae1a6a7ad651d30ac2ca29ab98af06c6facc26bfacac8ce5b51e92e8c7955c150a995c424f875a9a1cb315fe41f474ea3429cd7675ceec1ef82d454ad2bd434 SHA512 acb16992182c4c6b79357a511cfcedb53bb6513185caec91a5cb76aa41dc922e6c74099546886b32dba584d614f9bcaf36d31e40f3328b9ebc4ccd6b91296065
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch
deleted file mode 100644
index 1a4afdb31bea..000000000000
--- a/net-misc/r8125/files/r8125-9.008.00-linux-5.17.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Added compatibility with Linux Kernel 5.17+.
-
-Author: Karlson2k (Evgeny Grin)
-Gentoo bug: https://bugs.gentoo.org/839282
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -349,7 +349,7 @@ static int rtl8125_change_mtu(struct net_device *dev, int new_mtu);
- static void rtl8125_down(struct net_device *dev);
-
- static int rtl8125_set_mac_address(struct net_device *dev, void *p);
--static void rtl8125_rar_set(struct rtl8125_private *tp, uint8_t *addr);
-+static void rtl8125_rar_set(struct rtl8125_private *tp, const uint8_t *addr);
- static void rtl8125_desc_addr_fill(struct rtl8125_private *);
- static void rtl8125_tx_desc_init(struct rtl8125_private *tp);
- static void rtl8125_rx_desc_init(struct rtl8125_private *tp);
-@@ -1750,7 +1750,13 @@ static void rtl8125_proc_module_init(void)
- static int rtl8125_proc_open(struct inode *inode, struct file *file)
- {
- struct net_device *dev = proc_get_parent_data(inode);
-- int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-+ int (*show)(struct seq_file *, void *) =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
-+ PDE_DATA(inode);
-+#else
-+ pde_data(inode);
-+#endif
-+
-
- return single_open(file, show, dev);
- }
-@@ -5234,8 +5240,15 @@ rtl8125_set_ring_size(struct rtl8125_private *tp, u32 rx, u32 tx)
- }
-
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- static void rtl8125_get_ringparam(struct net_device *dev,
- struct ethtool_ringparam *ring)
-+#else
-+static void rtl8125_get_ringparam(struct net_device* dev,
-+ struct ethtool_ringparam* ring,
-+ struct kernel_ethtool_ringparam* kernel_ring,
-+ struct netlink_ext_ack* extack)
-+#endif
- {
- struct rtl8125_private *tp = netdev_priv(dev);
-
-@@ -5245,8 +5258,15 @@ static void rtl8125_get_ringparam(struct net_device *dev,
- ring->tx_pending = tp->tx_ring[0].num_tx_desc;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- static int rtl8125_set_ringparam(struct net_device *dev,
- struct ethtool_ringparam *ring)
-+#else
-+static int rtl8125_set_ringparam(struct net_device* dev,
-+ struct ethtool_ringparam* ring,
-+ struct kernel_ethtool_ringparam* kernel_ring,
-+ struct netlink_ext_ack* extack)
-+#endif
- {
- struct rtl8125_private *tp = netdev_priv(dev);
- u32 new_rx_count, new_tx_count;
-@@ -10889,6 +10909,9 @@ rtl8125_get_mac_address(struct net_device *dev)
- struct rtl8125_private *tp = netdev_priv(dev);
- int i;
- u8 mac_addr[MAC_ADDR_LEN];
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+ u8 addr[ETH_ALEN];
-+#endif
-
- for (i = 0; i < MAC_ADDR_LEN; i++)
- mac_addr[i] = RTL_R8(tp, MAC0 + i);
-@@ -10916,9 +10939,17 @@ rtl8125_get_mac_address(struct net_device *dev)
- rtl8125_rar_set(tp, mac_addr);
-
- for (i = 0; i < MAC_ADDR_LEN; i++) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
- tp->org_mac_addr[i] = dev->dev_addr[i]; /* keep the original MAC address */
-+#else
-+ addr[i] = RTL_R8(tp, MAC0 + i);
-+ tp->org_mac_addr[i] = addr[i]; /* keep the original MAC address */
-+#endif
- }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
-+ eth_hw_addr_set(dev, addr);
-+#endif
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)
- memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- #endif
-@@ -10944,7 +10975,11 @@ rtl8125_set_mac_address(struct net_device *dev,
- if (!is_valid_ether_addr(addr->sa_data))
- return -EADDRNOTAVAIL;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
- memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+#else
-+ eth_hw_addr_set(dev, addr->sa_data);
-+#endif
-
- rtl8125_rar_set(tp, dev->dev_addr);
-
-@@ -10959,7 +10994,7 @@ rtl8125_set_mac_address(struct net_device *dev,
- *****************************************************************************/
- void
- rtl8125_rar_set(struct rtl8125_private *tp,
-- uint8_t *addr)
-+ const uint8_t *addr)
- {
- uint32_t rar_low = 0;
- uint32_t rar_high = 0;
-
-
diff --git a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch b/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
deleted file mode 100644
index 6da1bdae6b6a..000000000000
--- a/net-misc/r8125/files/r8125-9.008.00-linux-5.18.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Added compatibility with Linux Kernel 5.18+.
-
-Author: Karlson2k (Evgeny Grin)
-Gentoo bug: https://bugs.gentoo.org/852311
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
-
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -11852,11 +11852,20 @@ rtl8125_init_board(struct pci_dev *pdev,
-
- if ((sizeof(dma_addr_t) > 4) &&
- use_dac &&
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
- !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&
- !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
-+#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-+ !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
-+ !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-+#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
- dev->features |= NETIF_F_HIGHDMA;
- } else {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-+#else // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
-+ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-+#endif // LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)
- if (rc < 0) {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
- if (netif_msg_probe(tp))
-
diff --git a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch b/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
deleted file mode 100644
index 8dc3f8749a11..000000000000
--- a/net-misc/r8125/files/r8125-9.009.01-linux-5.19.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c96e5ffc40585d463bea056f2fe02c29d43dcba7 Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Mon, 3 Apr 2023 18:17:24 +0300
-Subject: [PATCH] Backport kernel 5.19 compatibility
-
----
- src/r8125_n.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/r8125_n.c b/src/r8125_n.c
-index 0bc5eec..e35e557 100644
---- a/src/r8125_n.c
-+++ b/src/r8125_n.c
-@@ -12715,6 +12715,10 @@ rtl8125_init_one(struct pci_dev *pdev,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
- dev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
- dev->features |= NETIF_F_IPV6_CSUM;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-+ netif_set_tso_max_size(dev, LSO_64K);
-+ netif_set_tso_max_segs(dev, NIC_MAX_PHYS_BUF_COUNT_LSO2);
-+#else //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
- netif_set_gso_max_size(dev, LSO_64K);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
- dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
-@@ -12722,6 +12726,7 @@ rtl8125_init_one(struct pci_dev *pdev,
- dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
-
- #endif //LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
---
-2.40.0
-
diff --git a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch b/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
deleted file mode 100644
index 343ab8ccf125..000000000000
--- a/net-misc/r8125/files/r8125-9.011.00-linux-6.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cc2a99963b0039573464816f0cf86803381d5f11 Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Mon, 3 Apr 2023 16:46:39 +0300
-Subject: [PATCH] Fixed compatibility with Linux kernel versions >= 6.1
-
----
- src/r8125.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/r8125.h b/src/r8125.h
-index 9eac0eb..4a29116 100644
---- a/src/r8125.h
-+++ b/src/r8125.h
-@@ -676,7 +676,11 @@ typedef int *napi_budget;
- typedef struct napi_struct *napi_ptr;
- typedef int napi_budget;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
-+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight)
-+#else // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- #define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight)
-+#endif // LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0)
- #define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget)
- #define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr)
- #define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev;
---
-2.40.0
-
diff --git a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch b/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
deleted file mode 100644
index 26bb8620fbfd..000000000000
--- a/net-misc/r8125/files/r8125-9.011.01-linux-6.2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2ef10e8ccbd16a67a1585ebb627af0f1ae172e0f Mon Sep 17 00:00:00 2001
-From: Evgeny Grin <k2k@narod.ru>
-Date: Tue, 27 Jun 2023 11:16:26 +0300
-Subject: [PATCH] Patched PTP functionality for Linux 6.2+
-
----
- src/r8125_ptp.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/r8125_ptp.c b/src/r8125_ptp.c
-index 6010a18..b92fb18 100644
---- a/src/r8125_ptp.c
-+++ b/src/r8125_ptp.c
-@@ -195,6 +195,13 @@ static int rtl8125_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta)
- return 0;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)
-+static int rtl8125_phc_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)
-+{
-+ return rtl8125_phc_adjfreq(ptp, scaled_ppm_to_ppb(scaled_ppm));
-+}
-+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
-+
- static int rtl8125_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts64)
- {
- struct rtl8125_private *tp = container_of(ptp, struct rtl8125_private, ptp_clock_info);
-@@ -296,7 +303,11 @@ static const struct ptp_clock_info rtl_ptp_clock_info = {
- .n_per_out = 0,
- .n_pins = 0,
- .pps = 1,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)
- .adjfreq = rtl8125_phc_adjfreq,
-+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
-+ .adjfine = rtl8125_phc_adjfine,
-+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) */
- .adjtime = rtl8125_phc_adjtime,
- .gettime64 = rtl8125_phc_gettime,
- .settime64 = rtl8125_phc_settime,
---
-2.41.0.windows.1
-
diff --git a/net-misc/r8125/r8125-9.008.00-r1.ebuild b/net-misc/r8125/r8125-9.008.00-r1.ebuild
deleted file mode 100644
index 3779fd117278..000000000000
--- a/net-misc/r8125/r8125-9.008.00-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-# The alternative direct URL for the file from the link above with description
-# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.008.00-linux-5.17.patch" # bug 839282
- "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
- "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
- "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
- "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
- local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
- local modargs=(
- # Build parameters
- KERNELDIR="${KV_OUT_DIR}"
- # Configuration settings
- ENABLE_PTP_SUPPORT=$(usex ptp y n)
- ENABLE_RSS_SUPPORT=$(usex rss y n)
- ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
- ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
- )
-
- linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.009.01-r1.ebuild b/net-misc/r8125/r8125-9.009.01-r1.ebuild
deleted file mode 100644
index 87bff3e7fb42..000000000000
--- a/net-misc/r8125/r8125-9.009.01-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.008.00-linux-5.18.patch" # bug 852311
- "${FILESDIR}/${PN}-9.009.01-linux-5.19.patch"
- "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
- "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
- local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
- local modargs=(
- # Build parameters
- KERNELDIR="${KV_OUT_DIR}"
- # Configuration settings
- ENABLE_PTP_SUPPORT=$(usex ptp y n)
- ENABLE_RSS_SUPPORT=$(usex rss y n)
- ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
- ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
- )
-
- linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.009.02-r1.ebuild b/net-misc/r8125/r8125-9.009.02-r1.ebuild
deleted file mode 100644
index 61bad3803fde..000000000000
--- a/net-misc/r8125/r8125-9.009.02-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9.011.00-linux-6.1.patch" # bug 890714
- "${FILESDIR}/${PN}-9.011.01-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
- local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
- local modargs=(
- # Build parameters
- KERNELDIR="${KV_OUT_DIR}"
- # Configuration settings
- ENABLE_PTP_SUPPORT=$(usex ptp y n)
- ENABLE_RSS_SUPPORT=$(usex rss y n)
- ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
- ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
- )
-
- linux-mod-r1_src_compile
-}
diff --git a/net-misc/r8125/r8125-9.011.01-r1.ebuild b/net-misc/r8125/r8125-9.011.01-r1.ebuild
deleted file mode 100644
index e206e4deaa7c..000000000000
--- a/net-misc/r8125/r8125-9.011.01-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod-r1
-
-DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs"
-HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-
-SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+multi-tx-q ptp +rss use-firmware"
-
-PATCHES=(
- "${FILESDIR}/${P}-linux-6.2.patch" # bug 908645
-)
-
-CONFIG_CHECK="~!R8169"
-WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
-
-src_compile() {
- local modlist=( ${PN}=kernel/drivers/net/ethernet/realtek:src )
- local modargs=(
- # Build parameters
- KERNELDIR="${KV_OUT_DIR}"
- # Configuration settings
- ENABLE_PTP_SUPPORT=$(usex ptp y n)
- ENABLE_RSS_SUPPORT=$(usex rss y n)
- ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)
- ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)
- ENABLE_PAGE_REUSE=$(usex ptp n y) # Not compatible with PTP
- ENABLE_RX_PACKET_FRAGMENT=$(usex ptp n y) # Not compatible with PTP
- )
-
- linux-mod-r1_src_compile
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-01 15:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-15 12:41 [gentoo-commits] repo/gentoo:master commit in: net-misc/r8125/, net-misc/r8125/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-11-01 15:41 Andreas K. Hüttel
2023-07-20 19:07 Ionen Wolkens
2022-06-16 16:36 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox