diff --git a/backport-fix-build-error-with-Linux-6.4.patch b/backport-fix-build-error-with-Linux-6.4.patch deleted file mode 100644 index a615fbdbdd404a02d21ebbff498efea8738cfd41..0000000000000000000000000000000000000000 --- a/backport-fix-build-error-with-Linux-6.4.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 068c38ad88ccb09e5e966d4db5cedab0e02b3b95 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner -Date: Wed, 26 Oct 2022 15:22:14 +0200 -Subject: net: Remove the obsolte u64_stats_fetch_*_irq() users (drivers). - -Now that the 32bit UP oddity is gone and 32bit uses always a sequence -count, there is no need for the fetch_irq() variants anymore. - -Convert to the regular interface. - -Signed-off-by: Thomas Gleixner -Signed-off-by: Sebastian Andrzej Siewior -Acked-by: Peter Zijlstra (Intel) -Signed-off-by: Jakub Kicinski - ---- - src/iavf_ethtool_stats.h | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/iavf_ethtool_stats.h b/src/iavf_ethtool_stats.h -index 2c658aa..2733c0e 100644 ---- a/src/iavf_ethtool_stats.h -+++ b/src/iavf_ethtool_stats.h -@@ -228,7 +228,7 @@ enum iavf_chnl_stat_type { - * @stat_type: stat_type could be TX/TX/VECTOR - * - * Queue statistics must be copied while protected by -- * u64_stats_fetch_begin_irq, so we can't directly use iavf_add_ethtool_stats. -+ * u64_stats_fetch_begin, so we can't directly use iavf_add_ethtool_stats. - * Assumes that queue stats are defined in iavf_gstrings_queue_stats. If the - * ring pointer is null, zero out the queue stat values and update the data - * pointer. Otherwise safely copy the stats from the ring into the supplied -@@ -273,12 +273,12 @@ iavf_add_queue_stats_chnl(u64 **data, struct iavf_ring *ring, - - /* To avoid invalid statistics values, ensure that we keep retrying - * the copy until we get a consistent value according to -- * u64_stats_fetch_retry_irq. But first, make sure our ring is -+ * u64_stats_fetch_retry. But first, make sure our ring is - * non-null before attempting to access its syncp. - */ - #ifdef HAVE_NDO_GET_STATS64 - do { -- start = !ring ? 0 : u64_stats_fetch_begin_irq(&ring->syncp); -+ start = !ring ? 0 : u64_stats_fetch_begin(&ring->syncp); - #endif - for (i = 0; i < size; i++) { - void *ptr = ring; -@@ -289,7 +289,7 @@ iavf_add_queue_stats_chnl(u64 **data, struct iavf_ring *ring, - &stats[i]); - } - #ifdef HAVE_NDO_GET_STATS64 -- } while (ring && u64_stats_fetch_retry_irq(&ring->syncp, start)); -+ } while (ring && u64_stats_fetch_retry(&ring->syncp, start)); - #endif - - /* Once we successfully copy the stats in, update the data pointer */ -@@ -302,7 +302,7 @@ iavf_add_queue_stats_chnl(u64 **data, struct iavf_ring *ring, - * @ring: the ring to copy - * - * Queue statistics must be copied while protected by -- * u64_stats_fetch_begin_irq, so we can't directly use iavf_add_ethtool_stats. -+ * u64_stats_fetch_begin, so we can't directly use iavf_add_ethtool_stats. - * Assumes that queue stats are defined in iavf_gstrings_queue_stats. If the - * ring pointer is null, zero out the queue stat values and update the data - * pointer. Otherwise safely copy the stats from the ring into the supplied -@@ -322,19 +322,19 @@ iavf_add_queue_stats(u64 **data, struct iavf_ring *ring) - - /* To avoid invalid statistics values, ensure that we keep retrying - * the copy until we get a consistent value according to -- * u64_stats_fetch_retry_irq. But first, make sure our ring is -+ * u64_stats_fetch_retry. But first, make sure our ring is - * non-null before attempting to access its syncp. - */ - #ifdef HAVE_NDO_GET_STATS64 - do { -- start = !ring ? 0 : u64_stats_fetch_begin_irq(&ring->syncp); -+ start = !ring ? 0 : u64_stats_fetch_begin(&ring->syncp); - #endif - for (i = 0; i < size; i++) { - iavf_add_one_ethtool_stat(&(*data)[i], ring, - &stats[i]); - } - #ifdef HAVE_NDO_GET_STATS64 -- } while (ring && u64_stats_fetch_retry_irq(&ring->syncp, start)); -+ } while (ring && u64_stats_fetch_retry(&ring->syncp, start)); - #endif - - /* Once we successfully copy the stats in, update the data pointer */ --- -2.33.0 - diff --git a/backport-iavf-flow_dissector-use-64bits-for-used_keys.patch b/backport-iavf-flow_dissector-use-64bits-for-used_keys.patch deleted file mode 100644 index 923a39a22e84ef8af722aab17cf539dfbd9d322e..0000000000000000000000000000000000000000 --- a/backport-iavf-flow_dissector-use-64bits-for-used_keys.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2b3082c6ef3b0104d822f6f18d2afbe5fc9a5c2c Mon Sep 17 00:00:00 2001 -From: Ratheesh Kannoth -Date: Sat, 29 Jul 2023 04:52:15 +0530 -Subject: [PATCH] net: flow_dissector: Use 64bits for used_keys - -As 32bits of dissector->used_keys are exhausted, -increase the size to 64bits. - -This is base change for ESP/AH flow dissector patch. -Please find patch and discussions at -https://lore.kernel.org/netdev/ZMDNjD46BvZ5zp5I@corigine.com/T/#t - -Signed-off-by: Ratheesh Kannoth -Reviewed-by: Petr Machata # for mlxsw -Tested-by: Petr Machata -Reviewed-by: Martin Habets -Reviewed-by: Simon Horman -Reviewed-by: Vladimir Oltean -Signed-off-by: David S. Miller - ---- - src/iavf_main.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/iavf_main.c b/src/iavf_main.c -index e475564..9b70c2e 100644 ---- a/src/iavf_main.c -+++ b/src/iavf_main.c -@@ -4073,17 +4073,17 @@ static int iavf_parse_cls_flower(struct iavf_adapter *adapter, - int i = 0; - - if (dissector->used_keys & -- ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) | -- BIT(FLOW_DISSECTOR_KEY_BASIC) | -- BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) | -- BIT(FLOW_DISSECTOR_KEY_VLAN) | -- BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) | -- BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) | -+ ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) | - #ifdef HAVE_TC_FLOWER_ENC -- BIT(FLOW_DISSECTOR_KEY_ENC_KEYID) | -+ BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) | - #endif /* HAVE_TC_FLOWER_ENC */ -- BIT(FLOW_DISSECTOR_KEY_PORTS))) { -- dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%x\n", -+ BIT_ULL(FLOW_DISSECTOR_KEY_PORTS))) { -+ dev_err(&adapter->pdev->dev, "Unsupported key used: 0x%llx\n", - dissector->used_keys); - return -EOPNOTSUPP; - } --- -2.41.0 - diff --git a/backport-iavf-remove-redundant-pci_enable_pcie_error_reporting.patch b/backport-iavf-remove-redundant-pci_enable_pcie_error_reporting.patch deleted file mode 100644 index 5f93ac5ae500dca0696fd98edb87d6225905b1e3..0000000000000000000000000000000000000000 --- a/backport-iavf-remove-redundant-pci_enable_pcie_error_reporting.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bc4fddc3b306b204c5af664656ae62a1f23e2aab Mon Sep 17 00:00:00 2001 -From: Bjorn Helgaas -Date: Wed, 18 Jan 2023 17:46:08 -0600 -Subject: [PATCH] iavf: Remove redundant pci_enable_pcie_error_reporting() - -pci_enable_pcie_error_reporting() enables the device to send ERR_* -Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is -native"), the PCI core does this for all devices during enumeration. - -Remove the redundant pci_enable_pcie_error_reporting() call from the -driver. Also remove the corresponding pci_disable_pcie_error_reporting() -from the driver .remove() path. - -Note that this doesn't control interrupt generation by the Root Port; that -is controlled by the AER Root Error Command register, which is managed by -the AER service driver. - -Signed-off-by: Bjorn Helgaas -Cc: Jesse Brandeburg -Cc: Tony Nguyen -Cc: intel-wired-lan@lists.osuosl.org -Cc: netdev@vger.kernel.org -Tested-by: Marek Szlosek -Signed-off-by: Tony Nguyen ---- - src/iavf_main.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/iavf_main.c b/src/iavf_main.c -index 2c4480b20db3a5..3273aeb8fa6763 100644 ---- a/src/iavf_main.c -+++ b/src/iavf_main.c -@@ -4868,8 +4868,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) - goto err_pci_reg; - } - -- pci_enable_pcie_error_reporting(pdev); -- - pci_set_master(pdev); - - netdev = alloc_etherdev_mq(sizeof(struct iavf_adapter), -@@ -5175,8 +5172,6 @@ static void iavf_remove(struct pci_dev *pdev) - - free_netdev(netdev); - -- pci_disable_pcie_error_reporting(pdev); -- - pci_disable_device(pdev); - } - diff --git a/fix-build-error-with-Linux-6.6.patch b/fix-build-error-with-Linux-6.6.patch deleted file mode 100644 index be5df56d7a1f918766cc03ed84bf1c047dc968bc..0000000000000000000000000000000000000000 --- a/fix-build-error-with-Linux-6.6.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 732efb48473a90af4194464a2bf00fcd35993371 Mon Sep 17 00:00:00 2001 -From: eaglegai -Date: Tue, 9 Jan 2024 06:33:35 +0000 -Subject: [PATCH] fix build error with Linux 6.6 - ---- - src/iavf.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/iavf.h b/src/iavf.h -index 21b17fe..e7159d0 100644 ---- a/src/iavf.h -+++ b/src/iavf.h -@@ -39,6 +39,7 @@ - #include - #include - #endif /* __TC_MQPRIO_MODE_MAX */ -+#include - - #include "kcompat.h" - --- -2.33.0 - diff --git a/iavf-4.13.16.tar.gz b/iavf-4.13.16.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5f59b157ac5fe1185939c95eda23e5cb863f920c Binary files /dev/null and b/iavf-4.13.16.tar.gz differ diff --git a/iavf-4.7.0.tar.gz b/iavf-4.7.0.tar.gz deleted file mode 100644 index d8f6a34ea7ad7faae06547f859e6f41f2ce12f19..0000000000000000000000000000000000000000 Binary files a/iavf-4.7.0.tar.gz and /dev/null differ diff --git a/iavf.spec b/iavf.spec index d6220855c9fc7055c42481a1f14ab6a2111df4ed..9c71214884fa73fe52bb6c994eec009df6437d59 100644 --- a/iavf.spec +++ b/iavf.spec @@ -8,22 +8,17 @@ Name: iavf Summary: Intel(R) Ethernet Adaptive Virtual Function Driver -Version: 4.7.0 -Release: 3 +Version: 4.13.16 +Release: 1 Vendor: Intel Corporation License: GPL-2.0 URL: http://support.intel.com -Source0: https://downloadmirror.intel.com/762473/%{name}-%{version}.tar.gz +Source0: https://github.com/intel/ethernet-linux-iavf/releases/download/v%{version}/%{name}-%{version}.tar.gz Requires: kernel, findutils, gawk, bash, hwdata BuildRequires: kernel-devel hwdata uname-build-checks gcc -Patch0: backport-fix-build-error-with-Linux-6.4.patch -Patch1: backport-iavf-remove-redundant-pci_enable_pcie_error_reporting.patch -Patch2: backport-iavf-flow_dissector-use-64bits-for-used_keys.patch -Patch3: fix-build-error-with-Linux-6.6.patch - %description This package contains the Intel(R) Ethernet Adaptive Virtual Function Driver. @@ -401,6 +396,12 @@ else fi %changelog +* Mon Jul 28 2025 yanglu - 4.13.16-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update iavf version to 4.13.16 + * Thu Jan 11 2024 yanglu - 4.7.0-3 - Type:bugfix - ID:NA