Skip to contentSkip to conversation

Undefine srmmu_hwprobe in the CONFIG_LEON case.

PATCH In review Konrad Eisele 2 participants 3 messages Jun 9, 2009 – Jun 10, 2009 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 4/7 Undefine srmmu_hwprobe in the CONFIG_LEON case.

From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_LEON case. The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro

---
 arch/sparc/include/asm/pgtsrmmu.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
index 808555f..1701181 100644
@@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(
 
 }
 
+#if !(defined(CONFIG_LEON))
 static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
 {
 	unsigned long retval;
@@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprob
 
 	return retval;
 }
+#endif
 
 static inline int
 srmmu_get_pte (unsigned long addr)
Signature · 1 line
1.4.2.1

From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_LEON case. The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro

---
 arch/sparc/include/asm/pgtsrmmu.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
index 808555f..1701181 100644
@@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(
 
 }
 
+#if !(defined(CONFIG_LEON))
 static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
 {
 	unsigned long retval;
@@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprob
 
 	return retval;
 }
+#endif
 
 static inline int
 srmmu_get_pte (unsigned long addr)
Signature · 1 line
1.4.2.1
#1 lore raw
Quoted 33 lines · Konrad Eisele

From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_LEON case. The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro

---
 arch/sparc/include/asm/pgtsrmmu.h |    2 ++

 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
index 808555f..1701181 100644
@@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(
 
  }
 
+#if !(defined(CONFIG_LEON))
  static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
  {
        unsigned long retval;
@@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprob
 
        return retval;
  }
+#endif
 
Quoted 2 lines

 static inline int
 srmmu_get_pte (unsigned long addr)

Surely there is a better way to do this, oh and if this is the only way, #ifndef CONFIG_LEON is much cleaner.

Thanks,

Signature · 4 lines
Julian Calaby

Email: [email protected]
.Plan: http://sites.google.com/site/juliancalaby/
#2 lore raw

PATCH 4/7 Undefine srmmu_hwprobe in the CONFIG_SPARC_LEON case.

In reply to Konrad Eisele

From: Konrad Eisele <[email protected]>

Quoted 5 lines
Quoted 1 line

srmmu_get_pte (unsigned long addr)

Surely there is a better way to do this, oh and if this is the only way, #ifndef CONFIG_LEON is much cleaner.

SPARC-LEON doesnt have a hardware probe, so the function cannot be used for leon. I implement a softwareprobe instead. Changed to #ifndef CONFIG_LEON

The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro

---
 arch/sparc/include/asm/pgtsrmmu.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
index 808555f..267178c 100644
@@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(
 
 }
 
+#ifndef CONFIG_SPARC_LEON
 static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
 {
 	unsigned long retval;
@@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprob
 
 	return retval;
 }
+#endif
 
 static inline int
 srmmu_get_pte (unsigned long addr)
Signature · 1 line
1.4.2.1