Commit ae597565 authored Nov 27, 2020 by Arnd Bergmann

Merge tag 'optee-valid-memory-type-for-v5.11' of...

Merge tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Add writeback to valid OP-TEE shared memory types

Allows OP-TEE to work with ARMv7 based single CPU systems by allowing
writeback cache policy for shared memory.

* tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: add writeback to valid memory type

Link: https://lore.kernel.org/r/20201125120134.GA1642471@jade


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 454a079b 853735e4

drivers/tee/optee/call.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -534,7 +534,8 @@ void optee_free_pages_list(void *list, size_t num_entries)
		static bool is_normal_memory(pgprot_t p)
		{
		#if defined(CONFIG_ARM)
		return (pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC;
		return (((pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEALLOC) \|\|
		((pgprot_val(p) & L_PTE_MT_MASK) == L_PTE_MT_WRITEBACK));
		#elif defined(CONFIG_ARM64)
		return (pgprot_val(p) & PTE_ATTRINDX_MASK) == PTE_ATTRINDX(MT_NORMAL);
		#else

Admin message