Skip to contentSkip to conversation

Patch "crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Dec 13, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
crypto-caam-fix-pointer-size-for-aarch64-boot-loader-aarch32-kernel.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 39eaf759466f4e3fbeaa39075512f4f345dffdc8 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Horia=20Geant=C4=83?= <[email protected]>
Date: Mon, 5 Dec 2016 11:06:58 +0200
Subject: crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Horia Geantă <[email protected]>

commit 39eaf759466f4e3fbeaa39075512f4f345dffdc8 upstream.

Start with a clean slate before dealing with bit 16 (pointer size) of Master Configuration Register.
This fixes the case of AArch64 boot loader + AArch32 kernel, when the boot loader might set MCFGR[PS] and kernel would fail to clear it.

---
 drivers/crypto/caam/ctrl.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/crypto/caam/ctrl.c +3 -2
@@ -557,8 +557,9 @@ static int caam_probe(struct platform_de
 	 * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,
 	 * long pointers in master configuration register
 	 */
-	clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |
-		      MCFGR_AWCACHE_BUFF | MCFGR_WDENABLE | MCFGR_LARGE_BURST |
+	clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK | MCFGR_LONG_PTR,
+		      MCFGR_AWCACHE_CACH | MCFGR_AWCACHE_BUFF |
+		      MCFGR_WDENABLE | MCFGR_LARGE_BURST |
 		      (sizeof(dma_addr_t) == sizeof(u64) ? MCFGR_LONG_PTR : 0));
 
 	/*

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/crypto-caam-fix-pointer-size-for-aarch64-boot-loader-aarch32-kernel.patch