mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-18 16:40:29 +00:00
kernel: bump 5.15 to 5.15.109
Removed upstreamed: backport-5.15/743-v6.3-0005-net-dsa-b53-mmap-add-phy-ops.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.109&id=357fa038d93d0e9159a0f0d45bae0f8654e2ade5 Build system: x86_64 Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
parent
80c1105b03
commit
45f5115253
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .108
|
LINUX_VERSION-5.15 = .109
|
||||||
LINUX_KERNEL_HASH-5.15.108 = 8beb69ada46f1cbca2f4cf901ec078846035c1cd925d9471422f65aff74243ba
|
LINUX_KERNEL_HASH-5.15.109 = 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a
|
||||||
|
@ -354,7 +354,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
|
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -7645,6 +7645,7 @@ static void __init free_area_init_node(i
|
@@ -7661,6 +7661,7 @@ static void __init free_area_init_node(i
|
||||||
pgdat_set_deferred_range(pgdat);
|
pgdat_set_deferred_range(pgdat);
|
||||||
|
|
||||||
free_area_init_core(pgdat);
|
free_area_init_core(pgdat);
|
||||||
|
@ -21,7 +21,7 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|||||||
|
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -567,6 +567,7 @@ struct skb_shared_info {
|
@@ -568,6 +568,7 @@ struct skb_shared_info {
|
||||||
* Warning : all fields before dataref are cleared in __alloc_skb()
|
* Warning : all fields before dataref are cleared in __alloc_skb()
|
||||||
*/
|
*/
|
||||||
atomic_t dataref;
|
atomic_t dataref;
|
||||||
|
@ -1,49 +0,0 @@
|
|||||||
From 45977e58ce65ed0459edc9a0466d9dfea09463f5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
|
|
||||||
Date: Thu, 23 Mar 2023 20:48:41 +0100
|
|
||||||
Subject: [PATCH] net: dsa: b53: mmap: add phy ops
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Implement phy_read16() and phy_write16() ops for B53 MMAP to avoid accessing
|
|
||||||
B53_PORT_MII_PAGE registers which hangs the device.
|
|
||||||
This access should be done through the MDIO Mux bus controller.
|
|
||||||
|
|
||||||
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
||||||
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
||||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
---
|
|
||||||
drivers/net/dsa/b53/b53_mmap.c | 14 ++++++++++++++
|
|
||||||
1 file changed, 14 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/dsa/b53/b53_mmap.c
|
|
||||||
+++ b/drivers/net/dsa/b53/b53_mmap.c
|
|
||||||
@@ -216,6 +216,18 @@ static int b53_mmap_write64(struct b53_d
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int b53_mmap_phy_read16(struct b53_device *dev, int addr, int reg,
|
|
||||||
+ u16 *value)
|
|
||||||
+{
|
|
||||||
+ return -EIO;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int b53_mmap_phy_write16(struct b53_device *dev, int addr, int reg,
|
|
||||||
+ u16 value)
|
|
||||||
+{
|
|
||||||
+ return -EIO;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static const struct b53_io_ops b53_mmap_ops = {
|
|
||||||
.read8 = b53_mmap_read8,
|
|
||||||
.read16 = b53_mmap_read16,
|
|
||||||
@@ -227,6 +239,8 @@ static const struct b53_io_ops b53_mmap_
|
|
||||||
.write32 = b53_mmap_write32,
|
|
||||||
.write48 = b53_mmap_write48,
|
|
||||||
.write64 = b53_mmap_write64,
|
|
||||||
+ .phy_read16 = b53_mmap_phy_read16,
|
|
||||||
+ .phy_write16 = b53_mmap_phy_write16,
|
|
||||||
};
|
|
||||||
|
|
||||||
static int b53_mmap_probe_of(struct platform_device *pdev,
|
|
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
*/
|
*/
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -2854,6 +2854,10 @@ static inline int pskb_trim(struct sk_bu
|
@@ -2855,6 +2855,10 @@ static inline int pskb_trim(struct sk_bu
|
||||||
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
/**
|
/**
|
||||||
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
||||||
* @skb: buffer to alter
|
* @skb: buffer to alter
|
||||||
@@ -3004,16 +3008,6 @@ static inline struct sk_buff *dev_alloc_
|
@@ -3005,16 +3009,6 @@ static inline struct sk_buff *dev_alloc_
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
|
|||||||
|
|
||||||
--- a/mm/page_alloc.c
|
--- a/mm/page_alloc.c
|
||||||
+++ b/mm/page_alloc.c
|
+++ b/mm/page_alloc.c
|
||||||
@@ -7604,7 +7604,7 @@ static void __init alloc_node_mem_map(st
|
@@ -7620,7 +7620,7 @@ static void __init alloc_node_mem_map(st
|
||||||
if (pgdat == NODE_DATA(0)) {
|
if (pgdat == NODE_DATA(0)) {
|
||||||
mem_map = NODE_DATA(0)->node_mem_map;
|
mem_map = NODE_DATA(0)->node_mem_map;
|
||||||
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
|
||||||
|
@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -2820,7 +2820,7 @@ static inline int pskb_network_may_pull(
|
@@ -2821,7 +2821,7 @@ static inline int pskb_network_may_pull(
|
||||||
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
||||||
*/
|
*/
|
||||||
#ifndef NET_SKB_PAD
|
#ifndef NET_SKB_PAD
|
||||||
|
@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#endif
|
#endif
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -892,6 +892,7 @@ struct sk_buff {
|
@@ -893,6 +893,7 @@ struct sk_buff {
|
||||||
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
||||||
__u8 ndisc_nodetype:2;
|
__u8 ndisc_nodetype:2;
|
||||||
#endif
|
#endif
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
|
|||||||
|
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -563,6 +563,9 @@ struct skb_shared_info {
|
@@ -564,6 +564,9 @@ struct skb_shared_info {
|
||||||
unsigned int gso_type;
|
unsigned int gso_type;
|
||||||
u32 tskey;
|
u32 tskey;
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ Link: https://lore.kernel.org/r/20220506152107.1527552-9-dmitry.baryshkov@linaro
|
|||||||
+ perst-gpios = <&tlmm 58 0x1>;
|
+ perst-gpios = <&tlmm 58 0x1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&pcie_phy0 {
|
&pcie_qmp0 {
|
||||||
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
--- a/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
+++ b/arch/arm64/boot/dts/qcom/ipq8074-hk10.dtsi
|
||||||
@@ -39,12 +39,12 @@
|
@@ -39,12 +39,12 @@
|
||||||
|
@ -39,4 +39,4 @@ Link: https://lore.kernel.org/r/20221107092930.33325-3-robimarko@gmail.com
|
|||||||
+ perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
|
+ perst-gpios = <&tlmm 58 GPIO_ACTIVE_LOW>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&pcie_phy0 {
|
&pcie_qmp0 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user