Skip to content

Commit 487ca61

Browse files
graysky2hauke
graysky2
authored and
hauke
committed
kernel: bump 6.6 to 6.6.61
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.61 Manually rebased: bcm27xx/patches-6.6/950-0998-i2c-designware-Add-support-for-bus-clear-feature.patch All other patches automatically rebased. 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 <[email protected]> Link: openwrt/openwrt#16959 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent 77cfe8f commit 487ca61

19 files changed

+40
-39
lines changed

‎include/kernel-6.6‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.6 = .60
2-
LINUX_KERNEL_HASH-6.6.60 = 52f9e32d5082ab94253447fd66670d0c3bb765cfcb99b0bf61d1b8eae25952ef
1+
LINUX_VERSION-6.6 = .61
2+
LINUX_KERNEL_HASH-6.6.61 = 418fc24df9190f1c3ed9906dc3b7651c2a2eae5c1cb9ab4a6348e20faf047c0b

‎target/linux/airoha/patches-6.6/101-01-thermal-of-Add-devm_thermal_of_zone_register_with_pa.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Signed-off-by: Christian Marangi <[email protected]>
4040

4141
--- a/drivers/thermal/thermal_of.c
4242
+++ b/drivers/thermal/thermal_of.c
43-
@@ -249,7 +249,7 @@ static void thermal_of_parameters_init(s
43+
@@ -245,7 +245,7 @@ static void thermal_of_parameters_init(s
4444
{
4545
int coef[2];
4646
int ncoef = ARRAY_SIZE(coef);
@@ -49,7 +49,7 @@ Signed-off-by: Christian Marangi <[email protected]>
4949

5050
tzp->no_hwmon = true;
5151

52-
@@ -261,14 +261,11 @@ static void thermal_of_parameters_init(s
52+
@@ -257,14 +257,11 @@ static void thermal_of_parameters_init(s
5353
* thermal zone. Thus, we are considering only the first two
5454
* values as slope and offset.
5555
*/
@@ -67,7 +67,7 @@ Signed-off-by: Christian Marangi <[email protected]>
6767
}
6868

6969
static struct device_node *thermal_of_zone_get_by_name(struct thermal_zone_device *tz)
70-
@@ -462,10 +459,15 @@ static void thermal_of_zone_unregister(s
70+
@@ -458,10 +455,15 @@ static void thermal_of_zone_unregister(s
7171
* zone properties and registers new thermal zone with those
7272
* properties.
7373
*
@@ -83,7 +83,7 @@ Signed-off-by: Christian Marangi <[email protected]>
8383
*
8484
* Return: a valid thermal zone structure pointer on success.
8585
* - EINVAL: if the device tree thermal description is malformed
86-
@@ -473,11 +475,11 @@ static void thermal_of_zone_unregister(s
86+
@@ -469,11 +471,11 @@ static void thermal_of_zone_unregister(s
8787
* - Other negative errors are returned by the underlying called functions
8888
*/
8989
static struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, int id, void *data,
@@ -97,7 +97,7 @@ Signed-off-by: Christian Marangi <[email protected]>
9797
struct thermal_zone_device_ops *of_ops;
9898
struct device_node *np;
9999
int delay, pdelay;
100-
@@ -509,7 +511,7 @@ static struct thermal_zone_device *therm
100+
@@ -508,7 +510,7 @@ static struct thermal_zone_device *therm
101101
goto out_kfree_trips;
102102
}
103103

@@ -106,7 +106,7 @@ Signed-off-by: Christian Marangi <[email protected]>
106106

107107
of_ops->bind = thermal_of_bind;
108108
of_ops->unbind = thermal_of_unbind;
109-
@@ -517,7 +519,7 @@ static struct thermal_zone_device *therm
109+
@@ -516,7 +518,7 @@ static struct thermal_zone_device *therm
110110
mask = GENMASK_ULL((ntrips) - 1, 0);
111111

112112
tz = thermal_zone_device_register_with_trips(np->name, trips, ntrips,
@@ -115,15 +115,15 @@ Signed-off-by: Christian Marangi <[email protected]>
115115
pdelay, delay);
116116
if (IS_ERR(tz)) {
117117
ret = PTR_ERR(tz);
118-
@@ -572,6 +574,7 @@ static int devm_thermal_of_zone_match(st
118+
@@ -571,6 +573,7 @@ static int devm_thermal_of_zone_match(st
119119
struct thermal_zone_device *devm_thermal_of_zone_register(struct device *dev, int sensor_id, void *data,
120120
const struct thermal_zone_device_ops *ops)
121121
{
122122
+ struct thermal_zone_params tzp = { .slope = 1 };
123123
struct thermal_zone_device **ptr, *tzd;
124124

125125
ptr = devres_alloc(devm_thermal_of_zone_release, sizeof(*ptr),
126-
@@ -579,7 +582,7 @@ struct thermal_zone_device *devm_thermal
126+
@@ -578,7 +581,7 @@ struct thermal_zone_device *devm_thermal
127127
if (!ptr)
128128
return ERR_PTR(-ENOMEM);
129129

@@ -132,7 +132,7 @@ Signed-off-by: Christian Marangi <[email protected]>
132132
if (IS_ERR(tzd)) {
133133
devres_free(ptr);
134134
return tzd;
135-
@@ -593,6 +596,46 @@ struct thermal_zone_device *devm_thermal
135+
@@ -592,6 +595,46 @@ struct thermal_zone_device *devm_thermal
136136
EXPORT_SYMBOL_GPL(devm_thermal_of_zone_register);
137137

138138
/**

‎target/linux/bcm27xx/patches-6.6/950-0106-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17583,7 +17583,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1758317583
* For devices with more than one control interface, we assume the
1758417584
--- a/sound/usb/quirks.c
1758517585
+++ b/sound/usb/quirks.c
17586-
@@ -2195,6 +2195,8 @@ static const struct usb_audio_quirk_flag
17586+
@@ -2197,6 +2197,8 @@ static const struct usb_audio_quirk_flag
1758717587
QUIRK_FLAG_ALIGN_TRANSFER),
1758817588
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
1758917589
QUIRK_FLAG_ALIGN_TRANSFER),

‎target/linux/bcm27xx/patches-6.6/950-0535-i2c-designware-Add-SMBUS-quick-command-support.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1717

1818
--- a/drivers/i2c/busses/i2c-designware-core.h
1919
+++ b/drivers/i2c/busses/i2c-designware-core.h
20-
@@ -123,7 +123,9 @@
20+
@@ -124,7 +124,9 @@
2121

2222
#define DW_IC_ERR_TX_ABRT 0x1
2323

‎target/linux/bcm27xx/patches-6.6/950-0864-i2c-designware-Support-non-standard-bus-speeds.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5959

6060
--- a/drivers/i2c/busses/i2c-designware-core.h
6161
+++ b/drivers/i2c/busses/i2c-designware-core.h
62-
@@ -292,6 +292,7 @@ struct dw_i2c_dev {
62+
@@ -293,6 +293,7 @@ struct dw_i2c_dev {
6363
u16 fp_lcnt;
6464
u16 hs_hcnt;
6565
u16 hs_lcnt;

‎target/linux/bcm27xx/patches-6.6/950-0998-i2c-designware-Add-support-for-bus-clear-feature.patch‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3333
};
3434

3535
static int dw_reg_read(void *context, unsigned int reg, unsigned int *val)
36-
@@ -607,8 +609,16 @@ int i2c_dw_wait_bus_not_busy(struct dw_i
36+
@@ -609,8 +611,16 @@ int i2c_dw_wait_bus_not_busy(struct dw_i
3737
int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev)
3838
{
3939
unsigned long abort_source = dev->abort_source;
@@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5050
if (abort_source & DW_IC_TX_ABRT_NOACK) {
5151
for_each_set_bit(i, &abort_source, ARRAY_SIZE(abort_sources))
5252
dev_dbg(dev->dev,
53-
@@ -623,6 +633,8 @@ int i2c_dw_handle_tx_abort(struct dw_i2c
53+
@@ -625,6 +635,8 @@ int i2c_dw_handle_tx_abort(struct dw_i2c
5454
return -EAGAIN;
5555
else if (abort_source & DW_IC_TX_ABRT_GCALL_READ)
5656
return -EINVAL; /* wrong msgs[] data */
@@ -74,30 +74,31 @@ Signed-off-by: Phil Elwell <[email protected]>
7474
#define DW_IC_COMP_TYPE 0xfc
7575
#define DW_IC_COMP_TYPE_VALUE 0x44570140 /* "DW" + 0x0140 */
7676

77-
@@ -111,12 +114,14 @@
77+
@@ -111,6 +114,7 @@
7878

7979
#define DW_IC_ENABLE_ENABLE BIT(0)
8080
#define DW_IC_ENABLE_ABORT BIT(1)
8181
+#define DW_IC_ENABLE_BUS_RECOVERY BIT(3)
8282

8383
#define DW_IC_STATUS_ACTIVITY BIT(0)
8484
#define DW_IC_STATUS_TFE BIT(2)
85-
#define DW_IC_STATUS_RFNE BIT(3)
85+
@@ -118,6 +122,7 @@
8686
#define DW_IC_STATUS_MASTER_ACTIVITY BIT(5)
8787
#define DW_IC_STATUS_SLAVE_ACTIVITY BIT(6)
88+
#define DW_IC_STATUS_MASTER_HOLD_TX_FIFO_EMPTY BIT(7)
8889
+#define DW_IC_STATUS_SDA_STUCK_NOT_RECOVERED BIT(11)
8990

9091
#define DW_IC_SDA_HOLD_RX_SHIFT 16
9192
#define DW_IC_SDA_HOLD_RX_MASK GENMASK(23, 16)
92-
@@ -164,6 +169,7 @@
93+
@@ -165,6 +170,7 @@
9394
#define ABRT_SLAVE_FLUSH_TXFIFO 13
9495
#define ABRT_SLAVE_ARBLOST 14
9596
#define ABRT_SLAVE_RD_INTX 15
9697
+#define ABRT_SLAVE_SDA_STUCK_AT_LOW 17
9798

9899
#define DW_IC_TX_ABRT_7B_ADDR_NOACK BIT(ABRT_7B_ADDR_NOACK)
99100
#define DW_IC_TX_ABRT_10ADDR1_NOACK BIT(ABRT_10ADDR1_NOACK)
100-
@@ -179,6 +185,7 @@
101+
@@ -180,6 +186,7 @@
101102
#define DW_IC_RX_ABRT_SLAVE_RD_INTX BIT(ABRT_SLAVE_RD_INTX)
102103
#define DW_IC_RX_ABRT_SLAVE_ARBLOST BIT(ABRT_SLAVE_ARBLOST)
103104
#define DW_IC_RX_ABRT_SLAVE_FLUSH_TXFIFO BIT(ABRT_SLAVE_FLUSH_TXFIFO)

‎target/linux/generic/backport-6.6/771-v6.7-02-net-stmmac-move-TX-timer-arm-after-DMA-enable.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ Signed-off-by: Paolo Abeni <[email protected]>
4242

4343
u64_stats_update_begin(&txq_stats->napi_syncp);
4444
u64_stats_add(&txq_stats->napi.tx_packets, tx_packets);
45-
@@ -5602,6 +5606,7 @@ static int stmmac_napi_poll_tx(struct na
45+
@@ -5603,6 +5607,7 @@ static int stmmac_napi_poll_tx(struct na
4646
container_of(napi, struct stmmac_channel, tx_napi);
4747
struct stmmac_priv *priv = ch->priv_data;
4848
struct stmmac_txq_stats *txq_stats;
4949
+ bool pending_packets = false;
5050
u32 chan = ch->index;
5151
int work_done;
5252

53-
@@ -5610,7 +5615,7 @@ static int stmmac_napi_poll_tx(struct na
53+
@@ -5611,7 +5616,7 @@ static int stmmac_napi_poll_tx(struct na
5454
u64_stats_inc(&txq_stats->napi.poll);
5555
u64_stats_update_end(&txq_stats->napi_syncp);
5656

@@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
5959
work_done = min(work_done, budget);
6060

6161
if (work_done < budget && napi_complete_done(napi, work_done)) {
62-
@@ -5621,6 +5626,10 @@ static int stmmac_napi_poll_tx(struct na
62+
@@ -5622,6 +5627,10 @@ static int stmmac_napi_poll_tx(struct na
6363
spin_unlock_irqrestore(&ch->lock, flags);
6464
}
6565

@@ -70,15 +70,15 @@ Signed-off-by: Paolo Abeni <[email protected]>
7070
return work_done;
7171
}
7272

73-
@@ -5629,6 +5638,7 @@ static int stmmac_napi_poll_rxtx(struct
73+
@@ -5630,6 +5639,7 @@ static int stmmac_napi_poll_rxtx(struct
7474
struct stmmac_channel *ch =
7575
container_of(napi, struct stmmac_channel, rxtx_napi);
7676
struct stmmac_priv *priv = ch->priv_data;
7777
+ bool tx_pending_packets = false;
7878
int rx_done, tx_done, rxtx_done;
7979
struct stmmac_rxq_stats *rxq_stats;
8080
struct stmmac_txq_stats *txq_stats;
81-
@@ -5644,7 +5654,7 @@ static int stmmac_napi_poll_rxtx(struct
81+
@@ -5645,7 +5655,7 @@ static int stmmac_napi_poll_rxtx(struct
8282
u64_stats_inc(&txq_stats->napi.poll);
8383
u64_stats_update_end(&txq_stats->napi_syncp);
8484

@@ -87,7 +87,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
8787
tx_done = min(tx_done, budget);
8888

8989
rx_done = stmmac_rx_zc(priv, budget, chan);
90-
@@ -5669,6 +5679,10 @@ static int stmmac_napi_poll_rxtx(struct
90+
@@ -5670,6 +5680,10 @@ static int stmmac_napi_poll_rxtx(struct
9191
spin_unlock_irqrestore(&ch->lock, flags);
9292
}
9393

‎target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
4343

4444
#define QUECTEL_VENDOR_ID 0x2c7c
4545
/* These Quectel products use Quectel's vendor ID */
46-
@@ -1159,6 +1164,11 @@ static const struct usb_device_id option
46+
@@ -1160,6 +1165,11 @@ static const struct usb_device_id option
4747
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
4848
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
4949
.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
5555
/* Quectel products using Qualcomm vendor ID */
5656
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
5757
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
58-
@@ -1200,6 +1210,11 @@ static const struct usb_device_id option
58+
@@ -1201,6 +1211,11 @@ static const struct usb_device_id option
5959
.driver_info = ZLP },
6060
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
6161
.driver_info = RSVD(4) },

‎target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1818

1919
--- a/net/netfilter/nf_tables_api.c
2020
+++ b/net/netfilter/nf_tables_api.c
21-
@@ -8376,7 +8376,7 @@ static int nft_register_flowtable_net_ho
21+
@@ -8377,7 +8377,7 @@ static int nft_register_flowtable_net_ho
2222
err = flowtable->data.type->setup(&flowtable->data,
2323
hook->ops.dev,
2424
FLOW_BLOCK_BIND);

‎target/linux/mediatek/patches-6.6/901-arm-add-cmdline-override.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* CONFIG_CMDLINE is meant to be a default in case nothing else
3838
--- a/arch/arm64/Kconfig
3939
+++ b/arch/arm64/Kconfig
40-
@@ -2308,6 +2308,14 @@ config CMDLINE_FORCE
40+
@@ -2309,6 +2309,14 @@ config CMDLINE_FORCE
4141

4242
endchoice
4343

0 commit comments

Comments
 (0)