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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 B08D1C433ED for ; Mon, 17 May 2021 11:44:35 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 3F68F61073 for ; Mon, 17 May 2021 11:44:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F68F61073 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=2e5QJjWt14IqhPQButIE3uTyQtoURk4thArtgjEcI7U=; b=Wg5F1w8bEweX5PCvOJZUbfkZ9 p0JOi4lEBpjgYtqbEqnjeuo8zZ8dWDmviIbySG3zANA8bTUwUOZX3NZYx7Er8gzMmEW2AFnz5mOBV aRn/OtUo/LOR7RJQKlgXZLaUp3Qk+p0Qaa8i41+Gz9I8oS/+zw2EpALRlWMn6N7DHX/5PhRwOEI0X DADqLSfRmrBH3WeiItG9EnoIDPz7bqdDxOfIXAX7Sx1Gez8x9uWTjm28qurbDx4z7TaNQtY5JznXt HaV30A0wFKCguLshswepKbVKkhn7+qaZXJtTdBiSSjiQDJfZkeFOZRvKLgn2bF9Y9UBaxUAnPr9/M uKMioQ8bg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1libbj-00Elli-TH; Mon, 17 May 2021 11:40:25 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1libZf-00El9f-TD for linux-arm-kernel@desiato.infradead.org; Mon, 17 May 2021 11:38:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To:Subject: Sender:Reply-To:Content-ID:Content-Description:References; bh=Civrc/eMZ2h3q1MVAy/G2Z8mUuxP1TktBlup1mx4F4k=; b=bKgPrIbNdvP7AEY5xY/CC7T72l DgBddLQfOuWg/00GSfn7b4wlxjGZw+S3LVlnA3qtXo9vtAe+xmo2FYmdLKBU4UubKwnrhD+7xpaPR gbwKmiOZ75geOSKq+Aq7MNbEIXt2+fyISkUH7LsFs5x0G54I5SCNGmfGl0OZ05AL91UeG1sK+qOB8 7BMCwlnsetjHvnpDDkycRRCSo5xffdGfkRMMOsa6yAwOVETkfYCwElqeyqwKB/3jbLoOHgS1e7dTh bx4k7TFLZklaFuw+DHSiTe2HarWv23RGtqTKNa0DiJLUAu8+f0afBEF+vK7YXODnOz6rrkY74uc+z OVvzYnGg==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1libZc-00Dizp-Vo for linux-arm-kernel@lists.infradead.org; Mon, 17 May 2021 11:38:14 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D7AF611CA; Mon, 17 May 2021 11:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621251492; bh=2AWdiV1/rXiQHOhqLaHugyYxmZhOSxfUOfVxgahgMW4=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=dho6RZohsHFyuS5+6nYiTlAV/U7gOkVaK1bn8xRIPr7pHCsRoiOXvnYFlbk3jqsKz w/QG6TF5HxnXlgef0pbU6nM/LI8CA8Vpg55zkZLL67Rvle7RGNG6tRyTyNjRPN6YCt KZ+eQ/vA9wpNT+TX6wMn4GeKNdzu/etsDXmlvhf4= Subject: Patch "ARM: 9027/1: head.S: explicitly map DT even if it lives in the first physical section" has been added to the 5.10-stable tree To: akpm@linux-foundation.org, ardb@kernel.org, bot@kernelci.org, corbet@lwn.net, f.fainelli@gmail.com, gregkh@linuxfoundation.org, jcmvbkbc@gmail.com, joe@perches.com, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, ndesaulniers@google.com, nico@fluxnic.net, rmk+kernel@armlinux.org.uk, rppt@kernel.org, sashal@kernel.org, tiantao6@hisilicon.com Cc: From: Date: Mon, 17 May 2021 13:37:58 +0200 In-Reply-To: <20210510132111.1690943-5-f.fainelli@gmail.com> Message-ID: <1621251478183155@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210517_043813_096277_DAAC602C X-CRM114-Status: GOOD ( 19.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled ARM: 9027/1: head.S: explicitly map DT even if it lives in the first physical section to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-9027-1-head.s-explicitly-map-dt-even-if-it-lives-in-the-first-physical-section.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Mon May 17 01:35:13 PM CEST 2021 From: Florian Fainelli Date: Mon, 10 May 2021 06:21:11 -0700 Subject: ARM: 9027/1: head.S: explicitly map DT even if it lives in the first physical section To: stable@vger.kernel.org Cc: Ard Biesheuvel , "kernelci.org bot" , Linus Walleij , Russell King , Florian Fainelli , Jonathan Corbet , Russell King , Nicolas Pitre , Mike Rapoport , Andrew Morton , Nick Desaulniers , Joe Perches , Max Filippov , Tian Tao , linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), Greg Kroah-Hartman , Sasha Levin Message-ID: <20210510132111.1690943-5-f.fainelli@gmail.com> From: Ard Biesheuvel commit 10fce53c0ef8f6e79115c3d9e0d7ea1338c3fa37 upstream The early ATAGS/DT mapping code uses SECTION_SHIFT to mask low order bits of R2, and decides that no ATAGS/DTB were provided if the resulting value is 0x0. This means that on systems where DRAM starts at 0x0 (such as Raspberry Pi), no explicit mapping of the DT will be created if R2 points into the first 1 MB section of memory. This was not a problem before, because the decompressed kernel is loaded at the base of DRAM and mapped using sections as well, and so as long as the DT is referenced via a virtual address that uses the same translation (the linear map, in this case), things work fine. However, commit 7a1be318f579 ("9012/1: move device tree mapping out of linear region") changes this, and now the DT is referenced via a virtual address that is disjoint from the linear mapping of DRAM, and so we need the early code to create the DT mapping unconditionally. So let's create the early DT mapping for any value of R2 != 0x0. Reported-by: "kernelci.org bot" Reviewed-by: Linus Walleij Signed-off-by: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Florian Fainelli Signed-off-by: Greg Kroah-Hartman --- arch/arm/kernel/head.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -274,10 +274,10 @@ __create_page_tables: * We map 2 sections in case the ATAGs/DTB crosses a section boundary. */ mov r0, r2, lsr #SECTION_SHIFT - movs r0, r0, lsl #SECTION_SHIFT + cmp r2, #0 ldrne r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ORDER) addne r3, r3, r4 - orrne r6, r7, r0 + orrne r6, r7, r0, lsl #SECTION_SHIFT strne r6, [r3], #1 << PMD_ORDER addne r6, r6, #1 << SECTION_SHIFT strne r6, [r3] Patches currently in stable-queue which might be from f.fainelli@gmail.com are queue-5.10/arm-9020-1-mm-use-correct-section-size-macro-to-describe-the-fdt-virtual-address.patch queue-5.10/arm-9011-1-centralize-phys-to-virt-conversion-of-dt-atags-address.patch queue-5.10/arm-9027-1-head.s-explicitly-map-dt-even-if-it-lives-in-the-first-physical-section.patch queue-5.10/arm-9012-1-move-device-tree-mapping-out-of-linear-region.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel