From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 16 Jan 2015 12:05:45 +0100 (CET) Received: from mailapp01.imgtec.com ([195.59.15.196]:50053 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27010937AbbAPKxgjF8xO (ORCPT ); Fri, 16 Jan 2015 11:53:36 +0100 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id E8CB7201567A8 for ; Fri, 16 Jan 2015 10:53:28 +0000 (GMT) Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 16 Jan 2015 10:53:30 +0000 Received: from mchandras-linux.le.imgtec.org (192.168.154.96) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.210.2; Fri, 16 Jan 2015 10:53:30 +0000 From: Markos Chandras To: CC: Markos Chandras Subject: [PATCH RFC v2 49/70] MIPS: kernel: branch: Prevent BEQL emulation for MIPS R6 Date: Fri, 16 Jan 2015 10:49:28 +0000 Message-ID: <1421405389-15512-50-git-send-email-markos.chandras@imgtec.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421405389-15512-1-git-send-email-markos.chandras@imgtec.com> References: <1421405389-15512-1-git-send-email-markos.chandras@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.96] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 45194 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: markos.chandras@imgtec.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips MIPS R6 removed the BEQL instruction so do not try to emulate it if the R2-to-R6 emulator is not present. Signed-off-by: Markos Chandras --- arch/mips/kernel/branch.c | 4 ++++ arch/mips/math-emu/cp1emu.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 2273307f7c51..a21bbda1ea9e 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -569,6 +569,10 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, */ case beq_op: case beql_op: + if (NO_R6EMU && (insn.i_format.opcode == beql_op)) { + ret = -SIGILL; + break; + } if (regs->regs[insn.i_format.rs] == regs->regs[insn.i_format.rt]) { epc = epc + 4 + (insn.i_format.simmediate << 2); diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index 8aa6a451104b..c8ab23e96310 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c @@ -522,6 +522,9 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, return 1; case beq_op: case beql_op: + if (NO_R6EMU && (insn.i_format.opcode == beql_op)) + break; + if (regs->regs[insn.i_format.rs] == regs->regs[insn.i_format.rt]) *contpc = regs->cp0_epc + -- 2.2.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.59.15.196]:50053 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S27010937AbbAPKxgjF8xO (ORCPT ); Fri, 16 Jan 2015 11:53:36 +0100 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id E8CB7201567A8 for ; Fri, 16 Jan 2015 10:53:28 +0000 (GMT) From: Markos Chandras Subject: [PATCH RFC v2 49/70] MIPS: kernel: branch: Prevent BEQL emulation for MIPS R6 Date: Fri, 16 Jan 2015 10:49:28 +0000 Message-ID: <1421405389-15512-50-git-send-email-markos.chandras@imgtec.com> In-Reply-To: <1421405389-15512-1-git-send-email-markos.chandras@imgtec.com> References: <1421405389-15512-1-git-send-email-markos.chandras@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: linux-mips@linux-mips.org Cc: Markos Chandras Message-ID: <20150116104928.MxV5attBr3AiDb3NCqwmPMq_ibMUiu69WH8vtqmShHM@z> MIPS R6 removed the BEQL instruction so do not try to emulate it if the R2-to-R6 emulator is not present. Signed-off-by: Markos Chandras --- arch/mips/kernel/branch.c | 4 ++++ arch/mips/math-emu/cp1emu.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c index 2273307f7c51..a21bbda1ea9e 100644 --- a/arch/mips/kernel/branch.c +++ b/arch/mips/kernel/branch.c @@ -569,6 +569,10 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, */ case beq_op: case beql_op: + if (NO_R6EMU && (insn.i_format.opcode == beql_op)) { + ret = -SIGILL; + break; + } if (regs->regs[insn.i_format.rs] == regs->regs[insn.i_format.rt]) { epc = epc + 4 + (insn.i_format.simmediate << 2); diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c index 8aa6a451104b..c8ab23e96310 100644 --- a/arch/mips/math-emu/cp1emu.c +++ b/arch/mips/math-emu/cp1emu.c @@ -522,6 +522,9 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn, return 1; case beq_op: case beql_op: + if (NO_R6EMU && (insn.i_format.opcode == beql_op)) + break; + if (regs->regs[insn.i_format.rs] == regs->regs[insn.i_format.rt]) *contpc = regs->cp0_epc + -- 2.2.1