diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 13:01:53 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 12:59:26 +0200 |
| commit | b765f4be407ca407c8f446a0970aab8e7e93bffb (patch) | |
| tree | c7fa07cd13ad6e5bb380a14a7c7e4e5f49d383b0 /target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch | |
| parent | 456f486b53a7cbe7035dca7323f6b5fdb58be444 (diff) | |
| download | upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.gz upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.tar.bz2 upstream-b765f4be407ca407c8f446a0970aab8e7e93bffb.zip | |
kernel: bump 4.14 to 4.14.114
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Remove upstreamed:
- 022-0006-crypto-crypto4xx-properly-set-IV-after-de-and-encryp.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch index fc8df38867..1b13c345cc 100644 --- a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch +++ b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1075,9 +1075,6 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1084,9 +1084,6 @@ static irqreturn_t crypto4xx_ce_interrup struct device *dev = (struct device *)data; struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev); @@ -27,7 +27,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> writel(PPC4XX_INTERRUPT_CLR, core_dev->dev->ce_base + CRYPTO4XX_INT_CLR); tasklet_schedule(&core_dev->tasklet); -@@ -1325,13 +1322,6 @@ static int crypto4xx_probe(struct platfo +@@ -1334,13 +1331,6 @@ static int crypto4xx_probe(struct platfo tasklet_init(&core_dev->tasklet, crypto4xx_bh_tasklet_cb, (unsigned long) dev); @@ -41,7 +41,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0); if (!core_dev->dev->ce_base) { dev_err(dev, "failed to of_iomap\n"); -@@ -1339,6 +1329,13 @@ static int crypto4xx_probe(struct platfo +@@ -1348,6 +1338,13 @@ static int crypto4xx_probe(struct platfo goto err_iomap; } @@ -55,7 +55,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> /* need to setup pdr, rdr, gdr and sdr before this */ crypto4xx_hw_init(core_dev->dev); -@@ -1352,11 +1349,11 @@ static int crypto4xx_probe(struct platfo +@@ -1361,11 +1358,11 @@ static int crypto4xx_probe(struct platfo return 0; err_start_dev: |