nios2: change virt_to_phys to use physaddr_mask in global data

PATCH New Thomas Chou 2 participants 3 messages Oct 27, 2015 – Nov 3, 2015 NIOS2 architecture

Share & tools

Thomas Chou

author

2015-10-27 01:09 UTC #0 lore raw

PATCH 1/1 nios2: change virt_to_phys to use physaddr_mask in global data

As virt_to_phys() is used a lot in DMA transfer, change it to use physaddr_mask in global data. This will save an "if" statement and get a little faster.

Signed-off-by Thomas Chou <[email protected]>

---
 arch/nios2/cpu/cpu.c                 | 1 +
 arch/nios2/include/asm/global_data.h | 1 +
 arch/nios2/include/asm/io.h          | 5 +----
 3 files changed, 3 insertions(+), 4 deletions(-)

arch/nios2/cpu/cpu.c +1 -0

index 88c4e18..f6d5cd3 100644
@@ -119,6 +119,7 @@ static int altera_nios2_probe(struct udevice *dev)
 		"altr,has-mmu", 0);
 	gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x80000000;
 	gd->arch.mem_region_base = gd->arch.has_mmu ? 0xc0000000 : 0x00000000;
+	gd->arch.physaddr_mask = gd->arch.has_mmu ? 0x1fffffff : 0x7fffffff;
 
 	return 0;
 }

arch/nios2/include/asm/global_data.h +1 -0

index 9f3bd00..9863fd9 100644
@@ -19,6 +19,7 @@ struct arch_global_data {
 	int has_mmu;
 	u32 io_region_base;
 	u32 mem_region_base;
+	u32 physaddr_mask;
 };
 
 #include <asm-generic/global_data.h>

arch/nios2/include/asm/io.h +1 -4

index 007df8d..3443408 100644
@@ -44,10 +44,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)
 static inline phys_addr_t virt_to_phys(void * vaddr)
 {
 	DECLARE_GLOBAL_DATA_PTR;
-	if (gd->arch.has_mmu)
-		return (phys_addr_t)vaddr & 0x1fffffff;
-	else
-		return (phys_addr_t)vaddr & 0x7fffffff;
+	return (phys_addr_t)vaddr & gd->arch.physaddr_mask;
 }
 
 static inline void *ioremap(unsigned long physaddr, unsigned long size)

Signature · 1 line

2.1.4

Marek Vasut

2015-10-27 09:16 UTC #1 lore raw

PATCH 1/1 nios2: change virt_to_phys to use physaddr_mask in global data

Quoted 5 lines · Thomas Chou

As virt_to_phys() is used a lot in DMA transfer, change it to use physaddr_mask in global data. This will save an "if" statement and get a little faster.
Signed-off-by Thomas Chou <[email protected]>

Makes sense.

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

Thomas Chou

author

2015-11-03 05:14 UTC #2 lore raw

PATCH 1/1 nios2: change virt_to_phys to use physaddr_mask in global data

In reply to Thomas Chou

Quoted 11 lines · Thomas Chou

As virt_to_phys() is used a lot in DMA transfer, change it to use physaddr_mask in global data. This will save an "if" statement and get a little faster.
Signed-off-by Thomas Chou <[email protected]>
---
  arch/nios2/cpu/cpu.c                 | 1 +
  arch/nios2/include/asm/global_data.h | 1 +
  arch/nios2/include/asm/io.h          | 5 +----
  3 files changed, 3 insertions(+), 4 deletions(-)

Applied to u-boot-nios.