From 18e75ac84df6ba0cab4c204d3d424d15c2adb969 Mon Sep 17 00:00:00 2001 From: sys_oak Date: Tue, 2 Jul 2024 06:28:27 -0700 Subject: [PATCH] Auto update to lts2023-ubuntu v6.6.35-240702T091601Z Source of patches: ab9a8d47a rebase update to v6.6.35 Signed-off-by: sys_oak --- config.sh | 2 +- ...rt-recalculating-of-CBS-idle-slope-und.tsn | 22 +++++++++---------- kernel-patches/patches/series | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/config.sh b/config.sh index e52344e97..79e92ab2f 100755 --- a/config.sh +++ b/config.sh @@ -3,7 +3,7 @@ KVERSION=6 KPATCHLEVEL=6 -KSUBLEVEL=34 +KSUBLEVEL=35 KEXTRAVERSION= KRTV= diff --git a/kernel-patches/patches/0011-net-stmmac-support-recalculating-of-CBS-idle-slope-und.tsn b/kernel-patches/patches/0011-net-stmmac-support-recalculating-of-CBS-idle-slope-und.tsn index e951f3743..dcdd7b2b5 100644 --- a/kernel-patches/patches/0011-net-stmmac-support-recalculating-of-CBS-idle-slope-und.tsn +++ b/kernel-patches/patches/0011-net-stmmac-support-recalculating-of-CBS-idle-slope-und.tsn @@ -26,8 +26,8 @@ Signed-off-by: Michael Sit Wei Hong include/linux/stmmac.h | 2 + 2 files changed, 54 insertions(+), 3 deletions(-) -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c -index 85db28d41261..324af7441211 100644 +Index: b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +=================================================================== --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -11,6 +11,8 @@ @@ -39,24 +39,25 @@ index 85db28d41261..324af7441211 100644 static void tc_fill_all_pass_entry(struct stmmac_tc_entry *entry) { memset(entry, 0, sizeof(*entry)); -@@ -342,12 +344,13 @@ static int tc_init(struct stmmac_priv *priv) +@@ -342,13 +344,14 @@ static int tc_init(struct stmmac_priv *p static int tc_setup_cbs(struct stmmac_priv *priv, struct tc_cbs_qopt_offload *qopt) { + u64 value, scaling = 0, cycle_time_ns = 0, open_time = 0, tti_ns = 0; u32 tx_queues_count = priv->plat->tx_queues_to_use; -+ u32 ptr, speed_div, idle_slope; + s64 port_transmit_rate_kbps; ++ u32 ptr, idle_slope; + u32 gate = 0x1 << qopt->queue; u32 queue = qopt->queue; -- u32 ptr, speed_div; u32 mode_to_use; - u64 value; +- u32 ptr; - int ret; + int ret, row; /* Queue 0 is not AVB capable */ if (queue <= 0 || queue >= tx_queues_count) -@@ -410,6 +413,50 @@ static int tc_setup_cbs(struct stmmac_priv *priv, +@@ -407,6 +410,50 @@ static int tc_setup_cbs(struct stmmac_pr value = qopt->locredit * 1024ll * 8; priv->plat->tx_queues_cfg[queue].low_credit = value & GENMASK(31, 0); @@ -107,7 +108,7 @@ index 85db28d41261..324af7441211 100644 ret = stmmac_config_cbs(priv, priv->hw, priv->plat->tx_queues_cfg[queue].send_slope, priv->plat->tx_queues_cfg[queue].idle_slope, -@@ -1026,6 +1073,8 @@ static int tc_setup_taprio(struct stmmac_priv *priv, +@@ -1023,6 +1070,8 @@ static int tc_setup_taprio(struct stmmac } priv->plat->est->gcl[i] = delta_ns | (gates << wid); @@ -116,8 +117,8 @@ index 85db28d41261..324af7441211 100644 } mutex_lock(&priv->plat->est->lock); -diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h -index 432d1edf77c7..db0d8716a08c 100644 +Index: b/include/linux/stmmac.h +=================================================================== --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -126,6 +126,8 @@ struct stmmac_est { @@ -129,6 +130,3 @@ index 432d1edf77c7..db0d8716a08c 100644 u32 gcl_size; }; --- -2.42.0 - diff --git a/kernel-patches/patches/series b/kernel-patches/patches/series index 2ffbccc80..308c0c887 100644 --- a/kernel-patches/patches/series +++ b/kernel-patches/patches/series @@ -1,5 +1,5 @@ -# Series file for v6.6.34 linux kernel -# 76d42e596d89 Linux 6.6.34 +# Series file for v6.6.35 linux kernel +# 5f2d0708acd0 Linux 6.6.35 #security 0001-Add-security.md-file.security #tgpio