[98/98] MIPS: uasm: Add OR instruction.
in [Kernel]
|
Prev: [75/98] [SCSI] skip sense logging for some ATA PASS-THROUGH cdbs
Next: [59/98] libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
From: Greg KH on 10 May 2010 19:10 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ (cherry picked from commit 9c6befe8c744fa2f03cab36dead503c77950c3b8) This is needed for the fix of the M3 workaround. Signed-off-by: Ralf Baechle <ralf(a)linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- a/arch/mips/include/asm/uasm.h +++ b/arch/mips/include/asm/uasm.h @@ -84,6 +84,7 @@ Ip_u2s3u1(_lw); Ip_u1u2u3(_mfc0); Ip_u1u2u3(_mtc0); Ip_u2u1u3(_ori); +Ip_u3u1u2(_or); Ip_u2s3u1(_pref); Ip_0(_rfe); Ip_u2s3u1(_sc); diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c index e3ca0f7..29bbd10 100644 --- a/arch/mips/mm/uasm.c +++ b/arch/mips/mm/uasm.c @@ -61,7 +61,7 @@ enum opcode { insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, insn_dsrl32, insn_drotr, insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr, insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, - insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, + insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw, insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori, insn_dins }; @@ -116,6 +116,7 @@ static struct insn insn_table[] __cpuinitdata = { { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, + { insn_or, M(spec_op, 0, 0, 0, 0, or_op), RS | RT | RD }, { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, { insn_pref, M(pref_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 }, @@ -370,6 +371,7 @@ I_u2s3u1(_lw) I_u1u2u3(_mfc0) I_u1u2u3(_mtc0) I_u2u1u3(_ori) +I_u3u1u2(_or) I_u2s3u1(_pref) I_0(_rfe) I_u2s3u1(_sc) -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stefan Bader on 11 May 2010 08:00 That seems to fail to apply to a 2.6.32.12 tree Stefan On 05/11/2010 12:35 AM, Greg KH wrote: > 2.6.32-stable review patch. If anyone has any objections, please let us know. > > ------------------ > > (cherry picked from commit 9c6befe8c744fa2f03cab36dead503c77950c3b8) > > This is needed for the fix of the M3 workaround. > > Signed-off-by: Ralf Baechle <ralf(a)linux-mips.org> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> > > --- a/arch/mips/include/asm/uasm.h > +++ b/arch/mips/include/asm/uasm.h > @@ -84,6 +84,7 @@ Ip_u2s3u1(_lw); > Ip_u1u2u3(_mfc0); > Ip_u1u2u3(_mtc0); > Ip_u2u1u3(_ori); > +Ip_u3u1u2(_or); > Ip_u2s3u1(_pref); > Ip_0(_rfe); > Ip_u2s3u1(_sc); > diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c > index e3ca0f7..29bbd10 100644 > --- a/arch/mips/mm/uasm.c > +++ b/arch/mips/mm/uasm.c > @@ -61,7 +61,7 @@ enum opcode { > insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl, > insn_dsrl32, insn_drotr, insn_dsubu, insn_eret, insn_j, insn_jal, > insn_jr, insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0, > - insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, > + insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd, > insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw, > insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori, insn_dins > }; > @@ -116,6 +116,7 @@ static struct insn insn_table[] __cpuinitdata = { > { insn_lw, M(lw_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, > { insn_mfc0, M(cop0_op, mfc_op, 0, 0, 0, 0), RT | RD | SET}, > { insn_mtc0, M(cop0_op, mtc_op, 0, 0, 0, 0), RT | RD | SET}, > + { insn_or, M(spec_op, 0, 0, 0, 0, or_op), RS | RT | RD }, > { insn_ori, M(ori_op, 0, 0, 0, 0, 0), RS | RT | UIMM }, > { insn_pref, M(pref_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, > { insn_rfe, M(cop0_op, cop_op, 0, 0, 0, rfe_op), 0 }, > @@ -370,6 +371,7 @@ I_u2s3u1(_lw) > I_u1u2u3(_mfc0) > I_u1u2u3(_mtc0) > I_u2u1u3(_ori) > +I_u3u1u2(_or) > I_u2s3u1(_pref) > I_0(_rfe) > I_u2s3u1(_sc) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stefan Bader on 11 May 2010 08:10 Attached a quick backport on it.
From: Greg KH on 11 May 2010 11:20
On Tue, May 11, 2010 at 01:53:39PM +0200, Stefan Bader wrote: > That seems to fail to apply to a 2.6.32.12 tree Doh, you are right, I tried, and it failed. I'll just drop it for now, as it wasn't applied to the .33 tree either. It didn't show up in the patch on kernel.org either. Sorry about that. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |