Skip to content

Commit 648fa1b

Browse files
GoetzGoerischhauke
authored andcommitted
kernel: bump 6.6 to 6.6.117
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.117 Manually updated: bcm27xx/patches-6.6/950-0814-media-i2c-adv7180-Add-support-for-V4L2_CID_LINK_FREQ.patch Updated with Raspberry Pi patch. All patches auto-refreshed. Signed-off-by: Goetz Goerisch <[email protected]> Link: openwrt/openwrt#20927 (cherry picked from commit 0337cdf) Signed-off-by: Goetz Goerisch <[email protected]> Link: openwrt/openwrt#20952 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent 443fc11 commit 648fa1b

File tree

67 files changed

+148
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+148
-146
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 = .116
2-
LINUX_KERNEL_HASH-6.6.116 = a9a59742c29be284c205dc87cbe9b065f9688488132c8f5a6057a5539230a51d
1+
LINUX_VERSION-6.6 = .117
2+
LINUX_KERNEL_HASH-6.6.117 = 643b31079222fdbda70cfdd0b68c514f05a3926104be4762a4685f62818b43d1

target/linux/airoha/patches-6.6/034-v6.13-pinctrl-airoha-Add-support-for-EN7581-SoC.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Signed-off-by: Linus Walleij <[email protected]>
2929

3030
--- a/MAINTAINERS
3131
+++ b/MAINTAINERS
32-
@@ -16871,6 +16871,13 @@ F: drivers/pinctrl/
32+
@@ -16872,6 +16872,13 @@ F: drivers/pinctrl/
3333
F: include/dt-bindings/pinctrl/
3434
F: include/linux/pinctrl/
3535

target/linux/airoha/patches-6.6/108-v6.19-net-airoha-Add-the-capability-to-consume-out-of-orde.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
2323

