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 A13F1C76196 for ; Mon, 10 Apr 2023 12:00:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED2DF280011; Mon, 10 Apr 2023 08:00:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E82D1280002; Mon, 10 Apr 2023 08:00:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D237A280011; Mon, 10 Apr 2023 08:00:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BF48E280002 for ; Mon, 10 Apr 2023 08:00:32 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 95C0FA0921 for ; Mon, 10 Apr 2023 12:00:32 +0000 (UTC) X-FDA: 80665339104.07.F668857 Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) by imf30.hostedemail.com (Postfix) with ESMTP id 1EF4280031 for ; Mon, 10 Apr 2023 12:00:28 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf30.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.160.47 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681128029; 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=Hdg6OnGdhnbQDxiR6CHlfN0w6V2p30dC7To9wkPjF7U=; b=cCoC5vHbvLoxZggtfGoZ6fTIUcj/+tkeIjhAKbxeBkdhaf6IzJtSrTxLHWpN7Er9DNOSu0 KEGf6m9HT3s20v1VtV/lcPyz5SR3c7AuO7Sh7+yjZKL46ndqf6aZzS9A8Wbgc9MpJnp2tZ AdCeoukB3/ooU6s6+7UYBFZcYc0TeBg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf30.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.160.47 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681128029; a=rsa-sha256; cv=none; b=PX6VUCKVO0X0iwEP8Risna4rctRK9uWUNf0mkolpIR4Rb6fG2U4yCvB0TWSY8w5t+3MyQM 8dhjIRZ6RXv1QgOWTv9VyD2/VHK+mes5PsksMWIuuePWV7Gr1iF2/xTTJk8HN34OIlAV6D 2a+1o4MxS+AikfS5fsraT8raMSKfhBU= Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-1845f865452so410624fac.12 for ; Mon, 10 Apr 2023 05:00:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681128028; x=1683720028; 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=Hdg6OnGdhnbQDxiR6CHlfN0w6V2p30dC7To9wkPjF7U=; b=gVng48iLLGhkS4RBtwic9gHfb9m49euaLr/IaQ1ZdNqnuzqtYPZVdUZ5xOIpo0wcxt +osyCrNb7Y+p/ny/u/fS7f9HQTNjPRPUtC9d8WP0hYuXR/beUUiFzEia6HX+lteYEYRe uCumx42NzmrrgMQxUX5KR/j6gM+2m86Ky+rruvSm0I55gcSBwIBdbuII5lfPtqVpiYKz rBdIcDasG7w9zN4Kw70hvE+vn4fd68tcMQD5hCpbn7Al2IfzKGo2iKmAfZcXlpkAbJMM 9WZwj4uBc+QtECQeghpan5acK0pvXxBl90NjRiWFnuOnl5O1XOQoXaCa9VHKnfSFNEm4 9l1A== X-Gm-Message-State: AAQBX9efuClRJOgMPuu49QnDNhMnX0kCBSKfK+KN1LCcUCZrOiEJRISk ZfUyghNbGKLx3shAwOJt1kkJ+S7DKqg4QQ== X-Google-Smtp-Source: AKy350bAQmqx25l+3rBkic3FytZFkAQr9CoLxY8EvZgErZmEKWzqTuGKjdy/sRVA4KxfgfAtkx8g4g== X-Received: by 2002:a05:6870:c155:b0:180:2a5e:7f8f with SMTP id g21-20020a056870c15500b001802a5e7f8fmr6126629oad.22.1681128028235; Mon, 10 Apr 2023 05:00:28 -0700 (PDT) Received: from archfamilia.lan ([181.219.149.7]) by smtp.gmail.com with ESMTPSA id j4-20020a9d7384000000b0069f9203967bsm4141884otk.76.2023.04.10.05.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 05:00:27 -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 v2 1/1] of: fdt: Scan /memreserve/ last Date: Mon, 10 Apr 2023 08:00:17 -0400 Message-Id: <20230410120017.41664-2-tanure@linux.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230410120017.41664-1-tanure@linux.com> References: <20230410120017.41664-1-tanure@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1EF4280031 X-Stat-Signature: h6exoxw7z3mem88dccusdmdqeh7s7b15 X-HE-Tag: 1681128028-433661 X-HE-Meta: U2FsdGVkX1/HyyxO9lJ3nwngmOPt+xIyYfoLMELHa5w+l86eF0NLIQ/D4e2QTbjLYGSHzCNZpvU5y0UHz7U/RlcvQl+kYT+ODMAdfCgT8sWgDXNHN81+VUBsZjD4k3C1DJHS5nrIp9xjpcYOefuRcrnTOT+IFy9kVRCiYsRQ/z1l6gOTpdSy0u5XZFCsmAnk/4HlSzhpEApO8UqnNC3FsDOKauELd4fkq0q4MDsl6YE32D7NU/QniqfxR3kUOqBf7Xj3I95a+8lou/YDGXo+4qvK1f279ELCl1nh9gDHOOmPahLgdbagN+EXSDGuTsmPTDJcWZkhEFcD0co46sTs/0GxDnMGXqZAp0M2AOKPdZ+Zadg+CXXj8yXDsUtV4o5cNd1Rgy5kch46rZmY4ow+g2tdtYpSVtkGX19bWdwTuEsIqot1GNkQ/SGp8mDdtYvIA/iafvxvXAomk2Dhn4PRNfouc1M5slcmD1S114dvcjQoHCZKkgfNLIWCGyZA4RpP3zzRLDN1dH9D53w/w2FIF2ll8IruvhLhRcFHluPh+OR66PIcfgfzOBV+7+NBXZknImVyB2ReTmLDYi6LjreeQ++HjZX3opC8PbA9s2zJVFxJLlVawhqY2J3tCCQbCW6rCISstyDaaY7p0AeQL3mAfgs6U56NfeNu2/AJFv4jMO5PH/fRu0O6GBJKKUievDJT8Oco9qNDusj9Wi4nbpuMU2x2Xmhqiyf0ZwXy3Sneq/Xzgsh6D83wfQOz/GfswQqcgLjHCBEG2yyJLc6OJXW6tfaml+MIpaH6xZAknCBdTk+a8jFt009fYUHKG6BgPMOv/BiS2ePNS3LGryKjAVWYg2TAWlWtksRxOPyj5o+JxI8Aq+mGqlUeiXw+kR3goNoXjBPs16OZ5eE4wwxXdubzWrTnzf8yKfCp7PnNxUBDDjBdnlgXY0c1I9nik56XEsw2/wmWsgWoaQKD8w09xrN uuJ2Rqft SiunilOSt7FY1isfYRljz8UuAuF8iGdf39AfcBdivRweaMUqoUyRWaCmoRq199I5BQSNiqPSn75F9j2Xq7WVdgakrdFkcP+l9se4Gh/0dBybNHc8nq5jUx6zjhZWAz9/jQ0ikE33UDvC79VJx7aBinkq7LSNnVYlOX5Tw5AAlGtGZTWzfe+cY22nZwtRFY3oPep6B3Hm0V/3++ODhUw26pJAfblZYOqhj7FXtiAwzJjTPe7AskGEmbhKgvjZDYdt2sVbZ7OQSt1cgQflAc4/fLCQSimAbrHRiXiFF39u7jaqtJHC3oB8jPYaaESreggU+BWWZbuAvn4kSubEuFo3JNPscrhdyIZTAUzM3VEA8BwGR+SQjQx0zodltpUip3avo2qJvAduGMnSXxp/3f2ao7uF6I8FEP4NEnkRVtg1IzoHf/cJOAGcBaelxXYJVUwgJoPd/wn3Ft+l7ZxQgIWoILKvd4mKwB9UAZHMktyDHolrbUPcsnSxhi9gvuBebZB8UbKFRNezIEV/UavcnhAzuvjjP9w== 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d1a68b6d03b3..26e608d8025d 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -635,16 +635,21 @@ 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); if (!size) break; + if (memblock_overlaps_region(&memblock.memory, base, size) && + memblock_is_region_reserved(base, size)) + break; + memblock_reserve(base, size); } - fdt_scan_reserved_mem(); - fdt_reserve_elfcorehdr(); fdt_init_reserved_mem(); } -- 2.40.0