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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 14EDCC169C4 for ; Mon, 11 Feb 2019 16:07:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEEFF21B18 for ; Mon, 11 Feb 2019 16:07:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549901220; bh=9ga+wZBy1nI4TG11o+8Ss4nCRPFNFJfsene3WkwfKg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BhgdOdVRop0Vi/dOy/5iq0xjeyWa2/BaL45JvmsUpImtv4CiVY1crgOwQSCUqMEq0 ydv49gu7JuS5YMkOBfzkQfQSv8xQbgDJ9pIs0yJwEcAd8W0M4xaBhJIBSijLAOTcXU ByEtjGgEp3m5PEDXM02CZrdCKbQfGHeSpHBwP45Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728475AbfBKO1F (ORCPT ); Mon, 11 Feb 2019 09:27:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:32796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727247AbfBKO1E (ORCPT ); Mon, 11 Feb 2019 09:27:04 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E6F12075C; Mon, 11 Feb 2019 14:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895223; bh=9ga+wZBy1nI4TG11o+8Ss4nCRPFNFJfsene3WkwfKg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=REh55kORG62mNFmdALVuv4BDoD9Hjv/EanoUefuqlKzTkJbQavD7S59dgbsw844eF p3nlTAc+23O6By1whuXi7ROCFyDmbPsn0jWHrIPVCUJjeZB8XVRv8f0KbiFgyLEiJA Vd+0m7BQTuP3ZulryDCfsGBM+86triKgR0+/cie8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Markos Chandras , Paul Burton , linux-mips@vger.kernel.org, Jakub Kicinski , Song Liu , Jiong Wang , Alexei Starovoitov , Sasha Levin Subject: [PATCH 4.20 134/352] mips: bpf: fix encoding bug for mm_srlv32_op Date: Mon, 11 Feb 2019 15:16:01 +0100 Message-Id: <20190211141855.041560399@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 c05dcf5ab414..273ef58f4d43 100644 --- a/arch/mips/include/uapi/asm/inst.h +++ b/arch/mips/include/uapi/asm/inst.h @@ -369,8 +369,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