From: Greg Kroah-Hartman Date: Mon, 14 Jul 2025 12:58:42 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.188~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=520481ade4899873e6de12b53857fff407c2eb44;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: igc-allow-basetime-0-enrollment-for-qbv.patch igc-update-i226_k-device-id.patch --- diff --git a/queue-5.10/igc-allow-basetime-0-enrollment-for-qbv.patch b/queue-5.10/igc-allow-basetime-0-enrollment-for-qbv.patch new file mode 100644 index 0000000000..965c1ae5c3 --- /dev/null +++ b/queue-5.10/igc-allow-basetime-0-enrollment-for-qbv.patch @@ -0,0 +1,56 @@ +From e17090eb24944fbbe1f24d9f336d7bad4fbe47e8 Mon Sep 17 00:00:00 2001 +From: Tan Tee Min +Date: Fri, 9 Dec 2022 12:15:20 +0800 +Subject: igc: allow BaseTime 0 enrollment for Qbv + +From: Tan Tee Min + +commit e17090eb24944fbbe1f24d9f336d7bad4fbe47e8 upstream. + +Introduce qbv_enable flag in igc_adapter struct to store the Qbv on/off. +So this allow the BaseTime to enroll with zero value. + +Fixes: 61572d5f8f91 ("igc: Simplify TSN flags handling") +Signed-off-by: Muhammad Husaini Zulkifli +Signed-off-by: Tan Tee Min +Tested-by: Naama Meir +Signed-off-by: Tony Nguyen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/igc/igc.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 2 ++ + drivers/net/ethernet/intel/igc/igc_tsn.c | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/igc/igc.h ++++ b/drivers/net/ethernet/intel/igc/igc.h +@@ -168,6 +168,7 @@ struct igc_adapter { + + ktime_t base_time; + ktime_t cycle_time; ++ bool qbv_enable; + + /* OS defined structs */ + struct pci_dev *pdev; +--- a/drivers/net/ethernet/intel/igc/igc_main.c ++++ b/drivers/net/ethernet/intel/igc/igc_main.c +@@ -4943,6 +4943,8 @@ static int igc_save_qbv_schedule(struct + size_t n; + int i; + ++ adapter->qbv_enable = qopt->enable; ++ + if (!qopt->enable) { + adapter->base_time = 0; + return 0; +--- a/drivers/net/ethernet/intel/igc/igc_tsn.c ++++ b/drivers/net/ethernet/intel/igc/igc_tsn.c +@@ -23,7 +23,7 @@ static unsigned int igc_tsn_new_flags(st + { + unsigned int new_flags = adapter->flags & ~IGC_FLAG_TSN_ANY_ENABLED; + +- if (adapter->base_time) ++ if (adapter->qbv_enable) + new_flags |= IGC_FLAG_TSN_QBV_ENABLED; + + if (is_any_launchtime(adapter)) diff --git a/queue-5.10/igc-update-i226_k-device-id.patch b/queue-5.10/igc-update-i226_k-device-id.patch new file mode 100644 index 0000000000..13f0d80c51 --- /dev/null +++ b/queue-5.10/igc-update-i226_k-device-id.patch @@ -0,0 +1,31 @@ +From 79cc8322b6d82747cb63ea464146c0bf5b5a6bc1 Mon Sep 17 00:00:00 2001 +From: Sasha Neftin +Date: Thu, 9 Sep 2021 20:49:04 +0300 +Subject: igc: Update I226_K device ID + +From: Sasha Neftin + +commit 79cc8322b6d82747cb63ea464146c0bf5b5a6bc1 upstream. + +The device ID for I226_K was incorrectly assigned, update the device +ID to the correct one. + +Fixes: bfa5e98c9de4 ("igc: Add new device ID") +Signed-off-by: Sasha Neftin +Tested-by: Nechama Kraus +Signed-off-by: Tony Nguyen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/igc/igc_hw.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/net/ethernet/intel/igc/igc_hw.h ++++ b/drivers/net/ethernet/intel/igc/igc_hw.h +@@ -24,7 +24,6 @@ + #define IGC_DEV_ID_I225_K2 0x3101 + #define IGC_DEV_ID_I226_K 0x3102 + #define IGC_DEV_ID_I225_LMVP 0x5502 +-#define IGC_DEV_ID_I226_K 0x5504 + #define IGC_DEV_ID_I225_IT 0x0D9F + #define IGC_DEV_ID_I226_LM 0x125B + #define IGC_DEV_ID_I226_V 0x125C diff --git a/queue-5.10/series b/queue-5.10/series index 6e6bfcb611..718327771e 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -184,3 +184,5 @@ rtc-lib_test-add-module_license.patch pwm-mediatek-ensure-to-disable-clocks-in-error-path.patch netlink-fix-rmem-check-in-netlink_broadcast_deliver.patch netlink-make-sure-we-allow-at-least-one-dump-skb.patch +igc-update-i226_k-device-id.patch +igc-allow-basetime-0-enrollment-for-qbv.patch