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 9FBEAC7618D for ; Thu, 6 Apr 2023 15:14:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9530A6B007E; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 901C36B007D; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70E226B007D; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 53D8E6B007E for ; Thu, 6 Apr 2023 11:14:50 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BE2254135B for ; Thu, 6 Apr 2023 15:14:49 +0000 (UTC) X-FDA: 80651313498.04.A3471DB Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf09.hostedemail.com (Postfix) with ESMTP id EA81B140020 for ; Thu, 6 Apr 2023 15:14:47 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.128.48 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=1680794088; 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=VKATmeJF+Xd6RfEgdIKd/kdycc50pAq48rMDI6zu3z4=; b=GZkmlQg+UwjmZzRtB1ngyVAPk9nOr+bTlRiP18PXi3591OeKgwxv45j92MTnfehjc9PIGW AJPF00UAZcSDOMMjEgRqTHFCJxrCTkxE3ynI0CcF+diOZxRyo0nhQnpX1Prh+XzmPoVwWJ ClCzkMHSIZislQZLatgjfNAf+TL5yLE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf09.hostedemail.com: domain of tanurelinux@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=tanurelinux@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680794088; a=rsa-sha256; cv=none; b=wzMF+fVPCknQVgilKHv/THYQhYVWJvZrLt7gIPND50MDXO9xQjpsf4mFsWKQAJKi0whcO9 YtIMV0seawpi+DotHKCkb2JJfdaawuAFo83VPjm55w2Xeoys8pn4AcElSwqeJPcWeazRa8 C6zsKo1dlyOfXFdERFH/OIj2hB67jyA= Received: by mail-wm1-f48.google.com with SMTP id p34so22773595wms.3 for ; Thu, 06 Apr 2023 08:14:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680794086; x=1683386086; 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=VKATmeJF+Xd6RfEgdIKd/kdycc50pAq48rMDI6zu3z4=; b=1Scg7VTaGacNm48x92s4Uz/vBXZoDayEzdUzjDo+alw28tuSqceKuJ6T+s9FatPee7 2QXTz423pqpoA/Zmg4KEzbZNkIX5V7p37nOH5EPHbtIfcameOTa8eH1KTptuf7JVAY57 AFIGrhGIeL9vqUafyVUxiBNloWTNl6lfaMmdk5E1F12xnCP9ZlAmJEiQRmbJAzVL2EBg Qa2oI/rnT4rde+BCgeowtFEzT947s8uOblTmMni2sfzCHgQIg+NtZdpUqbrfZ/6JY0jF 14iF9lavCak16/UWQtGRSlinil/rzUVH7t1B+HWJuJxbyzLSWbpP6F3rGMIPPQI21YE/ h25w== X-Gm-Message-State: AAQBX9fuYcljbbbpMPnVSbGtvAIa8EzCgH8faP8BUmvj0oR2bjdhqVbo 5Q2T1OcoFmQRDRH2WFdFb80= X-Google-Smtp-Source: AKy350YOU24o0+DjVUVccG/oqlcWRmAeru9w+HwMxOWGCplLCkcR3X6veQF5xP1/2B5vxx8vQzUciA== X-Received: by 2002:a7b:c850:0:b0:3ef:6ea4:a675 with SMTP id c16-20020a7bc850000000b003ef6ea4a675mr7787556wml.36.1680794086552; Thu, 06 Apr 2023 08:14:46 -0700 (PDT) Received: from ryzen.lan (cpc87451-finc19-2-0-cust61.4-2.cable.virginm.net. [82.11.51.62]) by smtp.gmail.com with ESMTPSA id fj12-20020a05600c0c8c00b003ef67848a21sm5560213wmb.13.2023.04.06.08.14.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Apr 2023 08:14:46 -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 2/2] of: fdt: Allow the kernel to mark nomap regions received from fdt Date: Thu, 6 Apr 2023 16:14:29 +0100 Message-Id: <20230406151429.524591-3-tanure@linux.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230406151429.524591-1-tanure@linux.com> References: <20230406151429.524591-1-tanure@linux.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: EA81B140020 X-Stat-Signature: 9dfa86u1jzqfdzo7hpn37jzmh3emp47q X-Rspam-User: X-HE-Tag: 1680794087-850937 X-HE-Meta: U2FsdGVkX1++MWDapgul6FvjT75Zyi5CLIoejyufQ9dfqpz9sIXnowHfcyGzBGBNkdMHL6nSzU859vTgykUzniuPFjr4lbZTcnFpAQkY48bKcCzgShKWYMm8T7221TZgseAiLDISQ7xYnOkDcl0/iIAsQ1yO/Sb4Fm4BhydTg/bEbP+Ba2or0gxVhwYIzlOsYOMTQKlC+9felTV8bHrUzErzy+5kpSaL9RKeKLpxJGEQAClBPyShKkQjegPPveFgFmBfJuBoYucwV1cAPPTft626O+/uaiEeIwFxijJ1Viu1UmkI54lFnR2XN91YG7hdNdSuadrjDeqI90u9aBpELTOXS94KbHc8OK+aul4nKV8ooACj70HAetHvO3HMGC/rQGdTVcYkcXC0ssea+cr4DCcwgf/67lgZQZqlOwQKI9TGdhu4Otc5SAB7NlFypdRjKRoD3yZi9IRRWBernu5s5Tcn+vHDScVj4RkGu3EL8PSv3T/rgpO4epz1TmX4G1EkprCjWdNcPcS7QEk2nJGW+yVeCUN/79aLKMxL2kHcqZmhTCqWGFO2qSRd6KfzHoXCdsz3i2aA40H7LZkzx51bDUKMr08im0oJX/PQY3YK/I5fCIU44x4QqSHaqJzsTLW57mTswwGWcin9HnxBVYv6/xW1gDjxBexi7/yvv5OTj53P4wIyUC9SVNyTi7Lx4uwFTRo+vnn2ELKkQQkvT5w5xgH2YEopQTHlo3gTvN9wGKlBjMXrzdmDLcHd0ds1h6UGgtgOCGeqOHcmHTPf3l2ul55S0o2HnadFqjssKRmCCmk3H3s4C9CwyAud8I2Kux1Q6CJNODW2MPXxnRc2D3f6jzA5+/7evUsverc2MKppuLCG2pouH9OACqVZqDVMy9HXbYdmq42jlXkA3xrKmJAxYmFIRcMzKRcywES35X/Yq9QM5YbCsonFS1gAl3PQMY8C6lGbAR9ozBs2vJQz4P7 SmS2uycJ 8aPs1POYNXSluaRswiUlN/Tdzk6BadPT2CM1KrdKQE1iBFY7za+lNPFPlemUEPiavqkga/yDavsLk6ImT/5Gypxm0/fsXdXCPTLWJoUlTrFzjIy0eYA/8KCW7bmqtTGvmmOU548phigfJpHIh/mja0Q7Sl2AsGD6mD71uyPIy27WiMNqOaqnvhtkQVqTsDmuMByoa6LciwxyHBAGfz3xCvPKLtjCd692On111Dj7ZYJNnKfwf8yn066qq8DDCjXa8Mo0Brb05KeFmT5SPwI+rnDNnzQ0FonDl4pFcVqsdGeln3qqii3156tbqY1/txLOkChAiX4k4yFFbrYjNwgKcXi86+JNpY8ebyQ9hvoMiunhEHF+f7YmeX0yVzM3690IJHUBsSD3JeRdgntQhMwdPKt97U+NqkYaArgYgIXo1n8Tm9TF9wbsVN/sKa3BaA6sfA5HCaUXSMJCd7NDkj8uSjVB1liH/VXZsRbxXXcaRCAoTKVJeoAQF7NgAwZ4yBs+ckXHcfeVTYI4rGY1mt3Ex8mF+4w== 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: Reserved regions can be described in FDT and device trees, but FDT doesn't provide the related flags, like nomap. So allow the kernel to mark regions where the base and size received from the device tree are the same as the base and region on FDT. Here we trust that the device tree has a more updated description of the region than the one received from FDT. Signed-off-by: Lucas Tanure --- drivers/of/fdt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index d1a68b6d03b3..754a7ea4f45c 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -482,11 +482,13 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, if (nomap) { /* * If the memory is already reserved (by another region), we - * should not allow it to be marked nomap, but don't worry - * if the region isn't memory as it won't be mapped. + * should not allow it to be marked nomap, unless is the exact same region + * (same base and size), which the kernel knows better and should be allowed to mark + * it as nomap. + * But don't worry if the region isn't memory as it won't be mapped. */ - if (memblock_overlaps_region(&memblock.memory, base, size) && - memblock_is_region_reserved(base, size)) + if (memblock_overlaps_region(&memblock.memory, base, size) == MEMBLOCK_OVERLAPS && + memblock_is_region_reserved(base, size) == MEMBLOCK_OVERLAPS) return -EBUSY; return memblock_mark_nomap(base, size); -- 2.40.0