Skip to contentSkip to conversation

openrisc: remove bogus nops and shutdowns

PATCH Superseded Jason A. Donenfeld 2 participants 5 messages May 4, 2022 – May 11, 2022 Openrisc architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openrisc: remove bogus nops and shutdowns

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will shut down the simulator, which isn't what we want, since it makes it possible to handle errors.

---
 arch/openrisc/mm/fault.c | 5 -----
 1 file changed, 5 deletions(-)
arch/openrisc/mm/fault.c +0 -5
index 80bb66ad42f6..860da58d7509 100644
@@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	{
 		const struct exception_table_entry *entry;
 
-		__asm__ __volatile__("l.nop 42");
-
 		if ((entry = search_exception_tables(regs->pc)) != NULL) {
 			/* Adjust the instruction pointer in the stackframe */
 			regs->pc = entry->fixup;
@@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	 */
 
 out_of_memory:
-	__asm__ __volatile__("l.nop 42");
-	__asm__ __volatile__("l.nop 1");
-
 	mmap_read_unlock(mm);
 	if (!user_mode(regs))
 		goto no_context;
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 3 lines · Jason A. Donenfeld

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will shut down the simulator, which isn't what we want, since it makes it possible to handle errors.

Do you mean impossible to handler errors?

Quoted 2 lines

This looks good to me, I didn't add these debug's I think we can remove them.

-Stafford

Quoted 30 lines
---
 arch/openrisc/mm/fault.c | 5 -----
 1 file changed, 5 deletions(-)
arch/openrisc/mm/fault.c +0 -5
index 80bb66ad42f6..860da58d7509 100644
@@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	{
 		const struct exception_table_entry *entry;
 
-		__asm__ __volatile__("l.nop 42");
-
 		if ((entry = search_exception_tables(regs->pc)) != NULL) {
 			/* Adjust the instruction pointer in the stackframe */
 			regs->pc = entry->fixup;
@@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	 */
 
 out_of_memory:
-	__asm__ __volatile__("l.nop 42");
-	__asm__ __volatile__("l.nop 1");
-
 	mmap_read_unlock(mm);
 	if (!user_mode(regs))
 		goto no_context;
Signature · 1 line
2.35.1
#2 lore raw
Quoted 6 lines · Stafford Horne
Quoted 3 lines · Jason A. Donenfeld

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will shut down the simulator, which isn't what we want, since it makes it possible to handle errors.

Do you mean impossible to handler errors?

Whoops, yes.

Quoted 6 lines
Quoted 3 lines

This looks good to me, I didn't add these debug's I think we can remove them.

#3 lore raw

PATCH v2 1/1 openrisc: remove bogus nops and shutdowns

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will shut down the simulator, which isn't what we want, since it makes it impossible to handle errors.

---
Changes v1->v2:
- Fixed typo in commit message.

 arch/openrisc/mm/fault.c | 5 -----
 1 file changed, 5 deletions(-)
arch/openrisc/mm/fault.c +0 -5
index 80bb66ad42f6..860da58d7509 100644
@@ -223,8 +223,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	{
 		const struct exception_table_entry *entry;
 
-		__asm__ __volatile__("l.nop 42");
-
 		if ((entry = search_exception_tables(regs->pc)) != NULL) {
 			/* Adjust the instruction pointer in the stackframe */
 			regs->pc = entry->fixup;
@@ -252,9 +250,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
 	 */
 
 out_of_memory:
-	__asm__ __volatile__("l.nop 42");
-	__asm__ __volatile__("l.nop 1");
-
 	mmap_read_unlock(mm);
 	if (!user_mode(regs))
 		goto no_context;
Signature · 1 line
2.35.1
maintainer
#4 lore raw
Quoted 6 lines · Jason A. Donenfeld

Nop 42 is some leftover debugging thing by the looks of it. Nop 1 will shut down the simulator, which isn't what we want, since it makes it impossible to handle errors.

Thanks, this looks good now. I will queue it.