-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto update to lts2023-ubuntu v6.6.48-240905T080843Z
Source of patches: 8eb3a1da1 rebase update to v6.6.48 Signed-off-by: sys_oak <[email protected]>
- Loading branch information
Showing
3 changed files
with
16 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
|
||
KVERSION=6 | ||
KPATCHLEVEL=6 | ||
KSUBLEVEL=44 | ||
KSUBLEVEL=48 | ||
KEXTRAVERSION= | ||
KRTV= | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,8 +17,8 @@ Signed-off-by: Aravindhan Gunasekaran <[email protected]> | |
drivers/net/ethernet/intel/igc/igc_tsn.c | 14 ++++++++++++-- | ||
2 files changed, 14 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h | ||
index b3037016f31d..3ce4401c669b 100644 | ||
Index: b/drivers/net/ethernet/intel/igc/igc_defines.h | ||
=================================================================== | ||
--- a/drivers/net/ethernet/intel/igc/igc_defines.h | ||
+++ b/drivers/net/ethernet/intel/igc/igc_defines.h | ||
@@ -398,6 +398,8 @@ | ||
|
@@ -30,11 +30,11 @@ index b3037016f31d..3ce4401c669b 100644 | |
|
||
#define IGC_DTXMXPKTSZ_TSN 0x19 /* 1600 bytes of max TX DMA packet size */ | ||
#define IGC_DTXMXPKTSZ_DEFAULT 0x98 /* 9728-byte Jumbo frames */ | ||
diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c | ||
index 22cefb1eeedf..f038f5ca0f44 100644 | ||
Index: b/drivers/net/ethernet/intel/igc/igc_tsn.c | ||
=================================================================== | ||
--- a/drivers/net/ethernet/intel/igc/igc_tsn.c | ||
+++ b/drivers/net/ethernet/intel/igc/igc_tsn.c | ||
@@ -84,13 +84,18 @@ void igc_tsn_adjust_txtime_offset(struct igc_adapter *adapter) | ||
@@ -108,13 +108,18 @@ bool igc_tsn_is_taprio_activated_by_user | ||
static int igc_tsn_disable_offload(struct igc_adapter *adapter) | ||
{ | ||
struct igc_hw *hw = &adapter->hw; | ||
|
@@ -51,10 +51,10 @@ index 22cefb1eeedf..f038f5ca0f44 100644 | |
+ | ||
+ wr32(IGC_RXPBS, rxpbs); | ||
+ | ||
tqavctrl = rd32(IGC_TQAVCTRL); | ||
tqavctrl &= ~(IGC_TQAVCTRL_TRANSMIT_MODE_TSN | | ||
IGC_TQAVCTRL_ENHANCED_QAV | IGC_TQAVCTRL_FUTSCDDIS); | ||
@@ -115,7 +120,7 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter) | ||
if (igc_is_device_id_i226(hw)) | ||
igc_tsn_restore_retx_default(adapter); | ||
|
||
@@ -161,7 +166,7 @@ static int igc_tsn_enable_offload(struct | ||
{ | ||
struct igc_hw *hw = &adapter->hw; | ||
u32 tqavctrl, baset_l, baset_h; | ||
|
@@ -63,7 +63,7 @@ index 22cefb1eeedf..f038f5ca0f44 100644 | |
ktime_t base_time, systim; | ||
int i; | ||
|
||
@@ -123,6 +128,11 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter) | ||
@@ -169,6 +174,11 @@ static int igc_tsn_enable_offload(struct | ||
wr32(IGC_DTXMXPKTSZ, IGC_DTXMXPKTSZ_TSN); | ||
wr32(IGC_TXPBS, IGC_TXPBSIZE_TSN); | ||
|
||
|
@@ -72,9 +72,6 @@ index 22cefb1eeedf..f038f5ca0f44 100644 | |
+ | ||
+ wr32(IGC_RXPBS, rxpbs); | ||
+ | ||
for (i = 0; i < adapter->num_tx_queues; i++) { | ||
struct igc_ring *ring = adapter->tx_ring[i]; | ||
u32 txqctl = 0; | ||
-- | ||
2.25.1 | ||
|
||
if (igc_is_device_id_i226(hw)) | ||
igc_tsn_set_retx_qbvfullthreshold(adapter); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters