Re: [PATCH v2,04/10] MIPS: Add micro-assembler support for 'ins' and 'ext' instructions.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


On 05/10/2012 09:16 PM, Steven J. Hill wrote:
From: "Steven J. Hill"<sjhill@xxxxxxxx>

Add the MIPS32R2 'ins' and 'ext' instructions for use by the
kernel's micro-assembler.

Signed-off-by: Steven J. Hill<sjhill@xxxxxxxx>
---
  arch/mips/include/asm/uasm.h |    2 ++
  arch/mips/mm/tlbex.c         |   17 +++++++++++++++++

Really I think the tlbex.c patch should be broken out into a separate patch. It has nothing to do with adding instructions to uasm.


  arch/mips/mm/uasm.c          |   13 +++++++++++++
  3 files changed, 32 insertions(+)

diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h
index 504d40a..814bc9f 100644
--- a/arch/mips/include/asm/uasm.h
+++ b/arch/mips/include/asm/uasm.h
@@ -114,6 +114,8 @@ Ip_0(_tlbwi);
  Ip_0(_tlbwr);
  Ip_u3u1u2(_xor);
  Ip_u2u1u3(_xori);
+Ip_u2u1msbu3(_ext);
+Ip_u2u1msbu3(_ins);
  Ip_u2u1msbu3(_dins);
  Ip_u2u1msbu3(_dinsm);
  Ip_u1(_syscall);
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 897b727..7b12f27 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -921,6 +921,13 @@ build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)
  #endif
  	uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
  	uasm_i_lw(p, ptr, uasm_rel_lo(pgdc), ptr);
+#ifdef CONFIG_32BIT
+	if (cpu_has_mips32r2) {
+		uasm_i_ext(p, tmp, tmp, PGDIR_SHIFT, (32 - PGDIR_SHIFT));
+		uasm_i_ins(p, ptr, tmp, PGD_T_LOG2, (32 - PGDIR_SHIFT));
+		return;
+	}
+#endif
  	uasm_i_srl(p, tmp, tmp, PGDIR_SHIFT); /* get pgd only bits */
  	uasm_i_sll(p, tmp, tmp, PGD_T_LOG2);
  	uasm_i_addu(p, ptr, ptr, tmp); /* add in pgd offset */
@@ -956,6 +963,16 @@ static void __cpuinit build_adjust_context(u32 **p, unsigned int ctx)

  static void __cpuinit build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)
  {
+#ifdef CONFIG_32BIT
+	if (cpu_has_mips32r2) {
+		/* For MIPS32R2, PTE ptr offset is obtained from BadVAddr */
+		UASM_i_MFC0(p, tmp, C0_BADVADDR);
+		UASM_i_LW(p, ptr, 0, ptr);
+		uasm_i_ext(p, tmp, tmp, PAGE_SHIFT+1, PGDIR_SHIFT-PAGE_SHIFT-1);
+		uasm_i_ins(p, ptr, tmp, PTE_T_LOG2+1, PGDIR_SHIFT-PAGE_SHIFT-1);
+		return;
+	}
+#endif
  	/*
  	 * Bug workaround for the Nevada. It seems as if under certain
  	 * circumstances the move from cp0_context might produce a
diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
index 5fa1851..d3d0218 100644
--- a/arch/mips/mm/uasm.c
+++ b/arch/mips/mm/uasm.c
@@ -10,6 +10,7 @@
   * Copyright (C) 2004, 2005, 2006, 2008  Thiemo Seufer
   * Copyright (C) 2005, 2007  Maciej W. Rozycki
   * Copyright (C) 2006  Ralf Baechle (ralf@xxxxxxxxxxxxxx)
+ * Copyright (C) 2011, 2012  MIPS Technologies, Inc.
   */

  #include<linux/kernel.h>
@@ -63,6 +64,7 @@ enum opcode {
  	insn_bne, insn_cache, insn_daddu, insn_daddiu, insn_dmfc0,
  	insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl,
  	insn_dsrl32, insn_drotr, insn_drotr32, insn_dsubu, insn_eret,
+	insn_ins, insn_ext,

Should we re-flow this block? I think so. But that could be done at the time of re-alphabetization too.

[...]

David Daney




[Linux MIPS Home]     [LKML Archive]     [Linux ARM]     [Linux]     [Git]     [Photo]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

Add to Google Powered by Linux