Patchwork [6/7] Handle sparc-leon SRMMU specific bug. Shielded by CONFIG_SPARC_LEON.

login
register
mail settings
Submitter Konrad Eisele
Date June 10, 2009, 10:21 a.m.
Message ID <1244629275-24007-1-git-send-email-konrad@gaisler.com>
Download mbox | patch
Permalink /patch/28401/
State Superseded
Delegated to: David Miller
Headers show

Comments

Konrad Eisele - June 10, 2009, 10:21 a.m.
From: Konrad Eisele <konrad@gaisler.com>

>> +#ifdef CONFIG_LEON
>> +	   && !text_fault
>> +#endif
>> +	   ) {
>>  		if(!(vma->vm_flags & VM_WRITE))
>>  			goto bad_area;
>>  	} else {
> 
> We do not break up an if like this.
> And you need to comment on this.
> Consider using an inline helper function or similar to avoid
> obscufating the code.
> 

I added a additional comment.


---
 arch/sparc/mm/fault_32.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index 12e447f..99c1e29 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -227,7 +227,14 @@  asmlinkage void do_sparc_fault(struct pt
 	 */
 good_area:
 	info.si_code = SEGV_ACCERR;
-	if(write) {
+	if (write
+#ifdef CONFIG_SPARC_LEON
+	    /* a hardware bug in the sparc-leon SRMMU makes icache
+	       text_fault look as if writing in certain sparc-leon
+	       versions */
+	   && !text_fault
+#endif
+	   ) {
 		if(!(vma->vm_flags & VM_WRITE))
 			goto bad_area;
 	} else {