kernel-5.4: bump to 5.4.102 and refresh patches
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
committed by
Petr Štetiar
Petr Štetiar
parent
1d412235a5
commit
196f3d586f
@@ -1,148 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
||||
Date: Tue, 11 Feb 2020 20:47:05 +0100
|
||||
Subject: [PATCH] icmp: introduce helper for nat'd source address in network
|
||||
device context
|
||||
|
||||
commit 0b41713b606694257b90d61ba7e2712d8457648b upstream.
|
||||
|
||||
This introduces a helper function to be called only by network drivers
|
||||
that wraps calls to icmp[v6]_send in a conntrack transformation, in case
|
||||
NAT has been used. We don't want to pollute the non-driver path, though,
|
||||
so we introduce this as a helper to be called by places that actually
|
||||
make use of this, as suggested by Florian.
|
||||
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
Cc: Florian Westphal <fw@strlen.de>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
---
|
||||
include/linux/icmpv6.h | 10 ++++++++++
|
||||
include/net/icmp.h | 6 ++++++
|
||||
net/ipv4/icmp.c | 33 +++++++++++++++++++++++++++++++++
|
||||
net/ipv6/ip6_icmp.c | 34 ++++++++++++++++++++++++++++++++++
|
||||
4 files changed, 83 insertions(+)
|
||||
|
||||
--- a/include/linux/icmpv6.h
|
||||
+++ b/include/linux/icmpv6.h
|
||||
@@ -22,12 +22,22 @@ extern int inet6_unregister_icmp_sender(
|
||||
int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,
|
||||
unsigned int data_len);
|
||||
|
||||
+#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
|
||||
+#else
|
||||
+#define icmpv6_ndo_send icmpv6_send
|
||||
+#endif
|
||||
+
|
||||
#else
|
||||
|
||||
static inline void icmpv6_send(struct sk_buff *skb,
|
||||
u8 type, u8 code, __u32 info)
|
||||
{
|
||||
+}
|
||||
|
||||
+static inline void icmpv6_ndo_send(struct sk_buff *skb,
|
||||
+ u8 type, u8 code, __u32 info)
|
||||
+{
|
||||
}
|
||||
#endif
|
||||
|
||||
--- a/include/net/icmp.h
|
||||
+++ b/include/net/icmp.h
|
||||
@@ -43,6 +43,12 @@ static inline void icmp_send(struct sk_b
|
||||
__icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt);
|
||||
}
|
||||
|
||||
+#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
+void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info);
|
||||
+#else
|
||||
+#define icmp_ndo_send icmp_send
|
||||
+#endif
|
||||
+
|
||||
int icmp_rcv(struct sk_buff *skb);
|
||||
int icmp_err(struct sk_buff *skb, u32 info);
|
||||
int icmp_init(void);
|
||||
--- a/net/ipv4/icmp.c
|
||||
+++ b/net/ipv4/icmp.c
|
||||
@@ -750,6 +750,39 @@ out:;
|
||||
}
|
||||
EXPORT_SYMBOL(__icmp_send);
|
||||
|
||||
+#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
+#include <net/netfilter/nf_conntrack.h>
|
||||
+void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)
|
||||
+{
|
||||
+ struct sk_buff *cloned_skb = NULL;
|
||||
+ enum ip_conntrack_info ctinfo;
|
||||
+ struct nf_conn *ct;
|
||||
+ __be32 orig_ip;
|
||||
+
|
||||
+ ct = nf_ct_get(skb_in, &ctinfo);
|
||||
+ if (!ct || !(ct->status & IPS_SRC_NAT)) {
|
||||
+ icmp_send(skb_in, type, code, info);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (skb_shared(skb_in))
|
||||
+ skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC);
|
||||
+
|
||||
+ if (unlikely(!skb_in || skb_network_header(skb_in) < skb_in->head ||
|
||||
+ (skb_network_header(skb_in) + sizeof(struct iphdr)) >
|
||||
+ skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in,
|
||||
+ skb_network_offset(skb_in) + sizeof(struct iphdr))))
|
||||
+ goto out;
|
||||
+
|
||||
+ orig_ip = ip_hdr(skb_in)->saddr;
|
||||
+ ip_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.ip;
|
||||
+ icmp_send(skb_in, type, code, info);
|
||||
+ ip_hdr(skb_in)->saddr = orig_ip;
|
||||
+out:
|
||||
+ consume_skb(cloned_skb);
|
||||
+}
|
||||
+EXPORT_SYMBOL(icmp_ndo_send);
|
||||
+#endif
|
||||
|
||||
static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
|
||||
{
|
||||
--- a/net/ipv6/ip6_icmp.c
|
||||
+++ b/net/ipv6/ip6_icmp.c
|
||||
@@ -45,4 +45,38 @@ out:
|
||||
rcu_read_unlock();
|
||||
}
|
||||
EXPORT_SYMBOL(icmpv6_send);
|
||||
+
|
||||
+#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
+#include <net/netfilter/nf_conntrack.h>
|
||||
+void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)
|
||||
+{
|
||||
+ struct sk_buff *cloned_skb = NULL;
|
||||
+ enum ip_conntrack_info ctinfo;
|
||||
+ struct in6_addr orig_ip;
|
||||
+ struct nf_conn *ct;
|
||||
+
|
||||
+ ct = nf_ct_get(skb_in, &ctinfo);
|
||||
+ if (!ct || !(ct->status & IPS_SRC_NAT)) {
|
||||
+ icmpv6_send(skb_in, type, code, info);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (skb_shared(skb_in))
|
||||
+ skb_in = cloned_skb = skb_clone(skb_in, GFP_ATOMIC);
|
||||
+
|
||||
+ if (unlikely(!skb_in || skb_network_header(skb_in) < skb_in->head ||
|
||||
+ (skb_network_header(skb_in) + sizeof(struct ipv6hdr)) >
|
||||
+ skb_tail_pointer(skb_in) || skb_ensure_writable(skb_in,
|
||||
+ skb_network_offset(skb_in) + sizeof(struct ipv6hdr))))
|
||||
+ goto out;
|
||||
+
|
||||
+ orig_ip = ipv6_hdr(skb_in)->saddr;
|
||||
+ ipv6_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.in6;
|
||||
+ icmpv6_send(skb_in, type, code, info);
|
||||
+ ipv6_hdr(skb_in)->saddr = orig_ip;
|
||||
+out:
|
||||
+ consume_skb(cloned_skb);
|
||||
+}
|
||||
+EXPORT_SYMBOL(icmpv6_ndo_send);
|
||||
+#endif
|
||||
#endif
|
||||
@@ -1,299 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
||||
Date: Tue, 23 Feb 2021 14:18:58 +0100
|
||||
Subject: [PATCH] net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before
|
||||
sending
|
||||
|
||||
commit ee576c47db60432c37e54b1e2b43a8ca6d3a8dca upstream.
|
||||
|
||||
The icmp{,v6}_send functions make all sorts of use of skb->cb, casting
|
||||
it with IPCB or IP6CB, assuming the skb to have come directly from the
|
||||
inet layer. But when the packet comes from the ndo layer, especially
|
||||
when forwarded, there's no telling what might be in skb->cb at that
|
||||
point. As a result, the icmp sending code risks reading bogus memory
|
||||
contents, which can result in nasty stack overflows such as this one
|
||||
reported by a user:
|
||||
|
||||
panic+0x108/0x2ea
|
||||
__stack_chk_fail+0x14/0x20
|
||||
__icmp_send+0x5bd/0x5c0
|
||||
icmp_ndo_send+0x148/0x160
|
||||
|
||||
In icmp_send, skb->cb is cast with IPCB and an ip_options struct is read
|
||||
from it. The optlen parameter there is of particular note, as it can
|
||||
induce writes beyond bounds. There are quite a few ways that can happen
|
||||
in __ip_options_echo. For example:
|
||||
|
||||
// sptr/skb are attacker-controlled skb bytes
|
||||
sptr = skb_network_header(skb);
|
||||
// dptr/dopt points to stack memory allocated by __icmp_send
|
||||
dptr = dopt->__data;
|
||||
// sopt is the corrupt skb->cb in question
|
||||
if (sopt->rr) {
|
||||
optlen = sptr[sopt->rr+1]; // corrupt skb->cb + skb->data
|
||||
soffset = sptr[sopt->rr+2]; // corrupt skb->cb + skb->data
|
||||
// this now writes potentially attacker-controlled data, over
|
||||
// flowing the stack:
|
||||
memcpy(dptr, sptr+sopt->rr, optlen);
|
||||
}
|
||||
|
||||
In the icmpv6_send case, the story is similar, but not as dire, as only
|
||||
IP6CB(skb)->iif and IP6CB(skb)->dsthao are used. The dsthao case is
|
||||
worse than the iif case, but it is passed to ipv6_find_tlv, which does
|
||||
a bit of bounds checking on the value.
|
||||
|
||||
This is easy to simulate by doing a `memset(skb->cb, 0x41,
|
||||
sizeof(skb->cb));` before calling icmp{,v6}_ndo_send, and it's only by
|
||||
good fortune and the rarity of icmp sending from that context that we've
|
||||
avoided reports like this until now. For example, in KASAN:
|
||||
|
||||
BUG: KASAN: stack-out-of-bounds in __ip_options_echo+0xa0e/0x12b0
|
||||
Write of size 38 at addr ffff888006f1f80e by task ping/89
|
||||
CPU: 2 PID: 89 Comm: ping Not tainted 5.10.0-rc7-debug+ #5
|
||||
Call Trace:
|
||||
dump_stack+0x9a/0xcc
|
||||
print_address_description.constprop.0+0x1a/0x160
|
||||
__kasan_report.cold+0x20/0x38
|
||||
kasan_report+0x32/0x40
|
||||
check_memory_region+0x145/0x1a0
|
||||
memcpy+0x39/0x60
|
||||
__ip_options_echo+0xa0e/0x12b0
|
||||
__icmp_send+0x744/0x1700
|
||||
|
||||
Actually, out of the 4 drivers that do this, only gtp zeroed the cb for
|
||||
the v4 case, while the rest did not. So this commit actually removes the
|
||||
gtp-specific zeroing, while putting the code where it belongs in the
|
||||
shared infrastructure of icmp{,v6}_ndo_send.
|
||||
|
||||
This commit fixes the issue by passing an empty IPCB or IP6CB along to
|
||||
the functions that actually do the work. For the icmp_send, this was
|
||||
already trivial, thanks to __icmp_send providing the plumbing function.
|
||||
For icmpv6_send, this required a tiny bit of refactoring to make it
|
||||
behave like the v4 case, after which it was straight forward.
|
||||
|
||||
Fixes: a2b78e9b2cac ("sunvnet: generate ICMP PTMUD messages for smaller port MTUs")
|
||||
Reported-by: SinYu <liuxyon@gmail.com>
|
||||
Reviewed-by: Willem de Bruijn <willemb@google.com>
|
||||
Link: https://lore.kernel.org/netdev/CAF=yD-LOF116aHub6RMe8vB8ZpnrrnoTdqhobEx+bvoA8AsP0w@mail.gmail.com/T/
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
Link: https://lore.kernel.org/r/20210223131858.72082-1-Jason@zx2c4.com
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
[Jason: the gtp part didn't apply because it doesn't use icmp_ndo_send on 5.4]
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
---
|
||||
include/linux/icmpv6.h | 17 ++++++++++++++---
|
||||
include/linux/ipv6.h | 1 -
|
||||
include/net/icmp.h | 6 +++++-
|
||||
net/ipv4/icmp.c | 5 +++--
|
||||
net/ipv6/icmp.c | 16 ++++++++--------
|
||||
net/ipv6/ip6_icmp.c | 12 +++++++-----
|
||||
6 files changed, 37 insertions(+), 20 deletions(-)
|
||||
|
||||
--- a/include/linux/icmpv6.h
|
||||
+++ b/include/linux/icmpv6.h
|
||||
@@ -3,6 +3,7 @@
|
||||
#define _LINUX_ICMPV6_H
|
||||
|
||||
#include <linux/skbuff.h>
|
||||
+#include <linux/ipv6.h>
|
||||
#include <uapi/linux/icmpv6.h>
|
||||
|
||||
static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb)
|
||||
@@ -13,10 +14,16 @@ static inline struct icmp6hdr *icmp6_hdr
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
-extern void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info);
|
||||
+extern void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
|
||||
+ const struct inet6_skb_parm *parm);
|
||||
|
||||
+static inline void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
|
||||
+{
|
||||
+ __icmpv6_send(skb, type, code, info, IP6CB(skb));
|
||||
+}
|
||||
typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info,
|
||||
- const struct in6_addr *force_saddr);
|
||||
+ const struct in6_addr *force_saddr,
|
||||
+ const struct inet6_skb_parm *parm);
|
||||
extern int inet6_register_icmp_sender(ip6_icmp_send_t *fn);
|
||||
extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn);
|
||||
int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type,
|
||||
@@ -25,7 +32,11 @@ int ip6_err_gen_icmpv6_unreach(struct sk
|
||||
#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
|
||||
#else
|
||||
-#define icmpv6_ndo_send icmpv6_send
|
||||
+static inline void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)
|
||||
+{
|
||||
+ struct inet6_skb_parm parm = { 0 };
|
||||
+ __icmpv6_send(skb_in, type, code, info, &parm);
|
||||
+}
|
||||
#endif
|
||||
|
||||
#else
|
||||
--- a/include/linux/ipv6.h
|
||||
+++ b/include/linux/ipv6.h
|
||||
@@ -83,7 +83,6 @@ struct ipv6_params {
|
||||
__s32 autoconf;
|
||||
};
|
||||
extern struct ipv6_params ipv6_defaults;
|
||||
-#include <linux/icmpv6.h>
|
||||
#include <linux/tcp.h>
|
||||
#include <linux/udp.h>
|
||||
|
||||
--- a/include/net/icmp.h
|
||||
+++ b/include/net/icmp.h
|
||||
@@ -46,7 +46,11 @@ static inline void icmp_send(struct sk_b
|
||||
#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info);
|
||||
#else
|
||||
-#define icmp_ndo_send icmp_send
|
||||
+static inline void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)
|
||||
+{
|
||||
+ struct ip_options opts = { 0 };
|
||||
+ __icmp_send(skb_in, type, code, info, &opts);
|
||||
+}
|
||||
#endif
|
||||
|
||||
int icmp_rcv(struct sk_buff *skb);
|
||||
--- a/net/ipv4/icmp.c
|
||||
+++ b/net/ipv4/icmp.c
|
||||
@@ -755,13 +755,14 @@ EXPORT_SYMBOL(__icmp_send);
|
||||
void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)
|
||||
{
|
||||
struct sk_buff *cloned_skb = NULL;
|
||||
+ struct ip_options opts = { 0 };
|
||||
enum ip_conntrack_info ctinfo;
|
||||
struct nf_conn *ct;
|
||||
__be32 orig_ip;
|
||||
|
||||
ct = nf_ct_get(skb_in, &ctinfo);
|
||||
if (!ct || !(ct->status & IPS_SRC_NAT)) {
|
||||
- icmp_send(skb_in, type, code, info);
|
||||
+ __icmp_send(skb_in, type, code, info, &opts);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -776,7 +777,7 @@ void icmp_ndo_send(struct sk_buff *skb_i
|
||||
|
||||
orig_ip = ip_hdr(skb_in)->saddr;
|
||||
ip_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.ip;
|
||||
- icmp_send(skb_in, type, code, info);
|
||||
+ __icmp_send(skb_in, type, code, info, &opts);
|
||||
ip_hdr(skb_in)->saddr = orig_ip;
|
||||
out:
|
||||
consume_skb(cloned_skb);
|
||||
--- a/net/ipv6/icmp.c
|
||||
+++ b/net/ipv6/icmp.c
|
||||
@@ -312,10 +312,9 @@ static int icmpv6_getfrag(void *from, ch
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_IPV6_MIP6)
|
||||
-static void mip6_addr_swap(struct sk_buff *skb)
|
||||
+static void mip6_addr_swap(struct sk_buff *skb, const struct inet6_skb_parm *opt)
|
||||
{
|
||||
struct ipv6hdr *iph = ipv6_hdr(skb);
|
||||
- struct inet6_skb_parm *opt = IP6CB(skb);
|
||||
struct ipv6_destopt_hao *hao;
|
||||
struct in6_addr tmp;
|
||||
int off;
|
||||
@@ -332,7 +331,7 @@ static void mip6_addr_swap(struct sk_buf
|
||||
}
|
||||
}
|
||||
#else
|
||||
-static inline void mip6_addr_swap(struct sk_buff *skb) {}
|
||||
+static inline void mip6_addr_swap(struct sk_buff *skb, const struct inet6_skb_parm *opt) {}
|
||||
#endif
|
||||
|
||||
static struct dst_entry *icmpv6_route_lookup(struct net *net,
|
||||
@@ -427,7 +426,8 @@ static int icmp6_iif(const struct sk_buf
|
||||
* Send an ICMP message in response to a packet in error
|
||||
*/
|
||||
static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
|
||||
- const struct in6_addr *force_saddr)
|
||||
+ const struct in6_addr *force_saddr,
|
||||
+ const struct inet6_skb_parm *parm)
|
||||
{
|
||||
struct inet6_dev *idev = NULL;
|
||||
struct ipv6hdr *hdr = ipv6_hdr(skb);
|
||||
@@ -520,7 +520,7 @@ static void icmp6_send(struct sk_buff *s
|
||||
if (!(skb->dev->flags & IFF_LOOPBACK) && !icmpv6_global_allow(net, type))
|
||||
goto out_bh_enable;
|
||||
|
||||
- mip6_addr_swap(skb);
|
||||
+ mip6_addr_swap(skb, parm);
|
||||
|
||||
memset(&fl6, 0, sizeof(fl6));
|
||||
fl6.flowi6_proto = IPPROTO_ICMPV6;
|
||||
@@ -605,7 +605,7 @@ out_bh_enable:
|
||||
*/
|
||||
void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
|
||||
{
|
||||
- icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL);
|
||||
+ icmp6_send(skb, ICMPV6_PARAMPROB, code, pos, NULL, IP6CB(skb));
|
||||
kfree_skb(skb);
|
||||
}
|
||||
|
||||
@@ -662,10 +662,10 @@ int ip6_err_gen_icmpv6_unreach(struct sk
|
||||
}
|
||||
if (type == ICMP_TIME_EXCEEDED)
|
||||
icmp6_send(skb2, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,
|
||||
- info, &temp_saddr);
|
||||
+ info, &temp_saddr, IP6CB(skb2));
|
||||
else
|
||||
icmp6_send(skb2, ICMPV6_DEST_UNREACH, ICMPV6_ADDR_UNREACH,
|
||||
- info, &temp_saddr);
|
||||
+ info, &temp_saddr, IP6CB(skb2));
|
||||
if (rt)
|
||||
ip6_rt_put(rt);
|
||||
|
||||
--- a/net/ipv6/ip6_icmp.c
|
||||
+++ b/net/ipv6/ip6_icmp.c
|
||||
@@ -31,7 +31,8 @@ int inet6_unregister_icmp_sender(ip6_icm
|
||||
}
|
||||
EXPORT_SYMBOL(inet6_unregister_icmp_sender);
|
||||
|
||||
-void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)
|
||||
+void __icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,
|
||||
+ const struct inet6_skb_parm *parm)
|
||||
{
|
||||
ip6_icmp_send_t *send;
|
||||
|
||||
@@ -40,16 +41,17 @@ void icmpv6_send(struct sk_buff *skb, u8
|
||||
|
||||
if (!send)
|
||||
goto out;
|
||||
- send(skb, type, code, info, NULL);
|
||||
+ send(skb, type, code, info, NULL, parm);
|
||||
out:
|
||||
rcu_read_unlock();
|
||||
}
|
||||
-EXPORT_SYMBOL(icmpv6_send);
|
||||
+EXPORT_SYMBOL(__icmpv6_send);
|
||||
|
||||
#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
#include <net/netfilter/nf_conntrack.h>
|
||||
void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info)
|
||||
{
|
||||
+ struct inet6_skb_parm parm = { 0 };
|
||||
struct sk_buff *cloned_skb = NULL;
|
||||
enum ip_conntrack_info ctinfo;
|
||||
struct in6_addr orig_ip;
|
||||
@@ -57,7 +59,7 @@ void icmpv6_ndo_send(struct sk_buff *skb
|
||||
|
||||
ct = nf_ct_get(skb_in, &ctinfo);
|
||||
if (!ct || !(ct->status & IPS_SRC_NAT)) {
|
||||
- icmpv6_send(skb_in, type, code, info);
|
||||
+ __icmpv6_send(skb_in, type, code, info, &parm);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -72,7 +74,7 @@ void icmpv6_ndo_send(struct sk_buff *skb
|
||||
|
||||
orig_ip = ipv6_hdr(skb_in)->saddr;
|
||||
ipv6_hdr(skb_in)->saddr = ct->tuplehash[0].tuple.src.u3.in6;
|
||||
- icmpv6_send(skb_in, type, code, info);
|
||||
+ __icmpv6_send(skb_in, type, code, info, &parm);
|
||||
ipv6_hdr(skb_in)->saddr = orig_ip;
|
||||
out:
|
||||
consume_skb(cloned_skb);
|
||||
@@ -1,73 +0,0 @@
|
||||
From 6420a569504e212d618d4a4736e2c59ed80a8478 Mon Sep 17 00:00:00 2001
|
||||
From: Lech Perczak <lech.perczak@gmail.com>
|
||||
Date: Sun, 7 Feb 2021 01:54:43 +0100
|
||||
Subject: USB: serial: option: update interface mapping for ZTE P685M
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This patch prepares for qmi_wwan driver support for the device.
|
||||
Previously "option" driver mapped itself to interfaces 0 and 3 (matching
|
||||
ff/ff/ff), while interface 3 is in fact a QMI port.
|
||||
Interfaces 1 and 2 (matching ff/00/00) expose AT commands,
|
||||
and weren't supported previously at all.
|
||||
Without this patch, a possible conflict would exist if device ID was
|
||||
added to qmi_wwan driver for interface 3.
|
||||
|
||||
Update and simplify device ID to match interfaces 0-2 directly,
|
||||
to expose QCDM (0), PCUI (1), and modem (2) ports and avoid conflict
|
||||
with QMI (3), and ADB (4).
|
||||
|
||||
The modem is used inside ZTE MF283+ router and carriers identify it as
|
||||
such.
|
||||
Interface mapping is:
|
||||
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB
|
||||
|
||||
T: Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 3 Spd=480 MxCh= 0
|
||||
D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
|
||||
P: Vendor=19d2 ProdID=1275 Rev=f0.00
|
||||
S: Manufacturer=ZTE,Incorporated
|
||||
S: Product=ZTE Technologies MSM
|
||||
S: SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
|
||||
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
|
||||
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
|
||||
E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
|
||||
E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
|
||||
E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
|
||||
E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
|
||||
E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
|
||||
E: Ad=87(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
|
||||
E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
|
||||
E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
|
||||
|
||||
Cc: Johan Hovold <johan@kernel.org>
|
||||
Cc: Bjørn Mork <bjorn@mork.no>
|
||||
Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
|
||||
Link: https://lore.kernel.org/r/20210207005443.12936-1-lech.perczak@gmail.com
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Johan Hovold <johan@kernel.org>
|
||||
---
|
||||
drivers/usb/serial/option.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -1569,7 +1569,8 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) },
|
||||
- { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) },
|
||||
+ { USB_DEVICE(ZTE_VENDOR_ID, 0x1275), /* ZTE P685M */
|
||||
+ .driver_info = RSVD(3) | RSVD(4) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) },
|
||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
config MODULES_TREE_LOOKUP
|
||||
--- a/kernel/module.c
|
||||
+++ b/kernel/module.c
|
||||
@@ -3125,9 +3125,11 @@ static int setup_load_info(struct load_i
|
||||
@@ -3142,9 +3142,11 @@ static int setup_load_info(struct load_i
|
||||
|
||||
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
||||
{
|
||||
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
|
||||
modmagic = NULL;
|
||||
|
||||
@@ -3148,6 +3150,7 @@ static int check_modinfo(struct module *
|
||||
@@ -3165,6 +3167,7 @@ static int check_modinfo(struct module *
|
||||
mod->name);
|
||||
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
} \
|
||||
\
|
||||
/* __*init sections */ \
|
||||
@@ -898,6 +908,8 @@
|
||||
@@ -903,6 +913,8 @@
|
||||
EXIT_TEXT \
|
||||
EXIT_DATA \
|
||||
EXIT_CALL \
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
/* Part specific fixup hooks. */
|
||||
const struct spi_nor_fixups *fixups;
|
||||
@@ -1983,6 +1987,9 @@ static int spi_nor_clear_sr_bp(struct sp
|
||||
@@ -1985,6 +1989,9 @@ static int spi_nor_clear_sr_bp(struct sp
|
||||
int ret;
|
||||
u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
ret = read_sr(nor);
|
||||
if (ret < 0) {
|
||||
dev_err(nor->dev, "error while reading status register\n");
|
||||
@@ -2335,7 +2342,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -2337,7 +2344,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) },
|
||||
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
|
||||
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
|
||||
@@ -39,7 +39,7 @@
|
||||
{ "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
|
||||
{ "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
|
||||
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
@@ -5024,6 +5031,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -5025,6 +5032,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (info->flags & USE_CLSR)
|
||||
nor->flags |= SNOR_F_USE_CLSR;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2704,7 +2704,7 @@ static int spi_nor_write(struct mtd_info
|
||||
@@ -2706,7 +2706,7 @@ static int spi_nor_write(struct mtd_info
|
||||
|
||||
write_enable(nor);
|
||||
ret = spi_nor_write_data(nor, addr, page_remain, buf + i);
|
||||
|
||||
@@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -4883,6 +4883,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -4884,6 +4884,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
*/
|
||||
if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL ||
|
||||
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
|
||||
|
||||
@@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -4397,6 +4397,7 @@ static void st_micron_set_default_init(s
|
||||
@@ -4398,6 +4398,7 @@ static void st_micron_set_default_init(s
|
||||
|
||||
static void winbond_set_default_init(struct spi_nor *nor)
|
||||
{
|
||||
@@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
nor->params.set_4byte = winbond_set_4byte;
|
||||
}
|
||||
|
||||
@@ -4885,6 +4886,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -4886,6 +4887,7 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
|
||||
JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
|
||||
JEDEC_MFR(nor->info) == SNOR_MFR_SST ||
|
||||
|
||||
@@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
depends on OF && (ARM || ARM64 || COMPILE_TEST)
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -4463,6 +4463,7 @@ static void spi_nor_info_init_params(str
|
||||
@@ -4464,6 +4464,7 @@ static void spi_nor_info_init_params(str
|
||||
struct spi_nor_erase_map *map = ¶ms->erase_map;
|
||||
const struct flash_info *info = nor->info;
|
||||
struct device_node *np = spi_nor_get_flash_node(nor);
|
||||
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
u8 i, erase_mask;
|
||||
|
||||
/* Initialize legacy flash parameters and settings. */
|
||||
@@ -4526,6 +4527,21 @@ static void spi_nor_info_init_params(str
|
||||
@@ -4527,6 +4528,21 @@ static void spi_nor_info_init_params(str
|
||||
*/
|
||||
erase_mask = 0;
|
||||
i = 0;
|
||||
@@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (info->flags & SECT_4K_PMC) {
|
||||
erase_mask |= BIT(i);
|
||||
spi_nor_set_erase_type(&map->erase_type[i], 4096u,
|
||||
@@ -4537,6 +4553,7 @@ static void spi_nor_info_init_params(str
|
||||
@@ -4538,6 +4554,7 @@ static void spi_nor_info_init_params(str
|
||||
SPINOR_OP_BE_4K);
|
||||
i++;
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2177,6 +2177,7 @@ static const struct flash_info spi_nor_i
|
||||
@@ -2179,6 +2179,7 @@ static const struct flash_info spi_nor_i
|
||||
{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) },
|
||||
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
|
||||
{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
|
||||
|
||||
@@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2504,6 +2504,9 @@ static const struct flash_info spi_nor_i
|
||||
@@ -2506,6 +2506,9 @@ static const struct flash_info spi_nor_i
|
||||
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
|
||||
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
static int macronix_set_4byte(struct spi_nor *nor, bool enable)
|
||||
{
|
||||
if (nor->spimem) {
|
||||
@@ -1259,6 +1275,10 @@ static int spi_nor_erase(struct mtd_info
|
||||
@@ -1261,6 +1277,10 @@ static int spi_nor_erase(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -53,7 +53,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
/* whole-chip erase? */
|
||||
if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
|
||||
unsigned long timeout;
|
||||
@@ -1315,6 +1335,7 @@ static int spi_nor_erase(struct mtd_info
|
||||
@@ -1317,6 +1337,7 @@ static int spi_nor_erase(struct mtd_info
|
||||
write_disable(nor);
|
||||
|
||||
erase_err:
|
||||
@@ -61,7 +61,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
|
||||
|
||||
return ret;
|
||||
@@ -1621,7 +1642,9 @@ static int spi_nor_lock(struct mtd_info
|
||||
@@ -1623,7 +1644,9 @@ static int spi_nor_lock(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -71,7 +71,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK);
|
||||
return ret;
|
||||
@@ -1636,7 +1659,9 @@ static int spi_nor_unlock(struct mtd_inf
|
||||
@@ -1638,7 +1661,9 @@ static int spi_nor_unlock(struct mtd_inf
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -81,7 +81,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
|
||||
return ret;
|
||||
@@ -1651,7 +1676,9 @@ static int spi_nor_is_locked(struct mtd_
|
||||
@@ -1653,7 +1678,9 @@ static int spi_nor_is_locked(struct mtd_
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -91,7 +91,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
|
||||
return ret;
|
||||
@@ -2557,6 +2584,10 @@ static int spi_nor_read(struct mtd_info
|
||||
@@ -2559,6 +2586,10 @@ static int spi_nor_read(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -102,7 +102,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
while (len) {
|
||||
loff_t addr = from;
|
||||
|
||||
@@ -2580,6 +2611,7 @@ static int spi_nor_read(struct mtd_info
|
||||
@@ -2582,6 +2613,7 @@ static int spi_nor_read(struct mtd_info
|
||||
ret = 0;
|
||||
|
||||
read_err:
|
||||
@@ -110,7 +110,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
|
||||
return ret;
|
||||
}
|
||||
@@ -2597,6 +2629,10 @@ static int sst_write(struct mtd_info *mt
|
||||
@@ -2599,6 +2631,10 @@ static int sst_write(struct mtd_info *mt
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -121,7 +121,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
write_enable(nor);
|
||||
|
||||
nor->sst_write_second = false;
|
||||
@@ -2659,6 +2695,7 @@ static int sst_write(struct mtd_info *mt
|
||||
@@ -2661,6 +2697,7 @@ static int sst_write(struct mtd_info *mt
|
||||
}
|
||||
sst_write_err:
|
||||
*retlen += actual;
|
||||
@@ -129,7 +129,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
||||
return ret;
|
||||
}
|
||||
@@ -2681,6 +2718,10 @@ static int spi_nor_write(struct mtd_info
|
||||
@@ -2683,6 +2720,10 @@ static int spi_nor_write(struct mtd_info
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -140,7 +140,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
for (i = 0; i < len; ) {
|
||||
ssize_t written;
|
||||
loff_t addr = to + i;
|
||||
@@ -2720,6 +2761,7 @@ static int spi_nor_write(struct mtd_info
|
||||
@@ -2722,6 +2763,7 @@ static int spi_nor_write(struct mtd_info
|
||||
}
|
||||
|
||||
write_err:
|
||||
@@ -148,7 +148,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
|
||||
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
|
||||
return ret;
|
||||
}
|
||||
@@ -4725,9 +4767,13 @@ static int spi_nor_init(struct spi_nor *
|
||||
@@ -4726,9 +4768,13 @@ static int spi_nor_init(struct spi_nor *
|
||||
* reboots (e.g., crashes). Warn the user (or hopefully, system
|
||||
* designer) that this is bad.
|
||||
*/
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2230,6 +2230,11 @@ static const struct flash_info spi_nor_i
|
||||
@@ -2232,6 +2232,11 @@ static const struct flash_info spi_nor_i
|
||||
|
||||
/* GigaDevice */
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ Signed-off-by: Mantas Pucka <mantas@8devices.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/spi-nor.c
|
||||
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
||||
@@ -2170,6 +2170,32 @@ static struct spi_nor_fixups gd25q256_fi
|
||||
@@ -2172,6 +2172,32 @@ static struct spi_nor_fixups gd25q256_fi
|
||||
.default_init = gd25q256_default_init,
|
||||
};
|
||||
|
||||
@@ -48,7 +48,7 @@ Signed-off-by: Mantas Pucka <mantas@8devices.com>
|
||||
/* NOTE: double check command sets and memory organization when you add
|
||||
* more nor chips. This current list focusses on newer chips, which
|
||||
* have been converging on command sets which including JEDEC ID.
|
||||
@@ -2513,7 +2539,8 @@ static const struct flash_info spi_nor_i
|
||||
@@ -2515,7 +2541,8 @@ static const struct flash_info spi_nor_i
|
||||
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
|
||||
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
|
||||
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
|
||||
|
||||
Reference in New Issue
Block a user