Home Explore Help
Register Sign In
wareck
/
openwrt_lede
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 488fc98adf
Branches Tags
openwrt_lede
/
target
/
linux
/
layerscape
/
patches-4.4
/
3033-arm64-add-ioremap-for-normal-cacheable-non-shareable.patch

3033-arm64-add-ioremap-for-normal-cacheable-non-shareable.patch 2.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142 
  1. From 6ef5cf7b8f6b86fb3856f3449f1ad431118e5c9d Mon Sep 17 00:00:00 2001
    2. 

  2. From: Haiying Wang <Haiying.Wang@freescale.com>
    3. 

  3. Date: Wed, 22 Apr 2015 13:07:25 -0400
    4. 

  4. Subject: [PATCH 33/70] arm64: add ioremap for normal cacheable non-shareable
    5. 

  5.  memory
    6. 

  6. 

  7. [context adjustment]
    8. 

  8. 

  9. Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
    10. 

  10. Change-Id: Iab7413f182a64bd6ad4707dd1d6254d04f51a3b1
    11. 

  11. Reviewed-on: http://git.am.freescale.net:8181/35486
    12. 

  12. Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
    13. 

  13. Reviewed-by: Roy Pledge <roy.pledge@freescale.com>
    14. 

  14. Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com>
    15. 

  15. Integrated-by: Jiang Yutang <yutang.jiang@nxp.com>
    16. 

  16. ---
    17. 

  17.  arch/arm64/include/asm/io.h      |    2 ++
    18. 

  18.  arch/arm64/include/asm/pgtable.h |    2 ++
    19. 

  19.  2 files changed, 4 insertions(+)
    20. 

  20. 

  21. --- a/arch/arm64/include/asm/io.h
    22. 

  22. +++ b/arch/arm64/include/asm/io.h
    23. 

  23. @@ -171,6 +171,8 @@ extern void __iomem *ioremap_cache(phys_
    24. 

  24.  #define ioremap_nocache(addr, size)	__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
    25. 

  25.  #define ioremap_wc(addr, size)		__ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))
    26. 

  26.  #define ioremap_wt(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
    27. 

  27. +#define ioremap_cache_ns(addr, size)	__ioremap((addr), (size), \
    28. 

  28. +						 __pgprot(PROT_NORMAL_NS))
    29. 

  29.  #define iounmap				__iounmap
    30. 

  30.  
    31. 

  31.  /*
    32. 

  32. --- a/arch/arm64/include/asm/pgtable.h
    33. 

  33. +++ b/arch/arm64/include/asm/pgtable.h
    34. 

  34. @@ -74,6 +74,8 @@ extern void __pgd_error(const char *file
    35. 

  35.  #define PROT_NORMAL_NC		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_NC))
    36. 

  36.  #define PROT_NORMAL_WT		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL_WT))
    37. 

  37.  #define PROT_NORMAL		(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_NORMAL))
    38. 

  38. +#define PROT_NORMAL_NS		(PTE_TYPE_PAGE | PTE_AF | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | \
    39. 

  39. +				 PTE_ATTRINDX(MT_NORMAL))
    40. 

  40.  
    41. 

  41.  #define PROT_SECT_DEVICE_nGnRE	(PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_DEVICE_nGnRE))
    42. 

  42.  #define PROT_SECT_NORMAL	(PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL))
    43.