From nobody Wed Feb 11 07:50:11 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 BD2AC1586C8 for ; Sun, 5 Jan 2025 17:17:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736097471; cv=none; b=UC2aIBaOPJdj5Z/udySq0cNJWK47dnQ1cG44ONItBRxCgawjpvE3TxG5i5+DCaRJfCJsGDYA3uLi7hYt1R14/Ea4HRMXA8d2Znf0WQx5cknzWtQ/hcpqNVCBZjoOHo0o+Kz2AV8cSIBYey3plXcmaSYmUlpT2Ox3pRVyYEjvy7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736097471; c=relaxed/simple; bh=cQimmwB3iNQGTyLREuAKfsmql7piInL4jdzSszYRtYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MrJZA6CSIjC2g/nPKACSI9orXnktYiQ397MtD5WQ+0qQlh78nSbaI+z7rLfiBIM1bJ962TH49Y0zALZCqUZ6nbXLNKpIdeHt5oFaSUA/LiVL+7niTgKVTuUU/RNQA7/Ct1uP9QUialEDwNM2j8bzjTsxak24svXNpNkUT2hRvqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=lq2YNxLE; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lq2YNxLE" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43634b570c1so97781195e9.0 for ; Sun, 05 Jan 2025 09:17:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736097468; x=1736702268; 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=waaXYIjfvBCsra9ANlbbeFiP++cQQ67tbxpqxfXM0M8=; b=lq2YNxLEkAdCaNEX8yh8eUA6/Yj1p0J/4mZUxrhwALwEL1UL+rSnspjEvK52zoW8pX BCVRDPCmmL6abhDGYbSF23ePm63ZdZcWhhsaIvtvFcKJqvbSEWIG7W81ecNqX6nPRtgh cN6uTF6AbbdW+SRsR1f7xZCWx0Cvw/NoBmtXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736097468; x=1736702268; 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=waaXYIjfvBCsra9ANlbbeFiP++cQQ67tbxpqxfXM0M8=; b=QLJBZwVblb42I3gBdSIczvjpQ/YKrMPbaT98ERDOgYt8J/07SatqxD8aVwI9A+JLu7 IQ5TIgI0tim4ypUFwxaPg9J241u87rLIvt4HptNDv8Sf6nYWplyA/wq63IT+Qy1twyf/ WqUyVFDi8ytrUR4ZeWlP4zu3uGcrvDF2BG2QIxlF/9nOzmDLJ+Sa385oXolocXi5IYrz mByHcJp2q04QnAOIwgGVceDuv40qU5QoOTXHknHg1OMRC6arzoqhgeq24Kw3KAnjYWJM dv78BIw4eQiKyTNmydSwtGm6dS4u/2dzcVgtinLWeopJ0AXyg89V2XAfd+T1boCB075E DR/A== X-Forwarded-Encrypted: i=1; AJvYcCX8ddEgyH02UgHKCziBGG8sXyXhJj/3F3W5c/rkI05aMShpmj7kpOW0p3HIvrcq7imD9GvsYazTXqy6AnY=@vger.kernel.org X-Gm-Message-State: AOJu0YzkxoKfGUWUF8aRNeKa/PQX3hFtTJ71UYsAEv3kyqI92zSyFiVe VOVh1W1lSY9JinWC/wvszT3nkXrz/F1k7s29txb5VNKnyYJ88rrHbZnqZEsCTA== X-Gm-Gg: ASbGncv8SWiBrBXGYS6YUyc3VDaL9JbpARuQlil9pkku/a/e0GP8ZSxd/GLquUjzN7W lxltY3p3ZDmA7GFEyqffVSWVDLmEXxvnfWh/bg2rGFIrurYt7WHpo+iqFJZQO+mZKZCjG1zO83p j7rbXN5b1UpB+mA1LC3MWz8QJqLwzP+MfdeNMtoPG7JCuyXc4nrCX1Pbn75nB/BpiCfjkb1BGHm Jv+/LQs0NKdsiYKsBGKuZstFzD4oPljhnbb6LR9JYPQuXhE1BIeOpPjhOFLQ8UyoRWb8ixOQ+p5 THvJHHawUdx09e0t6frVPoF14++B809B27GO X-Google-Smtp-Source: AGHT+IFjcKrCEMvuHlallteEPNM9uk2psdNLjspH7AZMYWR56bzbdDPjejh5DZKCGH0JiZAnpORCrA== X-Received: by 2002:a05:600c:1c87:b0:434:ffe3:bc7d with SMTP id 5b1f17b1804b1-4366864646fmr484161975e9.16.1736097468068; Sun, 05 Jan 2025 09:17:48 -0800 (PST) Received: from dmaluka.c.googlers.com.com (19.50.76.34.bc.googleusercontent.com. [34.76.50.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436604e9c2csm543987345e9.43.2025.01.05.09.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2025 09:17:47 -0800 (PST) From: Dmytro Maluka To: Thomas Gleixner , Rob Herring Cc: Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , Saravana Kannan , Saurabh Sengar , Usama Arif , Stephen Boyd , Frank Rowand , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= , Shikha Panwar , Will Deacon , Keir Fraser , Michal Mazurek , =?UTF-8?q?Bart=C5=82omiej=20Grzesik?= , Tomasz Nowicki , Grzegorz Jaszczyk , Dmytro Maluka Subject: [PATCH 2/2] of/fdt: Restore possibility to use both ACPI and FDT from bootloader Date: Sun, 5 Jan 2025 17:16:43 +0000 Message-ID: <20250105171643.3473702-3-dmaluka@chromium.org> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog In-Reply-To: <20250105171643.3473702-1-dmaluka@chromium.org> References: <20250105171643.3473702-1-dmaluka@chromium.org> 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" There are cases when the bootloader provides information to the kernel in both ACPI and DTB, not interchangeably. One such use case is virtual machines in Android. When running on x86, the Android Virtualization Framework (AVF) boots VMs with ACPI like it is usually done on x86 (i.e. the virtual LAPIC, IOAPIC, HPET, PCI MMCONFIG etc are described in ACPI) but also passes various AVF-specific boot parameters in DTB. This allows reusing the same implementations of various AVF components on both arm64 and x86. Commit 7b937cc243e5 ("of: Create of_root if no dtb provided by firmware") removed the possibility to do that, since among other things it introduced forcing emptying the bootloader-provided DTB if ACPI is enabled (probably assuming that if ACPI is available, a DTB can only be useful for applying overlays to it afterwards, for testing purposes). So restore this possibility. Instead of completely preventing using ACPI and DT together, rely on arch-specific setup code to prevent using both to set up the same things (see various acpi_disabled checks under arch/). Fixes: 7b937cc243e5 ("of: Create of_root if no dtb provided by firmware") Signed-off-by: Dmytro Maluka --- 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 0121100372b4..3b29a5c50e2e 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -8,7 +8,6 @@ =20 #define pr_fmt(fmt) "OF: fdt: " fmt =20 -#include #include #include #include @@ -1215,14 +1214,7 @@ void __init unflatten_device_tree(void) /* Save the statically-placed regions in the reserved_mem array */ fdt_scan_reserved_mem_reg_nodes(); =20 - /* Don't use the bootloader provided DTB if ACPI is enabled */ - if (!acpi_disabled) - fdt =3D NULL; - - /* - * Populate an empty root node when ACPI is enabled or bootloader - * doesn't provide one. - */ + /* Populate an empty root node when bootloader doesn't provide one */ if (!fdt) { fdt =3D (void *) __dtb_empty_root_begin; /* fdt_totalsize() will be used for copy size */ --=20 2.47.1.613.gc27f4b7a9f-goog