Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3315547pxf; Mon, 15 Mar 2021 07:01:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr2ZmvFoMtio/Fdjnt1TnezjaCkk396sBtlvQdF2sQFDXtcWSoVfKWuWDZcdLdX1ASJ0pR X-Received: by 2002:a17:906:1f93:: with SMTP id t19mr24297463ejr.443.1615816872043; Mon, 15 Mar 2021 07:01:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615816872; cv=none; d=google.com; s=arc-20160816; b=PdxR1tnS094eJLCh28lNA0NTvtMHcUXXA2DqAGOyCmDmiNI3YIJABpMoSn4tvnOqvC wVdy8TPnpRn6vWgH9lEo0+ZLuM2F0I231PmYZG6QT30D6dsKewvDy8be10sIB+dT/gcX Py524sG4IGza8JuMousiEu3XClbnKA8mpBbc1uZFKN3VFHtF4RC2miGTrTkXCO3P4sMt /RnHyab9khT156+dKZgeP0Xd/UFOAYjUlaoWZYoAyNW1J181Rzr3Eq2+d1FXvOPWWBD7 nubI7+yTofbRdEYxhqnICO2WntAgirC/1IJYMgkrJ4Nk7CqsIUs8288Egk3JbVhXtdDm SgnQ== 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=bO5wijTI2m4CZhGqRK13eHh4cNJaks8Rrecn9ec5pPc=; b=OqPde26QVneoItdVcXEAOL3FMeogcQ3klAT1Nu+7ETAvukq9vdlu2z0ULXpxn81ize mcU8Fu0UWYHA2mRoHx1B/B6+kYDZqzDAviUyJjGSzIWLRVgpoF691oBqrdYiIVLBO8LI MG6wjOW1hSep0rOrI0ffVpzSieagmdJxROi/rfixHu6fn17cVTAHBYTL+eUDWr8XIEaq svDAhVw3wVVaGJPAMpRom3hrNkN+TfMVJ2gnZOX/GMr781HMDlHuqv6PY9GwkQqk3DtL kBBUFmM8Uovu9DQ4APX6SzfKVMYYajboD05vHMiBrimhY2yr4yBComegIbMJWlSU1uVZ gS/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wREna++u; 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 do13si11158763ejc.87.2021.03.15.07.00.49; Mon, 15 Mar 2021 07:01:12 -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=wREna++u; 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 S232723AbhCON7g (ORCPT + 99 others); Mon, 15 Mar 2021 09:59:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:59160 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230373AbhCONyx (ORCPT ); Mon, 15 Mar 2021 09:54:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 098B264F04; Mon, 15 Mar 2021 13:54:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816492; bh=lSNMJ+BgW6p1BGcFGRrZo0sOPdSgjdqEpvetgnJ9qGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wREna++uzJWMqx7aj3ciREvuyg/Ez0wFDMKhRwLl/iGqk9cdzPRlXPbZs8uto83qS itYePKtJPq+JPU4b7WB4Np4xbwaC35rU6mtOMhNtIe9D/8Avbo0uHC/+5mVuQzod24 Zwm5yXaPZ106T8/u+NONK2N6yKSkB5KvB+l6lKQc= 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.9 70/78] powerpc/64s: Fix instruction encoding for lis in ppc_function_entry() Date: Mon, 15 Mar 2021 14:52:33 +0100 Message-Id: <20210315135214.361168874@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135212.060847074@linuxfoundation.org> References: <20210315135212.060847074@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 @@ -46,7 +46,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