Skip to content

Commit

Permalink
kernel: bump 6.1 to 6.1.112 (coolsnowwolf#12510)
Browse files Browse the repository at this point in the history
  • Loading branch information
Beginner-Go authored Oct 1, 2024
1 parent fac34a2 commit 1a1b7da
Show file tree
Hide file tree
Showing 56 changed files with 160 additions and 236 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .111
LINUX_KERNEL_HASH-6.1.111 = c47298fa1d410bc5dcfb0662bc2cdbe86f5b0d12a1baac297e1ded7b6722edb0
LINUX_VERSION-6.1 = .112
LINUX_KERNEL_HASH-6.1.112 = 8bd8de3562fb006653e550a934e66ed9f80b7576258a03e2caa2e3ce1c1f9f24
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -2208,7 +2208,7 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
@@ -2208,7 +2208,7 @@ mackey_and_ltk:
if (err)
return SMP_UNSPECIFIED;

Expand All @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]>
if (test_bit(SMP_FLAG_INITIATOR, &smp->flags)) {
sc_dhkey_check(smp);
SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);
@@ -2223,9 +2223,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
@@ -2223,9 +2223,6 @@ mackey_and_ltk:
confirm_hint = 0;

confirm:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6061,6 +6061,9 @@ int __init cgroup_init_early(void)
@@ -6070,6 +6070,9 @@ int __init cgroup_init_early(void)
return 0;
}

Expand All @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <[email protected]>
/**
* cgroup_init - cgroup initialization
*
@@ -6094,6 +6097,12 @@ int __init cgroup_init(void)
@@ -6103,6 +6106,12 @@ int __init cgroup_init(void)

cgroup_unlock();

Expand All @@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <[email protected]>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
@@ -6734,6 +6743,10 @@ static int __init cgroup_disable(char *s
@@ -6743,6 +6752,10 @@ static int __init cgroup_disable(char *s
strcmp(token, ss->legacy_name))
continue;

Expand All @@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <[email protected]>
static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n",
ss->name);
@@ -6752,6 +6765,31 @@ static int __init cgroup_disable(char *s
@@ -6761,6 +6774,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -707,7 +707,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids)
@@ -709,7 +709,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids)
*/
static int spidev_of_check(struct device *dev)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ Signed-off-by: Phil Elwell <[email protected]>
goto out;
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase);
@@ -1818,7 +1818,8 @@ EXPORT_SYMBOL(mmc_erase);

int mmc_can_erase(struct mmc_card *card)
{
Expand All @@ -325,7 +325,7 @@ Signed-off-by: Phil Elwell <[email protected]>
}
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -130,6 +130,14 @@ static const struct mmc_fixup __maybe_un
@@ -134,6 +134,14 @@ static const struct mmc_fixup __maybe_un
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
MMC_QUIRK_BROKEN_SD_DISCARD),

Expand Down Expand Up @@ -1987,7 +1987,7 @@ Signed-off-by: Phil Elwell <[email protected]>

#define MAX_TUNING_LOOP 40

