mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump to 5.4.227, 5.10.159, 5.15.83 (#10619)
* kernel: bump 5.15 to 5.15.83 Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * kernel: bump 5.10 to 5.10.159 Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * kernel: bump 5.4 to 5.4.227 Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
This commit is contained in:
parent
afb7eaa4bb
commit
7660f97fb6
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.10 = .158
|
||||
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
|
||||
LINUX_VERSION-5.10 = .159
|
||||
LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7
|
||||
|
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.15 = .82
|
||||
LINUX_KERNEL_HASH-5.15.82 = fceef6bb79bac494663ccde34453521fc616cd94272fd30564752b3742381b65
|
||||
LINUX_VERSION-5.15 = .83
|
||||
LINUX_KERNEL_HASH-5.15.83 = 40590843c04c85789105157f69efbd71a4efe87ae2568e40d1b7258c3f747ff3
|
||||
|
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.4 = .226
|
||||
LINUX_KERNEL_HASH-5.4.226 = 0c1f552a1d2f63b3ecd4d33189f0003bc91fb8ff79967a7e295d015c280c9a44
|
||||
LINUX_VERSION-5.4 = .227
|
||||
LINUX_KERNEL_HASH-5.4.227 = 5eefc5037415f31c942d3cfa430b96c2a273246cf7e51db1e51b1d89887f0593
|
||||
|
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.1 =
|
||||
LINUX_VERSION-6.1 =
|
||||
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
|
||||
|
@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
|
||||
--- a/drivers/media/common/videobuf2/videobuf2-core.c
|
||||
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
|
||||
@@ -2144,12 +2144,12 @@ static int __find_plane_by_offset(struct
|
||||
@@ -2195,12 +2195,12 @@ static int __find_plane_by_offset(struct
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
||||
struct dma_buf *dbuf;
|
||||
|
||||
if (q->memory != VB2_MEMORY_MMAP) {
|
||||
@@ -2201,6 +2201,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
|
||||
@@ -2252,6 +2252,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
#define USB_VENDOR_ID_BELKIN 0x050d
|
||||
#define USB_DEVICE_ID_FLIP_KVM 0x3201
|
||||
|
||||
@@ -1310,6 +1313,9 @@
|
||||
@@ -1313,6 +1316,9 @@
|
||||
#define USB_VENDOR_ID_XAT 0x2505
|
||||
#define USB_DEVICE_ID_XAT_CSR 0x0220
|
||||
|
||||
@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
|
||||
@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu
|
||||
@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
|
||||
|
@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
/* Device and char device-related information */
|
||||
static DEFINE_IDA(gpio_ida);
|
||||
static dev_t gpio_devt;
|
||||
@@ -2361,8 +2363,8 @@ int gpiod_direction_output(struct gpio_d
|
||||
@@ -2392,8 +2394,8 @@ int gpiod_direction_output(struct gpio_d
|
||||
value = !!value;
|
||||
|
||||
/* GPIOs used for enabled IRQs shall not be set as output */
|
||||
@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||
gpiod_err(desc,
|
||||
"%s: tried to set a GPIO tied to an IRQ as output\n",
|
||||
__func__);
|
||||
@@ -3180,8 +3182,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
|
||||
@@ -3211,8 +3213,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
|
||||
}
|
||||
|
||||
/* To be valid for IRQ the line needs to be input or open drain */
|
||||
|
@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -17526,6 +17526,14 @@ T: git git://linuxtv.org/media_tree.git
|
||||
@@ -17521,6 +17521,14 @@ T: git git://linuxtv.org/media_tree.git
|
||||
F: Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
|
||||
F: drivers/media/i2c/imx412.c
|
||||
|
||||
|
@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
|
||||
+...
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -17540,6 +17540,7 @@ M: Raspberry Pi Kernel Maintenance <kern
|
||||
@@ -17535,6 +17535,7 @@ M: Raspberry Pi Kernel Maintenance <kern
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://linuxtv.org/media_tree.git
|
||||
|
@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
|
||||
+...
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -17544,6 +17544,14 @@ F: Documentation/devicetree/bindings/med
|
||||
@@ -17539,6 +17539,14 @@ F: Documentation/devicetree/bindings/med
|
||||
F: Documentation/devicetree/bindings/media/i2c/imx477.yaml
|
||||
F: drivers/media/i2c/imx477.c
|
||||
|
||||
|
@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
rate = clk_get_rate(clk);
|
||||
--- a/include/linux/clk.h
|
||||
+++ b/include/linux/clk.h
|
||||
@@ -987,6 +987,17 @@ static inline void clk_bulk_disable_unpr
|
||||
@@ -1096,6 +1096,17 @@ static inline void clk_bulk_disable_unpr
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
KUNIT_CASE(clk_test_orphan_transparent_multiple_parent_mux_set_parent_set_range_modified),
|
||||
--- a/include/linux/clk.h
|
||||
+++ b/include/linux/clk.h
|
||||
@@ -744,8 +744,9 @@ int clk_set_parent(struct clk *clk, stru
|
||||
@@ -829,8 +829,9 @@ int clk_set_parent(struct clk *clk, stru
|
||||
* clk_get_parent - get the parent clock source for this clock
|
||||
* @clk: clock source
|
||||
*
|
||||
|
@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
*
|
||||
--- a/include/linux/clk.h
|
||||
+++ b/include/linux/clk.h
|
||||
@@ -714,6 +714,17 @@ bool clk_has_parent(struct clk *clk, str
|
||||
@@ -799,6 +799,17 @@ bool clk_has_parent(struct clk *clk, str
|
||||
int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max);
|
||||
|
||||
/**
|
||||
@ -73,7 +73,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
* clk_set_min_rate - set a minimum clock rate for a clock source
|
||||
* @clk: clock source
|
||||
* @rate: desired minimum clock rate in Hz, inclusive
|
||||
@@ -909,6 +920,16 @@ static inline int clk_set_rate_range(str
|
||||
@@ -1018,6 +1029,16 @@ static inline int clk_set_rate_range(str
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||||
static inline int clk_set_min_rate(struct clk *clk, unsigned long rate)
|
||||
{
|
||||
return 0;
|
||||
@@ -999,6 +1020,44 @@ static inline int clk_drop_range(struct
|
||||
@@ -1108,6 +1129,44 @@ static inline int clk_drop_range(struct
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/gpio.h>
|
||||
@@ -2475,8 +2473,9 @@ int b53_switch_detect(struct b53_device
|
||||
@@ -2476,8 +2474,9 @@ int b53_switch_detect(struct b53_device
|
||||
dev->chip_id = id32;
|
||||
break;
|
||||
default:
|
||||
@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
return -ENODEV;
|
||||
}
|
||||
}
|
||||
@@ -2506,7 +2505,8 @@ int b53_switch_register(struct b53_devic
|
||||
@@ -2507,7 +2506,8 @@ int b53_switch_register(struct b53_devic
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -23,7 +23,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
|
||||
--- a/drivers/net/dsa/b53/b53_common.c
|
||||
+++ b/drivers/net/dsa/b53/b53_common.c
|
||||
@@ -2271,6 +2271,22 @@ static const struct b53_chip_data b53_sw
|
||||
@@ -2272,6 +2272,22 @@ static const struct b53_chip_data b53_sw
|
||||
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
|
||||
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
|
||||
},
|
||||
|
@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
mdio = of_find_node_by_phandle(*ph);
|
||||
--- a/drivers/net/ethernet/aeroflex/greth.c
|
||||
+++ b/drivers/net/ethernet/aeroflex/greth.c
|
||||
@@ -1449,10 +1449,10 @@ static int greth_of_probe(struct platfor
|
||||
@@ -1450,10 +1450,10 @@ static int greth_of_probe(struct platfor
|
||||
break;
|
||||
}
|
||||
if (i == 6) {
|
||||
|
@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
memmove(skb->data - ETH_HLEN,
|
||||
--- a/net/dsa/tag_ksz.c
|
||||
+++ b/net/dsa/tag_ksz.c
|
||||
@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st
|
||||
|
||||
pskb_trim_rcsum(skb, skb->len - len);
|
||||
@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
|
||||
if (pskb_trim_rcsum(skb, skb->len - len))
|
||||
return NULL;
|
||||
|
||||
- skb->offload_fwd_mark = true;
|
||||
+ dsa_default_offload_fwd_mark(skb);
|
||||
|
@ -92,7 +92,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
||||
}
|
||||
--- a/include/linux/cgroup.h
|
||||
+++ b/include/linux/cgroup.h
|
||||
@@ -432,6 +432,18 @@ static inline void cgroup_put(struct cgr
|
||||
@@ -433,6 +433,18 @@ static inline void cgroup_put(struct cgr
|
||||
css_put(&cgrp->self);
|
||||
}
|
||||
|
||||
@ -111,7 +111,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
||||
/**
|
||||
* task_css_set_check - obtain a task's css_set with extra access conditions
|
||||
* @task: the task to obtain css_set for
|
||||
@@ -446,7 +458,6 @@ static inline void cgroup_put(struct cgr
|
||||
@@ -447,7 +459,6 @@ static inline void cgroup_put(struct cgr
|
||||
* as locks used during the cgroup_subsys::attach() methods.
|
||||
*/
|
||||
#ifdef CONFIG_PROVE_RCU
|
||||
@ -119,7 +119,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
||||
extern spinlock_t css_set_lock;
|
||||
#define task_css_set_check(task, __c) \
|
||||
rcu_dereference_check((task)->cgroups, \
|
||||
@@ -707,6 +718,8 @@ struct cgroup;
|
||||
@@ -708,6 +719,8 @@ struct cgroup;
|
||||
static inline u64 cgroup_id(const struct cgroup *cgrp) { return 1; }
|
||||
static inline void css_get(struct cgroup_subsys_state *css) {}
|
||||
static inline void css_put(struct cgroup_subsys_state *css) {}
|
||||
@ -593,7 +593,7 @@ Change-Id: I71de7cd15b8dfa6f9fdd838023474693c4fee0a7
|
||||
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
|
||||
--- a/mm/memcontrol.c
|
||||
+++ b/mm/memcontrol.c
|
||||
@@ -5226,6 +5226,7 @@ static struct mem_cgroup *mem_cgroup_all
|
||||
@@ -5237,6 +5237,7 @@ static struct mem_cgroup *mem_cgroup_all
|
||||
memcg->deferred_split_queue.split_queue_len = 0;
|
||||
#endif
|
||||
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);
|
||||
|
@ -339,7 +339,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
|
||||
/* will mmdrop() in finish_task_switch(). */
|
||||
--- a/mm/memcontrol.c
|
||||
+++ b/mm/memcontrol.c
|
||||
@@ -5163,6 +5163,7 @@ static void __mem_cgroup_free(struct mem
|
||||
@@ -5174,6 +5174,7 @@ static void __mem_cgroup_free(struct mem
|
||||
|
||||
static void mem_cgroup_free(struct mem_cgroup *memcg)
|
||||
{
|
||||
@ -347,7 +347,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
|
||||
memcg_wb_domain_exit(memcg);
|
||||
__mem_cgroup_free(memcg);
|
||||
}
|
||||
@@ -6195,6 +6196,29 @@ static void mem_cgroup_move_task(void)
|
||||
@@ -6206,6 +6207,29 @@ static void mem_cgroup_move_task(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -377,7 +377,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
|
||||
static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
|
||||
{
|
||||
if (value == PAGE_COUNTER_MAX)
|
||||
@@ -6538,6 +6562,7 @@ struct cgroup_subsys memory_cgrp_subsys
|
||||
@@ -6549,6 +6573,7 @@ struct cgroup_subsys memory_cgrp_subsys
|
||||
.css_reset = mem_cgroup_css_reset,
|
||||
.css_rstat_flush = mem_cgroup_css_rstat_flush,
|
||||
.can_attach = mem_cgroup_can_attach,
|
||||
|
@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -2263,6 +2263,23 @@ struct btmtk_section_map {
|
||||
@@ -2268,6 +2268,23 @@ struct btmtk_section_map {
|
||||
};
|
||||
} __packed;
|
||||
|
||||
@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
static void btusb_mtk_wmt_recv(struct urb *urb)
|
||||
{
|
||||
struct hci_dev *hdev = urb->context;
|
||||
@@ -3914,6 +3931,7 @@ static int btusb_probe(struct usb_interf
|
||||
@@ -3919,6 +3936,7 @@ static int btusb_probe(struct usb_interf
|
||||
hdev->shutdown = btusb_mtk_shutdown;
|
||||
hdev->manufacturer = 70;
|
||||
hdev->cmd_timeout = btusb_mtk_cmd_timeout;
|
||||
|
@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -2268,7 +2268,7 @@ static int btusb_set_bdaddr_mtk(struct h
|
||||
@@ -2273,7 +2273,7 @@ static int btusb_set_bdaddr_mtk(struct h
|
||||
struct sk_buff *skb;
|
||||
long ret;
|
||||
|
||||
|
@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
mdio = of_find_node_by_phandle(*ph);
|
||||
--- a/drivers/net/ethernet/aeroflex/greth.c
|
||||
+++ b/drivers/net/ethernet/aeroflex/greth.c
|
||||
@@ -1451,10 +1451,10 @@ static int greth_of_probe(struct platfor
|
||||
@@ -1452,10 +1452,10 @@ static int greth_of_probe(struct platfor
|
||||
break;
|
||||
}
|
||||
if (i == 6) {
|
||||
|
@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
int nf_ct_expect_register_notifier(struct net *net,
|
||||
--- a/net/netfilter/nf_conntrack_netlink.c
|
||||
+++ b/net/netfilter/nf_conntrack_netlink.c
|
||||
@@ -701,12 +701,19 @@ static size_t ctnetlink_nlmsg_size(const
|
||||
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
|
||||
}
|
||||
|
||||
static int
|
||||
@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
struct nf_conn *ct = item->ct;
|
||||
struct sk_buff *skb;
|
||||
unsigned int type;
|
||||
@@ -3756,9 +3763,15 @@ static int ctnetlink_stat_exp_cpu(struct
|
||||
@@ -3757,9 +3764,15 @@ static int ctnetlink_stat_exp_cpu(struct
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||
|
@ -286,7 +286,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
|
||||
--- a/net/netfilter/nf_conntrack_netlink.c
|
||||
+++ b/net/netfilter/nf_conntrack_netlink.c
|
||||
@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
|
||||
@@ -711,12 +711,19 @@ static size_t ctnetlink_nlmsg_size(const
|
||||
}
|
||||
|
||||
static int
|
||||
@ -306,7 +306,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
struct nf_conn *ct = item->ct;
|
||||
struct sk_buff *skb;
|
||||
unsigned int type;
|
||||
@@ -3765,11 +3772,17 @@ static int ctnetlink_stat_exp_cpu(struct
|
||||
@@ -3766,11 +3773,17 @@ static int ctnetlink_stat_exp_cpu(struct
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||
@ -324,7 +324,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
||||
|
||||
static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
|
||||
[IPCTNL_MSG_CT_NEW] = {
|
||||
@@ -3868,8 +3881,12 @@ static int __net_init ctnetlink_net_init
|
||||
@@ -3869,8 +3882,12 @@ static int __net_init ctnetlink_net_init
|
||||
static void ctnetlink_net_pre_exit(struct net *net)
|
||||
{
|
||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 1e24c54da257ab93cff5826be8a793b014a5dc9c Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 21 Nov 2022 01:22:01 +0100
|
||||
Subject: ca8210: Fix crash by zero initializing data
|
||||
|
||||
The struct cas_control embeds multiple generic SPI structures and we
|
||||
have to make sure these structures are initialized to default values.
|
||||
This driver does not set all attributes. When using kmalloc before some
|
||||
attributes were not initialized and contained random data which caused
|
||||
random crashes at bootup.
|
||||
|
||||
Fixes: ded845a781a5 ("ieee802154: Add CA8210 IEEE 802.15.4 device driver")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de
|
||||
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
|
||||
---
|
||||
drivers/net/ieee802154/ca8210.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/ieee802154/ca8210.c
|
||||
+++ b/drivers/net/ieee802154/ca8210.c
|
||||
@@ -926,7 +926,7 @@ static int ca8210_spi_transfer(
|
||||
|
||||
dev_dbg(&spi->dev, "%s called\n", __func__);
|
||||
|
||||
- cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
+ cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
if (!cas_ctl)
|
||||
return -ENOMEM;
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 1e24c54da257ab93cff5826be8a793b014a5dc9c Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 21 Nov 2022 01:22:01 +0100
|
||||
Subject: ca8210: Fix crash by zero initializing data
|
||||
|
||||
The struct cas_control embeds multiple generic SPI structures and we
|
||||
have to make sure these structures are initialized to default values.
|
||||
This driver does not set all attributes. When using kmalloc before some
|
||||
attributes were not initialized and contained random data which caused
|
||||
random crashes at bootup.
|
||||
|
||||
Fixes: ded845a781a5 ("ieee802154: Add CA8210 IEEE 802.15.4 device driver")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de
|
||||
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
|
||||
---
|
||||
drivers/net/ieee802154/ca8210.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/ieee802154/ca8210.c
|
||||
+++ b/drivers/net/ieee802154/ca8210.c
|
||||
@@ -927,7 +927,7 @@ static int ca8210_spi_transfer(
|
||||
|
||||
dev_dbg(&spi->dev, "%s called\n", __func__);
|
||||
|
||||
- cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
+ cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC);
|
||||
if (!cas_ctl)
|
||||
return -ENOMEM;
|
||||
|
@ -10,7 +10,7 @@ Signed-off-by: Jianhua Xie <jianhua.xie@nxp.com>
|
||||
|
||||
--- a/arch/arm/include/asm/pgtable.h
|
||||
+++ b/arch/arm/include/asm/pgtable.h
|
||||
@@ -116,6 +116,13 @@ extern pgprot_t pgprot_s2_device;
|
||||
@@ -125,6 +125,13 @@ extern pgprot_t pgprot_s2_device;
|
||||
#define pgprot_noncached(prot) \
|
||||
__pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_UNCACHED)
|
||||
|
||||
|
@ -816,7 +816,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
err_put_master:
|
||||
spi_master_put(master);
|
||||
|
||||
@@ -917,8 +1296,10 @@ static int mtk_spi_remove(struct platfor
|
||||
@@ -920,8 +1299,10 @@ static int mtk_spi_remove(struct platfor
|
||||
|
||||
mtk_spi_reset(mdata);
|
||||
|
||||
@ -826,9 +826,9 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
+ clk_unprepare(mdata->spi_hclk);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -934,8 +1315,10 @@ static int mtk_spi_suspend(struct device
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
@@ -940,8 +1321,10 @@ static int mtk_spi_suspend(struct device
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -840,7 +840,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -952,11 +1335,20 @@ static int mtk_spi_resume(struct device
|
||||
@@ -958,11 +1341,20 @@ static int mtk_spi_resume(struct device
|
||||
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
@ -862,7 +862,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -968,10 +1360,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
@@ -974,10 +1366,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
|
||||
@ -878,7 +878,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -982,13 +1377,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
@@ -988,13 +1383,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
int ret;
|
||||
|
||||
|
@ -16,7 +16,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -9066,6 +9066,22 @@ F: include/net/nl802154.h
|
||||
@@ -9063,6 +9063,22 @@ F: include/net/nl802154.h
|
||||
F: net/ieee802154/
|
||||
F: net/mac802154/
|
||||
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
|
||||
@@ -680,7 +680,7 @@
|
||||
@@ -679,7 +679,7 @@
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
status = "okay";
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -12694,6 +12694,7 @@ F: include/uapi/linux/meye.h
|
||||
@@ -12689,6 +12689,7 @@ F: include/uapi/linux/meye.h
|
||||
|
||||
MOTORCOMM PHY DRIVER
|
||||
M: Peter Geis <pgwipeout@gmail.com>
|
||||
|
@ -6,5 +6,5 @@
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
|
||||
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-king3399.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-v10.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-rock-pi-e25.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-mrkaio-m68s.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-nanopi-r5s.dtb
|
||||
|
@ -21,7 +21,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
|
||||
@@ -684,7 +684,7 @@
|
||||
@@ -683,7 +683,7 @@
|
||||
|
||||
&usbdrd_dwc3_0 {
|
||||
status = "okay";
|
||||
|
Loading…
Reference in New Issue
Block a user