Skip to content

Commit

Permalink
kernel: bump 6.6 to 6.6.39
Browse files Browse the repository at this point in the history
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.39

Manually rebased:
	generic/backport-6.6/0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch

Removed upstreamed:
	generic/backport-6.6/801-v6.11-gpio-mmio-do-not-calculate-bgpio_bits-via-ngpios.patch[1]
	generic/backport-6.6/0081-v6.10-cpu-Fix-broken-cmdline-nosmp-and-maxcpus-0.patch[2]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.39&id=dee87316b5f5f167a201491a774bbd6e10c8dd94
2. gregkh/linux@6978779

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <[email protected]>
Co-authored-by: Hauke Mehrtens <[email protected]>
Link: openwrt/openwrt#15928
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
graysky2 and hauke committed Jul 14, 2024
1 parent 850a5ca commit a9818e3
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 101 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .38
LINUX_KERNEL_HASH-6.6.38 = 4ed403ffb550565d03485aeca9a52c128cdde43f4a373a1a9ee3a590524fe743
LINUX_VERSION-6.6 = .39
LINUX_KERNEL_HASH-6.6.39 = 2783d42112095f95c510e1b421f056df8cbfa845f9040c6115080434a77a776b
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3657,6 +3657,48 @@ static int xhci_align_td(struct xhci_hcd
@@ -3658,6 +3658,48 @@ static int xhci_align_td(struct xhci_hcd
return 1;
}

Expand Down Expand Up @@ -124,7 +124,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
/* This is very similar to what ehci-q.c qtd_fill() does */
int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
struct urb *urb, int slot_id, unsigned int ep_index)
@@ -3813,6 +3855,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
@@ -3814,6 +3856,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
}

check_trb_math(urb, enqd_len);
Expand All @@ -133,7 +133,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
start_cycle, start_trb);
return 0;
@@ -3948,6 +3992,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
@@ -3949,6 +3993,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
/* Event on completion */
field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@ Cc: [email protected]
#define cpuhp_tasks_frozen 0
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1905,14 +1905,14 @@ static bool __init cpuhp_bringup_cpus_pa
@@ -1905,17 +1905,17 @@ static bool __init cpuhp_bringup_cpus_pa
static inline bool cpuhp_bringup_cpus_parallel(unsigned int ncpus) { return false; }
#endif /* CONFIG_HOTPLUG_PARALLEL */

