From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B89AC282C8 for ; Mon, 28 Jan 2019 16:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0BC32084C for ; Mon, 28 Jan 2019 16:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548694089; bh=3RfusGbXGOlT7gdIyLzEyE+JtYXZHfbBiqpcEEx+Gsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G2pmIju8x96OyewkWF5/yd8ljv1sQIoiRxdayGMKlrqiNNv4RYqDtcY9ECT/ApuBf R3HacMKd24NEtBo/bx17HltfRshVwQ1GCGhAam6Om9OLL6PqLq6lkkD8ntPukvdsE1 kPJS4nud0IlO1gW9D4X+Q+kt0S/6wc0hdqMXktmM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389980AbfA1QsH (ORCPT ); Mon, 28 Jan 2019 11:48:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:57790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389099AbfA1QVy (ORCPT ); Mon, 28 Jan 2019 11:21:54 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AB1320663; Mon, 28 Jan 2019 16:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692513; bh=3RfusGbXGOlT7gdIyLzEyE+JtYXZHfbBiqpcEEx+Gsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZhxT8XILIsBZNuJXvei7MRpsD1Y5i1VDiHIkvfbOIGg6Iftb3riFcGh3YHTc1INsc SrwZAfDMZDWAftimsmsk9pUDbec8MqjdxzQyVpZLc6WWWkn871T00Ryzzo/RjZj5KF fDcqWan0hh59jOAxgFbhsQcG41Zj8bnuTE0yMmGY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiong Wang , Markos Chandras , Paul Burton , linux-mips@vger.kernel.org, Alexei Starovoitov , Sasha Levin Subject: [PATCH AUTOSEL 4.9 045/107] mips: bpf: fix encoding bug for mm_srlv32_op Date: Mon, 28 Jan 2019 11:18:45 -0500 Message-Id: <20190128161947.57405-45-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161947.57405-1-sashal@kernel.org> References: <20190128161947.57405-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiong Wang [ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ] For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90. Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav. v1->v2: - Keep mm_srlv32_op sorted by value. Fixes: f31318fdf324 ("MIPS: uasm: Add srlv uasm instruction") Cc: Markos Chandras Cc: Paul Burton Cc: linux-mips@vger.kernel.org Acked-by: Jakub Kicinski Acked-by: Song Liu Signed-off-by: Jiong Wang Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h index 711d9b8465b8..377d5179ea3b 100644 --- a/arch/mips/include/uapi/asm/inst.h +++ b/arch/mips/include/uapi/asm/inst.h @@ -361,8 +361,8 @@ enum mm_32a_minor_op { mm_ext_op = 0x02c, mm_pool32axf_op = 0x03c, mm_srl32_op = 0x040, + mm_srlv32_op = 0x050, mm_sra_op = 0x080, - mm_srlv32_op = 0x090, mm_rotr_op = 0x0c0, mm_lwxs_op = 0x118, mm_addu32_op = 0x150, -- 2.19.1