gentoo resync : 29.12.2022

3 files changed, 94 insertions, 0 deletions

diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 7764633b1c4f..6b2e3d8f0bb7 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,9 @@
 AUX r8168-8.049.02-5.17-fix.patch 2572 BLAKE2B 7bbd4de5576e1686a269ae88b68eb6f3317affe6192f2271fa21bfaf2ca5bb8d59c8fc3ae4e1f41cb9d325e12dbbfe83fc4ab166378895a68f4c11a98cf6aa92 SHA512 7a03481aa0c195188e975dcd99a3954dda45601fde2d7f110d4840ff498fb5a274d8d9bde83a8d83520a506f8e5bebbb1aea18f75b1c2e959d916f3b0359d900
+AUX r8168-8.050.02-5.18-fix.patch 2340 BLAKE2B d85b0d826b58bad42999309d81bd2a7a5202f81dfe516d32c0a7857d63394c70e5e9f66dcdfa03f8f05dce525204a225c6fa1c73dbd6a0cc2dae7a3995be120f SHA512 952660cd26f2c14e21b45bb0fa88012f980f7999b1f33849a295bc757063f25c2b5911f155305d4cc0d671b503acfc315901d584a83c78c47aeb76ee8301f3d7
 DIST r8168-8.049.02.tar.bz2 113195 BLAKE2B ee34ac7249d732a867384fdd2c87321a513e7b2770c79d0c13666edca7d4bf752d853d7f91554d7ee716b3f30ec5f3a69aed96221a79a60282f0b6d2f70f05d6 SHA512 8ccb69ab533cde6ff88f0e8af2dd66f7e6ce9467020a727d47748c5109b64d6d14eee6bc151db5ddbe70a476a2def5f2faf3871902b335074f43dd05484d39e0
 DIST r8168-8.050.00.tar.bz2 115418 BLAKE2B b3e24d0548494f1904b5d3341994bdda35a05a71dce85a64c9e87cbde7f40807b0b1bcd78401928ff7625e67606918d5c844e8254cbbab62ed3f8e8058a3f15b SHA512 04043fd01ea877ea9f422b8f2319630b8664a49b41363039fc725ed382dc5afb732dda59ba63021a94c50b12ed2f0b3585cd668d969bc06fdc40d08420dbdb95
+DIST r8168-8.050.02.tar.bz2 115331 BLAKE2B 37690019e6b8642929e167df426e1a5e3c4d805ab812541018fa950084061ad971648b867dc5723e611c43fecb0f04d5915bb8199006ac50640aef5a9c2eb41c SHA512 54d7080b598933c7d24ca513019c6c971f7472320d474ab4ed4148d859886f942e52896d0b98046a780319f708847596e6bc081a88a9c11e075593c97eb831b2
 EBUILD r8168-8.049.02-r1.ebuild 1116 BLAKE2B 5d3323e1997a3f3948cd197b92570044664a1d90c57bb5e997701755e74feb1caf677bf585b27c2870d350d87b61db9d3b31400ef44dae52821688a3292ca2c5 SHA512 30090d6e07e5abcb5e2b3983365773846a9226fba7d661742f6f0256c4c856f5f641725b81958a9c49c1bea544e063ef862feed892d500035db4d6648ac6b1c5
 EBUILD r8168-8.050.00.ebuild 1062 BLAKE2B 9f53614cb2b380f9a325ecc36a9ca4320a92011307cc85ac749227729f5286028e92adc10d821d1eb3e5d1f0bd791518d85690a894b22853eca1d5acccf0f412 SHA512 843fa593eba960ca5a81d30354bcaf4452db990a12e45d5d740d363393f8e23d8097492b008ddb9ddc2942945e82eb367bfa66b8df9755ee1875c5715d42cf16
+EBUILD r8168-8.050.02.ebuild 1120 BLAKE2B 2d0b7f3467ab274f154b4b77e9f872500bbc83ba00006f5bfb32fedacbe411d47fc635126f81c54e2b974de733880165f3b3103022b008acfaba8802ebe333da SHA512 915fca0ed33262f09c490bf231c7c45a39a0163cc22b4148acf58269820c9ec8e888b3892889e357ffb519a50cf1b8ab5da70171d3c73039e00ea4110b391ec0
 MISC metadata.xml 577 BLAKE2B 0335cbfc902163abd4ffef0ad089b15ae7eaee15e41ed7760834d0329662a8ea0c66d68366a779265205557abe31bf3055b474f6bda7469e803a6240c3e68951 SHA512 f27ae61be558fe46b14fdf43a8d975c71cc900788761e6c5044eea6e8f80ddb6528b0d9d711844b6c8b45e58401a8736d08c40827fa0ceb99be32a3a0abd7086
diff --git a/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
new file mode 100644
index 000000000000..442fa1c3eadf
--- /dev/null
+++ b/net-misc/r8168/files/r8168-8.050.02-5.18-fix.patch
@@ -0,0 +1,51 @@
+Functions like 'pci_dma_sync_single_for_device', 'pci_set_dma_mask', and 'pci_set_consistent_dma_mask'
+no longer exist in 5.18.0.
+Fix similar to https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2238850.html
+
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -3698,7 +3698,11 @@
+         txd->opts2 = 0;
+         while (1) {
+                 memset(tmpAddr, pattern++, len - 14);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                 pci_dma_sync_single_for_device(tp->pci_dev,
++#else
++                dma_sync_single_for_device(&tp->pci_dev->dev,
++#endif
+                                                le64_to_cpu(mapping),
+                                                len, DMA_TO_DEVICE);
+                 txd->opts1 = cpu_to_le32(DescOwn | FirstFrag | LastFrag | len);
+@@ -3726,7 +3730,11 @@
+                 if (rx_len == len) {
+                         dma_sync_single_for_cpu(tp_to_dev(tp), le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
+                         i = memcmp(skb->data, rx_skb->data, rx_len);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+                         pci_dma_sync_single_for_device(tp->pci_dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#else
++                        dma_sync_single_for_device(&tp->pci_dev->dev, le64_to_cpu(rxd->addr), tp->rx_buf_sz, DMA_FROM_DEVICE);
++#endif
+                         if (i == 0) {
+ //              dev_printk(KERN_INFO, tp_to_dev(tp), "loopback test finished\n",rx_len,len);
+                                 break;
+@@ -26408,11 +26416,20 @@
+ 
+         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
++            !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) &&
++            !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) {
++#endif
+                 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
++                rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++#endif
+                 if (rc < 0) {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+                         if (netif_msg_probe(tp))
diff --git a/net-misc/r8168/r8168-8.050.02.ebuild b/net-misc/r8168/r8168-8.050.02.ebuild
new file mode 100644
index 000000000000..33393afdbf6a
--- /dev/null
+++ b/net-misc/r8168/r8168-8.050.02.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.17" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+IUSE="use-firmware"
+
+CONFIG_CHECK="~!R8169"
+WARNING_R8169="CONFIG_R8169 is enabled. ${P} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED."
+
+PATCHES=(
+	"${FILESDIR}/r8168-8.050.02-5.18-fix.patch"
+)
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}