Skip to content

Commit

Permalink
Revert "kernel: bump 6.6 to 6.6.60"
Browse files Browse the repository at this point in the history 
This reverts commit 85844cf.
  • Loading branch information
@Ansuel
Ansuel committed Nov 15, 2024
1 parent 85844cf commit 6e6e430
Show file tree
Hide file tree
Showing 21 changed files with 113 additions and 54 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .60
LINUX_KERNEL_HASH-6.6.60 = 52f9e32d5082ab94253447fd66670d0c3bb765cfcb99b0bf61d1b8eae25952ef
LINUX_VERSION-6.6 = .59
LINUX_KERNEL_HASH-6.6.59 = 23616808d8c08f12815ff898f4edb4c11397a2b2843d029ee62452d21833a76d
4 changes: 2 additions & 2 deletions ...inux/airoha/patches-6.6/101-01-thermal-of-Add-devm_thermal_of_zone_register_with_pa.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
* @dev: Device for which which resource was allocated.
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -263,6 +263,10 @@ struct thermal_zone_params {
@@ -261,6 +261,10 @@ struct thermal_zone_params {
#ifdef CONFIG_THERMAL_OF
struct thermal_zone_device *devm_thermal_of_zone_register(struct device *dev, int id, void *data,
const struct thermal_zone_device_ops *ops);
Expand All @@ -192,7 +192,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

void devm_thermal_of_zone_unregister(struct device *dev, struct thermal_zone_device *tz);

@@ -274,6 +278,15 @@ struct thermal_zone_device *devm_thermal
@@ -272,6 +276,15 @@ struct thermal_zone_device *devm_thermal
{
return ERR_PTR(-ENOTSUPP);
}
Expand Down
2 changes: 1 addition & 1 deletion ...x/bcm27xx/patches-6.6/950-0262-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
tsdata->tdata_offset + crclen;
}

@@ -1335,17 +1392,27 @@ static int edt_ft5x06_ts_probe(struct i2
@@ -1317,17 +1374,27 @@ static int edt_ft5x06_ts_probe(struct i2
return error;
}

Expand Down
4 changes: 2 additions & 2 deletions ...x/bcm27xx/patches-6.6/950-0302-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -1438,6 +1438,10 @@ static void edt_ft5x06_ts_remove(struct
@@ -1420,6 +1420,10 @@ static void edt_ft5x06_ts_remove(struct
{
struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);

Expand All @@ -27,5 +27,5 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
+ cancel_work_sync(&tsdata->work_i2c_poll);
+ }
edt_ft5x06_ts_teardown_debugfs(tsdata);
regmap_exit(tsdata->regmap);
}

4 changes: 2 additions & 2 deletions .../linux/bcm27xx/patches-6.6/950-0441-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>

--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4865,6 +4865,7 @@ static const struct {
@@ -4861,6 +4861,7 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
+ struct fwnode_handle *fwnode = dev_fwnode(hdev->dev.parent);
int ret = 0;
bool invalid_bdaddr;
size_t i;
@@ -4893,7 +4894,8 @@ static int hci_dev_setup_sync(struct hci
@@ -4889,7 +4890,8 @@ static int hci_dev_setup_sync(struct hci
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
if (!ret) {
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
Expand Down
4 changes: 2 additions & 2 deletions ...x/bcm27xx/patches-6.6/950-0669-input-touchscreen-edt-ft5x06-Suppress-bogus-data-on-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
if (!error && num_points)
error = regmap_bulk_read(tsdata->regmap,
tsdata->tdata_offset,
@@ -1318,7 +1336,7 @@ static int edt_ft5x06_ts_probe(struct i2
@@ -1300,7 +1318,7 @@ static int edt_ft5x06_ts_probe(struct i2
if (tsdata->reset_gpio) {
usleep_range(5000, 6000);
gpiod_set_value_cansleep(tsdata->reset_gpio, 0);
Expand All @@ -67,7 +67,7 @@ Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
}

input = devm_input_allocate_device(&client->dev);
@@ -1407,11 +1425,12 @@ static int edt_ft5x06_ts_probe(struct i2
@@ -1389,11 +1407,12 @@ static int edt_ft5x06_ts_probe(struct i2
return error;
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion target/linux/bcm27xx/patches-6.6/950-1218-Bluetooth-hci_sync-Fix-crash-on-NULL-parent.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>

--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4865,7 +4865,8 @@ static const struct {
@@ -4861,7 +4861,8 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
Expand Down
59 changes: 59 additions & 0 deletions target/linux/generic/backport-6.6/409-mtd-spi-nor-winbond-fix-w25q128-regression.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
From 342672bbdf713654316a0ff73c7f2ecf7ea6693d Mon Sep 17 00:00:00 2001
From: Michael Walle <mwalle@kernel.org>
Date: Fri, 21 Jun 2024 14:09:29 +0200
Subject: [PATCH] mtd: spi-nor: winbond: fix w25q128 regression

Upstream commit d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901

("mtd: spi-nor: winbond: fix w25q128 regression")
however the code has changed a lot after v6.6 so the patch did
not apply to v6.6 or v6.1 which still has the problem.

This patch fixes the issue in the way of the old API and has
been tested on hardware. Please apply it for v6.1 and v6.6.

Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
removed the flags for non-SFDP devices. It was assumed that it wasn't in
use anymore. This wasn't true. Add the no_sfdp_flags as well as the size
again.

We add the additional flags for dual and quad read because they have
been reported to work properly by Hartmut using both older and newer
versions of this flash, the similar flashes with 64Mbit and 256Mbit
already have these flags and because it will (luckily) trigger our
legacy SFDP parsing, so newer versions with SFDP support will still get
the parameters from the SFDP tables.

Reported-by: Hartmut Birr <e9hack@gmail.com>
Closes: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/
Fixes: 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Michael Walle <mwalle@kernel.org>
Acked-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Reviewed-by: Esben Haabendal <esben@geanix.com>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Signed-off-by: Pratyush Yadav <pratyush@kernel.org>
Link: https://lore.kernel.org/r/20240621120929.2670185-1-mwalle@kernel.org
[Backported to v6.6 - vastly different due to upstream changes]
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mtd/spi-nor/winbond.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/mtd/spi-nor/winbond.c
+++ b/drivers/mtd/spi-nor/winbond.c
@@ -120,9 +120,10 @@ static const struct flash_info winbond_n
NO_SFDP_FLAGS(SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16)
NO_SFDP_FLAGS(SECT_4K) },
- { "w25q128", INFO(0xef4018, 0, 0, 0)
- PARSE_SFDP
- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256)
+ FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
+ NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
+ SPI_NOR_QUAD_READ) },
{ "w25q256", INFO(0xef4019, 0, 64 * 1024, 512)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
.fixups = &w25q256_fixups },
6 changes: 3 additions & 3 deletions ...generic/backport-6.6/600-v6.10-net-Remove-conditional-threaded-NAPI-wakeup-based-on.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4481,13 +4481,7 @@ static inline void ____napi_schedule(str
@@ -4477,13 +4477,7 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
Expand All @@ -47,7 +47,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
wake_up_process(thread);
return;
}
@@ -6643,8 +6637,6 @@ static int napi_poll(struct napi_struct
@@ -6639,8 +6633,6 @@ static int napi_poll(struct napi_struct

static int napi_thread_wait(struct napi_struct *napi)
{
Expand All @@ -56,7 +56,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
set_current_state(TASK_INTERRUPTIBLE);

while (!kthread_should_stop()) {
@@ -6653,15 +6645,13 @@ static int napi_thread_wait(struct napi_
@@ -6649,15 +6641,13 @@ static int napi_thread_wait(struct napi_
* Testing SCHED bit is not enough because SCHED bit might be
* set by some other busy poll thread or by napi_disable().
*/
Expand Down
22 changes: 11 additions & 11 deletions .../linux/generic/backport-6.6/601-v6.10-net-Allow-to-use-SMP-threads-for-backlog-NAPI.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
static inline void rps_lock_irqsave(struct softnet_data *sd,
unsigned long *flags)
{
@@ -4449,6 +4475,7 @@ EXPORT_SYMBOL(__dev_direct_xmit);
@@ -4445,6 +4471,7 @@ EXPORT_SYMBOL(__dev_direct_xmit);
/*************************************************************************
* Receiver routines
*************************************************************************/
+static DEFINE_PER_CPU(struct task_struct *, backlog_napi);

int netdev_max_backlog __read_mostly = 1000;
EXPORT_SYMBOL(netdev_max_backlog);
@@ -4481,12 +4508,16 @@ static inline void ____napi_schedule(str
@@ -4477,12 +4504,16 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
Expand All @@ -133,7 +133,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
list_add_tail(&napi->poll_list, &sd->poll_list);
WRITE_ONCE(napi->list_owner, smp_processor_id());
/* If not called from net_rx_action()
@@ -4732,6 +4763,11 @@ static void napi_schedule_rps(struct sof
@@ -4728,6 +4759,11 @@ static void napi_schedule_rps(struct sof

#ifdef CONFIG_RPS
if (sd != mysd) {
Expand All @@ -145,7 +145,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
sd->rps_ipi_next = mysd->rps_ipi_list;
mysd->rps_ipi_list = sd;

@@ -5955,7 +5991,7 @@ static void net_rps_action_and_irq_enabl
@@ -5951,7 +5987,7 @@ static void net_rps_action_and_irq_enabl
#ifdef CONFIG_RPS
struct softnet_data *remsd = sd->rps_ipi_list;

Expand All @@ -154,7 +154,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
sd->rps_ipi_list = NULL;

local_irq_enable();
@@ -5970,7 +6006,7 @@ static void net_rps_action_and_irq_enabl
@@ -5966,7 +6002,7 @@ static void net_rps_action_and_irq_enabl
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
{
#ifdef CONFIG_RPS
Expand All @@ -163,7 +163,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
#else
return false;
#endif
@@ -6014,7 +6050,7 @@ static int process_backlog(struct napi_s
@@ -6010,7 +6046,7 @@ static int process_backlog(struct napi_s
* We can use a plain write instead of clear_bit(),
* and we dont need an smp_mb() memory barrier.
*/
Expand All @@ -172,7 +172,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
again = false;
} else {
skb_queue_splice_tail_init(&sd->input_pkt_queue,
@@ -6680,43 +6716,48 @@ static void skb_defer_free_flush(struct
@@ -6676,43 +6712,48 @@ static void skb_defer_free_flush(struct
}
}

Expand Down Expand Up @@ -250,7 +250,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return 0;
}

@@ -11297,7 +11338,7 @@ static int dev_cpu_dead(unsigned int old
@@ -11293,7 +11334,7 @@ static int dev_cpu_dead(unsigned int old

list_del_init(&napi->poll_list);
if (napi->poll == process_backlog)
Expand All @@ -259,7 +259,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
else
____napi_schedule(sd, napi);
}
@@ -11305,12 +11346,14 @@ static int dev_cpu_dead(unsigned int old
@@ -11301,12 +11342,14 @@ static int dev_cpu_dead(unsigned int old
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();

Expand All @@ -278,7 +278,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

/* Process offline CPU's input_pkt_queue */
while ((skb = __skb_dequeue(&oldsd->process_queue))) {
@@ -11573,6 +11616,38 @@ static struct pernet_operations __net_in
@@ -11569,6 +11612,38 @@ static struct pernet_operations __net_in
*
*/

Expand Down Expand Up @@ -317,7 +317,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
/*
* This is called single threaded during boot, so no need
* to take the rtnl semaphore.
@@ -11623,7 +11698,10 @@ static int __init net_dev_init(void)
@@ -11619,7 +11694,10 @@ static int __init net_dev_init(void)
init_gro_hash(&sd->backlog);
sd->backlog.poll = process_backlog;
sd->backlog.weight = weight_p;
Expand Down
2 changes: 1 addition & 1 deletion ...inux/generic/backport-6.6/602-v6.10-net-Use-backlog-NAPI-to-clean-up-the-defer_list.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
spin_unlock_irq(&sd->input_pkt_queue.lock);
else if (!IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_enable();
@@ -4782,6 +4782,23 @@ static void napi_schedule_rps(struct sof
@@ -4778,6 +4778,23 @@ static void napi_schedule_rps(struct sof
__napi_schedule_irqoff(&mysd->backlog);
}

Expand Down
18 changes: 9 additions & 9 deletions target/linux/generic/backport-6.6/603-v6.10-net-Rename-rps_lock-to-backlog_lock.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
{
if (IS_ENABLED(CONFIG_RPS) || use_backlog_threads())
spin_unlock_irq(&sd->input_pkt_queue.lock);
@@ -4787,12 +4787,12 @@ void kick_defer_list_purge(struct softne
@@ -4783,12 +4783,12 @@ void kick_defer_list_purge(struct softne
unsigned long flags;

if (use_backlog_threads()) {
Expand All @@ -82,7 +82,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

} else if (!cmpxchg(&sd->defer_ipi_scheduled, 0, 1)) {
smp_call_function_single_async(cpu, &sd->defer_csd);
@@ -4854,7 +4854,7 @@ static int enqueue_to_backlog(struct sk_
@@ -4850,7 +4850,7 @@ static int enqueue_to_backlog(struct sk_
reason = SKB_DROP_REASON_NOT_SPECIFIED;
sd = &per_cpu(softnet_data, cpu);

Expand All @@ -91,7 +91,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
if (!netif_running(skb->dev))
goto drop;
qlen = skb_queue_len(&sd->input_pkt_queue);
@@ -4863,7 +4863,7 @@ static int enqueue_to_backlog(struct sk_
@@ -4859,7 +4859,7 @@ static int enqueue_to_backlog(struct sk_
enqueue:
__skb_queue_tail(&sd->input_pkt_queue, skb);
input_queue_tail_incr_save(sd, qtail);
Expand All @@ -100,7 +100,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
return NET_RX_SUCCESS;
}

@@ -4878,7 +4878,7 @@ enqueue:
@@ -4874,7 +4874,7 @@ enqueue:

drop:
sd->dropped++;
Expand All @@ -109,7 +109,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

dev_core_stats_rx_dropped_inc(skb->dev);
kfree_skb_reason(skb, reason);
@@ -5909,7 +5909,7 @@ static void flush_backlog(struct work_st
@@ -5905,7 +5905,7 @@ static void flush_backlog(struct work_st
local_bh_disable();
sd = this_cpu_ptr(&softnet_data);

Expand All @@ -118,7 +118,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
__skb_unlink(skb, &sd->input_pkt_queue);
@@ -5917,7 +5917,7 @@ static void flush_backlog(struct work_st
@@ -5913,7 +5913,7 @@ static void flush_backlog(struct work_st
input_queue_head_incr(sd);
}
}
Expand All @@ -127,7 +127,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
@@ -5935,14 +5935,14 @@ static bool flush_required(int cpu)
@@ -5931,14 +5931,14 @@ static bool flush_required(int cpu)
struct softnet_data *sd = &per_cpu(softnet_data, cpu);
bool do_flush;

Expand All @@ -144,7 +144,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>

return do_flush;
#endif
@@ -6057,7 +6057,7 @@ static int process_backlog(struct napi_s
@@ -6053,7 +6053,7 @@ static int process_backlog(struct napi_s

}

Expand All @@ -153,7 +153,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
if (skb_queue_empty(&sd->input_pkt_queue)) {
/*
* Inline a custom version of __napi_complete().
@@ -6073,7 +6073,7 @@ static int process_backlog(struct napi_s
@@ -6069,7 +6069,7 @@ static int process_backlog(struct napi_s
skb_queue_splice_tail_init(&sd->input_pkt_queue,
&sd->process_queue);
}
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/backport-6.6/611-02-v6.11-net-Make-USO-depend-on-CSUM-offload.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9759,6 +9759,15 @@ static void netdev_sync_lower_features(s
@@ -9755,6 +9755,15 @@ static void netdev_sync_lower_features(s
}
}

Expand All @@ -36,7 +36,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static netdev_features_t netdev_fix_features(struct net_device *dev,
netdev_features_t features)
{
@@ -9840,15 +9849,9 @@ static netdev_features_t netdev_fix_feat
@@ -9836,15 +9845,9 @@ static netdev_features_t netdev_fix_feat
features &= ~NETIF_F_LRO;
}

Expand All @@ -55,7 +55,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
}

if ((features & NETIF_F_HW_TLS_RX) && !(features & NETIF_F_RXCSUM)) {
@@ -9856,6 +9859,11 @@ static netdev_features_t netdev_fix_feat
@@ -9852,6 +9855,11 @@ static netdev_features_t netdev_fix_feat
features &= ~NETIF_F_HW_TLS_RX;
}

Expand Down
Loading

0 comments on commit 6e6e430

Please sign in to comment.