From patchwork Wed May 12 12:30:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 437240 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 D1E50C433B4 for ; Wed, 12 May 2021 12:30:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 961FF613EE for ; Wed, 12 May 2021 12:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232294AbhELMbe (ORCPT ); Wed, 12 May 2021 08:31:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232295AbhELMbe (ORCPT ); Wed, 12 May 2021 08:31:34 -0400 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 943CAC061574 for ; Wed, 12 May 2021 05:30:26 -0700 (PDT) Received: by mail-wr1-x44a.google.com with SMTP id x10-20020adfc18a0000b029010d83c83f2aso10090705wre.8 for ; Wed, 12 May 2021 05:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=44quH9h0v/ssSTsBsF6QUTp0nw21LsloMpFQ8AjM0kQ=; b=C0xuE2yozXLSMSpjPI9rTeWsK0+OgrdrzmIpri3JUkb3UOcpkGxVeIxButnxWU09wf ZT1yfChZpzrQICxqVjHRh2EDiVYSwpQCADnl5N2xuPonnKoTPAmodeNuxlQFXgQGzelU jEhQ4qNHcpUZePa9HX4MFYNUUSqOdDIkOO6SUHGnlZ1rBMu3tRcv7neSuB/dLpCFN4Zr f333T+8Jgllr1gqJ3nw9dWO85O4olzasaXTLib4yiP2BZbvt96/tOkZYUei7qd1d185n hH55s4QbykMUkO6PhVbIOsbA4x4YSpEJutlFW90jf85Bdfyu9Kl33I4ieaGbPMWnRzg8 cDIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=44quH9h0v/ssSTsBsF6QUTp0nw21LsloMpFQ8AjM0kQ=; b=XE+Gt2UbE/F2covieiYYeFqhUMxOc7J9Ve6e3v3QCeBbXX+3iNcHobIyEu/a/amblz brFcWmMB7ZAcqEusPIh3OfGblA81+VDTktXzLRBBDYSdK2XpZQ/Iot/VqViJ6uHVKyeU xr93LGXD3f7x0OlstN0vxRHeZ+Cbu20HywCeFD47d4GZhFw3vG8mna7f/zCsLFsUU5Bv iWy5yPTVarPiHGjNWZ5mK0DnCM7ll7INJP6gbSh6W8JhkY94fX/u+mK+vp0pgsWdpLJF K32rRx5/B39mdNNxxrWCtpyZHgTJxSiaU22304utG+LmI99c5QVc9RPW8btNvqZ9lQX9 TeEg== X-Gm-Message-State: AOAM530LhaAOuC1g0hjFkXC8d6xGRzBkdsoeX3wqhTwiTgTxH/s5pnCm iC201tYhrpqzj99JN+2cbERXOzeTpWgV7Qmr8waIt5MntIw4M4DUpMLqnP96IDeuwrd6lPEWfqM dINllNGizIkCPvWgjE/rIaIQ5vxrBY0qyp/WHmZrT5gr9ezvJO7BPnrlhoYFleiZ2 X-Google-Smtp-Source: ABdhPJzVeLKnaqLHjd0HMGsoCeY7/sX/MIuwiDF7tUSEoO+Im3Dg6bQIhAZ/AjWu2guTTmxWkCUdZbh5o9lD X-Received: from r2d2-qp.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:1652]) (user=qperret job=sendgmr) by 2002:a1c:193:: with SMTP id 141mr38601174wmb.99.1620822625180; Wed, 12 May 2021 05:30:25 -0700 (PDT) Date: Wed, 12 May 2021 12:30:22 +0000 In-Reply-To: <20210512122853.3243417-1-qperret@google.com> Message-Id: <20210512123023.3286501-1-qperret@google.com> Mime-Version: 1.0 References: <20210512122853.3243417-1-qperret@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH stable 4.14 1/2] Revert "of/fdt: Make sure no-map does not remove already reserved regions" From: Quentin Perret To: stable@vger.kernel.org Cc: alexandre.torgue@foss.st.com, robh+dt@kernel.org, f.fainelli@gmail.com, ardb@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This reverts commit 6793433fc8f263eaba1621d3724b6aeba511c6c5. It is not really a fix, and the backport misses dependencies, which breaks existing platforms. Reported-by: Alexandre TORGUE Signed-off-by: Quentin Perret --- drivers/of/fdt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 3f58812d02d9..6df66fcefbb4 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1212,16 +1212,8 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { - if (nomap) { - /* - * If the memory is already reserved (by another region), we - * should not allow it to be marked nomap. - */ - if (memblock_is_region_reserved(base, size)) - return -EBUSY; - + if (nomap) return memblock_mark_nomap(base, size); - } return memblock_reserve(base, size); } From patchwork Wed May 12 12:30:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 438812 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 57A87C433ED for ; Wed, 12 May 2021 12:30:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1DB1B613E6 for ; Wed, 12 May 2021 12:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbhELMbg (ORCPT ); Wed, 12 May 2021 08:31:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232297AbhELMbg (ORCPT ); Wed, 12 May 2021 08:31:36 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CFD0C061574 for ; Wed, 12 May 2021 05:30:28 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id d20-20020a25add40000b02904f8960b23e8so17695673ybe.6 for ; Wed, 12 May 2021 05:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Tl67DNcLJJ6frA3U3ojWPpQjhGxw7aJXL7f8Jzt3JKY=; b=KrEdjKOqz42tvMyJqEYeN1yL7DniN93eM4kKxcw+UPHZaRPC1VX0ahuiKEh14x9o8N +IqLMxU8dio9F9roTFpT4fEnBKzod2xBfmZfMPVwCrzVFgxaJmB8kXQ9WDZawOPnAuXV wK08SgJNG9V/5Zy/73M4w5BudYjlsmv+GQGKxFDufv5IpGlHEkbxyQr2CoJT7Ykrno75 KgakFsLbnHlEEZTQJFIhtdCSbdszU+RArWMIzHmXUVndX6S1PKc2oO3P5+c411httP1Y fbIzXcpk9mH52z1RUSCuwCSaoEc9xiASK/MRHQ9GCf869R6fl2otSp4eSivnDJYYMFl4 ziIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Tl67DNcLJJ6frA3U3ojWPpQjhGxw7aJXL7f8Jzt3JKY=; b=t+johlSQ2O+0GsJKdYwIgA/uWBcF0LGBHNk8eRpB0Vs/a8XDL0nCHDtKiLI2mXhZHC kZ2tf4zuJzrhuCy7Eab8+wm+k7Ujd/nrWYHbQmavW+wgDYTDfAB/r+EV1+EM1POFQLKf X9oME9TyUsfXIeFuA91W6o3r4AP1hbe9XyYauNV2FCBzkPYMKMBb0dlu7JbdJ1LGRofN M3EpY+LNhxbKT3RUucxYLRkPJ0joZrdCtZDagTIF5TlNyS1QUiG9P2umqzAHIxJn2NJg UIpFNn6i2u6xOrcxstCTdGme74M3cr3jgGCsPitpkCRskqWdLbm8Bb6awjHx3bIB/ib9 bPlA== X-Gm-Message-State: AOAM5300ylM95IVFmBIzNvFz3Kb7UBJlfO5uM7oMpJecmnRheq6GJdQA XKjVv/bPQZp00M3YZL+KfQjWPSOzNTdkrd6ROyXenwZ+FwjyMJ8biOEKmz7YXrsCZ4S64jQII7Z Fxt3RmbW1RuFKsX8xd17fDJNnfm/MPpttNrHT9BH0lnA4qP8VIhxwEK3ilbMB8zxh X-Google-Smtp-Source: ABdhPJzZO55SZptaXz+DRv/1SPFSy8/bkvN/+bs0qkHsfszY0bOR901n9Ru2V2uw+Eh+PccwGBnDDRwG8W+N X-Received: from r2d2-qp.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:1652]) (user=qperret job=sendgmr) by 2002:a25:4012:: with SMTP id n18mr2868363yba.295.1620822627335; Wed, 12 May 2021 05:30:27 -0700 (PDT) Date: Wed, 12 May 2021 12:30:23 +0000 In-Reply-To: <20210512123023.3286501-1-qperret@google.com> Message-Id: <20210512123023.3286501-2-qperret@google.com> Mime-Version: 1.0 References: <20210512122853.3243417-1-qperret@google.com> <20210512123023.3286501-1-qperret@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH stable 4.14 2/2] Revert "fdt: Properly handle "no-map" field in the memory region" From: Quentin Perret To: stable@vger.kernel.org Cc: alexandre.torgue@foss.st.com, robh+dt@kernel.org, f.fainelli@gmail.com, ardb@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This reverts commit 71bc5d496725f7f923904d2f41cd39e32c647fdf. It is not really a fix, and the backport misses dependencies, which breaks existing platforms. Reported-by: Alexandre TORGUE Signed-off-by: Quentin Perret --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6df66fcefbb4..6337c394bfe3 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1213,7 +1213,7 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) - return memblock_mark_nomap(base, size); + return memblock_remove(base, size); return memblock_reserve(base, size); }