Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3526051pxf; Mon, 15 Mar 2021 11:30:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJj6LkYuL6ssHlXX0lCHb/EPTzXBfZrPs9nN3SO/v8DssrhTIXWzWLbbJDJc//rP0h5JVh X-Received: by 2002:a17:906:938f:: with SMTP id l15mr25092733ejx.15.1615833050446; Mon, 15 Mar 2021 11:30:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615833050; cv=none; d=google.com; s=arc-20160816; b=yPQh3SXCrlj+u6At7u3Q4g/NbpZrR5hD+LiOuVvjmS/FnRU71orkbk0M13NtcI9q1s S2jD4ki8CYUAJTtN4HuKy12sBSpfkETp7koKlPPgTETrRmcJywseAD3ANn3FOV3g3JlH 4ZkqCFt92Vcea9z/n+J7tf4Uk7zQJCu7PLKhKcGpE0r0N0dlOqvD3DKkk/xtAfX4AGey v2XJgSDNasuNnf22U1EZQMTsA35iHjQQL8F9MoNKKQXx24Q5G1jeAXHCZeaarbwwkna7 7yJKRTuRKK4DdtthoiMvOJxZXhKho788hi/THaT5wTS4m7lxCbGvg6Q+oRCH7bBSvkvW twvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HKQmQFIb9IQVfwC6r0FwN1WT4cetXFz3vH+wUg7SQEQ=; b=r31JAXeBnuN3/EWh6aZreY5swW4/+LMzz9qQ4nyBw75Kgjv8nK1cvwGJXqGGhwtvD4 zGeelfKTijKOqfO7cqVmO7+hUe6TYiMJhZ1keZtdsJqCDkzlIOqkDq4ueeophW6x2yXf 0x4H5IAImFuMjqmlF5IgpqtGXSOwRbZGvUYFHxCPnPRLsRIc/XNtShQR6AUEj1kAuwly Z+Issfgqhuvg43xSraFzLEJTyHtOXkqNHheGDnxEij27+TH4JqHVRzbvujuJNz0/sO3x ne/1+7J78ysta8hfJs6qfVZvWgu+ZgaFB5+orj9eOF3gleO5oV2BjVZcIhoDUL3n7ZWk neDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LyLur8ak; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gb35si12588792ejc.351.2021.03.15.11.30.27; Mon, 15 Mar 2021 11:30:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LyLur8ak; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239906AbhCOOdQ (ORCPT + 99 others); Mon, 15 Mar 2021 10:33:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:37836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233276AbhCOOBV (ORCPT ); Mon, 15 Mar 2021 10:01:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D22C464F5C; Mon, 15 Mar 2021 14:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816857; bh=P0MVKTBLZpTjeQJF12x1AzQJCEXZYoic11tOAsAhRXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LyLur8akvGAigo6+D+OLVycVnyM1GO5/ap+H+cXr6R7aPLvjt2sqsS/6wFJC/0Kj4 FG9t0+KpMiSlZGgJtt50uNDKHGNL+zTCZRHvtuwVTmIB5yz2Hxo7mclfHelU3yroHR 40GXI3s7AiQEDmftxWQqaMtTx7XfzuQXasFcxjjo= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Olsa , "Naveen N. Rao" , Segher Boessenkool , Michael Ellerman Subject: [PATCH 4.19 113/120] powerpc/64s: Fix instruction encoding for lis in ppc_function_entry() Date: Mon, 15 Mar 2021 14:57:44 +0100 Message-Id: <20210315135723.684917244@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135720.002213995@linuxfoundation.org> References: <20210315135720.002213995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Naveen N. Rao commit cea15316ceee2d4a51dfdecd79e08a438135416c upstream. 'lis r2,N' is 'addis r2,0,N' and the instruction encoding in the macro LIS_R2 is incorrect (it currently maps to 'addis r0,r2,N'). Fix the same. Fixes: c71b7eff426f ("powerpc: Add ABIv2 support to ppc_function_entry") Cc: stable@vger.kernel.org # v3.16+ Reported-by: Jiri Olsa Signed-off-by: Naveen N. Rao Acked-by: Segher Boessenkool Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210304020411.16796-1-naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/code-patching.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -52,7 +52,7 @@ void __patch_exception(int exc, unsigned #endif #define OP_RT_RA_MASK 0xffff0000UL -#define LIS_R2 0x3c020000UL +#define LIS_R2 0x3c400000UL #define ADDIS_R2_R12 0x3c4c0000UL #define ADDI_R2_R2 0x38420000UL