2424
--- a/drivers/net/ethernet/airoha/airoha_eth.c
2525
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
26-
@@ -892,19 +892,13 @@ static int airoha_qdma_tx_napi_poll(stru
26+
@@ -893,19 +893,13 @@ static int airoha_qdma_tx_napi_poll(stru
2727

2828
dma_unmap_single(eth->dev, e->dma_addr, e->dma_len,
2929
DMA_TO_DEVICE);
@@ -46,15 +46,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
4646
if (skb) {
4747
u16 queue = skb_get_queue_mapping(skb);
4848
struct netdev_queue *txq;
49-
@@ -949,6 +943,7 @@ static int airoha_qdma_init_tx_queue(str
49+
@@ -950,6 +944,7 @@ static int airoha_qdma_init_tx_queue(str
5050
q->ndesc = size;
5151
q->qdma = qdma;
5252
q->free_thr = 1 + MAX_SKB_FRAGS;
5353
+ INIT_LIST_HEAD(&q->tx_list);
5454

5555
q->entry = devm_kzalloc(eth->dev, q->ndesc * sizeof(*q->entry),
5656
GFP_KERNEL);
57-
@@ -961,9 +956,9 @@ static int airoha_qdma_init_tx_queue(str
57+
@@ -962,9 +957,9 @@ static int airoha_qdma_init_tx_queue(str
5858
return -ENOMEM;
5959

6060
for (i = 0; i < q->ndesc; i++) {
@@ -66,7 +66,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
6666
WRITE_ONCE(q->desc[i].ctrl, cpu_to_le32(val));
6767
}
6868

69-
@@ -973,9 +968,9 @@ static int airoha_qdma_init_tx_queue(str
69+
@@ -974,9 +969,9 @@ static int airoha_qdma_init_tx_queue(str
7070

7171
airoha_qdma_wr(qdma, REG_TX_RING_BASE(qid), dma_addr);
7272
airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid), TX_RING_CPU_IDX_MASK,
@@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
7878

7979
return 0;
8080
}
81-
@@ -1031,17 +1026,21 @@ static int airoha_qdma_init_tx(struct ai
81+
@@ -1032,17 +1027,21 @@ static int airoha_qdma_init_tx(struct ai
8282
static void airoha_qdma_cleanup_tx_queue(struct airoha_queue *q)
8383
{
8484
struct airoha_eth *eth = q->qdma->eth;
@@ -104,7 +104,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
104104
q->queued--;
105105
}
106106
spin_unlock_bh(&q->lock);
107-
@@ -1883,20 +1882,6 @@ static u32 airoha_get_dsa_tag(struct sk_
107+
@@ -1884,20 +1883,6 @@ static u32 airoha_get_dsa_tag(struct sk_
108108
#endif
109109
}
110110

@@ -125,7 +125,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
125125
static int airoha_get_fe_port(struct airoha_gdm_port *port)
126126
{
127127
struct airoha_qdma *qdma = port->qdma;
128-
@@ -1919,8 +1904,10 @@ static netdev_tx_t airoha_dev_xmit(struc
128+
@@ -1920,8 +1905,10 @@ static netdev_tx_t airoha_dev_xmit(struc
129129
struct airoha_gdm_port *port = netdev_priv(dev);
130130
struct airoha_qdma *qdma = port->qdma;
131131
u32 nr_frags, tag, msg0, msg1, len;
@@ -136,7 +136,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
136136
void *data;
137137
int i, qid;
138138
u16 index;
139-
@@ -1966,7 +1953,7 @@ static netdev_tx_t airoha_dev_xmit(struc
139+
@@ -1967,7 +1954,7 @@ static netdev_tx_t airoha_dev_xmit(struc
140140
txq = netdev_get_tx_queue(dev, qid);
141141
nr_frags = 1 + skb_shinfo(skb)->nr_frags;
142142

@@ -145,7 +145,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
145145
/* not enough space in the queue */
146146
netif_tx_stop_queue(txq);
147147
spin_unlock_bh(&q->lock);
148-
@@ -1975,11 +1962,13 @@ static netdev_tx_t airoha_dev_xmit(struc
148+
@@ -1976,11 +1963,13 @@ static netdev_tx_t airoha_dev_xmit(struc
149149

150150
len = skb_headlen(skb);
151151
data = skb->data;
@@ -161,7 +161,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
161161
skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
162162
dma_addr_t addr;
163163
u32 val;
164-
@@ -1989,7 +1978,14 @@ static netdev_tx_t airoha_dev_xmit(struc
164+
@@ -1990,7 +1979,14 @@ static netdev_tx_t airoha_dev_xmit(struc
165165
if (unlikely(dma_mapping_error(dev->dev.parent, addr)))
166166
goto error_unmap;
167167

@@ -177,7 +177,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
177177

178178
val = FIELD_PREP(QDMA_DESC_LEN_MASK, len);
179179
if (i < nr_frags - 1)
180-
@@ -2002,15 +1998,9 @@ static netdev_tx_t airoha_dev_xmit(struc
180+
@@ -2003,15 +1999,9 @@ static netdev_tx_t airoha_dev_xmit(struc
181181
WRITE_ONCE(desc->msg1, cpu_to_le32(msg1));
182182
WRITE_ONCE(desc->msg2, cpu_to_le32(0xffff));
183183

@@ -193,7 +193,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
193193
q->queued += i;
194194

195195
skb_tx_timestamp(skb);
196-
@@ -2019,7 +2009,7 @@ static netdev_tx_t airoha_dev_xmit(struc
196+
@@ -2020,7 +2010,7 @@ static netdev_tx_t airoha_dev_xmit(struc
197197
if (netif_xmit_stopped(txq) || !netdev_xmit_more())
198198
airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid),
199199
TX_RING_CPU_IDX_MASK,
@@ -202,7 +202,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
202202

203203
if (q->ndesc - q->queued < q->free_thr)
204204
netif_tx_stop_queue(txq);
205-
@@ -2029,10 +2019,13 @@ static netdev_tx_t airoha_dev_xmit(struc
205+
@@ -2030,10 +2020,13 @@ static netdev_tx_t airoha_dev_xmit(struc
206206
return NETDEV_TX_OK;
207207

208208
error_unmap:

target/linux/airoha/patches-6.6/116-02-net-airoha-deassert-XSI-line-on-hw-init.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Christian Marangi <[email protected]>
1313

1414
--- a/drivers/net/ethernet/airoha/airoha_eth.c
1515
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
16-
@@ -1384,6 +1384,10 @@ static int airoha_hw_init(struct platfor
16+
@@ -1383,6 +1383,10 @@ static int airoha_hw_init(struct platfor
1717
if (err)
1818
return err;
1919

target/linux/airoha/patches-6.6/116-06-net-airoha-add-initial-fixup-for-GDM3-4-port-support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Signed-off-by: Christian Marangi <[email protected]>
2828

2929
airoha_fe_crsn_qsel_init(eth);
3030

31-
@@ -1626,7 +1628,8 @@ static int airoha_dev_open(struct net_de
31+
@@ -1625,7 +1627,8 @@ static int airoha_dev_open(struct net_de
3232
if (err)
3333
return err;
3434

target/linux/airoha/patches-6.6/116-07-airoha-ethernet-drop-xsi-mac-reset.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Signed-off-by: Christian Marangi <[email protected]>
1515

1616
--- a/drivers/net/ethernet/airoha/airoha_eth.c
1717
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
18-
@@ -3096,7 +3096,6 @@ static void airoha_remove(struct platfor
18+
@@ -3089,7 +3089,6 @@ static void airoha_remove(struct platfor
1919
}
2020

2121
static const char * const en7581_xsi_rsts_names[] = {
2222
- "xsi-mac",
2323
"hsi0-mac",
2424
"hsi1-mac",
2525
"hsi-mac",
26-
@@ -3128,7 +3127,6 @@ static int airoha_en7581_get_src_port_id
26+
@@ -3121,7 +3120,6 @@ static int airoha_en7581_get_src_port_id
2727
}
2828

2929
static const char * const an7583_xsi_rsts_names[] = {

target/linux/airoha/patches-6.6/116-10-net-airoha-add-phylink-support-for-GDM2-4.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Signed-off-by: Christian Marangi <[email protected]>
3535
static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)
3636
{
3737
struct airoha_eth *eth = port->qdma->eth;
38-
@@ -1623,6 +1629,17 @@ static int airoha_dev_open(struct net_de
38+
@@ -1622,6 +1628,17 @@ static int airoha_dev_open(struct net_de
3939
struct airoha_gdm_port *port = netdev_priv(dev);
4040
struct airoha_qdma *qdma = port->qdma;
4141

@@ -53,7 +53,7 @@ Signed-off-by: Christian Marangi <[email protected]>
5353
netif_tx_start_all_queues(dev);
5454
err = airoha_set_vip_for_gdm_port(port, true);
5555
if (err)
56-
@@ -1676,6 +1693,11 @@ static int airoha_dev_stop(struct net_de
56+
@@ -1675,6 +1692,11 @@ static int airoha_dev_stop(struct net_de
5757
}
5858
}
5959

@@ -65,7 +65,7 @@ Signed-off-by: Christian Marangi <[email protected]>
6565
return 0;
6666
}
6767

68-
@@ -2824,6 +2846,20 @@ static const struct ethtool_ops airoha_e
68+
@@ -2817,6 +2839,20 @@ static const struct ethtool_ops airoha_e
6969
.get_link = ethtool_op_get_link,
7070
};
7171

@@ -86,7 +86,7 @@ Signed-off-by: Christian Marangi <[email protected]>
8686
static int airoha_metadata_dst_alloc(struct airoha_gdm_port *port)
8787
{
8888
int i;
89-
@@ -2868,6 +2904,99 @@ bool airoha_is_valid_gdm_port(struct air
89+
@@ -2861,6 +2897,99 @@ bool airoha_is_valid_gdm_port(struct air
9090
return false;
9191
}
9292

@@ -186,7 +186,7 @@ Signed-off-by: Christian Marangi <[email protected]>
186186
static int airoha_alloc_gdm_port(struct airoha_eth *eth,
187187
struct device_node *np, int index)
188188
{
189-
@@ -2946,6 +3075,12 @@ static int airoha_alloc_gdm_port(struct
189+
@@ -2939,6 +3068,12 @@ static int airoha_alloc_gdm_port(struct
190190
if (err)
191191
return err;
192192

@@ -199,7 +199,7 @@ Signed-off-by: Christian Marangi <[email protected]>
199199
err = register_netdev(dev);
200200
if (err)
201201
goto free_metadata_dst;
202-
@@ -3061,6 +3196,10 @@ error_hw_cleanup:
202+
@@ -3054,6 +3189,10 @@ error_hw_cleanup:
203203
if (port && port->dev->reg_state == NETREG_REGISTERED) {
204204
unregister_netdev(port->dev);
205205
airoha_metadata_dst_free(port);
@@ -210,7 +210,7 @@ Signed-off-by: Christian Marangi <[email protected]>
210210
}
211211
}
212212
free_netdev(eth->napi_dev);
213-
@@ -3088,6 +3227,10 @@ static void airoha_remove(struct platfor
213+
@@ -3081,6 +3220,10 @@ static void airoha_remove(struct platfor
214214
airoha_dev_stop(port->dev);
215215
unregister_netdev(port->dev);
216216
airoha_metadata_dst_free(port);
@@ -223,7 +223,7 @@ Signed-off-by: Christian Marangi <[email protected]>
223223

224224
--- a/drivers/net/ethernet/airoha/airoha_eth.h
225225
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
226-
@@ -531,6 +531,10 @@ struct airoha_gdm_port {
226+
@@ -536,6 +536,10 @@ struct airoha_gdm_port {
227227
struct net_device *dev;
228228
int id;
229229

target/linux/bcm27xx/patches-6.6/950-0065-cgroup-Disable-cgroup-memory-by-default.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <[email protected]>
4040
for_each_subsys(ss, ssid) {
4141
if (ss->early_init) {
4242
struct cgroup_subsys_state *css =
43-
@@ -6769,6 +6778,10 @@ static int __init cgroup_disable(char *s
43+
@@ -6785,6 +6794,10 @@ static int __init cgroup_disable(char *s
4444
strcmp(token, ss->legacy_name))
4545
continue;
4646

@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5151
static_branch_disable(cgroup_subsys_enabled_key[i]);
5252
pr_info("Disabling %s control group subsystem\n",
5353
ss->name);
54-
@@ -6787,6 +6800,31 @@ static int __init cgroup_disable(char *s
54+
@@ -6803,6 +6816,31 @@ static int __init cgroup_disable(char *s
5555
}
5656
__setup("cgroup_disable=", cgroup_disable);
5757

target/linux/bcm27xx/patches-6.6/950-0138-media-adv7180-Default-to-the-first-valid-input.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Signed-off-by: Dave Stevenson <[email protected]>
1616

1717
--- a/drivers/media/i2c/adv7180.c
1818
+++ b/drivers/media/i2c/adv7180.c
19-
@@ -1350,6 +1350,7 @@ static const struct adv7180_chip_info ad
19+
@@ -1340,6 +1340,7 @@ static const struct adv7180_chip_info ad
2020
static int init_device(struct adv7180_state *state)
2121
{
2222
int ret;
2323
+ int i;
2424

2525
mutex_lock(&state->mutex);
2626

27-
@@ -1397,6 +1398,18 @@ static int init_device(struct adv7180_st
27+
@@ -1387,6 +1388,18 @@ static int init_device(struct adv7180_st
2828
goto out_unlock;
2929
}
3030

target/linux/bcm27xx/patches-6.6/950-0139-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
1414

1515
--- a/drivers/media/i2c/adv7180.c
1616
+++ b/drivers/media/i2c/adv7180.c
17-
@@ -1339,6 +1339,7 @@ static const struct adv7180_chip_info ad
17+
@@ -1329,6 +1329,7 @@ static const struct adv7180_chip_info ad
1818
BIT(ADV7182_INPUT_SVIDEO_AIN1_AIN2) |
1919
BIT(ADV7182_INPUT_SVIDEO_AIN3_AIN4) |
2020
BIT(ADV7182_INPUT_SVIDEO_AIN7_AIN8) |

0 commit comments

Comments
 (0)