Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9192460pxu; Mon, 28 Dec 2020 08:55:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1UkdW2AKID2k6iNikpGaJxubZru02+O1/bHeU9usTexiIG08EKi54A8+OuGkTGVIZmOy2 X-Received: by 2002:a05:6402:407:: with SMTP id q7mr42940840edv.312.1609174504477; Mon, 28 Dec 2020 08:55:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609174504; cv=none; d=google.com; s=arc-20160816; b=y4CqgsagfE+JnyHlPZR0ymd7OnTj5PTWOXxamYlrxcgIwtG9v4dzaMb7F5pz1wnRHA g9wdHmWYbwD/5dc3alwqLgWU5uX9lpt3SV0rpJOBlrHIi62sbMPJ+deXtxLRFMeCJx03 JIvsmU9R4eXi6/ko4ew6zAq5w9ss95Jyosr7JKBfTj8B+18fGwQzbbM7+2iLTIEA5/NH +GYpFobSFr0E/d3lihB67Qh0ig6/zrxntNbPls+LVN0ifv3Lkim2PKVxF/70vIO4K3CZ yMY655iSF7hvqt4y2f85UII/vyVuei9xRCIAAbEv6+rbi/yrj/IDn6AhyywUf2fCqPqE 7KZA== 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=A9yr+z3g8PLFDtoUzDgD20eIvb4J7yRUc+xCRjWaIug=; b=NBLzX8IK7NCylLeM66d3b5IbiRMiWN8HwnT/wC4KXUTdr1dx0ywmzTeg6+GNWDIeJL 3Wq02CMtl0OZfQqTBZ00YePJlhxqNps5S32SfJzW2wx4RdQyYLXYy7WA/1ieG06cPE3v vNoOExwRDZHtaS5o4NgiilH3IBOKfg6x85ACcvskXyjJAZb777QWTPNuI1HL7UavuUxJ ZqIFtZYcdgX4JWJ0+xkX3a6M4te7Yh1+4k5mVH3nTNS6e+yfcxAHrhOefhkZOhOs8IcI Diw3gns8rGHt7MzIDnMWgZfLeE84CMQdN0FmTaimYwOEoaTwZqTu+yAcxhofAlpHtzqt GkyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=njM3nqW+; 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 z23si20391034edx.444.2020.12.28.08.54.41; Mon, 28 Dec 2020 08:55:04 -0800 (PST) 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=njM3nqW+; 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 S1728765AbgL1QtR (ORCPT + 99 others); Mon, 28 Dec 2020 11:49:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:49798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728080AbgL1MxI (ORCPT ); Mon, 28 Dec 2020 07:53:08 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 55EA622B47; Mon, 28 Dec 2020 12:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609159952; bh=YStn6+xfoChb/ZUebmuhPMCzr1wh5qHt8/j/I5c1E2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njM3nqW+9fhL9QpHkrMZ+/zKWG0NifN8IigSjxkYA0TsnV+riSlarw7lekV1sHQMm 6pmD58UUzpasVM10jBKSloQbFIdvqZWNwLgpMeSR0siF+sFrIvr5wW/sAkORc+54HO /BsPdutRaxd7iJQhSBNjZ9Mlrg4jLTSoDTZMeGpk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Pitre , Linus Walleij , Ard Biesheuvel , Sasha Levin Subject: [PATCH 4.4 033/132] ARM: p2v: fix handling of LPAE translation in BE mode Date: Mon, 28 Dec 2020 13:48:37 +0100 Message-Id: <20201228124848.005352515@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124846.409999325@linuxfoundation.org> References: <20201228124846.409999325@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: Ard Biesheuvel [ Upstream commit 4e79f0211b473f8e1eab8211a9fd50cc41a3a061 ] When running in BE mode on LPAE hardware with a PA-to-VA translation that exceeds 4 GB, we patch bits 39:32 of the offset into the wrong byte of the opcode. So fix that, by rotating the offset in r0 to the right by 8 bits, which will put the 8-bit immediate in bits 31:24. Note that this will also move bit #22 in its correct place when applying the rotation to the constant #0x400000. Fixes: d9a790df8e984 ("ARM: 7883/1: fix mov to mvn conversion in case of 64 bit phys_addr_t and BE") Acked-by: Nicolas Pitre Reviewed-by: Linus Walleij Signed-off-by: Ard Biesheuvel Signed-off-by: Sasha Levin --- arch/arm/kernel/head.S | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 04286fd9e09ce..2e336acd68b0a 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -673,12 +673,8 @@ ARM_BE8(rev16 ip, ip) ldrcc r7, [r4], #4 @ use branch for delay slot bcc 1b bx lr -#else -#ifdef CONFIG_CPU_ENDIAN_BE8 - moveq r0, #0x00004000 @ set bit 22, mov to mvn instruction #else moveq r0, #0x400000 @ set bit 22, mov to mvn instruction -#endif b 2f 1: ldr ip, [r7, r3] #ifdef CONFIG_CPU_ENDIAN_BE8 @@ -687,7 +683,7 @@ ARM_BE8(rev16 ip, ip) tst ip, #0x000f0000 @ check the rotation field orrne ip, ip, r6, lsl #24 @ mask in offset bits 31-24 biceq ip, ip, #0x00004000 @ clear bit 22 - orreq ip, ip, r0 @ mask in offset bits 7-0 + orreq ip, ip, r0, ror #8 @ mask in offset bits 7-0 #else bic ip, ip, #0x000000ff tst ip, #0xf00 @ check the rotation field -- 2.27.0