mirror of
https://github.com/hanwckf/immortalwrt-mt798x.git
synced 2025-01-09 02:43:53 +08:00
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
commit
0d4a1f1dbd
@ -21,10 +21,13 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:= \
|
||||
https://mirrors.cloud.tencent.com/openssl/source/ \
|
||||
https://mirrors.cloud.tencent.com/openssl/source/old/$(PKG_BASE)/ \
|
||||
https://ftp.fi.muni.cz/pub/openssl/source/ \
|
||||
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
|
||||
https://www.openssl.org/source/ \
|
||||
https://www.openssl.org/source/old/$(PKG_BASE)/
|
||||
https://www.openssl.org/source/old/$(PKG_BASE)/ \
|
||||
https://ftp.fi.muni.cz/pub/openssl/source/ \
|
||||
https://ftp.fi.muni.cz/pub/openssl/source/old/$(PKG_BASE)/ \
|
||||
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/ \
|
||||
ftp://ftp.pca.dfn.de/pub/tools/net/openssl/source/old/$(PKG_BASE)/
|
||||
|
||||
PKG_HASH:=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
|
||||
|
||||
PKG_LICENSE:=OpenSSL
|
||||
|
@ -48,7 +48,7 @@ config WOLFSSL_HAS_WPAS
|
||||
default y
|
||||
|
||||
config WOLFSSL_HAS_ECC25519
|
||||
bool "Include ECC Curve 22519 support"
|
||||
bool "Include ECC Curve 25519 support"
|
||||
default n
|
||||
|
||||
config WOLFSSL_HAS_DEVCRYPTO
|
||||
|
@ -8,12 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=wolfssl
|
||||
PKG_VERSION:=4.6.0-stable
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=4.7.0-stable
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/wolfSSL/wolfssl/archive/v$(PKG_VERSION)
|
||||
PKG_HASH:=053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848
|
||||
PKG_HASH:=b0e740b31d4d877d540ad50cc539a8873fc41af02bd3091c4357b403f7106e31
|
||||
|
||||
PKG_FIXUP:=libtool libtool-abiver
|
||||
PKG_INSTALL:=1
|
||||
|
@ -1,53 +0,0 @@
|
||||
From fad1e67677bf7797b6bd6e1f21a513c289d963a7 Mon Sep 17 00:00:00 2001
|
||||
From: Sean Parkinson <sean@wolfssl.com>
|
||||
Date: Thu, 21 Jan 2021 08:24:38 +1000
|
||||
Subject: [PATCH] TLS 1.3: ensure key for signature in CertificateVerify
|
||||
|
||||
---
|
||||
src/tls13.c | 18 +++++++++++++-----
|
||||
1 file changed, 13 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/src/tls13.c
|
||||
+++ b/src/tls13.c
|
||||
@@ -5624,28 +5624,36 @@ static int DoTls13CertificateVerify(WOLF
|
||||
#ifdef HAVE_ED25519
|
||||
if (args->sigAlgo == ed25519_sa_algo &&
|
||||
!ssl->peerEd25519KeyPresent) {
|
||||
- WOLFSSL_MSG("Oops, peer sent ED25519 key but not in verify");
|
||||
+ WOLFSSL_MSG("Peer sent ED22519 sig but not ED22519 cert");
|
||||
+ ret = SIG_VERIFY_E;
|
||||
+ goto exit_dcv;
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_ED448
|
||||
if (args->sigAlgo == ed448_sa_algo && !ssl->peerEd448KeyPresent) {
|
||||
- WOLFSSL_MSG("Oops, peer sent ED448 key but not in verify");
|
||||
+ WOLFSSL_MSG("Peer sent ED448 sig but not ED448 cert");
|
||||
+ ret = SIG_VERIFY_E;
|
||||
+ goto exit_dcv;
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_ECC
|
||||
if (args->sigAlgo == ecc_dsa_sa_algo &&
|
||||
!ssl->peerEccDsaKeyPresent) {
|
||||
- WOLFSSL_MSG("Oops, peer sent ECC key but not in verify");
|
||||
+ WOLFSSL_MSG("Peer sent ECC sig but not ECC cert");
|
||||
+ ret = SIG_VERIFY_E;
|
||||
+ goto exit_dcv;
|
||||
}
|
||||
#endif
|
||||
#ifndef NO_RSA
|
||||
if (args->sigAlgo == rsa_sa_algo) {
|
||||
- WOLFSSL_MSG("Oops, peer sent PKCS#1.5 signature");
|
||||
+ WOLFSSL_MSG("Peer sent PKCS#1.5 algo but not in certificate");
|
||||
ERROR_OUT(INVALID_PARAMETER, exit_dcv);
|
||||
}
|
||||
if (args->sigAlgo == rsa_pss_sa_algo &&
|
||||
(ssl->peerRsaKey == NULL || !ssl->peerRsaKeyPresent)) {
|
||||
- WOLFSSL_MSG("Oops, peer sent RSA key but not in verify");
|
||||
+ WOLFSSL_MSG("Peer sent RSA sig but not RSA cert");
|
||||
+ ret = SIG_VERIFY_E;
|
||||
+ goto exit_dcv;
|
||||
}
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/wolfssl/wolfcrypt/settings.h
|
||||
+++ b/wolfssl/wolfcrypt/settings.h
|
||||
@@ -2248,7 +2248,7 @@ extern void uITRON4_free(void *p) ;
|
||||
@@ -2255,7 +2255,7 @@ extern void uITRON4_free(void *p) ;
|
||||
#endif
|
||||
|
||||
/* warning for not using harden build options (default with ./configure) */
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 391ecbd647c121300dc7dcf209e412ccb7b8d432 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Fri, 1 Jan 2021 21:57:56 +0100
|
||||
Subject: [PATCH] Fix linking against hostapd with LTO
|
||||
|
||||
When running LTO on wolfssl the ecc_map() function is removed from the
|
||||
binary by GCC 8.4.0. This function is used by multiple functions from
|
||||
the crypto_wolfssl.c implementation of hostapd master.
|
||||
|
||||
Fixes: 780e8a4619b6 ("Fixes for building `--enable-wpas=small` with WPA Supplicant v2.7.")
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -947,6 +947,7 @@ then
|
||||
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA_X509_SMALL"
|
||||
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PUBLIC_MP"
|
||||
+ AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_PUBLIC_ECC_ADD_DBL"
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_DER_LOAD"
|
||||
AM_CFLAGS="$AM_CFLAGS -DATOMIC_USER"
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"
|
@ -1,10 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -943,6 +943,7 @@ then
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ALWAYS_KEEP_SNI"
|
||||
AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA"
|
||||
AM_CFLAGS="$AM_CFLAGS -DHAVE_EXT_CACHE"
|
||||
+ AM_CFLAGS="$AM_CFLAGS -DHAVE_SECRET_CALLBACK"
|
||||
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_EITHER_SIDE"
|
||||
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_EXTRA_X509_SMALL"
|
||||
|
@ -1907,505 +1907,3 @@ index 00000000..ac333e8c
|
||||
+ state = (struct inflate_state FAR *)strm->state;
|
||||
+ return (unsigned long)(state->next - state->codes);
|
||||
+}
|
||||
|
||||
From 247147654fe5cd11cf15d8dff91440405ea57040 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Hosie <simon.hosie@arm.com>
|
||||
Date: Wed, 12 Apr 2017 15:44:21 -0700
|
||||
Subject: [PATCH 2/2] Inflate using wider loads and stores
|
||||
|
||||
In inflate_fast() the output pointer always has plenty of room to write. This
|
||||
means that so long as the target is capable, wide un-aligned loads and stores
|
||||
can be used to transfer several bytes at once. When the reference distance is
|
||||
too short simply unroll the data a little to increase the distance.
|
||||
|
||||
Change-Id: I59854eb25d2b1e43561c8a2afaf9175bf10cf674
|
||||
---
|
||||
contrib/arm/chunkcopy.h | 279 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
contrib/arm/inffast.c | 96 +++++++----------
|
||||
contrib/arm/inflate.c | 22 ++--
|
||||
3 files changed, 335 insertions(+), 62 deletions(-)
|
||||
create mode 100644 contrib/arm/chunkcopy.h
|
||||
|
||||
diff --git a/contrib/arm/chunkcopy.h b/contrib/arm/chunkcopy.h
|
||||
new file mode 100644
|
||||
index 00000000..2d6fd6f9
|
||||
--- /dev/null
|
||||
+++ b/contrib/arm/chunkcopy.h
|
||||
@@ -0,0 +1,279 @@
|
||||
+/* chunkcopy.h -- fast copies and sets
|
||||
+ * Copyright (C) 2017 ARM, Inc.
|
||||
+ * For conditions of distribution and use, see copyright notice in zlib.h
|
||||
+ */
|
||||
+
|
||||
+#ifndef CHUNKCOPY_H
|
||||
+#define CHUNKCOPY_H
|
||||
+
|
||||
+#include "zutil.h"
|
||||
+#include <arm_neon.h>
|
||||
+
|
||||
+#if __STDC_VERSION__ >= 199901L
|
||||
+#define Z_RESTRICT restrict
|
||||
+#else
|
||||
+#define Z_RESTRICT
|
||||
+#endif
|
||||
+
|
||||
+typedef uint8x16_t chunkcopy_chunk_t;
|
||||
+#define CHUNKCOPY_CHUNK_SIZE sizeof(chunkcopy_chunk_t)
|
||||
+
|
||||
+/*
|
||||
+ Ask the compiler to perform a wide, unaligned load with an machine
|
||||
+ instruction appropriate for the chunkcopy_chunk_t type.
|
||||
+ */
|
||||
+static inline chunkcopy_chunk_t loadchunk(const unsigned char FAR *s) {
|
||||
+ chunkcopy_chunk_t c;
|
||||
+ __builtin_memcpy(&c, s, sizeof(c));
|
||||
+ return c;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Ask the compiler to perform a wide, unaligned store with an machine
|
||||
+ instruction appropriate for the chunkcopy_chunk_t type.
|
||||
+ */
|
||||
+static inline void storechunk(unsigned char FAR *d, chunkcopy_chunk_t c) {
|
||||
+ __builtin_memcpy(d, &c, sizeof(c));
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform a memcpy-like operation, but assume that length is non-zero and that
|
||||
+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
|
||||
+ the length is shorter than this.
|
||||
+
|
||||
+ It also guarantees that it will properly unroll the data if the distance
|
||||
+ between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on
|
||||
+ in chunkcopy_relaxed().
|
||||
+
|
||||
+ Aside from better memory bus utilisation, this means that short copies
|
||||
+ (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop
|
||||
+ without iteration, which will hopefully make the branch prediction more
|
||||
+ reliable.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_core(unsigned char FAR *out,
|
||||
+ const unsigned char FAR *from,
|
||||
+ unsigned len) {
|
||||
+ int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1;
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += bump;
|
||||
+ from += bump;
|
||||
+ len /= CHUNKCOPY_CHUNK_SIZE;
|
||||
+ while (len-- > 0) {
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += CHUNKCOPY_CHUNK_SIZE;
|
||||
+ from += CHUNKCOPY_CHUNK_SIZE;
|
||||
+ }
|
||||
+ return out;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Like chunkcopy_core, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_core_safe(unsigned char FAR *out,
|
||||
+ const unsigned char FAR * from,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ if (limit - out < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ const unsigned char FAR * Z_RESTRICT rfrom = from;
|
||||
+ if (len & 8) { __builtin_memcpy(out, rfrom, 8); out += 8; rfrom += 8; }
|
||||
+ if (len & 4) { __builtin_memcpy(out, rfrom, 4); out += 4; rfrom += 4; }
|
||||
+ if (len & 2) { __builtin_memcpy(out, rfrom, 2); out += 2; rfrom += 2; }
|
||||
+ if (len & 1) { *out++ = *rfrom++; }
|
||||
+ return out;
|
||||
+ }
|
||||
+ return chunkcopy_core(out, from, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform short copies until distance can be rewritten as being at least
|
||||
+ CHUNKCOPY_CHUNK_SIZE.
|
||||
+
|
||||
+ This assumes that it's OK to overwrite at least the first
|
||||
+ 2*CHUNKCOPY_CHUNK_SIZE bytes of output even if the copy is shorter than
|
||||
+ this. This assumption holds within inflate_fast() which starts every
|
||||
+ iteration with at least 258 bytes of output space available (258 being the
|
||||
+ maximum length output from a single token; see inffast.c).
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkunroll_relaxed(unsigned char FAR *out,
|
||||
+ unsigned FAR *dist,
|
||||
+ unsigned FAR *len) {
|
||||
+ const unsigned char FAR *from = out - *dist;
|
||||
+ while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += *dist;
|
||||
+ *len -= *dist;
|
||||
+ *dist += *dist;
|
||||
+ }
|
||||
+ return out;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static inline uint8x16_t chunkset_vld1q_dup_u8x8(const unsigned char FAR * Z_RESTRICT from) {
|
||||
+#if defined(__clang__) || defined(__aarch64__)
|
||||
+ return vreinterpretq_u8_u64(vld1q_dup_u64((void *)from));
|
||||
+#else
|
||||
+ /* 32-bit GCC uses an alignment hint for vld1q_dup_u64, even when given a
|
||||
+ * void pointer, so here's an alternate implementation.
|
||||
+ */
|
||||
+ uint8x8_t h = vld1_u8(from);
|
||||
+ return vcombine_u8(h, h);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform an overlapping copy which behaves as a memset() operation, but
|
||||
+ supporting periods other than one, and assume that length is non-zero and
|
||||
+ that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output
|
||||
+ even if the length is shorter than this.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkset_core(unsigned char FAR *out,
|
||||
+ unsigned period,
|
||||
+ unsigned len) {
|
||||
+ uint8x16_t f;
|
||||
+ int bump = ((len - 1) % sizeof(f)) + 1;
|
||||
+
|
||||
+ switch (period) {
|
||||
+ case 1:
|
||||
+ f = vld1q_dup_u8(out - 1);
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ while (len > 0) {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 2:
|
||||
+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2)));
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2)));
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 4:
|
||||
+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4)));
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4)));
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 8:
|
||||
+ f = chunkset_vld1q_dup_u8x8(out - 8);
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = chunkset_vld1q_dup_u8x8(out - 8);
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ }
|
||||
+ out = chunkunroll_relaxed(out, &period, &len);
|
||||
+ return chunkcopy_core(out, out - period, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform a memcpy-like operation, but assume that length is non-zero and that
|
||||
+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
|
||||
+ the length is shorter than this.
|
||||
+
|
||||
+ Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour
|
||||
+ of overlapping buffers, regardless of the distance between the pointers.
|
||||
+ This is reflected in the `restrict`-qualified pointers, allowing the
|
||||
+ compiler to reorder loads and stores.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_relaxed(unsigned char FAR * Z_RESTRICT out,
|
||||
+ const unsigned char FAR * Z_RESTRICT from,
|
||||
+ unsigned len) {
|
||||
+ return chunkcopy_core(out, from, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Like chunkcopy_relaxed, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Unlike chunkcopy_core_safe() above, no guarantee is made regarding the
|
||||
+ behaviour of overlapping buffers, regardless of the distance between the
|
||||
+ pointers. This is reflected in the `restrict`-qualified pointers, allowing
|
||||
+ the compiler to reorder loads and stores.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_safe(unsigned char FAR *out,
|
||||
+ const unsigned char FAR * Z_RESTRICT from,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ return chunkcopy_core_safe(out, from, len, limit);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform chunky copy within the same buffer, where the source and destination
|
||||
+ may potentially overlap.
|
||||
+
|
||||
+ Assumes that len > 0 on entry, and that it's safe to write at least
|
||||
+ CHUNKCOPY_CHUNK_SIZE*3 bytes to the output.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_lapped_relaxed(unsigned char FAR *out,
|
||||
+ unsigned dist,
|
||||
+ unsigned len) {
|
||||
+ if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ return chunkset_core(out, dist, len);
|
||||
+ }
|
||||
+ return chunkcopy_core(out, out - dist, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Behave like chunkcopy_lapped_relaxed, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_lapped_safe(unsigned char FAR *out,
|
||||
+ unsigned dist,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ if (limit - out < CHUNKCOPY_CHUNK_SIZE * 3) {
|
||||
+ /* TODO: try harder to optimise this */
|
||||
+ while (len-- > 0) {
|
||||
+ *out = *(out - dist);
|
||||
+ out++;
|
||||
+ }
|
||||
+ return out;
|
||||
+ }
|
||||
+ return chunkcopy_lapped_relaxed(out, dist, len);
|
||||
+}
|
||||
+
|
||||
+#undef Z_RESTRICT
|
||||
+
|
||||
+#endif /* CHUNKCOPY_H */
|
||||
diff --git a/contrib/arm/inffast.c b/contrib/arm/inffast.c
|
||||
index 0dbd1dbc..f7f50071 100644
|
||||
--- a/contrib/arm/inffast.c
|
||||
+++ b/contrib/arm/inffast.c
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
#include "inffast.h"
|
||||
+#include "chunkcopy.h"
|
||||
|
||||
#ifdef ASMINF
|
||||
# pragma message("Assembler code may have bugs -- use at your own risk")
|
||||
@@ -57,6 +58,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
unsigned char FAR *out; /* local strm->next_out */
|
||||
unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
|
||||
unsigned char FAR *end; /* while out < end, enough space available */
|
||||
+ unsigned char FAR *limit; /* safety limit for chunky copies */
|
||||
#ifdef INFLATE_STRICT
|
||||
unsigned dmax; /* maximum distance from zlib header */
|
||||
#endif
|
||||
@@ -84,12 +86,13 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
out = strm->next_out;
|
||||
beg = out - (start - strm->avail_out);
|
||||
end = out + (strm->avail_out - 257);
|
||||
+ limit = out + strm->avail_out;
|
||||
#ifdef INFLATE_STRICT
|
||||
dmax = state->dmax;
|
||||
#endif
|
||||
wsize = state->wsize;
|
||||
whave = state->whave;
|
||||
- wnext = state->wnext;
|
||||
+ wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext;
|
||||
window = state->window;
|
||||
hold = state->hold;
|
||||
bits = state->bits;
|
||||
@@ -197,70 +200,51 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
#endif
|
||||
}
|
||||
from = window;
|
||||
- if (wnext == 0) { /* very common case */
|
||||
- from += wsize - op;
|
||||
- if (op < len) { /* some from window */
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
+ if (wnext >= op) { /* contiguous in window */
|
||||
+ from += wnext - op;
|
||||
}
|
||||
- else if (wnext < op) { /* wrap around window */
|
||||
- from += wsize + wnext - op;
|
||||
+ else { /* wrap around window */
|
||||
op -= wnext;
|
||||
+ from += wsize - op;
|
||||
if (op < len) { /* some from end of window */
|
||||
len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = window;
|
||||
- if (wnext < len) { /* some from start of window */
|
||||
- op = wnext;
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
+ out = chunkcopy_safe(out, from, op, limit);
|
||||
+ from = window; /* more from start of window */
|
||||
+ op = wnext;
|
||||
+ /* This (rare) case can create a situation where
|
||||
+ the first chunkcopy below must be checked.
|
||||
+ */
|
||||
}
|
||||
}
|
||||
- else { /* contiguous in window */
|
||||
- from += wnext - op;
|
||||
- if (op < len) { /* some from window */
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
- }
|
||||
- while (len > 2) {
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- len -= 3;
|
||||
- }
|
||||
- if (len) {
|
||||
- *out++ = *from++;
|
||||
- if (len > 1)
|
||||
- *out++ = *from++;
|
||||
+ if (op < len) { /* still need some from output */
|
||||
+ out = chunkcopy_safe(out, from, op, limit);
|
||||
+ len -= op;
|
||||
+ /* When dist is small the amount of data that can be
|
||||
+ copied from the window is also small, and progress
|
||||
+ towards the dangerous end of the output buffer is
|
||||
+ also small. This means that for trivial memsets and
|
||||
+ for chunkunroll_relaxed() a safety check is
|
||||
+ unnecessary. However, these conditions may not be
|
||||
+ entered at all, and in that case it's possible that
|
||||
+ the main copy is near the end.
|
||||
+ */
|
||||
+ out = chunkunroll_relaxed(out, &dist, &len);
|
||||
+ out = chunkcopy_safe(out, out - dist, len, limit);
|
||||
+ } else {
|
||||
+ /* from points to window, so there is no risk of
|
||||
+ overlapping pointers requiring memset-like behaviour
|
||||
+ */
|
||||
+ out = chunkcopy_safe(out, from, len, limit);
|
||||
}
|
||||
}
|
||||
else {
|
||||
- from = out - dist; /* copy direct from output */
|
||||
- do { /* minimum length is three */
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- len -= 3;
|
||||
- } while (len > 2);
|
||||
- if (len) {
|
||||
- *out++ = *from++;
|
||||
- if (len > 1)
|
||||
- *out++ = *from++;
|
||||
- }
|
||||
+ /* Whole reference is in range of current output. No
|
||||
+ range checks are necessary because we start with room
|
||||
+ for at least 258 bytes of output, so unroll and roundoff
|
||||
+ operations can write beyond `out+len` so long as they
|
||||
+ stay within 258 bytes of `out`.
|
||||
+ */
|
||||
+ out = chunkcopy_lapped_relaxed(out, dist, len);
|
||||
}
|
||||
}
|
||||
else if ((op & 64) == 0) { /* 2nd level distance code */
|
||||
diff --git a/contrib/arm/inflate.c b/contrib/arm/inflate.c
|
||||
index ac333e8c..e40322c3 100644
|
||||
--- a/contrib/arm/inflate.c
|
||||
+++ b/contrib/arm/inflate.c
|
||||
@@ -84,6 +84,7 @@
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
#include "inffast.h"
|
||||
+#include "contrib/arm/chunkcopy.h"
|
||||
|
||||
#ifdef MAKEFIXED
|
||||
# ifndef BUILDFIXED
|
||||
@@ -405,10 +406,20 @@ unsigned copy;
|
||||
|
||||
/* if it hasn't been done already, allocate space for the window */
|
||||
if (state->window == Z_NULL) {
|
||||
+ unsigned wsize = 1U << state->wbits;
|
||||
state->window = (unsigned char FAR *)
|
||||
- ZALLOC(strm, 1U << state->wbits,
|
||||
+ ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE,
|
||||
sizeof(unsigned char));
|
||||
if (state->window == Z_NULL) return 1;
|
||||
+#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED
|
||||
+ /* Copies from the overflow portion of this buffer are undefined and
|
||||
+ may cause analysis tools to raise a warning if we don't initialize
|
||||
+ it. However, this undefined data overwrites other undefined data
|
||||
+ and is subsequently either overwritten or left deliberately
|
||||
+ undefined at the end of decode; so there's really no point.
|
||||
+ */
|
||||
+ memset(state->window + wsize, 0, CHUNKCOPY_CHUNK_SIZE);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/* if window not in use yet, initialize */
|
||||
@@ -1175,17 +1186,16 @@ int flush;
|
||||
else
|
||||
from = state->window + (state->wnext - copy);
|
||||
if (copy > state->length) copy = state->length;
|
||||
+ if (copy > left) copy = left;
|
||||
+ put = chunkcopy_safe(put, from, copy, put + left);
|
||||
}
|
||||
else { /* copy from output */
|
||||
- from = put - state->offset;
|
||||
copy = state->length;
|
||||
+ if (copy > left) copy = left;
|
||||
+ put = chunkcopy_lapped_safe(put, state->offset, copy, put + left);
|
||||
}
|
||||
- if (copy > left) copy = left;
|
||||
left -= copy;
|
||||
state->length -= copy;
|
||||
- do {
|
||||
- *put++ = *from++;
|
||||
- } while (--copy);
|
||||
if (state->length == 0) state->mode = LEN;
|
||||
break;
|
||||
case LIT:
|
||||
|
@ -0,0 +1,501 @@
|
||||
From 247147654fe5cd11cf15d8dff91440405ea57040 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Hosie <simon.hosie@arm.com>
|
||||
Date: Wed, 12 Apr 2017 15:44:21 -0700
|
||||
Subject: [PATCH 2/2] Inflate using wider loads and stores
|
||||
|
||||
In inflate_fast() the output pointer always has plenty of room to write. This
|
||||
means that so long as the target is capable, wide un-aligned loads and stores
|
||||
can be used to transfer several bytes at once. When the reference distance is
|
||||
too short simply unroll the data a little to increase the distance.
|
||||
|
||||
Change-Id: I59854eb25d2b1e43561c8a2afaf9175bf10cf674
|
||||
---
|
||||
contrib/arm/chunkcopy.h | 279 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
contrib/arm/inffast.c | 96 +++++++----------
|
||||
contrib/arm/inflate.c | 22 ++--
|
||||
3 files changed, 335 insertions(+), 62 deletions(-)
|
||||
create mode 100644 contrib/arm/chunkcopy.h
|
||||
|
||||
diff --git a/contrib/arm/chunkcopy.h b/contrib/arm/chunkcopy.h
|
||||
new file mode 100644
|
||||
index 00000000..2d6fd6f9
|
||||
--- /dev/null
|
||||
+++ b/contrib/arm/chunkcopy.h
|
||||
@@ -0,0 +1,279 @@
|
||||
+/* chunkcopy.h -- fast copies and sets
|
||||
+ * Copyright (C) 2017 ARM, Inc.
|
||||
+ * For conditions of distribution and use, see copyright notice in zlib.h
|
||||
+ */
|
||||
+
|
||||
+#ifndef CHUNKCOPY_H
|
||||
+#define CHUNKCOPY_H
|
||||
+
|
||||
+#include "zutil.h"
|
||||
+#include <arm_neon.h>
|
||||
+
|
||||
+#if __STDC_VERSION__ >= 199901L
|
||||
+#define Z_RESTRICT restrict
|
||||
+#else
|
||||
+#define Z_RESTRICT
|
||||
+#endif
|
||||
+
|
||||
+typedef uint8x16_t chunkcopy_chunk_t;
|
||||
+#define CHUNKCOPY_CHUNK_SIZE sizeof(chunkcopy_chunk_t)
|
||||
+
|
||||
+/*
|
||||
+ Ask the compiler to perform a wide, unaligned load with an machine
|
||||
+ instruction appropriate for the chunkcopy_chunk_t type.
|
||||
+ */
|
||||
+static inline chunkcopy_chunk_t loadchunk(const unsigned char FAR *s) {
|
||||
+ chunkcopy_chunk_t c;
|
||||
+ __builtin_memcpy(&c, s, sizeof(c));
|
||||
+ return c;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Ask the compiler to perform a wide, unaligned store with an machine
|
||||
+ instruction appropriate for the chunkcopy_chunk_t type.
|
||||
+ */
|
||||
+static inline void storechunk(unsigned char FAR *d, chunkcopy_chunk_t c) {
|
||||
+ __builtin_memcpy(d, &c, sizeof(c));
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform a memcpy-like operation, but assume that length is non-zero and that
|
||||
+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
|
||||
+ the length is shorter than this.
|
||||
+
|
||||
+ It also guarantees that it will properly unroll the data if the distance
|
||||
+ between `out` and `from` is at least CHUNKCOPY_CHUNK_SIZE, which we rely on
|
||||
+ in chunkcopy_relaxed().
|
||||
+
|
||||
+ Aside from better memory bus utilisation, this means that short copies
|
||||
+ (CHUNKCOPY_CHUNK_SIZE bytes or fewer) will fall straight through the loop
|
||||
+ without iteration, which will hopefully make the branch prediction more
|
||||
+ reliable.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_core(unsigned char FAR *out,
|
||||
+ const unsigned char FAR *from,
|
||||
+ unsigned len) {
|
||||
+ int bump = (--len % CHUNKCOPY_CHUNK_SIZE) + 1;
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += bump;
|
||||
+ from += bump;
|
||||
+ len /= CHUNKCOPY_CHUNK_SIZE;
|
||||
+ while (len-- > 0) {
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += CHUNKCOPY_CHUNK_SIZE;
|
||||
+ from += CHUNKCOPY_CHUNK_SIZE;
|
||||
+ }
|
||||
+ return out;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Like chunkcopy_core, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_core_safe(unsigned char FAR *out,
|
||||
+ const unsigned char FAR * from,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ if (limit - out < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ const unsigned char FAR * Z_RESTRICT rfrom = from;
|
||||
+ if (len & 8) { __builtin_memcpy(out, rfrom, 8); out += 8; rfrom += 8; }
|
||||
+ if (len & 4) { __builtin_memcpy(out, rfrom, 4); out += 4; rfrom += 4; }
|
||||
+ if (len & 2) { __builtin_memcpy(out, rfrom, 2); out += 2; rfrom += 2; }
|
||||
+ if (len & 1) { *out++ = *rfrom++; }
|
||||
+ return out;
|
||||
+ }
|
||||
+ return chunkcopy_core(out, from, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform short copies until distance can be rewritten as being at least
|
||||
+ CHUNKCOPY_CHUNK_SIZE.
|
||||
+
|
||||
+ This assumes that it's OK to overwrite at least the first
|
||||
+ 2*CHUNKCOPY_CHUNK_SIZE bytes of output even if the copy is shorter than
|
||||
+ this. This assumption holds within inflate_fast() which starts every
|
||||
+ iteration with at least 258 bytes of output space available (258 being the
|
||||
+ maximum length output from a single token; see inffast.c).
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkunroll_relaxed(unsigned char FAR *out,
|
||||
+ unsigned FAR *dist,
|
||||
+ unsigned FAR *len) {
|
||||
+ const unsigned char FAR *from = out - *dist;
|
||||
+ while (*dist < *len && *dist < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ storechunk(out, loadchunk(from));
|
||||
+ out += *dist;
|
||||
+ *len -= *dist;
|
||||
+ *dist += *dist;
|
||||
+ }
|
||||
+ return out;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static inline uint8x16_t chunkset_vld1q_dup_u8x8(const unsigned char FAR * Z_RESTRICT from) {
|
||||
+#if defined(__clang__) || defined(__aarch64__)
|
||||
+ return vreinterpretq_u8_u64(vld1q_dup_u64((void *)from));
|
||||
+#else
|
||||
+ /* 32-bit GCC uses an alignment hint for vld1q_dup_u64, even when given a
|
||||
+ * void pointer, so here's an alternate implementation.
|
||||
+ */
|
||||
+ uint8x8_t h = vld1_u8(from);
|
||||
+ return vcombine_u8(h, h);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform an overlapping copy which behaves as a memset() operation, but
|
||||
+ supporting periods other than one, and assume that length is non-zero and
|
||||
+ that it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE*3 bytes of output
|
||||
+ even if the length is shorter than this.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkset_core(unsigned char FAR *out,
|
||||
+ unsigned period,
|
||||
+ unsigned len) {
|
||||
+ uint8x16_t f;
|
||||
+ int bump = ((len - 1) % sizeof(f)) + 1;
|
||||
+
|
||||
+ switch (period) {
|
||||
+ case 1:
|
||||
+ f = vld1q_dup_u8(out - 1);
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ while (len > 0) {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 2:
|
||||
+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2)));
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = vreinterpretq_u8_u16(vld1q_dup_u16((void *)(out - 2)));
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 4:
|
||||
+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4)));
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = vreinterpretq_u8_u32(vld1q_dup_u32((void *)(out - 4)));
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ case 8:
|
||||
+ f = chunkset_vld1q_dup_u8x8(out - 8);
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += bump;
|
||||
+ len -= bump;
|
||||
+ if (len > 0) {
|
||||
+ f = chunkset_vld1q_dup_u8x8(out - 8);
|
||||
+ do {
|
||||
+ vst1q_u8(out, f);
|
||||
+ out += sizeof(f);
|
||||
+ len -= sizeof(f);
|
||||
+ } while (len > 0);
|
||||
+ }
|
||||
+ return out;
|
||||
+ }
|
||||
+ out = chunkunroll_relaxed(out, &period, &len);
|
||||
+ return chunkcopy_core(out, out - period, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform a memcpy-like operation, but assume that length is non-zero and that
|
||||
+ it's OK to overwrite at least CHUNKCOPY_CHUNK_SIZE bytes of output even if
|
||||
+ the length is shorter than this.
|
||||
+
|
||||
+ Unlike chunkcopy_core() above, no guarantee is made regarding the behaviour
|
||||
+ of overlapping buffers, regardless of the distance between the pointers.
|
||||
+ This is reflected in the `restrict`-qualified pointers, allowing the
|
||||
+ compiler to reorder loads and stores.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_relaxed(unsigned char FAR * Z_RESTRICT out,
|
||||
+ const unsigned char FAR * Z_RESTRICT from,
|
||||
+ unsigned len) {
|
||||
+ return chunkcopy_core(out, from, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Like chunkcopy_relaxed, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Unlike chunkcopy_core_safe() above, no guarantee is made regarding the
|
||||
+ behaviour of overlapping buffers, regardless of the distance between the
|
||||
+ pointers. This is reflected in the `restrict`-qualified pointers, allowing
|
||||
+ the compiler to reorder loads and stores.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_safe(unsigned char FAR *out,
|
||||
+ const unsigned char FAR * Z_RESTRICT from,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ return chunkcopy_core_safe(out, from, len, limit);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Perform chunky copy within the same buffer, where the source and destination
|
||||
+ may potentially overlap.
|
||||
+
|
||||
+ Assumes that len > 0 on entry, and that it's safe to write at least
|
||||
+ CHUNKCOPY_CHUNK_SIZE*3 bytes to the output.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_lapped_relaxed(unsigned char FAR *out,
|
||||
+ unsigned dist,
|
||||
+ unsigned len) {
|
||||
+ if (dist < len && dist < CHUNKCOPY_CHUNK_SIZE) {
|
||||
+ return chunkset_core(out, dist, len);
|
||||
+ }
|
||||
+ return chunkcopy_core(out, out - dist, len);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ Behave like chunkcopy_lapped_relaxed, but avoid writing beyond of legal output.
|
||||
+
|
||||
+ Accepts an additional pointer to the end of safe output. A generic safe
|
||||
+ copy would use (out + len), but it's normally the case that the end of the
|
||||
+ output buffer is beyond the end of the current copy, and this can still be
|
||||
+ exploited.
|
||||
+ */
|
||||
+static inline unsigned char FAR *chunkcopy_lapped_safe(unsigned char FAR *out,
|
||||
+ unsigned dist,
|
||||
+ unsigned len,
|
||||
+ unsigned char FAR *limit) {
|
||||
+ Assert(out + len <= limit, "chunk copy exceeds safety limit");
|
||||
+ if (limit - out < CHUNKCOPY_CHUNK_SIZE * 3) {
|
||||
+ /* TODO: try harder to optimise this */
|
||||
+ while (len-- > 0) {
|
||||
+ *out = *(out - dist);
|
||||
+ out++;
|
||||
+ }
|
||||
+ return out;
|
||||
+ }
|
||||
+ return chunkcopy_lapped_relaxed(out, dist, len);
|
||||
+}
|
||||
+
|
||||
+#undef Z_RESTRICT
|
||||
+
|
||||
+#endif /* CHUNKCOPY_H */
|
||||
diff --git a/contrib/arm/inffast.c b/contrib/arm/inffast.c
|
||||
index 0dbd1dbc..f7f50071 100644
|
||||
--- a/contrib/arm/inffast.c
|
||||
+++ b/contrib/arm/inffast.c
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
#include "inffast.h"
|
||||
+#include "chunkcopy.h"
|
||||
|
||||
#ifdef ASMINF
|
||||
# pragma message("Assembler code may have bugs -- use at your own risk")
|
||||
@@ -57,6 +58,7 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
unsigned char FAR *out; /* local strm->next_out */
|
||||
unsigned char FAR *beg; /* inflate()'s initial strm->next_out */
|
||||
unsigned char FAR *end; /* while out < end, enough space available */
|
||||
+ unsigned char FAR *limit; /* safety limit for chunky copies */
|
||||
#ifdef INFLATE_STRICT
|
||||
unsigned dmax; /* maximum distance from zlib header */
|
||||
#endif
|
||||
@@ -84,12 +86,13 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
out = strm->next_out;
|
||||
beg = out - (start - strm->avail_out);
|
||||
end = out + (strm->avail_out - 257);
|
||||
+ limit = out + strm->avail_out;
|
||||
#ifdef INFLATE_STRICT
|
||||
dmax = state->dmax;
|
||||
#endif
|
||||
wsize = state->wsize;
|
||||
whave = state->whave;
|
||||
- wnext = state->wnext;
|
||||
+ wnext = (state->wnext == 0 && whave >= wsize) ? wsize : state->wnext;
|
||||
window = state->window;
|
||||
hold = state->hold;
|
||||
bits = state->bits;
|
||||
@@ -197,70 +200,51 @@ unsigned start; /* inflate()'s starting value for strm->avail_out */
|
||||
#endif
|
||||
}
|
||||
from = window;
|
||||
- if (wnext == 0) { /* very common case */
|
||||
- from += wsize - op;
|
||||
- if (op < len) { /* some from window */
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
+ if (wnext >= op) { /* contiguous in window */
|
||||
+ from += wnext - op;
|
||||
}
|
||||
- else if (wnext < op) { /* wrap around window */
|
||||
- from += wsize + wnext - op;
|
||||
+ else { /* wrap around window */
|
||||
op -= wnext;
|
||||
+ from += wsize - op;
|
||||
if (op < len) { /* some from end of window */
|
||||
len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = window;
|
||||
- if (wnext < len) { /* some from start of window */
|
||||
- op = wnext;
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
+ out = chunkcopy_safe(out, from, op, limit);
|
||||
+ from = window; /* more from start of window */
|
||||
+ op = wnext;
|
||||
+ /* This (rare) case can create a situation where
|
||||
+ the first chunkcopy below must be checked.
|
||||
+ */
|
||||
}
|
||||
}
|
||||
- else { /* contiguous in window */
|
||||
- from += wnext - op;
|
||||
- if (op < len) { /* some from window */
|
||||
- len -= op;
|
||||
- do {
|
||||
- *out++ = *from++;
|
||||
- } while (--op);
|
||||
- from = out - dist; /* rest from output */
|
||||
- }
|
||||
- }
|
||||
- while (len > 2) {
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- len -= 3;
|
||||
- }
|
||||
- if (len) {
|
||||
- *out++ = *from++;
|
||||
- if (len > 1)
|
||||
- *out++ = *from++;
|
||||
+ if (op < len) { /* still need some from output */
|
||||
+ out = chunkcopy_safe(out, from, op, limit);
|
||||
+ len -= op;
|
||||
+ /* When dist is small the amount of data that can be
|
||||
+ copied from the window is also small, and progress
|
||||
+ towards the dangerous end of the output buffer is
|
||||
+ also small. This means that for trivial memsets and
|
||||
+ for chunkunroll_relaxed() a safety check is
|
||||
+ unnecessary. However, these conditions may not be
|
||||
+ entered at all, and in that case it's possible that
|
||||
+ the main copy is near the end.
|
||||
+ */
|
||||
+ out = chunkunroll_relaxed(out, &dist, &len);
|
||||
+ out = chunkcopy_safe(out, out - dist, len, limit);
|
||||
+ } else {
|
||||
+ /* from points to window, so there is no risk of
|
||||
+ overlapping pointers requiring memset-like behaviour
|
||||
+ */
|
||||
+ out = chunkcopy_safe(out, from, len, limit);
|
||||
}
|
||||
}
|
||||
else {
|
||||
- from = out - dist; /* copy direct from output */
|
||||
- do { /* minimum length is three */
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- *out++ = *from++;
|
||||
- len -= 3;
|
||||
- } while (len > 2);
|
||||
- if (len) {
|
||||
- *out++ = *from++;
|
||||
- if (len > 1)
|
||||
- *out++ = *from++;
|
||||
- }
|
||||
+ /* Whole reference is in range of current output. No
|
||||
+ range checks are necessary because we start with room
|
||||
+ for at least 258 bytes of output, so unroll and roundoff
|
||||
+ operations can write beyond `out+len` so long as they
|
||||
+ stay within 258 bytes of `out`.
|
||||
+ */
|
||||
+ out = chunkcopy_lapped_relaxed(out, dist, len);
|
||||
}
|
||||
}
|
||||
else if ((op & 64) == 0) { /* 2nd level distance code */
|
||||
diff --git a/contrib/arm/inflate.c b/contrib/arm/inflate.c
|
||||
index ac333e8c..e40322c3 100644
|
||||
--- a/contrib/arm/inflate.c
|
||||
+++ b/contrib/arm/inflate.c
|
||||
@@ -84,6 +84,7 @@
|
||||
#include "inftrees.h"
|
||||
#include "inflate.h"
|
||||
#include "inffast.h"
|
||||
+#include "contrib/arm/chunkcopy.h"
|
||||
|
||||
#ifdef MAKEFIXED
|
||||
# ifndef BUILDFIXED
|
||||
@@ -405,10 +406,20 @@ unsigned copy;
|
||||
|
||||
/* if it hasn't been done already, allocate space for the window */
|
||||
if (state->window == Z_NULL) {
|
||||
+ unsigned wsize = 1U << state->wbits;
|
||||
state->window = (unsigned char FAR *)
|
||||
- ZALLOC(strm, 1U << state->wbits,
|
||||
+ ZALLOC(strm, wsize + CHUNKCOPY_CHUNK_SIZE,
|
||||
sizeof(unsigned char));
|
||||
if (state->window == Z_NULL) return 1;
|
||||
+#ifdef INFLATE_CLEAR_UNUSED_UNDEFINED
|
||||
+ /* Copies from the overflow portion of this buffer are undefined and
|
||||
+ may cause analysis tools to raise a warning if we don't initialize
|
||||
+ it. However, this undefined data overwrites other undefined data
|
||||
+ and is subsequently either overwritten or left deliberately
|
||||
+ undefined at the end of decode; so there's really no point.
|
||||
+ */
|
||||
+ memset(state->window + wsize, 0, CHUNKCOPY_CHUNK_SIZE);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/* if window not in use yet, initialize */
|
||||
@@ -1175,17 +1186,16 @@ int flush;
|
||||
else
|
||||
from = state->window + (state->wnext - copy);
|
||||
if (copy > state->length) copy = state->length;
|
||||
+ if (copy > left) copy = left;
|
||||
+ put = chunkcopy_safe(put, from, copy, put + left);
|
||||
}
|
||||
else { /* copy from output */
|
||||
- from = put - state->offset;
|
||||
copy = state->length;
|
||||
+ if (copy > left) copy = left;
|
||||
+ put = chunkcopy_lapped_safe(put, state->offset, copy, put + left);
|
||||
}
|
||||
- if (copy > left) copy = left;
|
||||
left -= copy;
|
||||
state->length -= copy;
|
||||
- do {
|
||||
- *put++ = *from++;
|
||||
- } while (--copy);
|
||||
if (state->length == 0) state->mode = LEN;
|
||||
break;
|
||||
case LIT:
|
@ -238,7 +238,6 @@ foreach my $mirror (@ARGV) {
|
||||
push @mirrors, "http://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
|
||||
push @mirrors, "http://nongnu.uib.no/$1";
|
||||
push @mirrors, "http://ftp.igh.cnrs.fr/pub/nongnu/$1";
|
||||
push @mirrors, "http://public.p-knowledge.co.jp/Savannah-nongnu-mirror/$1";
|
||||
push @mirrors, "ftp://cdimage.debian.org/mirror/gnu.org/savannah/$1";
|
||||
push @mirrors, "ftp://ftp.acc.umu.se/mirror/gnu.org/savannah/$1";
|
||||
} elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
|
||||
@ -252,7 +251,6 @@ foreach my $mirror (@ARGV) {
|
||||
push @mirrors, "https://mirrors.cqu.edu.cn/kernel/$dir";
|
||||
push @mirrors, "https://mirrors.ustc.edu.cn/kernel.org/$dir";
|
||||
push @mirrors, "https://cdn.kernel.org/pub/$dir";
|
||||
push @mirrors, "https://mirror.rackspace.com/kernel.org/pub/$dir";
|
||||
push @mirrors, "https://download.xs4all.nl/ftp.kernel.org/pub/$dir";
|
||||
push @mirrors, "https://mirrors.mit.edu/kernel/$dir";
|
||||
push @mirrors, "http://ftp.nara.wide.ad.jp/pub/kernel.org/$dir";
|
||||
|
@ -196,10 +196,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -150,10 +150,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -41,8 +41,6 @@
|
||||
reg-io-width = <4>;
|
||||
reg-shift = <2>;
|
||||
no-loopback-test;
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
usb_phy: usb-phy@18030000 {
|
||||
|
@ -48,10 +48,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
ngpios = <31>;
|
||||
gpio-line-names =
|
||||
|
@ -91,7 +91,3 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -120,10 +120,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mdio0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -212,10 +212,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pll {
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
@ -159,10 +159,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pll {
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
@ -117,7 +117,3 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -102,10 +102,6 @@
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mdio0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -188,10 +188,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -75,10 +75,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mdio0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -67,10 +67,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -181,7 +181,3 @@
|
||||
pinctrl-single,bits = <0x0 0x0 0xf8>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -157,7 +157,3 @@
|
||||
pinctrl-single,bits = <0x0 0x0 0xf8>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -90,10 +90,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -196,7 +196,3 @@
|
||||
gpio-controller;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -129,7 +129,3 @@
|
||||
gpio-controller;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -115,7 +115,3 @@
|
||||
pinctrl-single,bits = <0x0 0x0 0xf8>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -201,7 +201,3 @@
|
||||
gpio-controller;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -185,10 +185,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -104,7 +104,3 @@
|
||||
mtd-mac-address = <&uboot 0x1fc00>;
|
||||
mtd-mac-address-increment = <1>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -150,7 +150,3 @@
|
||||
mtd-mac-address = <&uboot 0x1fc00>;
|
||||
mtd-mac-address-increment = <1>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -27,10 +27,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pll {
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
@ -133,10 +133,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie {
|
||||
status = "okay";
|
||||
|
||||
|
@ -144,10 +144,6 @@
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -217,10 +217,6 @@
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb_phy {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -69,10 +69,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -69,10 +69,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -90,10 +90,6 @@
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&mdio0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -134,10 +134,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
@ -128,10 +128,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð1 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -45,8 +45,6 @@
|
||||
reg-io-width = <4>;
|
||||
reg-shift = <2>;
|
||||
no-loopback-test;
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
gpio: gpio@18040000 {
|
||||
|
@ -15,10 +15,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -72,8 +72,6 @@
|
||||
reg-io-width = <4>;
|
||||
reg-shift = <2>;
|
||||
no-loopback-test;
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
gpio: gpio@18040000 {
|
||||
|
@ -62,10 +62,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pll {
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
@ -79,10 +79,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pll {
|
||||
clocks = <&extosc>;
|
||||
};
|
||||
|
@ -106,10 +106,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -8,6 +8,10 @@
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
cpus {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@ -41,8 +45,6 @@
|
||||
|
||||
clocks = <&pll ATH79_CLK_REF>;
|
||||
clock-names = "uart";
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
gpio: gpio@18040000 {
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "dlink,dir-505", "qca,ar9330";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power_green;
|
||||
led-failsafe = &led_status_red;
|
||||
led-running = &led_power_green;
|
||||
@ -50,10 +49,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
led_enable {
|
||||
gpio-hog;
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "glinet,gl-ar150", "qca,ar9330";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -62,10 +61,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -11,7 +11,6 @@
|
||||
};
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power_blue;
|
||||
led-failsafe = &led_power_blue;
|
||||
led-running = &led_power_blue;
|
||||
@ -78,10 +77,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pqi,air-pen", "qca,ar9330";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_wlan;
|
||||
led-failsafe = &led_wlan;
|
||||
led-upgrade = &led_wlan;
|
||||
@ -50,10 +49,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "8dev,carambola2", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
label-mac-device = &wmac;
|
||||
};
|
||||
|
||||
@ -49,10 +48,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -11,7 +11,6 @@
|
||||
led-boot = &led_vpn;
|
||||
led-failsafe = &led_vpn;
|
||||
led-upgrade = &led_vpn;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
keys {
|
||||
@ -111,10 +110,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -9,10 +9,6 @@
|
||||
model = "Arduino Yun";
|
||||
compatible = "arduino,yun", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
chosen {
|
||||
bootargs = "console=ttyATH0,250000";
|
||||
};
|
||||
@ -107,14 +103,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinmux {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&jtag_disable_pins &switch_led_disable_pins>;
|
||||
|
@ -14,7 +14,6 @@
|
||||
led-failsafe = &led_status;
|
||||
led-running = &led_status;
|
||||
led-upgrade = &led_status;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
leds {
|
||||
@ -43,10 +42,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -13,7 +13,6 @@
|
||||
led-boot = &led_etactica;
|
||||
led-failsafe = &led_etactica;
|
||||
led-upgrade = &led_etactica;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
keys {
|
||||
@ -53,10 +52,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
label-mac-device = &wmac;
|
||||
};
|
||||
|
||||
@ -65,10 +64,6 @@
|
||||
mtd-mac-address = <&uboot 0x1fc00>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
vbus-supply = <®_usb_vbus>;
|
||||
|
@ -10,7 +10,6 @@
|
||||
model = "GL.iNet GL-MiFi";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
label-mac-device = ð0;
|
||||
};
|
||||
|
||||
@ -69,10 +68,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
model = "GL.iNet GL-USB150";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
|
@ -6,10 +6,6 @@
|
||||
#include <dt-bindings/input/input.h>
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
keys: keys {
|
||||
compatible = "gpio-keys";
|
||||
|
||||
@ -87,10 +83,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -14,7 +14,6 @@
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-upgrade = &led_system;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
gpio-export {
|
||||
@ -107,10 +106,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pisen,ts-d084", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-running = &led_system;
|
||||
@ -91,10 +90,6 @@
|
||||
compatible = "syscon", "simple-mfd";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
status = "okay";
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pisen,wmm003n", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-running = &led_system;
|
||||
@ -99,10 +98,6 @@
|
||||
compatible = "syscon", "simple-mfd";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
vbus-supply = <®_usb_vbus>;
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "tplink,tl-mr3020-v1", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_wps;
|
||||
led-failsafe = &led_wps;
|
||||
led-running = &led_wps;
|
||||
@ -86,10 +85,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "tplink,tl-mr3040-v2", "qca,ar9331";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_lan;
|
||||
led-failsafe = &led_lan;
|
||||
label-mac-device = ð0;
|
||||
@ -82,10 +81,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-running = &led_system;
|
||||
@ -97,10 +96,6 @@
|
||||
compatible = "syscon", "simple-mfd";
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
dr_mode = "host";
|
||||
vbus-supply = <®_usb_vbus>;
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-running = &led_system;
|
||||
@ -65,10 +64,6 @@
|
||||
mtd-mac-address-increment = <(-1)>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
model = "TP-Link TL-WR741N/ND v4";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_system;
|
||||
led-failsafe = &led_system;
|
||||
led-running = &led_system;
|
||||
@ -140,10 +139,6 @@
|
||||
mtd-mac-address-increment = <(-1)>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&wmac {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
compatible = "engenius,eap300-v2", "qca,ar9341";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -69,10 +68,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
compatible = "engenius,ens202ext-v1", "qca,ar9341";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -84,10 +83,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
};
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power_blue;
|
||||
led-failsafe = &led_power_blue;
|
||||
led-running = &led_power_blue;
|
||||
@ -82,10 +81,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinmux {
|
||||
led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin {
|
||||
pinctrl-single,bits = <0x10 0x0 0x0000ffff>;
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pcs,cr3000", "qca,ar9341";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -84,10 +83,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
compatible = "pisen,wmb001n", "qca,ar9341";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_wifi;
|
||||
led-failsafe = &led_wifi;
|
||||
led-running = &led_wifi;
|
||||
@ -131,10 +130,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -66,10 +65,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&jtag_disable_pins &pmx_usb_power>;
|
||||
|
@ -7,7 +7,6 @@
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
label-mac-device = &wmac;
|
||||
};
|
||||
};
|
||||
@ -50,10 +49,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -132,7 +132,3 @@
|
||||
rxdv-delay = <3>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -71,10 +71,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -25,10 +25,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pcie {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -57,10 +57,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -65,10 +65,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&gpio {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&jtag_disable_pins>;
|
||||
|
@ -144,10 +144,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&wmac {
|
||||
status = "okay";
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
model = "COMFAST CF-E120A v3";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_rssihigh;
|
||||
led-failsafe = &led_rssihigh;
|
||||
led-upgrade = &led_rssihigh;
|
||||
@ -118,10 +117,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
phy-handle = <&swphy0>;
|
||||
|
@ -61,10 +61,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -128,10 +128,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
led-failsafe = &led_power_orange;
|
||||
led-running = &led_power_blue;
|
||||
led-upgrade = &led_power_orange;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
leds {
|
||||
|
@ -11,7 +11,6 @@
|
||||
led-failsafe = &led_power_orange;
|
||||
led-running = &led_power_green;
|
||||
led-upgrade = &led_power_orange;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
leds {
|
||||
|
@ -119,10 +119,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&usb {
|
||||
status = "okay";
|
||||
#address-cells = <1>;
|
||||
|
@ -13,7 +13,6 @@
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
led-upgrade = &led_power;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
keys {
|
||||
@ -61,10 +60,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -96,10 +96,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinmux {
|
||||
enable_gpio_16: pinmux_enable_gpio_16 {
|
||||
pinctrl-single,bits = <0x10 0x0 0x000000ff>;
|
||||
|
@ -14,7 +14,6 @@
|
||||
led-failsafe = &led_user;
|
||||
led-running = &led_user;
|
||||
led-upgrade = &led_user;
|
||||
serial0 = &uart;
|
||||
};
|
||||
|
||||
leds {
|
||||
@ -163,10 +162,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
status = "okay";
|
||||
|
||||
|
@ -260,7 +260,3 @@
|
||||
gpio-controller;
|
||||
};
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
@ -66,10 +66,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -11,7 +11,6 @@
|
||||
};
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
label-mac-device = ð0;
|
||||
};
|
||||
|
||||
@ -30,10 +29,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -14,7 +14,6 @@
|
||||
};
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power_blue;
|
||||
led-failsafe = &led_power_blue;
|
||||
led-running = &led_power_blue;
|
||||
@ -85,10 +84,6 @@
|
||||
clock-frequency = <40000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinmux {
|
||||
led_lan_wan_blue_pin: pinmux_lan_wan_blue_pin {
|
||||
pinctrl-single,bits = <0xc 0x0 0xffff0000>;
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pcs,cap324", "qca,ar9344";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power_amber;
|
||||
led-failsafe = &led_power_amber;
|
||||
led-running = &led_power_green;
|
||||
@ -73,10 +72,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
@ -10,7 +10,6 @@
|
||||
compatible = "pcs,cr5000", "qca,ar9344";
|
||||
|
||||
aliases {
|
||||
serial0 = &uart;
|
||||
led-boot = &led_power;
|
||||
led-failsafe = &led_power;
|
||||
led-running = &led_power;
|
||||
@ -65,10 +64,6 @@
|
||||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
&uart {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&spi {
|
||||
status = "okay";
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user