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 (file)
index 0000000..965c1ae
--- /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 <tee.min.tan@linux.intel.com>
+Date: Fri, 9 Dec 2022 12:15:20 +0800
+Subject: igc: allow BaseTime 0 enrollment for Qbv
+
+From: Tan Tee Min <tee.min.tan@linux.intel.com>
+
+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 <muhammad.husaini.zulkifli@intel.com>
+Signed-off-by: Tan Tee Min <tee.min.tan@linux.intel.com>
+Tested-by: Naama Meir <naamax.meir@linux.intel.com>
+Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 (file)
index 0000000..13f0d80
--- /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 <sasha.neftin@intel.com>
+Date: Thu, 9 Sep 2021 20:49:04 +0300
+Subject: igc: Update I226_K device ID
+
+From: Sasha Neftin <sasha.neftin@intel.com>
+
+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 <sasha.neftin@intel.com>
+Tested-by: Nechama Kraus <nechamax.kraus@linux.intel.com>
+Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 6e6bfcb611b0928082ae600e1d58e296d5a9dc56..718327771e799c8e36b0809d0d89d77cfb9db8b6 100644 (file)
--- 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