mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
kernel: bump 6.6 to 6.6.24
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.24
Removed upstreamed:
generic/backport-6.6/838-v6.9-leds-trigger-netdev-Fix-kernel-panic-on-interface-re.patch[1]
generic/backport-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[2]
mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch[3]
Removed:
ipq40xx/patches-6.6/110-mtd-limit-OTP-nvmem-to-non-nand-devices.patch[4]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=10f2af1af8ab8a7064f193446abd5579d3def7e3
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=9c74507e6c4382d12a5e418742b81fd441f03313
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=fe750e2744428be6aec7395b13df3b34381ce6b6
4. Acknowledgment to @DragonBlurp for pointing out the redundancy of this patch. dd78a59cd7
Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia
parent
4d3f41130e
commit
5c2eca676a
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.6 = .23
|
||||
LINUX_KERNEL_HASH-6.6.23 = 200fd119cb9ef06bcedcdb52be00ba443163eab154295c5831fed9a12211a8b9
|
||||
LINUX_VERSION-6.6 = .24
|
||||
LINUX_KERNEL_HASH-6.6.24 = 3e9ef879dae8319338eb0dc2d2c2025c13257fdeddf6245c000cb5a85a8af6f5
|
||||
|
||||
@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
imx_ocotp_nvmem_config.priv = priv;
|
||||
--- a/drivers/nvmem/meson-efuse.c
|
||||
+++ b/drivers/nvmem/meson-efuse.c
|
||||
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
|
||||
@@ -74,6 +74,7 @@ static int meson_efuse_probe(struct plat
|
||||
|
||||
econfig->dev = dev;
|
||||
econfig->name = dev_name(dev);
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From 12ce20e02e532f101b725d71c52a36c5cc8ad1e6 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Marangi <ansuelsmth@gmail.com>
|
||||
Date: Sun, 4 Feb 2024 00:54:01 +0100
|
||||
Subject: [PATCH] leds: trigger: netdev: Fix kernel panic on interface rename
|
||||
trig notify
|
||||
|
||||
Commit d5e01266e7f5 ("leds: trigger: netdev: add additional specific link
|
||||
speed mode") in the various changes, reworked the way to set the LINKUP
|
||||
mode in commit cee4bd16c319 ("leds: trigger: netdev: Recheck
|
||||
NETDEV_LED_MODE_LINKUP on dev rename") and moved it to a generic function.
|
||||
|
||||
This changed the logic where, in the previous implementation the dev
|
||||
from the trigger event was used to check if the carrier was ok, but in
|
||||
the new implementation with the generic function, the dev in
|
||||
trigger_data is used instead.
|
||||
|
||||
This is problematic and cause a possible kernel panic due to the fact
|
||||
that the dev in the trigger_data still reference the old one as the
|
||||
new one (passed from the trigger event) still has to be hold and saved
|
||||
in the trigger_data struct (done in the NETDEV_REGISTER case).
|
||||
|
||||
On calling of get_device_state(), an invalid net_dev is used and this
|
||||
cause a kernel panic.
|
||||
|
||||
To handle this correctly, move the call to get_device_state() after the
|
||||
new net_dev is correctly set in trigger_data (in the NETDEV_REGISTER
|
||||
case) and correctly parse the new dev.
|
||||
|
||||
Fixes: d5e01266e7f5 ("leds: trigger: netdev: add additional specific link speed mode")
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
||||
Link: https://lore.kernel.org/r/20240203235413.1146-1-ansuelsmth@gmail.com
|
||||
Signed-off-by: Lee Jones <lee@kernel.org>
|
||||
---
|
||||
drivers/leds/trigger/ledtrig-netdev.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/leds/trigger/ledtrig-netdev.c
|
||||
+++ b/drivers/leds/trigger/ledtrig-netdev.c
|
||||
@@ -489,12 +489,12 @@ static int netdev_trig_notify(struct not
|
||||
trigger_data->duplex = DUPLEX_UNKNOWN;
|
||||
switch (evt) {
|
||||
case NETDEV_CHANGENAME:
|
||||
- get_device_state(trigger_data);
|
||||
- fallthrough;
|
||||
case NETDEV_REGISTER:
|
||||
dev_put(trigger_data->net_dev);
|
||||
dev_hold(dev);
|
||||
trigger_data->net_dev = dev;
|
||||
+ if (evt == NETDEV_CHANGENAME)
|
||||
+ get_device_state(trigger_data);
|
||||
break;
|
||||
case NETDEV_UNREGISTER:
|
||||
dev_put(trigger_data->net_dev);
|
||||
@ -1,27 +0,0 @@
|
||||
From: Ezra Buehler <ezra.buehler@husqvarnagroup.com>
|
||||
|
||||
E.g. ESMT chips will return an identification code with a length of 5
|
||||
bytes. In order to prevent ambiguity, flash chips would actually need to
|
||||
return IDs that are up to 17 or more bytes long due to JEDEC's
|
||||
continuation scheme. I understand that if a manufacturer ID is located
|
||||
in bank N of JEDEC's database (there are currently 16 banks), N - 1
|
||||
continuation codes (7Fh) need to be added to the identification code
|
||||
(comprising of manufacturer ID and device ID). However, most flash chip
|
||||
manufacturers don't seem to implement this (correctly).
|
||||
|
||||
Signed-off-by: Ezra Buehler <ezra.buehler@husqvarnagroup.com>
|
||||
---
|
||||
include/linux/mtd/spinand.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/include/linux/mtd/spinand.h
|
||||
+++ b/include/linux/mtd/spinand.h
|
||||
@@ -169,7 +169,7 @@
|
||||
struct spinand_op;
|
||||
struct spinand_device;
|
||||
|
||||
-#define SPINAND_MAX_ID_LEN 4
|
||||
+#define SPINAND_MAX_ID_LEN 5
|
||||
/*
|
||||
* For erase, write and read operation, we got the following timings :
|
||||
* tBERS (erase) 1ms to 4ms
|
||||
@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||
|
||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||
/* These Quectel products use Quectel's vendor ID */
|
||||
@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
|
||||
@@ -1152,6 +1157,11 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
||||
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
||||
@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||
/* Quectel products using Qualcomm vendor ID */
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
||||
@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
|
||||
@@ -1193,6 +1203,11 @@ static const struct usb_device_id option
|
||||
.driver_info = ZLP },
|
||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||
.driver_info = RSVD(4) },
|
||||
|
||||
@ -385,7 +385,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/ipv4/proc.c
|
||||
+++ b/net/ipv4/proc.c
|
||||
@@ -556,5 +556,8 @@ static __net_initdata struct pernet_oper
|
||||
@@ -557,5 +557,8 @@ static __net_initdata struct pernet_oper
|
||||
|
||||
int __init ip_misc_proc_init(void)
|
||||
{
|
||||
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/mmc/core/block.c
|
||||
+++ b/drivers/mmc/core/block.c
|
||||
@@ -2461,6 +2461,8 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
@@ -2463,6 +2463,8 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
int area_type,
|
||||
unsigned int part_type)
|
||||
{
|
||||
@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
struct mmc_blk_data *md;
|
||||
int devidx, ret;
|
||||
char cap_str[10];
|
||||
@@ -2557,6 +2559,13 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
@@ -2559,6 +2561,13 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
|
||||
blk_queue_write_cache(md->queue.queue, cache_enabled, fua_enabled);
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/mmc/core/block.c
|
||||
+++ b/drivers/mmc/core/block.c
|
||||
@@ -2515,6 +2515,7 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
@@ -2517,6 +2517,7 @@ static struct mmc_blk_data *mmc_blk_allo
|
||||
md->disk->major = MMC_BLOCK_MAJOR;
|
||||
md->disk->minors = perdev_minors;
|
||||
md->disk->first_minor = devidx * perdev_minors;
|
||||
|
||||
@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -8214,7 +8214,7 @@ static int nft_register_flowtable_net_ho
|
||||
@@ -8221,7 +8221,7 @@ static int nft_register_flowtable_net_ho
|
||||
err = flowtable->data.type->setup(&flowtable->data,
|
||||
hook->ops.dev,
|
||||
FLOW_BLOCK_BIND);
|
||||
|
||||
@ -132,7 +132,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
/*
|
||||
* Define if arch has non-standard setup. This is a _PCI_ standard
|
||||
@@ -874,6 +877,12 @@ struct ata_port {
|
||||
@@ -875,6 +878,12 @@ struct ata_port {
|
||||
#ifdef CONFIG_ATA_ACPI
|
||||
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
|
||||
#endif
|
||||
|
||||
@ -93,7 +93,7 @@ Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
|
||||
+#endif
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -4627,6 +4627,9 @@ enum skb_ext_id {
|
||||
@@ -4637,6 +4637,9 @@ enum skb_ext_id {
|
||||
#if IS_ENABLED(CONFIG_MCTP_FLOWS)
|
||||
SKB_EXT_MCTP,
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
},
|
||||
[PORT_NPCM] = {
|
||||
.name = "Nuvoton 16550",
|
||||
@@ -2780,6 +2780,11 @@ serial8250_do_set_termios(struct uart_po
|
||||
@@ -2774,6 +2774,11 @@ serial8250_do_set_termios(struct uart_po
|
||||
unsigned long flags;
|
||||
unsigned int baud, quot, frac = 0;
|
||||
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From patchwork Thu Sep 7 11:20:18 2023
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de>
|
||||
X-Patchwork-Id: 13376356
|
||||
From: Frank Wunderlich <linux@fw-web.de>
|
||||
To: linux-mediatek@lists.infradead.org
|
||||
Subject: [PATCH] thermal/drivers/mediatek: Fix control buffer enablement on
|
||||
MT7896
|
||||
Date: Thu, 7 Sep 2023 13:20:18 +0200
|
||||
Message-Id: <20230907112018.52811-1-linux@fw-web.de>
|
||||
X-Mailer: git-send-email 2.34.1
|
||||
MIME-Version: 1.0
|
||||
X-Mail-ID: e7eeb8e1-00de-41f6-a5df-ce2e9164136e
|
||||
X-BeenThere: linux-mediatek@lists.infradead.org
|
||||
X-Mailman-Version: 2.1.34
|
||||
Precedence: list
|
||||
List-Id: <linux-mediatek.lists.infradead.org>
|
||||
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>,
|
||||
"Rafael J. Wysocki" <rafael@kernel.org>, linux-pm@vger.kernel.org,
|
||||
Amit Kucheria <amitk@kernel.org>, Daniel Golle <daniel@makrotopia.org>,
|
||||
stable@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||
Matthias Brugger <matthias.bgg@gmail.com>, Zhang Rui <rui.zhang@intel.com>,
|
||||
linux-arm-kernel@lists.infradead.org,
|
||||
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org>
|
||||
|
||||
From: Frank Wunderlich <frank-w@public-files.de>
|
||||
|
||||
Reading thermal sensor on mt7986 devices returns invalid temperature:
|
||||
|
||||
bpi-r3 ~ # cat /sys/class/thermal/thermal_zone0/temp
|
||||
-274000
|
||||
|
||||
Fix this by adding missing members in mtk_thermal_data struct which were
|
||||
used in mtk_thermal_turn_on_buffer after commit 33140e668b10.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Fixes: 33140e668b10 ("thermal/drivers/mediatek: Control buffer enablement tweaks")
|
||||
Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
|
||||
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com>
|
||||
---
|
||||
drivers/thermal/mediatek/auxadc_thermal.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
--- a/drivers/thermal/mediatek/auxadc_thermal.c
|
||||
+++ b/drivers/thermal/mediatek/auxadc_thermal.c
|
||||
@@ -690,6 +690,9 @@ static const struct mtk_thermal_data mt7
|
||||
.adcpnp = mt7986_adcpnp,
|
||||
.sensor_mux_values = mt7986_mux_values,
|
||||
.version = MTK_THERMAL_V3,
|
||||
+ .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
|
||||
+ .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
|
||||
+ .apmixed_buffer_ctl_set = BIT(0),
|
||||
};
|
||||
|
||||
static bool mtk_thermal_temp_is_valid(int temp)
|
||||
@ -20,7 +20,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -2119,6 +2119,26 @@ static struct clk_branch gcc_blsp1_qup5_
|
||||
@@ -2121,6 +2121,26 @@ static struct clk_branch gcc_blsp1_qup5_
|
||||
},
|
||||
};
|
||||
|
||||
@ -47,7 +47,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||
static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
|
||||
.halt_reg = 0x0700c,
|
||||
.clkr = {
|
||||
@@ -4275,6 +4295,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4277,6 +4297,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr,
|
||||
[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
|
||||
[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
|
||||
|
||||
@ -17,7 +17,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq6018.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq6018.c
|
||||
@@ -3522,6 +3522,22 @@ static struct clk_branch gcc_prng_ahb_cl
|
||||
@@ -3524,6 +3524,22 @@ static struct clk_branch gcc_prng_ahb_cl
|
||||
},
|
||||
};
|
||||
|
||||
@ -40,7 +40,7 @@ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
||||
static struct clk_branch gcc_qdss_dap_clk = {
|
||||
.halt_reg = 0x29084,
|
||||
.clkr = {
|
||||
@@ -4361,6 +4377,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
@@ -4363,6 +4379,7 @@ static struct clk_regmap *gcc_ipq6018_cl
|
||||
[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
|
||||
[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
|
||||
[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
|
||||
|
||||
@ -23,7 +23,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -1675,13 +1675,21 @@ static struct clk_regmap_div nss_port4_t
|
||||
@@ -1677,13 +1677,21 @@ static struct clk_regmap_div nss_port4_t
|
||||
},
|
||||
};
|
||||
|
||||
@ -49,7 +49,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
F(156250000, P_UNIPHY1_RX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY1_RX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1737,13 +1745,21 @@ static struct clk_regmap_div nss_port5_r
|
||||
@@ -1739,13 +1747,21 @@ static struct clk_regmap_div nss_port5_r
|
||||
},
|
||||
};
|
||||
|
||||
@ -75,7 +75,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
F(156250000, P_UNIPHY1_TX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY1_TX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1799,13 +1815,21 @@ static struct clk_regmap_div nss_port5_t
|
||||
@@ -1801,13 +1817,21 @@ static struct clk_regmap_div nss_port5_t
|
||||
},
|
||||
};
|
||||
|
||||
@ -101,7 +101,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
F(156250000, P_UNIPHY2_RX, 2, 0, 0),
|
||||
F(312500000, P_UNIPHY2_RX, 1, 0, 0),
|
||||
{ }
|
||||
@@ -1856,13 +1880,21 @@ static struct clk_regmap_div nss_port6_r
|
||||
@@ -1858,13 +1882,21 @@ static struct clk_regmap_div nss_port6_r
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4710,6 +4710,7 @@ static const struct qcom_reset_map gcc_i
|
||||
@@ -4712,6 +4712,7 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = BIT(27) | GENMASK(9, 8) },
|
||||
[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = BIT(28) | GENMASK(11, 10) },
|
||||
[GCC_NSSPORT6_RESET] = { .reg = 0x68014, .bitmask = BIT(29) | GENMASK(13, 12) },
|
||||
|
||||
@ -92,7 +92,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
||||
};
|
||||
|
||||
static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
|
||||
@@ -1897,12 +1897,11 @@ static const struct freq_tbl ftbl_ubi32_
|
||||
@@ -1899,12 +1899,11 @@ static const struct freq_tbl ftbl_ubi32_
|
||||
{ }
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user