diff options
Diffstat (limited to 'target/linux/apm821xx')
3 files changed, 5 insertions, 48 deletions
diff --git a/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch b/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch index 2459dd3221..2b4452b7de 100644 --- a/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch +++ b/target/linux/apm821xx/patches-4.4/001-crypto4xx-integrate-ppc4xx-rng-into-crypto4xx.patch @@ -240,7 +240,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> #define PPC4XX_SEC_VERSION_STR "0.5" -@@ -1230,6 +1231,7 @@ static int crypto4xx_probe(struct platfo +@@ -1221,6 +1222,7 @@ static int crypto4xx_probe(struct platfo if (rc) goto err_start_dev; @@ -248,7 +248,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> return 0; err_start_dev: -@@ -1256,6 +1258,8 @@ static int crypto4xx_remove(struct platf +@@ -1247,6 +1249,8 @@ static int crypto4xx_remove(struct platf struct device *dev = &ofdev->dev; struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev); @@ -257,7 +257,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> free_irq(core_dev->irq, dev); irq_dispose_mapping(core_dev->irq); -@@ -1276,7 +1280,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match) +@@ -1267,7 +1271,7 @@ MODULE_DEVICE_TABLE(of, crypto4xx_match) static struct platform_driver crypto4xx_driver = { .driver = { @@ -266,7 +266,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> .of_match_table = crypto4xx_match, }, .probe = crypto4xx_probe, -@@ -1288,4 +1292,3 @@ module_platform_driver(crypto4xx_driver) +@@ -1279,4 +1283,3 @@ module_platform_driver(crypto4xx_driver) MODULE_LICENSE("GPL"); MODULE_AUTHOR("James Hsiao <jhsiao@amcc.com>"); MODULE_DESCRIPTION("Driver for AMCC PPC4xx crypto accelerator"); diff --git a/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch b/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch deleted file mode 100644 index 428b416a67..0000000000 --- a/target/linux/apm821xx/patches-4.4/003-Revert-crypto-crypto4xx-properly-set-IV-after-de-and.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8d9f1b2c4ad8b86c4a5af5e4787ea4eae7853f6d Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens <hauke@hauke-m.de> -Date: Thu, 20 Jun 2019 11:29:15 +0200 -Subject: Revert "crypto: crypto4xx - properly set IV after de- and encrypt" - -This reverts commit e9a60ab1609a7d975922adad1bf9c46ac6954584. - -This fixes a compile problem in upstream kernel 4.4. ---- - drivers/crypto/amcc/crypto4xx_alg.c | 3 +-- - drivers/crypto/amcc/crypto4xx_core.c | 9 --------- - 2 files changed, 1 insertion(+), 11 deletions(-) - ---- a/drivers/crypto/amcc/crypto4xx_alg.c -+++ b/drivers/crypto/amcc/crypto4xx_alg.c -@@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct c - sa = (struct dynamic_sa_ctl *) ctx->sa_in; - ctx->hash_final = 0; - -- set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ? -- SA_SAVE_IV : SA_NOT_SAVE_IV), -+ set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV, - SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE, - SA_NO_HEADER_PROC, SA_HASH_ALG_NULL, - SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO, ---- a/drivers/crypto/amcc/crypto4xx_core.c -+++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -646,15 +646,6 @@ static u32 crypto4xx_ablkcipher_done(str - addr = dma_map_page(dev->core_dev->device, sg_page(dst), - dst->offset, dst->length, DMA_FROM_DEVICE); - } -- -- if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) { -- struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req); -- -- crypto4xx_memcpy_from_le32((u32 *)req->iv, -- pd_uinfo->sr_va->save_iv, -- crypto_skcipher_ivsize(skcipher)); -- } -- - crypto4xx_ret_sg_desc(dev, pd_uinfo); - if (ablk_req->base.complete != NULL) - ablk_req->base.complete(&ablk_req->base, 0); diff --git a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch index 2adcfef309..af3108d4b9 100644 --- a/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch +++ b/target/linux/apm821xx/patches-4.4/040-backport_leds-convert-IDE-trigger-to-common-disk-trigger.patch @@ -47,7 +47,7 @@ Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> #include <linux/pm_runtime.h> #include <linux/platform_device.h> -@@ -4946,6 +4947,9 @@ void ata_qc_complete(struct ata_queued_c +@@ -4949,6 +4950,9 @@ void ata_qc_complete(struct ata_queued_c { struct ata_port *ap = qc->ap; |