-void __init bringup_nonboot_cpus(unsigned int setup_max_cpus)
+void __init bringup_nonboot_cpus(unsigned int max_cpus)
{
- if (!setup_max_cpus)
+ if (!max_cpus)
return;

/* Try parallel bringup optimization if enabled */
- if (cpuhp_bringup_cpus_parallel(setup_max_cpus))
+ if (cpuhp_bringup_cpus_parallel(max_cpus))
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>

#include "gpiolib.h"
#include "gpiolib-of.h"
@@ -1111,3 +1113,74 @@ void of_gpiochip_remove(struct gpio_chip
@@ -1129,3 +1131,74 @@ void of_gpiochip_remove(struct gpio_chip
{
of_node_put(dev_of_node(&chip->gpiodev->dev));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
@@ -375,14 +375,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: Rafael J. Wysocki <[email protected]>

--- a/drivers/thermal/mediatek/lvts_thermal.c
+++ b/drivers/thermal/mediatek/lvts_thermal.c
@@ -1247,7 +1247,7 @@ static int lvts_probe(struct platform_de
@@ -1249,7 +1249,7 @@ static int lvts_probe(struct platform_de
return 0;
}

Expand All @@ -38,7 +38,7 @@ Signed-off-by: Rafael J. Wysocki <[email protected]>
{
struct lvts_domain *lvts_td;
int i;
@@ -1258,8 +1258,6 @@ static int lvts_remove(struct platform_d
@@ -1260,8 +1260,6 @@ static int lvts_remove(struct platform_d
lvts_ctrl_set_enable(&lvts_td->lvts_ctrl[i], false);

lvts_debugfs_exit(lvts_td);
Expand All @@ -47,7 +47,7 @@ Signed-off-by: Rafael J. Wysocki <[email protected]>
}

static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
@@ -1360,7 +1358,7 @@ MODULE_DEVICE_TABLE(of, lvts_of_match);
@@ -1362,7 +1360,7 @@ MODULE_DEVICE_TABLE(of, lvts_of_match);

static struct platform_driver lvts_driver = {
.probe = lvts_probe,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Link: https://lore.kernel.org/r/[email protected]

lvts_ctrl[i].low_thresh = INT_MIN;
lvts_ctrl[i].high_thresh = INT_MIN;
@@ -1229,6 +1240,8 @@ static int lvts_probe(struct platform_de
@@ -1231,6 +1242,8 @@ static int lvts_probe(struct platform_de
if (irq < 0)
return irq;

Expand All @@ -180,7 +180,7 @@ Link: https://lore.kernel.org/r/[email protected]
ret = lvts_domain_init(dev, lvts_td, lvts_data);
if (ret)
return dev_err_probe(dev, ret, "Failed to initialize the lvts domain\n");
@@ -1342,11 +1355,15 @@ static const struct lvts_ctrl_data mt819
@@ -1344,11 +1357,15 @@ static const struct lvts_ctrl_data mt819
static const struct lvts_data mt8195_lvts_mcu_data = {
.lvts_ctrl = mt8195_lvts_mcu_data_ctrl,
.num_lvts_ctrl = ARRAY_SIZE(mt8195_lvts_mcu_data_ctrl),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Link: https://lore.kernel.org/r/[email protected]
#define LVTS_HW_SHUTDOWN_MT8195 105000

#define LVTS_MINIMUM_THRESHOLD 20000
@@ -1273,6 +1276,33 @@ static void lvts_remove(struct platform_
@@ -1275,6 +1278,33 @@ static void lvts_remove(struct platform_
lvts_debugfs_exit(lvts_td);
}

Expand Down Expand Up @@ -67,7 +67,7 @@ Link: https://lore.kernel.org/r/[email protected]
static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
{
.cal_offset = { 0x04, 0x07 },
@@ -1352,6 +1382,13 @@ static const struct lvts_ctrl_data mt819
@@ -1354,6 +1384,13 @@ static const struct lvts_ctrl_data mt819
}
};

Expand All @@ -81,7 +81,7 @@ Link: https://lore.kernel.org/r/[email protected]
static const struct lvts_data mt8195_lvts_mcu_data = {
.lvts_ctrl = mt8195_lvts_mcu_data_ctrl,
.num_lvts_ctrl = ARRAY_SIZE(mt8195_lvts_mcu_data_ctrl),
@@ -1367,6 +1404,7 @@ static const struct lvts_data mt8195_lvt
@@ -1369,6 +1406,7 @@ static const struct lvts_data mt8195_lvt
};

static const struct of_device_id lvts_of_match[] = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Link: https://lore.kernel.org/r/[email protected]

--- a/drivers/thermal/mediatek/lvts_thermal.c
+++ b/drivers/thermal/mediatek/lvts_thermal.c
@@ -1303,6 +1303,38 @@ static const struct lvts_ctrl_data mt798
@@ -1305,6 +1305,38 @@ static const struct lvts_ctrl_data mt798
}
};

Expand Down Expand Up @@ -63,7 +63,7 @@ Link: https://lore.kernel.org/r/[email protected]
static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
{
.cal_offset = { 0x04, 0x07 },
@@ -1411,12 +1443,17 @@ static const struct of_device_id lvts_of
@@ -1413,12 +1445,17 @@ static const struct of_device_id lvts_of
};
MODULE_DEVICE_TABLE(of, lvts_of_match);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Link: https://lore.kernel.org/r/[email protected]
#define LVTS_HW_SHUTDOWN_MT8195 105000

#define LVTS_MINIMUM_THRESHOLD 20000
@@ -1335,6 +1336,88 @@ static int lvts_resume(struct device *de
@@ -1337,6 +1338,88 @@ static int lvts_resume(struct device *de
return 0;
}

Expand Down Expand Up @@ -123,7 +123,7 @@ Link: https://lore.kernel.org/r/[email protected]
static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
{
.cal_offset = { 0x04, 0x07 },
@@ -1421,6 +1504,16 @@ static const struct lvts_data mt7988_lvt
@@ -1423,6 +1506,16 @@ static const struct lvts_data mt7988_lvt
.temp_offset = LVTS_COEFF_B_MT7988,
};

Expand All @@ -140,7 +140,7 @@ Link: https://lore.kernel.org/r/[email protected]
static const struct lvts_data mt8195_lvts_mcu_data = {
.lvts_ctrl = mt8195_lvts_mcu_data_ctrl,
.num_lvts_ctrl = ARRAY_SIZE(mt8195_lvts_mcu_data_ctrl),
@@ -1437,6 +1530,8 @@ static const struct lvts_data mt8195_lvt
@@ -1439,6 +1532,8 @@ static const struct lvts_data mt8195_lvt

static const struct of_device_id lvts_of_match[] = {
{ .compatible = "mediatek,mt7988-lvts-ap", .data = &mt7988_lvts_ap_data },
Expand Down

0 comments on commit a9818e3

Please sign in to comment.