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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAl++RYIaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJf4AQ/8DtO6CixvM9VKOwfwb+I+
 ww5oLpWCfqxI7/Mnr6pGN3OmLKC972lD+KbbsrWMpT13KwY5Uk7s7NQfHAz4Qy2e
 c9eO9ntCfrcUCezkL/+CVFPoBFAFRZC+0wKxK2/q0e7W7um8LSEXAkFhQbg21VqR
 e5fIn9MZE4cazOsV1Cs4Gz7Qtebt8qjmAQLNxm7Pck3zv/XupPDikRQobsdEL+qn
 FA6wGVP8S7rFR+zQnaZHTAk90BxRPmFT/1Fod6z7CSVPwHUxUTUkUVNey2kXALK+
 LVTvcdjiHtdaSqjw/Oax3Y2RDaJ3RSOLSxzTKugmHYlOg4f25dJn8MNrERBekHSn
 6hJOGSlaMs4Mmbe1jiyreRsB2tLwUhWlS8EqSj2SmefBIKJJic9Vek3mwp1aPGX3
 gdSmxGrdOhLLy80Szdpjp9zir+i7dKdVzm6oAO/0JHT9VpIUIx6ciGgB6wSFYxDJ
 0EA0j5Ab18K7PGunL1m1boYh0ck/+438GYycSF2CkLkSy8CHp7N8XdTfBW4jljAa
 4ugH7kZmry6XEBbLltMDdNGXAM9wE38ma3Viz9XZ80TfnWmzII3lhwX3/rAnDNbV
 XYc+baLNBpEJvV+R944hbcTEfbcWkRXM3zvvVa1ZFv5ES7Sx2eupNSedE9tXSAFl
 JrkTej9xXtF1rEYqMcwRTRM=
 =umMU
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2020-11-27 17:45:45 +01:00
commit ae597565d1

View File

@ -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