@@ -3236,7 +3236,7 @@ static void sdhci_timeout_timer(struct t
@@ -3235,7 +3235,7 @@ static void sdhci_timeout_timer(struct t
spin_lock_irqsave(&host->lock, flags);

if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
Expand All @@ -1996,7 +1996,7 @@ Signed-off-by: Phil Elwell <[email protected]>
mmc_hostname(host->mmc));
sdhci_err_stats_inc(host, REQ_TIMEOUT);
sdhci_dumpregs(host);
@@ -3259,7 +3259,7 @@ static void sdhci_timeout_data_timer(str
@@ -3258,7 +3258,7 @@ static void sdhci_timeout_data_timer(str

if (host->data || host->data_cmd ||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Signed-off-by: Phil Elwell <[email protected]>
#endif
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -509,6 +509,9 @@ do { \
@@ -499,6 +499,9 @@ do { \
extern unsigned long __must_check
arm_copy_from_user(void *to, const void __user *from, unsigned long n);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17615,7 +17615,7 @@ Signed-off-by: Ashish Vara <[email protected]>
* For devices with more than one control interface, we assume the
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -2087,6 +2087,8 @@ static const struct usb_audio_quirk_flag
@@ -2089,6 +2089,8 @@ static const struct usb_audio_quirk_flag
QUIRK_FLAG_FIXED_RATE),
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
QUIRK_FLAG_FIXED_RATE),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <[email protected]>

--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1643,6 +1643,109 @@ command_cleanup:
@@ -1653,6 +1653,109 @@ command_cleanup:
}

/*
Expand Down Expand Up @@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
* non-error returns are a promise to giveback() the urb later
* we drop ownership so next owner (or urb unlink) can get it
*/
@@ -5480,6 +5583,7 @@ static const struct hc_driver xhci_hc_dr
@@ -5492,6 +5595,7 @@ static const struct hc_driver xhci_hc_dr
.endpoint_reset = xhci_endpoint_reset,
.check_bandwidth = xhci_check_bandwidth,
.reset_bandwidth = xhci_reset_bandwidth,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
#define USB_VENDOR_ID_BELKIN 0x050d
#define USB_DEVICE_ID_FLIP_KVM 0x3201

@@ -1373,6 +1376,9 @@
@@ -1385,6 +1388,9 @@
#define USB_VENDOR_ID_XIAOMI 0x2717
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -52,6 +52,8 @@
@@ -53,6 +53,8 @@
#define extra_checks 0
#endif

Expand All @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
/* Device and char device-related information */
static DEFINE_IDA(gpio_ida);
static dev_t gpio_devt;
@@ -2423,8 +2425,8 @@ int gpiod_direction_output(struct gpio_d
@@ -2424,8 +2426,8 @@ int gpiod_direction_output(struct gpio_d
value = !!value;

/* GPIOs used for enabled IRQs shall not be set as output */
Expand All @@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <[email protected]>
gpiod_err(desc,
"%s: tried to set a GPIO tied to an IRQ as output\n",
__func__);
@@ -3302,8 +3304,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
@@ -3303,8 +3305,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
}

/* To be valid for IRQ the line needs to be input or open drain */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -415,6 +415,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ;
@@ -419,6 +419,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ;
$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
-i $(dir $<) $(DTC_FLAGS) \
-Wno-interrupts_property \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Signed-off-by: Phil Elwell <[email protected]>
+ { .name = "spidev" },
{ .name = "bh2228fv" },
{ .name = "dh2228fv" },
{ .name = "ltc2488" },
{ .name = "jg10309-01" },
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -1358,6 +1358,7 @@ static const struct of_device_id pca953x
@@ -1360,6 +1360,7 @@ static const struct of_device_id pca953x
{ .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), },
{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
{ .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Jonathan Bell <[email protected]>

--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1732,7 +1732,7 @@ static void xhci_fixup_endpoint(struct u
@@ -1742,7 +1742,7 @@ static void xhci_fixup_endpoint(struct u
return;
}
ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Signed-off-by: Jaegeuk Kim <[email protected]>
}

return err;
@@ -5064,11 +5062,9 @@ int f2fs_build_segment_manager(struct f2
@@ -5067,11 +5065,9 @@ int f2fs_build_segment_manager(struct f2

init_f2fs_rwsem(&sm_info->curseg_lock);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR
static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -3074,6 +3074,15 @@ static void sdhci_card_event(struct mmc_
@@ -3073,6 +3073,15 @@ static void sdhci_card_event(struct mmc_
spin_unlock_irqrestore(&host->lock, flags);
}

Expand All @@ -42,15 +42,15 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR
static const struct mmc_host_ops sdhci_ops = {
.request = sdhci_request,
.post_req = sdhci_post_req,
@@ -3089,6 +3098,7 @@ static const struct mmc_host_ops sdhci_o
@@ -3088,6 +3097,7 @@ static const struct mmc_host_ops sdhci_o
.execute_tuning = sdhci_execute_tuning,
.card_event = sdhci_card_event,
.card_busy = sdhci_card_busy,
+ .init_sd_express = sdhci_init_sd_express,
};

/*****************************************************************************\
@@ -4614,6 +4624,15 @@ int sdhci_setup_host(struct sdhci_host *
@@ -4609,6 +4619,15 @@ int sdhci_setup_host(struct sdhci_host *
!(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
mmc->caps |= MMC_CAP_UHS_DDR50;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
},
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1180,6 +1180,24 @@ static void dwc3_config_threshold(struct
@@ -1201,6 +1201,24 @@ static void dwc3_config_threshold(struct
}
}

Expand All @@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
/**
* dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure
@@ -1257,6 +1275,8 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1278,6 +1296,8 @@ static int dwc3_core_init(struct dwc3 *d

dwc3_set_incr_burst_type(dwc);

Expand All @@ -246,15 +246,15 @@ Signed-off-by: Jonathan Bell <[email protected]>
usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0);
ret = phy_power_on(dwc->usb2_generic_phy);
@@ -1490,6 +1510,7 @@ static void dwc3_get_properties(struct d
@@ -1526,6 +1546,7 @@ static void dwc3_get_properties(struct d
u8 tx_thr_num_pkt_prd = 0;
u8 tx_max_burst_prd = 0;
u8 tx_fifo_resize_max_num;
+ u8 axi_pipe_limit;
const char *usb_psy_name;
int ret;

@@ -1512,6 +1533,9 @@ static void dwc3_get_properties(struct d
@@ -1548,6 +1569,9 @@ static void dwc3_get_properties(struct d
*/
tx_fifo_resize_max_num = 6;

Expand All @@ -264,7 +264,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->maximum_speed = usb_get_maximum_speed(dev);
dwc->max_ssp_rate = usb_get_maximum_ssp_rate(dev);
dwc->dr_mode = usb_get_dr_mode(dev);
@@ -1627,6 +1651,9 @@ static void dwc3_get_properties(struct d
@@ -1663,6 +1687,9 @@ static void dwc3_get_properties(struct d
dwc->dis_split_quirk = device_property_read_bool(dev,
"snps,dis-split-quirk");

Expand All @@ -274,7 +274,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
dwc->tx_de_emphasis = tx_de_emphasis;

@@ -1644,6 +1671,8 @@ static void dwc3_get_properties(struct d
@@ -1680,6 +1707,8 @@ static void dwc3_get_properties(struct d
dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd;
dwc->tx_max_burst_prd = tx_max_burst_prd;

Expand All @@ -283,7 +283,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->imod_interval = 0;

dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num;
@@ -1852,6 +1881,12 @@ static int dwc3_probe(struct platform_de
@@ -1888,6 +1917,12 @@ static int dwc3_probe(struct platform_de

dwc3_get_properties(dwc);

Expand All @@ -308,15 +308,15 @@ Signed-off-by: Jonathan Bell <[email protected]>
/* Global Debug LSP MUX Select */
#define DWC3_GDBGLSPMUX_ENDBC BIT(15) /* Host only */
#define DWC3_GDBGLSPMUX_HOSTSELECT(n) ((n) & 0x3fff)
@@ -1056,6 +1059,7 @@ struct dwc3_scratchpad_array {
@@ -1057,6 +1060,7 @@ struct dwc3_scratchpad_array {
* @tx_max_burst_prd: max periodic ESS transmit burst size
* @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize
* @clear_stall_protocol: endpoint number that requires a delayed status phase
+ * @axi_max_pipe: set to override the maximum number of pipelined AXI transfers
* @hsphy_interface: "utmi" or "ulpi"
* @connected: true when we're connected to a host, false otherwise
* @softconnect: true when gadget connect is called, false when disconnect runs
@@ -1287,6 +1291,7 @@ struct dwc3 {
@@ -1289,6 +1293,7 @@ struct dwc3 {
u8 tx_max_burst_prd;
u8 tx_fifo_resize_max_num;
u8 clear_stall_protocol;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <[email protected]>

--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1728,6 +1728,12 @@ static bool sdhci_send_command(struct sd
@@ -1727,6 +1727,12 @@ static bool sdhci_send_command(struct sd
if (host->use_external_dma)
sdhci_external_dma_pre_transfer(host, cmd);

Expand All @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);

return true;
@@ -3333,6 +3339,11 @@ static void sdhci_cmd_irq(struct sdhci_h
@@ -3332,6 +3338,11 @@ static void sdhci_cmd_irq(struct sdhci_h
if (intmask & SDHCI_INT_TIMEOUT) {
host->cmd->error = -ETIMEDOUT;
sdhci_err_stats_inc(host, CMD_TIMEOUT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ Signed-off-by: Mark Brown <[email protected]>

--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -702,6 +702,7 @@ static const struct spi_device_id spidev
@@ -703,6 +703,7 @@ static const struct spi_device_id spidev
{ .name = "spi-petra" },
{ .name = "spi-authenta" },
{ .name = "em3581" },
+ { .name = "si3210" },
{},
};
MODULE_DEVICE_TABLE(spi, spidev_spi_ids);
@@ -730,6 +731,7 @@ static const struct of_device_id spidev_
@@ -732,6 +733,7 @@ static const struct of_device_id spidev_
{ .compatible = "rohm,dh2228fv", .data = &spidev_of_check },
{ .compatible = "semtech,sx1301", .data = &spidev_of_check },
{ .compatible = "silabs,em3581", .data = &spidev_of_check },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8012,7 +8012,7 @@ static int nft_register_flowtable_net_ho
@@ -8017,7 +8017,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Signed-off-by: Viresh Kumar <[email protected]>
{ .compatible = "qcom,msm8960", },
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
@@ -148,6 +148,11 @@ static int qcom_cpufreq_kryo_name_versio
@@ -152,6 +152,11 @@ static int qcom_cpufreq_kryo_name_versio
switch (msm_id) {
case QCOM_ID_MSM8996:
case QCOM_ID_APQ8096:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Link: https://lore.kernel.org/r/[email protected]

--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -677,6 +677,14 @@
@@ -679,6 +679,14 @@
#mbox-cells = <1>;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Link: https://lore.kernel.org/r/[email protected]
cryptobam: dma-controller@704000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x00704000 0x20000>;
@@ -876,4 +886,90 @@
@@ -878,4 +888,90 @@
<GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
Expand Down
Loading

0 comments on commit 1a1b7da

Please sign in to comment.