| Message ID | 20170814142418.13267-17-julien.grall@arm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen/arm: Memory subsystem clean-up | expand |
Hi, On 14/08/17 15:24, Julien Grall wrote: > They were imported from non-LPAE Linux, but Xen is LPAE only. It is time > to do some clean-up in the memory attribute and keep only what make > sense for Xen. Follow-up patch will do more clean-up. > > Also, update the comment saying our attribute matches Linux. > > Signed-off-by: Julien Grall <julien.grall@arm.com> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre. > --- > xen/include/asm-arm/page.h | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h > index cef2f28914..465300c6e5 100644 > --- a/xen/include/asm-arm/page.h > +++ b/xen/include/asm-arm/page.h > @@ -21,9 +21,9 @@ > #define LPAE_SH_OUTER 0x2 > #define LPAE_SH_INNER 0x3 > > -/* LPAE Memory region attributes, to match Linux's (non-LPAE) choices. > - * Indexed by the AttrIndex bits of a LPAE entry; > - * the 8-bit fields are packed little-endian into MAIR0 and MAIR1 > +/* > + * LPAE Memory region attributes. Indexed by the AttrIndex bits of a > + * LPAE entry; the 8-bit fields are packed little-endian into MAIR0 and MAIR1. > * > * ai encoding > * UNCACHED 000 0000 0000 -- Strongly Ordered > @@ -35,9 +35,7 @@ > * reserved 110 > * WRITEALLOC 111 1111 1111 -- Write-back write-allocate > * > - * DEV_NONSHARED 100 (== DEV_SHARED) > * DEV_WC 001 (== BUFFERABLE) > - * DEV_CACHED 011 (== WRITEBACK) > */ > #define MAIR0VAL 0xeeaa4400 > #define MAIR1VAL 0xff000004 > @@ -57,9 +55,7 @@ > #define WRITEBACK 0x3 > #define DEV_SHARED 0x4 > #define WRITEALLOC 0x7 > -#define DEV_NONSHARED DEV_SHARED > #define DEV_WC BUFFERABLE > -#define DEV_CACHED WRITEBACK > > #define PAGE_HYPERVISOR (WRITEALLOC) > #define PAGE_HYPERVISOR_NOCACHE (DEV_SHARED) >
diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index cef2f28914..465300c6e5 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -21,9 +21,9 @@ #define LPAE_SH_OUTER 0x2 #define LPAE_SH_INNER 0x3 -/* LPAE Memory region attributes, to match Linux's (non-LPAE) choices. - * Indexed by the AttrIndex bits of a LPAE entry; - * the 8-bit fields are packed little-endian into MAIR0 and MAIR1 +/* + * LPAE Memory region attributes. Indexed by the AttrIndex bits of a + * LPAE entry; the 8-bit fields are packed little-endian into MAIR0 and MAIR1. * * ai encoding * UNCACHED 000 0000 0000 -- Strongly Ordered @@ -35,9 +35,7 @@ * reserved 110 * WRITEALLOC 111 1111 1111 -- Write-back write-allocate * - * DEV_NONSHARED 100 (== DEV_SHARED) * DEV_WC 001 (== BUFFERABLE) - * DEV_CACHED 011 (== WRITEBACK) */ #define MAIR0VAL 0xeeaa4400 #define MAIR1VAL 0xff000004 @@ -57,9 +55,7 @@ #define WRITEBACK 0x3 #define DEV_SHARED 0x4 #define WRITEALLOC 0x7 -#define DEV_NONSHARED DEV_SHARED #define DEV_WC BUFFERABLE -#define DEV_CACHED WRITEBACK #define PAGE_HYPERVISOR (WRITEALLOC) #define PAGE_HYPERVISOR_NOCACHE (DEV_SHARED)
They were imported from non-LPAE Linux, but Xen is LPAE only. It is time to do some clean-up in the memory attribute and keep only what make sense for Xen. Follow-up patch will do more clean-up. Also, update the comment saying our attribute matches Linux. Signed-off-by: Julien Grall <julien.grall@arm.com> --- xen/include/asm-arm/page.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)