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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DA2EC77B6E for ; Wed, 12 Apr 2023 22:46:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E39BA6B0078; Wed, 12 Apr 2023 18:46:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC289900003; Wed, 12 Apr 2023 18:46:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8B076B007D; Wed, 12 Apr 2023 18:46:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BABAD6B0078 for ; Wed, 12 Apr 2023 18:46:36 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 85D8A4028D for ; Wed, 12 Apr 2023 22:46:36 +0000 (UTC) X-FDA: 80674224792.19.2134E87 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by imf14.hostedemail.com (Postfix) with ESMTP id A8528100021 for ; Wed, 12 Apr 2023 22:46:34 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681339594; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n6IQmhNHxPjInxSQpSIu3wq6BYWmrEpb2ujMy7CJmmE=; b=Idn4TjgxxkQBfjgf7CV36lks+TFqlXCIq7mOtv55SOP/kGrEPvqFJzdb9tNFJ/80eanAS7 ONa+AjRiFmEmml7XF/zt3iSJoS4wc0XmhV3s33TpK/FAtzjxabYGoNMbtJCJni9NJxwRE1 7QYV7FvcyplaMNbkznkaXFJCOq+J5G4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.167.175 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681339594; a=rsa-sha256; cv=none; b=m4loKib37gQdYbkKh+njeE9f7cRIzea1d7/d7morj1oUx572B3AYiudnbKm6M3pwCvLiAh j9vmKsMIIo5JLOYZc8ogB8tSfLG0qM7k0uy7juxOEiXK833npyiX4BQFMP/5xoRzmiST8s FeuilETSZ+JrngY53fkq58h6OXVUuAc= Received: by mail-oi1-f175.google.com with SMTP id bh10so8926443oib.1 for ; Wed, 12 Apr 2023 15:46:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681339594; x=1683931594; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n6IQmhNHxPjInxSQpSIu3wq6BYWmrEpb2ujMy7CJmmE=; b=PCE9tReTsj7/PL4MmsbMtOawUSqSzT3nmDKy+yeFek5hzF0CnnqZr8dNJDWtVDsISd Pv5Ju6KEMqnw6FyPBVWPakW2cE2NRM3KD/KiNUR+xV3qBvkA/RxTCwTFR8YTbmtlO9JS RIqGjMVPcwekFl+ivarMeP/5nZDUJGcWhJMd7bklyslXvCb7CWDigK9f+BnwwQLbagU1 KvMC5WqCyPYe8+hRCVLjz3Z1kvMGkp4nyXjmjJEoQKBr6FxzhfebEXvPtETe/jdb9lda qWEGH1mY5m7vCBV8CZ6YnvR9qGVTpGRcVoSdEwAwgM/rBKX3oKbmMKRu9MUvgL4Al8cm 8+kQ== X-Gm-Message-State: AAQBX9cyGPE84DvxzqxrqlbSH2tLPqv74bekSLhTllS1lZiwWg1wijQw ffQun09LnVxMSfEHtFQM6NY= X-Google-Smtp-Source: AKy350b3kRXiEpI85ie3nrvEShAhdBFxd4KwZmrMkY60iSWqORJl20wsZIIc2xYDvXSOb8nHd/bsSg== X-Received: by 2002:a05:6808:694:b0:38c:9f1:2c88 with SMTP id k20-20020a056808069400b0038c09f12c88mr111818oig.32.1681339593707; Wed, 12 Apr 2023 15:46:33 -0700 (PDT) Received: from archfamilia.lan ([181.219.149.7]) by smtp.gmail.com with ESMTPSA id cg9-20020a056808328900b0038beb8c1289sm50012oib.15.2023.04.12.15.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 15:46:33 -0700 (PDT) From: Lucas Tanure To: Rob Herring , Frank Rowand , Mike Rapoport , Andrew Morton Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, jbrunet@baylibre.com, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, martin.blumenstingl@googlemail.com, narmstrong@baylibre.com, stefan@agner.ch, Lucas Tanure Subject: [PATCH v3 1/1] of: fdt: Scan /memreserve/ last Date: Wed, 12 Apr 2023 18:46:20 -0400 Message-Id: <20230412224620.8909-2-tanure@linux.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230412224620.8909-1-tanure@linux.com> References: <20230412224620.8909-1-tanure@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: ngaxetksjs77mco4rbr4xbdq9qds4nun X-Rspam-User: X-Rspamd-Queue-Id: A8528100021 X-Rspamd-Server: rspam06 X-HE-Tag: 1681339594-907429 X-HE-Meta: U2FsdGVkX1+abTIpFcAGt5lZwToG/ULdBYNWnY0aA5qdILsCVmHJIfNPIinrLSnxM44BMpyNueCoSUukt35JS/a2aGb6qXz15c5pomOjHtmTyUqBCy+NxGjNEh2euEyuZKFC/POsbE0bpD+wtFjP3IkaBE0z8HLznLuBRCXIYOnyC9/5LkEzJ7yQsFdH/3Nbr9cgPhkb1U39z5C3m+90ZEvPprMZnd+FzExafziiZrN7Y5yXreC2BDe3DnoxvwZCIJp+kdJ4UrvHCLWBh/rLEuwVMm3SJtNgW82bzzpZJwr3cxWC3PvRGk4e1eC+FvYzgVG9+pWGRUrfWv7PGemDY66MvzDojKKZqe49VMoAUMzdwPPa8byTC0ZyUaGMqbVw7jX/kc8NJbyKeRI43bpuUXaStG7kaoDzn2uTDMtcy76S8giWWLKmH2rJIBNjO2m3mzbRgE8NhkmnIQmS4WUqHJ27m2ZrRd1bZYV0Qx8MgVymvvTNyUqrN4zkY1Uoo8/siCB5Gu1lyV5P+i229S6INLj9Df5RADuxAyr+SKfdgbwb5OR3Hbu7lxyz+ELxdcQytj7/kzUEZd3My35Xf4AMY7E3VdUw9tI76t4entMNfXQuJzfug9pzR989/mRBMxvCPSmX13yUfQ8dyFsUWkcvrccU8apUoV8sc9xdP8SArKN6U2wOTYQksTPGmC+FfQUfdEpvQ7qrPiUfSEUX9/tUyhEOL5sK7hBu4msFbvb9JYeVJLTC8sYknIh4iMBRjMltr78VwLANw4dHU/entyFKHXbTryTdmWfhYI7TPCbghs/EPIPm2u6R6qM0rdEtlxBJd9Q/jNCdCnP+MJ9dUFg1slktnOSKs+UTGP3NqTqVwu8UYkWe8ZeS6pOABlCvY1RGcyWytkXWnF/ZyCsw8uycSqr9cIgW8KumSVy/XT5G0veXDLzrG6sGzNY3F1VaYPY7TSCbjQJQD0hYbFUJXVV fHjlGZ7a LmwDadRmbdM2jNITitcALtKSomzJ8SMmKZDBxuXuTz/RVBKrZJ1iU8631qY3Ga8OVMeIIzd6q0CQe6H5jOOEugNJc1CQtlL/ENgDhoBcVRPNxbeBN/LOlYVOA3e0WVR2DnYQvMUkA8YI8I5fI0qBoHAra6CLI7y5HWwIDcdzyAe79SuTeullucFpWn6pR4+YDGeJemLUPDLucaeO9CfePlrNouE51+YXqWoUxxHo/083FZfWuY9UZQehdBTIqAUEsh45RcstnvX8GJhE7d0W0P+TsCQZs2f2Ho6C2SSIuPLPbRBcx2zfb29PFWxJ2nU2AKnnHQOzy+A+wYlPk7lIOc710kMGkSp71Smhc1zd8WTorDcPVjADLWk8xd8Xch+KaSDeP8NBV2fw0Y3Og4VaSNVzdVomXlY77y7zxQrCK69vruXtGkFhv3NZvrSwzKbna3aUo6sXiPvkGB7iIVyVIDLTrV/+0DlZPaJGFsiv6gz4849OcTrUh1Vr+12MtAvOYhT1j6KdWl+J8X+vWsVOvBl9k2g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Change the order of scanning /memreserve/ and /reserved-memory node. /reserved-memory node should go first, as it has a more updated description of the memory regions and it can apply flags, like nomap. Also, /memreserve/ should avoid reserving regions described in /reserved-memory node. Signed-off-by: Lucas Tanure --- drivers/of/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d1a68b6d03b3..c28aedd7ae1f 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -635,6 +635,9 @@ void __init early_init_fdt_scan_reserved_mem(void) if (!initial_boot_params) return; + fdt_scan_reserved_mem(); + fdt_reserve_elfcorehdr(); + /* Process header /memreserve/ fields */ for (n = 0; ; n++) { fdt_get_mem_rsv(initial_boot_params, n, &base, &size); @@ -643,8 +646,6 @@ void __init early_init_fdt_scan_reserved_mem(void) memblock_reserve(base, size); } - fdt_scan_reserved_mem(); - fdt_reserve_elfcorehdr(); fdt_init_reserved_mem(); } -- 2.40.0