[PATCH] Loongson 2 requires no NOP insns to work around hazards

[PATCH] Loongson 2 requires no NOP insns to work around hazards

[Zhang Le]

Quoting from Loongson2FUserGuide.pdf:

5.22.1 Hazards
The processor detects most of the pipeline hazards in hardware, including CP0 hazards and
load hazards. No NOP instructions are required to correct instruction sequences.

Signed-off-by: Zhang Le <r0bertz@gentoo.org>
---
 arch/mips/include/asm/hazards.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h
index 134e1fc..19d1141 100644
--- a/arch/mips/include/asm/hazards.h
+++ b/arch/mips/include/asm/hazards.h
@@ -139,7 +139,7 @@ do {									\
 } while (0)
 
 #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \
-      defined(CONFIG_CPU_R5500)
+      defined(CONFIG_CPU_R5500) || defined(CONFIG_CPU_LOONGSON2)
 
 /*
  * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.
-- 
1.6.2

Re: [PATCH] Loongson 2 requires no NOP insns to work around hazards

[Ralf Baechle]

On Wed, Apr 15, 2009 at 05:01:52PM +0800, Zhang Le wrote:

> Quoting from Loongson2FUserGuide.pdf:
> 
> 5.22.1 Hazards
> The processor detects most of the pipeline hazards in hardware, including CP0 hazards and
> load hazards. No NOP instructions are required to correct instruction sequences.

Patch looks ok - but *please* generate patches against a new source tree.
Your patch rejects because of another patches that was applied over two
week before you sent this one.

Applied,

  Ralf

Re: [PATCH] Loongson 2 requires no NOP insns to work around hazards

[Zhang Le]

On 14:22 Sat 18 Apr     , Ralf Baechle wrote:
> On Wed, Apr 15, 2009 at 05:01:52PM +0800, Zhang Le wrote:
> 
> > Quoting from Loongson2FUserGuide.pdf:
> > 
> > 5.22.1 Hazards
> > The processor detects most of the pipeline hazards in hardware, including CP0 hazards and
> > load hazards. No NOP instructions are required to correct instruction sequences.
> 
> Patch looks ok - but *please* generate patches against a new source tree.
> Your patch rejects because of another patches that was applied over two
> week before you sent this one.

Ah, sorry, I didn't check carefully, I thought I was operating on the master
branch. 

> 
> Applied,

Thanks.

-- 
Zhang, Le
Gentoo/Loongson Developer
http://zhangle.is-a-geek.org
0260 C902 B8F8 6506 6586 2B90 BC51 C808 1E4E 2973