mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
Remove deprecated patches
This commit is contained in:
Igor Pecovnik
parent
f183a85cf2
commit
9f78d1b26e
2 changed files with 0 additions and 262 deletions
|
|
@ -1,64 +0,0 @@
|
|||
From 8e69c52d77837dbd6c5ee8fda2af97ee5c1eacb0 Mon Sep 17 00:00:00 2001
|
||||
From: Myy <myy@miouyouyou.fr>
|
||||
Date: Sun, 12 Mar 2017 19:15:12 +0000
|
||||
Subject: [PATCH 06/12] [Adaptation] ARM: dts: rockchip: fix the MiQi board's
|
||||
LED definition
|
||||
|
||||
The MiQi board's green LED doesn't work at all with the mainline kernel.
|
||||
There are multiple reasons to this. First, the gpio number is wrong, it
|
||||
is declared on gpio220 (chip 7 pin 4) instead of gpio218 (chip 7 pin 2).
|
||||
Second, a pinctrl is referenced, also declared with the same wrong value
|
||||
while it is not unused. Third, the GPIO polarity was wrong (active low
|
||||
instead of active high) with the default value set to "default-on",
|
||||
resulting in the LED being turned off even when the GPIO is correct.
|
||||
|
||||
This patch fixes all these inconsistencies at once since these they are
|
||||
related to each other, and also restores the "timer" trigger which is
|
||||
the same as the one used by the kernels shipped with the board.
|
||||
|
||||
It's important to note that during the port to mainline, the led's label
|
||||
was changed from "System" to "miqi:green:user", so scripts making use of
|
||||
the name will still not work until they're fixed.
|
||||
|
||||
Fixes: 162718c (v4.7)
|
||||
Cc: Heiko Stuebner <heiko@sntech.de>
|
||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
||||
Signed-off-by: Myy <myy@miouyouyou.fr>
|
||||
---
|
||||
arch/arm/boot/dts/rk3288-miqi.dts | 12 ++----------
|
||||
1 file changed, 2 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||
index 43728c9..7a42069 100644
|
||||
--- a/arch/arm/boot/dts/rk3288-miqi.dts
|
||||
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
|
||||
@@ -68,11 +68,9 @@
|
||||
compatible = "gpio-leds";
|
||||
|
||||
work {
|
||||
- gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_LOW>;
|
||||
+ gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>;
|
||||
label = "miqi:green:user";
|
||||
- linux,default-trigger = "default-on";
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&led_ctl>;
|
||||
+ linux,default-trigger = "timer";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -363,12 +361,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
- leds {
|
||||
- led_ctl: led-ctl {
|
||||
- rockchip,pins = <7 4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
- };
|
||||
- };
|
||||
-
|
||||
sdmmc {
|
||||
/*
|
||||
* Default drive strength isn't enough to achieve even
|
||||
--
|
||||
2.10.2
|
||||
|
||||
|
|
@ -1,198 +0,0 @@
|
|||
From b56f5cbc7e08ec7d31c42fc41e5247677f20b143 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Tue, 14 Feb 2017 21:51:01 +0000
|
||||
Subject: crypto: arm/aes-neonbs - resolve fallback cipher at runtime
|
||||
|
||||
Currently, the bit sliced NEON AES code for ARM has a link time
|
||||
dependency on the scalar ARM asm implementation, which it uses as a
|
||||
fallback to perform CBC encryption and the encryption of the initial
|
||||
XTS tweak.
|
||||
|
||||
The bit sliced NEON code is both fast and time invariant, which makes
|
||||
it a reasonable default on hardware that supports it. However, the
|
||||
ARM asm code it pulls in is not time invariant, and due to the way it
|
||||
is linked in, cannot be overridden by the new generic time invariant
|
||||
driver. In fact, it will not be used at all, given that the ARM asm
|
||||
code registers itself as a cipher with a priority that exceeds the
|
||||
priority of the fixed time cipher.
|
||||
|
||||
So remove the link time dependency, and allocate the fallback cipher
|
||||
via the crypto API. Note that this requires this driver's module_init
|
||||
call to be replaced with late_initcall, so that the (possibly generic)
|
||||
fallback cipher is guaranteed to be available when the builtin test
|
||||
is performed at registration time.
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
||||
---
|
||||
arch/arm/crypto/Kconfig | 2 +-
|
||||
arch/arm/crypto/aes-neonbs-glue.c | 60 +++++++++++++++++++++++++++++----------
|
||||
2 files changed, 46 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
|
||||
index a8fce93..b9adedc 100644
|
||||
--- a/arch/arm/crypto/Kconfig
|
||||
+++ b/arch/arm/crypto/Kconfig
|
||||
@@ -73,7 +73,7 @@ config CRYPTO_AES_ARM_BS
|
||||
depends on KERNEL_MODE_NEON
|
||||
select CRYPTO_BLKCIPHER
|
||||
select CRYPTO_SIMD
|
||||
- select CRYPTO_AES_ARM
|
||||
+ select CRYPTO_AES
|
||||
help
|
||||
Use a faster and more secure NEON based implementation of AES in CBC,
|
||||
CTR and XTS modes
|
||||
diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
|
||||
index 2920b96..c763779 100644
|
||||
--- a/arch/arm/crypto/aes-neonbs-glue.c
|
||||
+++ b/arch/arm/crypto/aes-neonbs-glue.c
|
||||
@@ -42,9 +42,6 @@ asmlinkage void aesbs_xts_encrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||
asmlinkage void aesbs_xts_decrypt(u8 out[], u8 const in[], u8 const rk[],
|
||||
int rounds, int blocks, u8 iv[]);
|
||||
|
||||
-asmlinkage void __aes_arm_encrypt(const u32 rk[], int rounds, const u8 in[],
|
||||
- u8 out[]);
|
||||
-
|
||||
struct aesbs_ctx {
|
||||
int rounds;
|
||||
u8 rk[13 * (8 * AES_BLOCK_SIZE) + 32] __aligned(AES_BLOCK_SIZE);
|
||||
@@ -52,12 +49,12 @@ struct aesbs_ctx {
|
||||
|
||||
struct aesbs_cbc_ctx {
|
||||
struct aesbs_ctx key;
|
||||
- u32 enc[AES_MAX_KEYLENGTH_U32];
|
||||
+ struct crypto_cipher *enc_tfm;
|
||||
};
|
||||
|
||||
struct aesbs_xts_ctx {
|
||||
struct aesbs_ctx key;
|
||||
- u32 twkey[AES_MAX_KEYLENGTH_U32];
|
||||
+ struct crypto_cipher *tweak_tfm;
|
||||
};
|
||||
|
||||
static int aesbs_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
@@ -132,20 +129,18 @@ static int aesbs_cbc_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
|
||||
ctx->key.rounds = 6 + key_len / 4;
|
||||
|
||||
- memcpy(ctx->enc, rk.key_enc, sizeof(ctx->enc));
|
||||
-
|
||||
kernel_neon_begin();
|
||||
aesbs_convert_key(ctx->key.rk, rk.key_enc, ctx->key.rounds);
|
||||
kernel_neon_end();
|
||||
|
||||
- return 0;
|
||||
+ return crypto_cipher_setkey(ctx->enc_tfm, in_key, key_len);
|
||||
}
|
||||
|
||||
static void cbc_encrypt_one(struct crypto_skcipher *tfm, const u8 *src, u8 *dst)
|
||||
{
|
||||
struct aesbs_cbc_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
|
||||
- __aes_arm_encrypt(ctx->enc, ctx->key.rounds, src, dst);
|
||||
+ crypto_cipher_encrypt_one(ctx->enc_tfm, dst, src);
|
||||
}
|
||||
|
||||
static int cbc_encrypt(struct skcipher_request *req)
|
||||
@@ -181,6 +176,23 @@ static int cbc_decrypt(struct skcipher_request *req)
|
||||
return err;
|
||||
}
|
||||
|
||||
+static int cbc_init(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ ctx->enc_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||
+ if (IS_ERR(ctx->enc_tfm))
|
||||
+ return PTR_ERR(ctx->enc_tfm);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void cbc_exit(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_cbc_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ crypto_free_cipher(ctx->enc_tfm);
|
||||
+}
|
||||
+
|
||||
static int ctr_encrypt(struct skcipher_request *req)
|
||||
{
|
||||
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
|
||||
@@ -228,7 +240,6 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
unsigned int key_len)
|
||||
{
|
||||
struct aesbs_xts_ctx *ctx = crypto_skcipher_ctx(tfm);
|
||||
- struct crypto_aes_ctx rk;
|
||||
int err;
|
||||
|
||||
err = xts_verify_key(tfm, in_key, key_len);
|
||||
@@ -236,15 +247,30 @@ static int aesbs_xts_setkey(struct crypto_skcipher *tfm, const u8 *in_key,
|
||||
return err;
|
||||
|
||||
key_len /= 2;
|
||||
- err = crypto_aes_expand_key(&rk, in_key + key_len, key_len);
|
||||
+ err = crypto_cipher_setkey(ctx->tweak_tfm, in_key + key_len, key_len);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
- memcpy(ctx->twkey, rk.key_enc, sizeof(ctx->twkey));
|
||||
-
|
||||
return aesbs_setkey(tfm, in_key, key_len);
|
||||
}
|
||||
|
||||
+static int xts_init(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ ctx->tweak_tfm = crypto_alloc_cipher("aes", 0, 0);
|
||||
+ if (IS_ERR(ctx->tweak_tfm))
|
||||
+ return PTR_ERR(ctx->tweak_tfm);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void xts_exit(struct crypto_tfm *tfm)
|
||||
+{
|
||||
+ struct aesbs_xts_ctx *ctx = crypto_tfm_ctx(tfm);
|
||||
+
|
||||
+ crypto_free_cipher(ctx->tweak_tfm);
|
||||
+}
|
||||
+
|
||||
static int __xts_crypt(struct skcipher_request *req,
|
||||
void (*fn)(u8 out[], u8 const in[], u8 const rk[],
|
||||
int rounds, int blocks, u8 iv[]))
|
||||
@@ -256,7 +282,7 @@ static int __xts_crypt(struct skcipher_request *req,
|
||||
|
||||
err = skcipher_walk_virt(&walk, req, true);
|
||||
|
||||
- __aes_arm_encrypt(ctx->twkey, ctx->key.rounds, walk.iv, walk.iv);
|
||||
+ crypto_cipher_encrypt_one(ctx->tweak_tfm, walk.iv, walk.iv);
|
||||
|
||||
kernel_neon_begin();
|
||||
while (walk.nbytes >= AES_BLOCK_SIZE) {
|
||||
@@ -309,6 +335,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||
.base.cra_ctxsize = sizeof(struct aesbs_cbc_ctx),
|
||||
.base.cra_module = THIS_MODULE,
|
||||
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||
+ .base.cra_init = cbc_init,
|
||||
+ .base.cra_exit = cbc_exit,
|
||||
|
||||
.min_keysize = AES_MIN_KEY_SIZE,
|
||||
.max_keysize = AES_MAX_KEY_SIZE,
|
||||
@@ -342,6 +370,8 @@ static struct skcipher_alg aes_algs[] = { {
|
||||
.base.cra_ctxsize = sizeof(struct aesbs_xts_ctx),
|
||||
.base.cra_module = THIS_MODULE,
|
||||
.base.cra_flags = CRYPTO_ALG_INTERNAL,
|
||||
+ .base.cra_init = xts_init,
|
||||
+ .base.cra_exit = xts_exit,
|
||||
|
||||
.min_keysize = 2 * AES_MIN_KEY_SIZE,
|
||||
.max_keysize = 2 * AES_MAX_KEY_SIZE,
|
||||
@@ -402,5 +432,5 @@ unregister_simds:
|
||||
return err;
|
||||
}
|
||||
|
||||
-module_init(aes_init);
|
||||
+late_initcall(aes_init);
|
||||
module_exit(aes_exit);
|
||||
--
|
||||
cgit v1.1
|
||||
Loading…
Add table
Add a link
Reference in a new issue