From patchwork Wed Sep 16 02:49:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 11778743 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9BD4C159A for ; Wed, 16 Sep 2020 02:50:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 44D43206A4 for ; Wed, 16 Sep 2020 02:50:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FPt2z66f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44D43206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gwYPOPumCSLN3+cgJokEk9S8AMQb+m8J3A6fLLHfLK4=; b=FPt2z66fv/Jz/jpgMKvYtIkAA E9kGBPtIfZ2+Gp1YixArOqmDRB2Yd9+/xMmxIv5G7xaNhtSHgr40fsd0sUhRX/KpukxRIbfs6SJ0m 5O0xns1uLTtBFJw+jzI9KZ/8lqAj0U3XF+pZqm1HrYHN0DgsJ8U8FITUch/XoazikOMYFznXOfPtM Q/eHNLLoOeNhNnYnReQRYkFgeoe706xxf/606IccZWvKoPLvJd0/dcgF2PIuFYTLF8jfGQvJzURlp Ghtj0vnh64On3g+Fi0SccL3E7S0fuV7uaFdDV3vEBgHnv/1hVcPNj09g72iW6mBmJr3XzC+e8V+3P Sd+fCrp8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kINWG-0003Rd-0Z; Wed, 16 Sep 2020 02:50:04 +0000 Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kINWC-0003QU-Iu for linux-arm-kernel@lists.infradead.org; Wed, 16 Sep 2020 02:50:01 +0000 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 86395F139311534FEE2D; Wed, 16 Sep 2020 10:49:57 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.253) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Wed, 16 Sep 2020 10:49:49 +0800 From: Zhen Lei To: Daniel Lezcano , Thomas Gleixner , Andrew Morton , Russell King , Catalin Marinas , linux-arm-kernel , linux-kernel Subject: [PATCH v3 1/2] ARM: fix trivial comments in head.S Date: Wed, 16 Sep 2020 10:49:26 +0800 Message-ID: <20200916024927.3191-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20200916024927.3191-1-thunder.leizhen@huawei.com> References: <20200916024927.3191-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.177.253] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_225000_922679_BE646918 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [45.249.212.32 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [45.249.212.32 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jianguo Chen , Kefeng Wang , Libin , Zhen Lei Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 1. Change pv_offset to __pv_offset. 2. Change PHYS_OFFSET to PHYS_PFN_OFFSET. commit e26a9e00afc4 ("ARM: Better virt_to_page() handling") replaced __pv_phys_offset with __pv_phys_pfn_offset, but forgot updating the related PHYS_OFFSET to PHYS_PFN_OFFSET. #define PHYS_PFN_OFFSET (__pv_phys_pfn_offset) Fixes: f52bb722547f ("ARM: mm: Correct virt_to_phys patching for 64 bit physical addresses") Fixes: e26a9e00afc4 ("ARM: Better virt_to_page() handling") Signed-off-by: Zhen Lei --- arch/arm/kernel/head.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f8904227e7fdc44..02d78c9198d0e8d 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -612,7 +612,7 @@ __fixup_pv_table: add r6, r6, r3 @ adjust __pv_phys_pfn_offset address add r7, r7, r3 @ adjust __pv_offset address mov r0, r8, lsr #PAGE_SHIFT @ convert to PFN - str r0, [r6] @ save computed PHYS_OFFSET to __pv_phys_pfn_offset + str r0, [r6] @ save computed PHYS_PFN_OFFSET to __pv_phys_pfn_offset strcc ip, [r7, #HIGH_OFFSET] @ save to __pv_offset high bits mov r6, r3, lsr #24 @ constant for add/sub instructions teq r3, r6, lsl #24 @ must be 16MiB aligned @@ -634,8 +634,8 @@ __fixup_a_pv_table: adr r0, 3f ldr r6, [r0] add r6, r6, r3 - ldr r0, [r6, #HIGH_OFFSET] @ pv_offset high word - ldr r6, [r6, #LOW_OFFSET] @ pv_offset low word + ldr r0, [r6, #HIGH_OFFSET] @ __pv_offset high word + ldr r6, [r6, #LOW_OFFSET] @ __pv_offset low word mov r6, r6, lsr #24 cmn r0, #1 #ifdef CONFIG_THUMB2_KERNEL