mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
kernel: refresh 5.19 patch (#9890)
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
parent
2e53ea6741
commit
e99155a6e1
@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -3026,11 +3026,13 @@ static const struct seq_operations fib_r
|
@@ -3029,11 +3029,13 @@ static const struct seq_operations fib_r
|
||||||
|
|
||||||
int __net_init fib_proc_init(struct net *net)
|
int __net_init fib_proc_init(struct net *net)
|
||||||
{
|
{
|
||||||
@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
fib_triestat_seq_show, NULL))
|
fib_triestat_seq_show, NULL))
|
||||||
goto out2;
|
goto out2;
|
||||||
|
|
||||||
@@ -3041,17 +3043,21 @@ int __net_init fib_proc_init(struct net
|
@@ -3044,17 +3046,21 @@ int __net_init fib_proc_init(struct net
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out3:
|
out3:
|
||||||
|
@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
+dma-shared-buffer-objs := $(dma-buf-objs-y)
|
||||||
--- a/drivers/dma-buf/dma-buf.c
|
--- a/drivers/dma-buf/dma-buf.c
|
||||||
+++ b/drivers/dma-buf/dma-buf.c
|
+++ b/drivers/dma-buf/dma-buf.c
|
||||||
@@ -1459,4 +1459,5 @@ static void __exit dma_buf_deinit(void)
|
@@ -1473,4 +1473,5 @@ static void __exit dma_buf_deinit(void)
|
||||||
kern_unmount(dma_buf_mnt);
|
kern_unmount(dma_buf_mnt);
|
||||||
dma_buf_uninit_sysfs_statistics();
|
dma_buf_uninit_sysfs_statistics();
|
||||||
}
|
}
|
||||||
@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -4287,6 +4287,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -4284,6 +4284,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
|
|
||||||
--- a/include/net/netfilter/nf_conntrack_ecache.h
|
--- a/include/net/netfilter/nf_conntrack_ecache.h
|
||||||
+++ b/include/net/netfilter/nf_conntrack_ecache.h
|
+++ b/include/net/netfilter/nf_conntrack_ecache.h
|
||||||
@@ -81,9 +81,14 @@ struct nf_ct_event_notifier {
|
@@ -65,9 +65,14 @@ struct nf_ct_event_notifier {
|
||||||
int (*exp_event)(unsigned int events, const struct nf_exp_event *item);
|
int (*exp_event)(unsigned int events, const struct nf_exp_event *item);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -38,7 +38,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
|
|
||||||
void nf_ct_deliver_cached_events(struct nf_conn *ct);
|
void nf_ct_deliver_cached_events(struct nf_conn *ct);
|
||||||
int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
|
int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
|
||||||
@@ -109,11 +114,13 @@ static inline void
|
@@ -98,11 +103,13 @@ static inline void
|
||||||
nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
|
nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||||
@ -53,7 +53,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
|
|
||||||
e = nf_ct_ecache_find(ct);
|
e = nf_ct_ecache_find(ct);
|
||||||
if (e == NULL)
|
if (e == NULL)
|
||||||
@@ -117,20 +124,24 @@
|
@@ -117,20 +124,24 @@ nf_conntrack_event_report(enum ip_conntr
|
||||||
u32 portid, int report)
|
u32 portid, int report)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||||
@ -80,9 +80,9 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||||
--- a/include/net/netns/conntrack.h
|
--- a/include/net/netns/conntrack.h
|
||||||
+++ b/include/net/netns/conntrack.h
|
+++ b/include/net/netns/conntrack.h
|
||||||
@@ -112,6 +112,9 @@ struct netns_ct {
|
@@ -107,6 +107,9 @@ struct netns_ct {
|
||||||
|
u8 sysctl_checksum;
|
||||||
|
|
||||||
struct ct_pcpu __percpu *pcpu_lists;
|
|
||||||
struct ip_conntrack_stat __percpu *stat;
|
struct ip_conntrack_stat __percpu *stat;
|
||||||
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
|
+#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
|
||||||
+ struct atomic_notifier_head nf_conntrack_chain;
|
+ struct atomic_notifier_head nf_conntrack_chain;
|
||||||
@ -109,7 +109,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
depends on NETFILTER_ADVANCED
|
depends on NETFILTER_ADVANCED
|
||||||
--- a/net/netfilter/nf_conntrack_core.c
|
--- a/net/netfilter/nf_conntrack_core.c
|
||||||
+++ b/net/netfilter/nf_conntrack_core.c
|
+++ b/net/netfilter/nf_conntrack_core.c
|
||||||
@@ -2837,6 +2837,10 @@ int nf_conntrack_init_net(struct net *ne
|
@@ -2802,6 +2802,10 @@ int nf_conntrack_init_net(struct net *ne
|
||||||
nf_conntrack_helper_pernet_init(net);
|
nf_conntrack_helper_pernet_init(net);
|
||||||
nf_conntrack_proto_pernet_init(net);
|
nf_conntrack_proto_pernet_init(net);
|
||||||
|
|
||||||
@ -305,7 +305,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
struct nf_conn *ct = item->ct;
|
struct nf_conn *ct = item->ct;
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
unsigned int type;
|
unsigned int type;
|
||||||
@@ -3825,11 +3832,17 @@ static int ctnetlink_stat_exp_cpu(struct
|
@@ -3791,11 +3798,17 @@ static int ctnetlink_stat_exp_cpu(struct
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||||
@ -323,7 +323,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
|
|||||||
|
|
||||||
static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
|
static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
|
||||||
[IPCTNL_MSG_CT_NEW] = {
|
[IPCTNL_MSG_CT_NEW] = {
|
||||||
@@ -3928,8 +3941,12 @@ static int __net_init ctnetlink_net_init
|
@@ -3894,8 +3907,12 @@ static int __net_init ctnetlink_net_init
|
||||||
static void ctnetlink_net_pre_exit(struct net *net)
|
static void ctnetlink_net_pre_exit(struct net *net)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_EVENTS
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
struct list_head *br_ip_list);
|
struct list_head *br_ip_list);
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -1022,6 +1022,10 @@ struct sk_buff {
|
@@ -1146,6 +1146,10 @@ struct sk_buff {
|
||||||
__u8 slow_gro:1;
|
__u8 slow_gro:1;
|
||||||
__u8 csum_not_inet:1;
|
__u8 csum_not_inet:1;
|
||||||
|
|
||||||
@ -38,7 +38,7 @@
|
|||||||
#endif
|
#endif
|
||||||
--- a/include/net/netfilter/nf_conntrack_ecache.h
|
--- a/include/net/netfilter/nf_conntrack_ecache.h
|
||||||
+++ b/include/net/netfilter/nf_conntrack_ecache.h
|
+++ b/include/net/netfilter/nf_conntrack_ecache.h
|
||||||
@@ -84,6 +84,8 @@ struct nf_ct_event_notifier {
|
@@ -68,6 +68,8 @@ struct nf_ct_event_notifier {
|
||||||
#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
|
#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
|
||||||
extern int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb);
|
extern int nf_conntrack_register_notifier(struct net *net, struct notifier_block *nb);
|
||||||
extern int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb);
|
extern int nf_conntrack_unregister_notifier(struct net *net, struct notifier_block *nb);
|
||||||
@ -92,7 +92,7 @@
|
|||||||
struct net_bridge_port *p;
|
struct net_bridge_port *p;
|
||||||
--- a/net/core/dev.c
|
--- a/net/core/dev.c
|
||||||
+++ b/net/core/dev.c
|
+++ b/net/core/dev.c
|
||||||
@@ -3532,9 +3532,17 @@ static int xmit_one(struct sk_buff *skb,
|
@@ -3581,9 +3581,17 @@ static int xmit_one(struct sk_buff *skb,
|
||||||
{
|
{
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
int rc;
|
int rc;
|
||||||
@ -110,8 +110,8 @@
|
|||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
len = skb->len;
|
len = skb->len;
|
||||||
PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
|
trace_net_dev_start_xmit(skb, dev);
|
||||||
@@ -5161,6 +5169,11 @@ void netdev_rx_handler_unregister(struct
|
@@ -5232,6 +5240,11 @@ void netdev_rx_handler_unregister(struct
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
|
||||||
|
|
||||||
@ -123,7 +123,7 @@
|
|||||||
/*
|
/*
|
||||||
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
* Limit the use of PFMEMALLOC reserves to those protocols that implement
|
||||||
* the special handling of PFMEMALLOC skbs.
|
* the special handling of PFMEMALLOC skbs.
|
||||||
@@ -5209,6 +5222,10 @@ static int __netif_receive_skb_core(stru
|
@@ -5280,6 +5293,10 @@ static int __netif_receive_skb_core(stru
|
||||||
int ret = NET_RX_DROP;
|
int ret = NET_RX_DROP;
|
||||||
__be16 type;
|
__be16 type;
|
||||||
|
|
||||||
@ -134,7 +134,7 @@
|
|||||||
net_timestamp_check(!netdev_tstamp_prequeue, skb);
|
net_timestamp_check(!netdev_tstamp_prequeue, skb);
|
||||||
|
|
||||||
trace_netif_receive_skb(skb);
|
trace_netif_receive_skb(skb);
|
||||||
@@ -5246,6 +5263,15 @@ another_round:
|
@@ -5317,6 +5334,15 @@ another_round:
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st
|
@@ -7702,7 +7702,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)
|
||||||
|
@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -2773,6 +2773,7 @@ static const char *const rtn_type_names[
|
@@ -2776,6 +2776,7 @@ static const char *const rtn_type_names[
|
||||||
[RTN_THROW] = "THROW",
|
[RTN_THROW] = "THROW",
|
||||||
[RTN_NAT] = "NAT",
|
[RTN_NAT] = "NAT",
|
||||||
[RTN_XRESOLVE] = "XRESOLVE",
|
[RTN_XRESOLVE] = "XRESOLVE",
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
|
|||||||
reg = <0x0 0xff100000 0x0 0x1000>;
|
reg = <0x0 0xff100000 0x0 0x1000>;
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||||
@@ -2017,6 +2017,16 @@
|
@@ -2042,6 +2042,16 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
|
|||||||
|
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
@@ -1005,6 +1005,13 @@
|
@@ -1023,6 +1023,13 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -260,6 +260,11 @@ config INTEL_XWAY_PHY
|
@@ -267,6 +267,11 @@ config INTEL_XWAY_PHY
|
||||||
PEF 7061, PEF 7071 and PEF 7072 or integrated into the Intel
|
PEF 7061, PEF 7071 and PEF 7072 or integrated into the Intel
|
||||||
SoCs xRX200, xRX300, xRX330, xRX350 and xRX550.
|
SoCs xRX200, xRX300, xRX330, xRX350 and xRX550.
|
||||||
|
|
||||||
@ -14,7 +14,7 @@
|
|||||||
help
|
help
|
||||||
--- a/drivers/net/phy/Makefile
|
--- a/drivers/net/phy/Makefile
|
||||||
+++ b/drivers/net/phy/Makefile
|
+++ b/drivers/net/phy/Makefile
|
||||||
@@ -72,6 +72,8 @@ obj-$(CONFIG_DP83TC811_PHY) += dp83tc811
|
@@ -74,6 +74,8 @@ obj-$(CONFIG_DP83TD510_PHY) += dp83td510
|
||||||
obj-$(CONFIG_FIXED_PHY) += fixed_phy.o
|
obj-$(CONFIG_FIXED_PHY) += fixed_phy.o
|
||||||
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
|
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
|
||||||
obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o
|
obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
||||||
@@ -9,8 +9,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9
|
@@ -10,8 +10,12 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3318-a9
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3326-odroid-go2.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb
|
||||||
@ -13,7 +13,7 @@
|
|||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
|
||||||
@@ -22,6 +26,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or
|
@@ -23,6 +27,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-or
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
|
||||||
@ -22,7 +22,7 @@
|
|||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ficus.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-firefly.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-gru-bob.dtb
|
||||||
@@ -40,6 +46,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na
|
@@ -41,6 +47,9 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-na
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb
|
||||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-r4s.dtb
|
||||||
|
@ -2133,7 +2133,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|||||||
.ivsize = DES_BLOCK_SIZE,
|
.ivsize = DES_BLOCK_SIZE,
|
||||||
--- a/drivers/crypto/Kconfig
|
--- a/drivers/crypto/Kconfig
|
||||||
+++ b/drivers/crypto/Kconfig
|
+++ b/drivers/crypto/Kconfig
|
||||||
@@ -784,7 +784,12 @@ config CRYPTO_DEV_IMGTEC_HASH
|
@@ -669,7 +669,12 @@ config CRYPTO_DEV_IMGTEC_HASH
|
||||||
config CRYPTO_DEV_ROCKCHIP
|
config CRYPTO_DEV_ROCKCHIP
|
||||||
tristate "Rockchip's Cryptographic Engine driver"
|
tristate "Rockchip's Cryptographic Engine driver"
|
||||||
depends on OF && ARCH_ROCKCHIP
|
depends on OF && ARCH_ROCKCHIP
|
||||||
@ -2146,7 +2146,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|||||||
select CRYPTO_LIB_DES
|
select CRYPTO_LIB_DES
|
||||||
select CRYPTO_MD5
|
select CRYPTO_MD5
|
||||||
select CRYPTO_SHA1
|
select CRYPTO_SHA1
|
||||||
@@ -796,6 +801,16 @@ config CRYPTO_DEV_ROCKCHIP
|
@@ -681,6 +686,16 @@ config CRYPTO_DEV_ROCKCHIP
|
||||||
This driver interfaces with the hardware crypto accelerator.
|
This driver interfaces with the hardware crypto accelerator.
|
||||||
Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
|
Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
|
||||||
|
|
||||||
@ -2165,7 +2165,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|||||||
depends on ZYNQMP_FIRMWARE || COMPILE_TEST
|
depends on ZYNQMP_FIRMWARE || COMPILE_TEST
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -16972,6 +16972,13 @@ F: Documentation/ABI/*/sysfs-driver-hid-
|
@@ -17300,6 +17300,13 @@ F: Documentation/ABI/*/sysfs-driver-hid-
|
||||||
F: drivers/hid/hid-roccat*
|
F: drivers/hid/hid-roccat*
|
||||||
F: include/linux/hid-roccat*
|
F: include/linux/hid-roccat*
|
||||||
|
|
||||||
@ -2370,7 +2370,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|||||||
#define SRST_CRYPTO1_S 184
|
#define SRST_CRYPTO1_S 184
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
|
||||||
@@ -1040,6 +1040,17 @@
|
@@ -1058,6 +1058,17 @@
|
||||||
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -2390,7 +2390,7 @@ Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|||||||
rockchip,grf = <&grf>;
|
rockchip,grf = <&grf>;
|
||||||
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||||
@@ -573,6 +573,26 @@
|
@@ -582,6 +582,26 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user