From nobody Mon May 25 03:33:27 2026 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C8843E170F for ; Tue, 19 May 2026 08:24:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179078; cv=none; b=Os2+ScjMoomtqIipyUW0hkrLJFhKSnaWc1wdMYSFebOCUbToSDo8Tho8fcrju+Pf6C0qKdAb1ccb9C9Cyzgi4RyVZXyufUXKJcWCWQHR5zxPVNDSChCDiEZEgMT4NpHoQHydCyXSYxOILeY+h6Lb0SDpoPDoSuKwwi+QxleHgg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179078; c=relaxed/simple; bh=CkstdbjcyxCbFYACRa+dH3E6m7IV7Z9T7BiW3Y+DXR8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XDNItWAH6KlS9Iv7dGwrMtcm8SO+mYhZVtxSg05jVrr4W8aBTTx16n++CZDIbwlmsyv3bMZSJb9NN4Rri3ESpe6CV93rWiPC+mkMa9YGDRX9hpSD+xWHxMbSg3jIFU45Jbt9s/UeMqUDpHq6o5KF1MEqppOyZXD8HqYd2Z+BSbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AGM9D64J; arc=none smtp.client-ip=209.85.210.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AGM9D64J" Received: by mail-pf1-f194.google.com with SMTP id d2e1a72fcca58-82f8b60e485so1247546b3a.0 for ; Tue, 19 May 2026 01:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779179077; x=1779783877; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hWIfLWdmt/c7x4yuYJlj2y5vCVFFJpw5Nml3m5vGj7s=; b=AGM9D64JwCdhNey+DtCqHFGFqxD5qKbcA8ihhB/rvkL1oirEoxRSMXQoIO5WEil7ge lpf1d+BNRtErbrp8II3ryx3sSY188aDOY7/0+Z0oSxRbtUf1ZTNYq2Q9+TVk5sda1IBS ihAuuRqaVsqihhmifeGtNWCwqHOjiQQbbMerNndmP+U8TUdxEvd5pVe9lFwqqdP9DYsp DV+l4levYqbOV1IodpffFYv0EOdv1L6fzwlhAIzvRhKwlKEZsDYe9Al58NulG5GmgpWF pXa33PuiLqtC19lCZGNoVhiVD1HYkrlofPu0h3MKitV3Ah940uS0DDqCVyXD0NY0TkB/ uWqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779179077; x=1779783877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hWIfLWdmt/c7x4yuYJlj2y5vCVFFJpw5Nml3m5vGj7s=; b=Lx/5w9gyZEnoADH6M9Ne+yGxy2CRPJs9heWeZXFb1ha7RGasBGraRzSLUuzYIACzXM hD120jhdJqERahoK2UYNPaHcP1iiGSOAUPuCnZQhoHQ5vRuoEXHNHqS5qUJlRGeJOu+Y qdSdmhzgX9VsfXkdjTf0IitxXqSaDEFzJC/ZFMUAoZ+BiX4K3Lld1fg3sBri9PF9FRlR RpxHkFJBVrxDKWjGjRNRphyfsb1GHEL5WoDAD3DKJLDzc+U5f7UJf1vxTmMWC8dM17sX 5Hkn0tHl8vM4wFRnUwinGy8JtdiBVcXlDrvrMHcmDzDHb8hUvUmrvOaOfo+8Rm9eX6wg dxFQ== X-Forwarded-Encrypted: i=1; AFNElJ+JQ4K7yH+NKiF1s5RoIWQ1jka4rPxgvQx6uWcW/htkb7uKn+fTG5d6MiqkcLxYdIyuRDibdrGukRz+jPI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4G1A0yoP88Hn6CEtqA9kk1GT0b9XhDofz/P0QBjK8kIXRYdyZ hNUDxi87QwNRgbRPeB0epLKYsjFRHSlvyjumlooxYTxMSqh+Jyl1coFb X-Gm-Gg: Acq92OEFvlJxgURA/mb43KIp1fyhUnPgdfTCawFqPBJTs+Ki7ph609XYVpIW6SUj9FS EWsYvM7P3WX8ed7dynKRH8dogRqa+J8MW1RvWIPE8LNhBZ2wAH5bYiGAtAGlHSw2FBvPyKdSO+B aSvgegX67jhmP3Ng9iT9MM4+BYIAb0wMPSSFEDgZakuSbAWBTbloUIqTrlIMw/m287kUus0MAs2 n5wZEp9XivqqKfg5SIv/hxxR66Z7L1Uj2Oe0T5H4QdEedEJ6rPfGD1M16E4/jp7kfP8rmtjmH++ sdxzICV1vIQXWL3Pamj+c84K1Ym6EuoxoWXvFCNdsn5mO0Duij2+Gxa0HA5yzOGFtfBb0jIZxrM bqwTlZvHk7VFJWd4Qmk056liEvd7IrP3V9AxpGnn4rQa6H5T71GzfSq1d99XTWehAKsmIULZMjy C5BdhIU8UAgoLvoRq8X7FLQNqLMCirANwqYBnFRUFLMFwsTp43 X-Received: by 2002:a05:6a00:9094:b0:82f:5726:be23 with SMTP id d2e1a72fcca58-83f33ddaab4mr19553785b3a.49.1779179076711; Tue, 19 May 2026 01:24:36 -0700 (PDT) Received: from intel.company.local ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19c5b4bfsm17822898b3a.28.2026.05.19.01.24.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 01:24:36 -0700 (PDT) From: Wandun Chen X-Google-Original-From: Wandun Chen To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, zhaomeijing@lixiang.com Cc: robh@kernel.org, saravanak@kernel.org Subject: [PATCH v2 1/3] of: reserved_mem: avoid unnecessary memory allocation when __reserved_mem_check_root() fails Date: Tue, 19 May 2026 16:24:25 +0800 Message-ID: <20260519082427.4181476-2-chenwandun@lixiang.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260519082427.4181476-1-chenwandun@lixiang.com> References: <20260519082427.4181476-1-chenwandun@lixiang.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" total_reserved_mem_cnt will keep the init value (MAX_RESERVED_REGIONS) in fdt_scan_reserved_mem() if __reserved_mem_check_root() fails. fdt_scan_reserved_mem_late() calls alloc_reserved_mem_array() to allocate memory according to total_reserved_mem_cnt before __reserved_mem_check_root(), so if __reserved_mem_check_root() fails, the allocated array has nowhere to be used, so no need to allocate memory. Move alloc_reserved_mem_array() after __reserved_mem_check_root() to avoid potential memory waste. Signed-off-by: Wandun Chen Tested-by: Meijing Zhao --- drivers/of/of_reserved_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 8d5777cb5d1b..7856dc857d65 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -265,14 +265,14 @@ void __init fdt_scan_reserved_mem_late(void) return; } =20 - /* Attempt dynamic allocation of a new reserved_mem array */ - alloc_reserved_mem_array(); - if (__reserved_mem_check_root(node)) { pr_err("Reserved memory: unsupported node format, ignoring\n"); return; } =20 + /* Attempt dynamic allocation of a new reserved_mem array */ + alloc_reserved_mem_array(); + fdt_for_each_subnode(child, fdt, node) { const char *uname; u64 b, s; --=20 2.43.0 From nobody Mon May 25 03:33:27 2026 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 724A93E2746 for ; Tue, 19 May 2026 08:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179081; cv=none; b=rqZ5mwRKvgbRjj42Yytcyfvv87616ey/InVodPWOnZejodSWbI7PKL4e6oO7uqCEpp8y8hb/NkvILXyeag2KzUH0x89DK8KElfIAoHJP/RtpxEvl6QwzaMHeIlsukrVFPGAxWHcIpDBDvC6duDnzRA1mzGuqU7ODwxquKfEfpwk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179081; c=relaxed/simple; bh=fqAFN7dyR+wKqQAqSyaQDBTmVbMV9AvPw9gs4mNuCmA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s3YSdnH6bNEeSJUXp6AV4o5NZCjYo3nT741nSSHXTe/4jbEXKP+oRR4eKZK9dMlz1oitoMy3fwypLpyJvCO/OI6LaAbJSxT9BATPS507mF4gbjjOSWpm7ril/Yg3t9A+j6RcZSgBC9B+hYWqLd2VLrWKqC3ClqkEySAOKafQWvY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AsqO2GR6; arc=none smtp.client-ip=209.85.210.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AsqO2GR6" Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-82fa8d6425bso1448722b3a.0 for ; Tue, 19 May 2026 01:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779179080; x=1779783880; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7uXKxPnncRw5Ggb8vAy59S8N718WjW+e/lnMOsiI/io=; b=AsqO2GR6vX2yZdXRD/EE33EEi+/Mvu3qehcgWASz2nTbqCOFYubpesz4rT6Xzx3lsV 5B8b9Yl+A+hO3b0B6gXwHeh0CBzHlywEy1rG+vTE69C1zhYAmb27Pc52Fc+M3FrwAFo1 sBATMnAe8GIemVBq8WeLb3Ie7MYcD8xVcEDLXI5Yb6ZKlxTtQ11TDo4NqVjMjfta2pRL o6Z79DHRmPdgnMibOXZwjjcStyQ58//g+Hs07CBiAbnzFUxx1xgq8oqrjTdIS+93VIir SLEfZHm57+xCgIuD03ZTNDhREo/bszXzoVApogPCLUrK3NfmurJ9WrxZtV7cAZFNaMXa koog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779179080; x=1779783880; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7uXKxPnncRw5Ggb8vAy59S8N718WjW+e/lnMOsiI/io=; b=jXLMzHE1mOjNWhgqbdpfdLjUidcL3M09qUxkyi3a6oF9com4Zw28z43fJcPNfGsLxT QjZrvh5gfU40NZ1dGwJ2R+DmCQEXEhm35Ni843xcCoQ7ShSBTetmeb4X0H+gg6dTJeZM eGBgQwx1121KeKZ50CccaINAbgp8ZHbH0rBW44PEPVnVm2YIUeQkJUrzri+dW5H+1dP+ OzsE2Pz7KXXB6aKFtqB4WMUrDBvZpG3Db2azPtPvV4yfeOW+fBJnjWOSxtlM2ir3A/NE hUcbv/nnzq+/+HZzPZXptj6Kf7/qvC/hPaBDE7LDM0t0fGfy/LhnjV7lNZ/00po/BMNJ lxgw== X-Forwarded-Encrypted: i=1; AFNElJ8dPsQQMmtzX46dTU4CyzHqeWNi2RRn6ej9dQHsRH76eHmpTX8U5n3+c/GR1pbngIJLdXhQGnnSdNTXDcg=@vger.kernel.org X-Gm-Message-State: AOJu0Yws4x/1UR4Q+e80yJg2PVTAwgySoieIoIgPjLcjgMGTY8O7JUri LbAtYLv8DvA3TB4wECbrbM19t/mahdZZKaFuGAn7PsZiN6LalZttFd0n X-Gm-Gg: Acq92OG7s2cXpL4CkHudVRksSr56s7cOcwVh0LVXFpt6m2zYSQ+/D36xUpeO90Wgnrk yV/h3SHBLCGKTFKjIOt15kuTTwE/kK4SpBTKJh094D7u0ivNrWCOt4bMcY6Ptab9vKohvhpo+3A 9kHM+jm0AFJSIk8bRbzmk6YNG+4HC/FIipHcgurW5fuj069L40w8sZCjgAfcsIf08V78Cr+zXfI M5s+GFpeqZm7uz6+emQPDtWNLB9U4UzwFzvfllIA+WC93cUYF2UpO+CX/U2fwMcVOSIHLXMXpqN 0vXE7m60Y0HG6TK1oPSBO1WiWcBZgzrZKJOGi4GoO4OURR9VNSvrtrCjd5VWGPspIYFDTeCweY6 PmazY5sx0zZa9dm20pVC2PGXTWhkkAAA4AF9xXz01xxA4KrgtV3ihDzHPyBT06fw4ldsC8nPjty 7q0fJ0oGupSR6PFcoVoe3C25NhXC/T3ovU+cfRidg7c/BpS5NJ X-Received: by 2002:a05:6a00:ad87:b0:837:d746:8e1a with SMTP id d2e1a72fcca58-83f33ce695amr18963950b3a.22.1779179079824; Tue, 19 May 2026 01:24:39 -0700 (PDT) Received: from intel.company.local ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19c5b4bfsm17822898b3a.28.2026.05.19.01.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 01:24:39 -0700 (PDT) From: Wandun Chen X-Google-Original-From: Wandun Chen To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, zhaomeijing@lixiang.com Cc: robh@kernel.org, saravanak@kernel.org Subject: [PATCH v2 2/3] of: reserved_mem: clean up redundant alloc_reserved_mem_array() call Date: Tue, 19 May 2026 16:24:26 +0800 Message-ID: <20260519082427.4181476-3-chenwandun@lixiang.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260519082427.4181476-1-chenwandun@lixiang.com> References: <20260519082427.4181476-1-chenwandun@lixiang.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If total_reserved_mem_cnt is 0 after fdt_scan_reserved_mem(), there is no entry to save, alloc_reserved_mem_array() has nothing to do. Just skip it. Signed-off-by: Wandun Chen --- drivers/of/of_reserved_mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 7856dc857d65..462e7c3078a3 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -270,6 +270,9 @@ void __init fdt_scan_reserved_mem_late(void) return; } =20 + if (!total_reserved_mem_cnt) + return; + /* Attempt dynamic allocation of a new reserved_mem array */ alloc_reserved_mem_array(); =20 --=20 2.43.0 From nobody Mon May 25 03:33:27 2026 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC53F3E2760 for ; Tue, 19 May 2026 08:24:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179085; cv=none; b=bl7mUykvzf04H7iY+2gq0RVcKk1mg7P+kLI66YaIMz3ofGXnGeop8ojn8l+Fu6q8akGjJjYw0AwyS2OWldriUJCOa+l00HzrkUy8DhIk2B+t1bKygai0Nwa3MLWFHrsyLXuq2v5gCbpVRaCBvSFeNW9wGeRvFxipQBlZPJAanKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779179085; c=relaxed/simple; bh=Ob0QeBApGXxL+bHjlAt4A8HF0QM+j4NvS2rVrECCubM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cWwy0Wp3/VGPvLaB3ab9blFoI3G4LttAW1w3evPr/zbmQXu2EX3Lwv6lwmj2KtJ/DbjLnJqc61+OyXQpOLGVeT2mnHSjTXNBLrdqLCBqXrXficnuZLKoC8AibynI5q3p5axPLyc5TrUIGZUYBYhgdLSbGOqLJmNt7ARR1NOXaDA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OqqZZavi; arc=none smtp.client-ip=209.85.210.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OqqZZavi" Received: by mail-pf1-f193.google.com with SMTP id d2e1a72fcca58-83d31ac4017so1441156b3a.3 for ; Tue, 19 May 2026 01:24:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779179083; x=1779783883; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3TgtSA5cUn5h4h0Ny3QzeZ6CBBxSd3EVznRrJzHVc6I=; b=OqqZZaviL/Q/STmZ2C9ccqUYW0xMV2EgWHDME90Zp/WirY0WVsNss9zlwL3oYTf3s7 FcphN6MsPLvppVYe1VWyANWiPnJIMlmyTjO4b0Ju2Go1hyRVLpEcq8gUc3gHsFnD99jf PBnQIQg1Gx0Mttg3iaNv8/ArQFDpImXVq6BkSgeS3MHK7XNIVTfggywuorNgTdZCiAdw 0SjiZ3cjXUIl/GBMmL81RRvl8cRbGNhSeA/i5dbvpjqMvFsA88jCNx7J1H1VrDeZIQR6 RZA3mQN2BPW1lonEaYjUofJq8wWeZynSBn03mSxUeM3YYavgZqT9VslD5lrj/ZMGvmxo Mwyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779179083; x=1779783883; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3TgtSA5cUn5h4h0Ny3QzeZ6CBBxSd3EVznRrJzHVc6I=; b=Uh4DtJ/dPcAN8ZPE9POd3GAl8hrGfJXclA1qBxMKqDA9RFC1R1PF4LhVxiuDfjYJCq L3FPZblr/UHHquyoRGWa7oph0lpTyvzIM7/69vbTXUfdD8gIDdw6QVmWSjgF3Z9uN2x2 rSSi13qUZ6EM92902eeUnIiB6rZIRPhFgRcHuJu97HctZKFBplernqr6mivD4lkNjGbp ekZrcyKEbaCZP+wngkxcZtiD/SIXTI6RpMF012Y9UEb1f2SYLVO9rvrP52LtH1YRm0R8 5N3Lj80asBq7YEpGni/YLVkpLTxJW/v43GnGJ7LtyBGRQkxXGd2gRE95dfYOwypyYIMp BbcQ== X-Forwarded-Encrypted: i=1; AFNElJ+rYZ5v4oig5UU6MCo8aLXGpWPCeayPlpPStacbVzMS2zEuUeMTxoX1rjWg/8fTzT6k6eH2ROBBzGW/PwA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyd+G0TCSFN/jgXI0a5fL1quPe5XW11ZTQYCf/9SqvezdiB1SEl pLdWVfiKCz6kFK0VWvBmRUB4s4WCZxPDqWKnY6axoejVl0udHHl3TAeX X-Gm-Gg: Acq92OFoPgUosn/YynN/BkHLLXHbtb3MWFGMDI1RGDMZpThSx+8o6GD5SQuNsaxTBFJ R9EeuVAGy4lqn5B0NL8/TUHGd5q0tIbIvDaFd4iAy8tblXtK/rLo2VmwEik3kyFYkvfJpPkD44I fjVuZO5ArQLMbKTKVHmUqpsF+wflGFTSy8qT2ZU9MOjE1v91qLEc+tM+y6iHH7e6rD/MOAdoE9M UvRZwtxpaT9gAD9xXKLkS3cL66YVd5xf3zx/Sp/bzzkL1YRqti6OinizaUYbsq76UmlTYyv9SZ8 uoLoZobtVIRcglKxzABOcqxZDkTqUcjJAzBmYWAY9fAoGPJWni6CkldDo4HyhoML5F4EquZ3p8S nDM1j7Wr1in3TQik7o7weN+9DWCqxA50QqDgZwx3vVHvKyqU2e3vucdwVZQjnXukRX0y/L1iId4 cDfYdJZPoD3+MK1WFHnOAZJR7RbE7NjIRvewBQoEBWZkXL+pee X-Received: by 2002:a05:6a00:3925:b0:838:29b3:9ed1 with SMTP id d2e1a72fcca58-83f33df85ecmr18320240b3a.41.1779179083239; Tue, 19 May 2026 01:24:43 -0700 (PDT) Received: from intel.company.local ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19c5b4bfsm17822898b3a.28.2026.05.19.01.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2026 01:24:42 -0700 (PDT) From: Wandun Chen X-Google-Original-From: Wandun Chen To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, zhaomeijing@lixiang.com Cc: robh@kernel.org, saravanak@kernel.org Subject: [PATCH v2 3/3] of: reserved_mem: only support one entry in reg property Date: Tue, 19 May 2026 16:24:27 +0800 Message-ID: <20260519082427.4181476-4-chenwandun@lixiang.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260519082427.4181476-1-chenwandun@lixiang.com> References: <20260519082427.4181476-1-chenwandun@lixiang.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A /reserved-memory child node may have multiple tuples in 'reg' property, but multiple entries in 'reg' have never been fully functional: - fdt_scan_reserved_mem() in the early pass loops over every tuple and reserves them all. - fdt_scan_reserved_mem_late() reads 'reg' by of_flat_dt_get_addr_size(), which returns false if entries !=3D 1. So 'reg' property with multiple entries will be skipped, no reserved_mem entry is created in reserved_mem[]. Supporting multiple tuples is not a good idea: - It requires reserved_mem_ops->node_init support. Currently, CMA(rmem_cma_setup) and DMA(rmem_dma_setup) are not supported. - of_reserved_mem_lookup() is name-based, only the first entry in multiple tuples will be found. So change to support one entry in 'reg' property. Also update dt binding: https://github.com/devicetree-org/dt-schema/pull/197 Suggested-by: Rob Herring Signed-off-by: Wandun Chen Tested-by: Meijing Zhao Link: https://lore.kernel.org/all/20260506014752.GA280279-robh@kernel.org/ --- drivers/of/of_reserved_mem.c | 39 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 462e7c3078a3..0e91c4a71d89 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -134,37 +134,38 @@ static int __init __reserved_mem_reserve_reg(unsigned= long node, const char *uname) { phys_addr_t base, size; - int i, len, err; + int len, err; const __be32 *prop; bool nomap; + u64 b, s; =20 prop =3D of_flat_dt_get_addr_size_prop(node, "reg", &len); if (!prop) return -ENOENT; =20 + if (len > 1) + pr_warn("Reserved memory: node '%s' has %d entries, only the= first is used\n", + uname, len); + nomap =3D of_get_flat_dt_prop(node, "no-map", NULL) !=3D NULL; =20 err =3D fdt_validate_reserved_mem_node(node, NULL); if (err && err !=3D -ENODEV) return err; =20 - for (i =3D 0; i < len; i++) { - u64 b, s; - - of_flat_dt_read_addr_size(prop, i, &b, &s); - - base =3D b; - size =3D s; + of_flat_dt_read_addr_size(prop, 0, &b, &s); + base =3D b; + size =3D s; =20 - if (size && early_init_dt_reserve_memory(base, size, nomap) =3D=3D 0) { - fdt_fixup_reserved_mem_node(node, base, size); - pr_debug("Reserved memory: reserved region for node '%s': base %pa, siz= e %lu MiB\n", - uname, &base, (unsigned long)(size / SZ_1M)); - } else { - pr_err("Reserved memory: failed to reserve memory for node '%s': base %= pa, size %lu MiB\n", - uname, &base, (unsigned long)(size / SZ_1M)); - } + if (size && early_init_dt_reserve_memory(base, size, nomap) =3D=3D 0) { + fdt_fixup_reserved_mem_node(node, base, size); + pr_debug("Reserved memory: reserved region for node '%s': base %pa, size= %lu MiB\n", + uname, &base, (unsigned long)(size / SZ_1M)); + } else { + pr_err("Reserved memory: failed to reserve memory for node '%s': base %p= a, size %lu MiB\n", + uname, &base, (unsigned long)(size / SZ_1M)); } + return 0; } =20 @@ -277,20 +278,24 @@ void __init fdt_scan_reserved_mem_late(void) alloc_reserved_mem_array(); =20 fdt_for_each_subnode(child, fdt, node) { + const __be32 *prop; const char *uname; u64 b, s; int ret; + int len; =20 if (!of_fdt_device_is_available(fdt, child)) continue; =20 - if (!of_flat_dt_get_addr_size(child, "reg", &b, &s)) + prop =3D of_flat_dt_get_addr_size_prop(child, "reg", &len); + if (!prop) continue; =20 ret =3D fdt_validate_reserved_mem_node(child, NULL); if (ret && ret !=3D -ENODEV) continue; =20 + of_flat_dt_read_addr_size(prop, 0, &b, &s); base =3D b; size =3D s; =20 --=20 2.43.0