Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 6.1 to 6.1.90 #12125

Merged
merged 1 commit into from
May 5, 2024
Merged

kernel: bump 6.1 to 6.1.90 #12125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-6.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .89
LINUX_KERNEL_HASH-6.1.89 = 12bab8e092618d1d4eeaf4201e6e70054c94896198956bd84ff0e908b0264719
LINUX_VERSION-6.1 = .90
LINUX_KERNEL_HASH-6.1.90 = 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d
4 changes: 2 additions & 2 deletions target/linux/generic/hack-6.1/601-of_net-add-mac-address-ascii-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com>

--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -531,6 +531,63 @@ int eth_platform_get_mac_address(struct
@@ -521,6 +521,63 @@ int eth_platform_get_mac_address(struct
}
EXPORT_SYMBOL(eth_platform_get_mac_address);

Expand Down Expand Up @@ -75,7 +75,7 @@ Submitted-by: Yousong Zhou <yszhou4tech@gmail.com>
/**
* platform_get_ethdev_address - Set netdev's MAC address from a given device
* @dev: Pointer to the device
@@ -564,19 +621,23 @@ int nvmem_get_mac_address(struct device
@@ -554,19 +611,23 @@ int nvmem_get_mac_address(struct device
{
struct nvmem_cell *cell;
const void *mac;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-6.1/901-debloat_sock_diag.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

static void sock_def_write_space_wfree(struct sock *sk);
static void sock_def_write_space(struct sock *sk);
@@ -585,6 +587,18 @@ discard_and_relse:
@@ -586,6 +588,18 @@ discard_and_relse:
}
EXPORT_SYMBOL(__sk_receive_skb);

Expand All @@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
u32));
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
@@ -2188,9 +2202,11 @@ static void __sk_free(struct sock *sk)
@@ -2189,9 +2203,11 @@ static void __sk_free(struct sock *sk)
if (likely(sk->sk_net_refcnt))
sock_inuse_add(sock_net(sk), -1);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.1/902-debloat_proc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -4114,6 +4114,8 @@ static __net_initdata struct pernet_oper
@@ -4115,6 +4115,8 @@ static __net_initdata struct pernet_oper

static int __init proto_init(void)
{
Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* eth_type_trans - determine the packet's protocol ID.
* @skb: received socket data
@@ -174,6 +186,10 @@ __be16 eth_type_trans(struct sk_buff *sk
} else {
skb->pkt_type = PACKET_OTHERHOST;
@@ -419,6 +431,10 @@ struct sk_buff *eth_gro_receive(struct l
NAPI_GRO_CB(p)->same_flow = 0;
continue;
}
+
+ if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
+ dev->local_addr_mask))
+ skb->gro_skip = 1;
}

/*
type = eh->h_proto;
8 changes: 4 additions & 4 deletions .../linux/generic/pending-6.1/760-net-core-add-optional-threading-for-backlog-processi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
sd->backlog.weight = weight_p;
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -29,6 +29,7 @@ static int int_3600 = 3600;
static int min_sndbuf = SOCK_MIN_SNDBUF;
@@ -30,6 +30,7 @@ static int min_sndbuf = SOCK_MIN_SNDBUF;
static int min_rcvbuf = SOCK_MIN_RCVBUF;
static int max_skb_frags = MAX_SKB_FRAGS;
static int min_mem_pcpu_rsv = SK_MEMORY_PCPU_RESERVE;
+static int backlog_threaded;

static int net_msg_warn; /* Unused, but still a sysctl */

@@ -112,6 +113,23 @@ static int rps_sock_flow_sysctl(struct c
@@ -113,6 +114,23 @@ static int rps_sock_flow_sysctl(struct c
}
#endif /* CONFIG_RPS */

Expand All @@ -209,7 +209,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CONFIG_NET_FLOW_LIMIT
static DEFINE_MUTEX(flow_limit_update_mutex);

@@ -473,6 +491,15 @@ static struct ctl_table net_core_table[]
@@ -482,6 +500,15 @@ static struct ctl_table net_core_table[]
.proc_handler = rps_sock_flow_sysctl
},
#endif
Expand Down
2 changes: 1 addition & 1 deletion target/linux/mediatek/patches-6.1/104-mt7622-add-snor-irq.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -578,6 +578,7 @@
@@ -575,6 +575,7 @@
compatible = "mediatek,mt7622-nor",
"mediatek,mt8173-nor";
reg = <0 0x11014000 0 0xe0>;
Expand Down
2 changes: 1 addition & 1 deletion target/linux/mediatek/patches-6.1/190-arm64-dts-mediatek-mt7622-fix-GICv2-range.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -346,7 +346,7 @@
@@ -344,7 +344,7 @@
#interrupt-cells = <3>;
interrupt-parent = <&gic>;
reg = <0 0x10310000 0 0x1000>,
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mediatek/patches-6.1/602-arm64-dts-mediatek-add-mt7622-pcie-slot-node.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -849,6 +849,12 @@
@@ -844,6 +844,12 @@
#address-cells = <0>;
#interrupt-cells = <1>;
};
Expand All @@ -13,7 +13,7 @@
};

pcie1: pcie@1a145000 {
@@ -887,6 +893,12 @@
@@ -882,6 +888,12 @@
#address-cells = <0>;
#interrupt-cells = <1>;
};
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mediatek/patches-6.1/710-pci-pcie-mediatek-add-support-for-coherent-DMA.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -837,6 +837,9 @@
@@ -832,6 +832,9 @@
bus-range = <0x00 0xff>;
ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>;
status = "disabled";
Expand All @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
@@ -881,6 +884,9 @@
@@ -876,6 +879,9 @@
bus-range = <0x00 0xff>;
ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>;
status = "disabled";
Expand Down
10 changes: 5 additions & 5 deletions target/linux/rockchip/patches-6.1/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
if (alloc_lpis) {
lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map)
@@ -4731,6 +4768,13 @@ static bool __maybe_unused its_enable_qu
@@ -4726,6 +4763,13 @@ static bool __maybe_unused its_enable_qu
return true;
}

Expand All @@ -152,7 +152,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
static const struct gic_quirk its_quirks[] = {
#ifdef CONFIG_CAVIUM_ERRATUM_22375
{
@@ -4777,6 +4821,14 @@ static const struct gic_quirk its_quirks
@@ -4772,6 +4816,14 @@ static const struct gic_quirk its_quirks
.init = its_enable_quirk_hip07_161600802,
},
#endif
Expand All @@ -167,15 +167,15 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
{
}
};
@@ -5032,6 +5084,7 @@ static int __init its_probe_one(struct r
@@ -5027,6 +5079,7 @@ static int __init its_probe_one(struct r
struct page *page;
u32 ctlr;
int err;
+ gfp_t gfp_flags;

its_base = its_map_one(res, &err);
if (!its_base)
@@ -5085,7 +5138,9 @@ static int __init its_probe_one(struct r
@@ -5080,7 +5133,9 @@ static int __init its_probe_one(struct r

its->numa_node = numa_node;

Expand All @@ -186,7 +186,7 @@ Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
get_order(ITS_CMD_QUEUE_SZ));
if (!page) {
err = -ENOMEM;
@@ -5116,6 +5171,9 @@ static int __init its_probe_one(struct r
@@ -5111,6 +5166,9 @@ static int __init its_probe_one(struct r
gits_write_cbaser(baser, its->base + GITS_CBASER);
tmp = gits_read_cbaser(its->base + GITS_CBASER);

Expand Down