From nobody Thu Dec 18 05:17:47 2025 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 A04EA79C8 for ; Wed, 17 Jul 2024 04:28:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721190483; cv=none; b=IBcdb2jKSZVnIApF0VMcUOW6plM1IZeC/ltiXJ3WgR0HMdHBIBb+Xo2rxTqe4ukmCGyPZz5uu5yxfpVRcfXjcqcDijRsorY9zTb3IYcqp5mf4O++1kbwfCe5mVcx/r0QreYbxqhMtnDkPr4TzGCZ5XzDo/RwMWOO8TpuM/3mR6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721190483; c=relaxed/simple; bh=5yvr1C3OyUG6Njd+0y6Sd8Bq9qPSsr9WMtTbIENi7r8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=eybXJOLIbSEwVZJce5Q2jGZ/y8XnYVKqwzxNpQ/JNNQLQ74XZVty5WZ2JXE5UiqpNoc3hqnZBoW4h7Hb5Ho344fw82Emt/00UvogTGDIFg/RrATWXVZZKjtWHr9Ysq0ueRRHV1GBbR7GdknwiKZlTWlAYgOu0U7/2z2o7fFFCyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=xEAVasDS; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="xEAVasDS" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-70b1207bc22so5325286b3a.3 for ; Tue, 16 Jul 2024 21:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721190480; x=1721795280; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pt6gY0086xG9hv3Wd3+MWNDnw87cQj+/HrgKVsB7LW8=; b=xEAVasDSJUd++l5iya2spUhSkmpQ5xbaDqoEJbIsW1dZ1KQt9W5QeMqE/QmG9PUHTO sGI5URgmR2ESVJgGjhYjd7btx5fJno7l8h9cx/lLySo3yFWXcb/95gXmMkF+5ii/aO+L 52JJMYRb7AuL2OgEJ9wDJTyhTsvkrCY+1kkhh8jTAvc9hBawcht11qvkLS3N1whjioAS /oFGDifehvzuZ+ZRVv3n+V+8gpa1nzJb/apAcw9WbuSuuQOx48nof+hjt04KLl0KaTZ1 4A4lCJ0WDfUDDDmxfHZa6rB3XkZPoGC/0vFhTA0J4vDE8cMacJ1FE5Zcl8qwcaWPTkXr 1pXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721190480; x=1721795280; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pt6gY0086xG9hv3Wd3+MWNDnw87cQj+/HrgKVsB7LW8=; b=GMQyFk093xaU4Db53FLGqEs/VJ1SzcVYbg7TLwgCl9gRotB5pEntBVFrynjSB5y7rq 3cuZ+c87A16Fv+QVWmDf7AYLc3CfHIntXxKahgCbuoOlSxXCZyNDptb1kIwnzZk5KkiS uCQOQsIdNKmQRvrG8zZh+qmrslsS4mX54thym43XZlHX9v16rCS25Ir+0EhFlZxUmIie MIazRg3qgiMI1EC/KK39cHXlXw+ySXG2B628tI92hdzCNqqkCdkM6cyiRWvo7CVVItLJ +wrCf/5BKzXlUo6BKZYM+F2BIud36MSHkWoiV35xQYlaoDVokjgFStQEPSE7BsBmJt62 67kg== X-Forwarded-Encrypted: i=1; AJvYcCVATeoG3TkMC9NdFESNOEjpouQeIBLJ+/fd4VUPUqlDqYLgj1YOIDpfxWNaAk1xihE/k86Rvjmf+B5B9OtLg4Zx728X5Hchg8Hz0G3I X-Gm-Message-State: AOJu0YxyJ9y11kgm/YF3xJBMn0enhRAN3pq0TFNM1LjV/9of4LsNgJjL LHi8wAojI98CntrGNciXuYVH/WbIqGqiiDvyCn251yGT2EOL+8aAwmHmXSqNtQ== X-Google-Smtp-Source: AGHT+IF2r67aEOlDm8IfXFlJ7mPLmcBYBY5HxMG4efU7XKetTNpJekMsfas9W/sdXDxqUueT8mTqcQ== X-Received: by 2002:a05:6a00:2381:b0:706:7943:b9aa with SMTP id d2e1a72fcca58-70ce4e8d73fmr719467b3a.5.1721190479851; Tue, 16 Jul 2024 21:27:59 -0700 (PDT) Received: from localhost.localdomain ([220.158.156.207]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7ec7d517sm7196738b3a.127.2024.07.16.21.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 21:27:58 -0700 (PDT) From: Manivannan Sadhasivam To: Linus Torvalds Cc: Bartosz Golaszewski , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam , Bartosz Golaszewski Subject: [PATCH v2] PCI: Check for the existence of 'dev.of_node' before calling of_platform_populate() Date: Wed, 17 Jul 2024 09:57:46 +0530 Message-Id: <20240717042746.8766-1-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 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" Commit 50b040ef3732 ("PCI/pwrctl: only call of_platform_populate() if CONFIG_OF is enabled") added the CONFIG_OF guard for the of_platform_populate() API. But it missed the fact that the CONFIG_OF platforms can also run on ACPI without devicetree (so dev.of_node will be NULL). In those cases, of_platform_populate() will fail with below error messages as seen on the Ampere Altra box: pci 000c:00:01.0: failed to populate child OF nodes (-22) pci 000c:00:02.0: failed to populate child OF nodes (-22) Fix this by checking for the existence of 'dev.of_node' before calling the of_platform_populate() API. This also warrants the removal of CONFIG_OF check, since dev_of_node() helper will return NULL if CONFIG_OF is not enabled. While at it, let's also use dev_of_node() to pass device OF node pointer to of_platform_populate(). Fixes: 50b040ef3732 ("PCI/pwrctl: only call of_platform_populate() if CONFI= G_OF is enabled") Reported-by: Linus Torvalds Closes: https://lore.kernel.org/linux-arm-msm/CAHk-=3DwjcO_9dkNf-bNda6bzykb= 5ZXWtAYA97p7oDsXPHmMRi6g@mail.gmail.com Reviewed-by: Bartosz Golaszewski Signed-off-by: Manivannan Sadhasivam --- Changes in v2: * Dropped CONFIG_OF check (Linus) * Used dev_of_node() to pass np to of_platform_populate() (Bart) * Slightly modified commit message * Collected review tag drivers/pci/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 3bab78cc68f7..55c853686051 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -350,8 +350,8 @@ void pci_bus_add_device(struct pci_dev *dev) =20 pci_dev_assign_added(dev, true); =20 - if (IS_ENABLED(CONFIG_OF) && pci_is_bridge(dev)) { - retval =3D of_platform_populate(dev->dev.of_node, NULL, NULL, + if (dev_of_node(&dev->dev) && pci_is_bridge(dev)) { + retval =3D of_platform_populate(dev_of_node(&dev->dev), NULL, NULL, &dev->dev); if (retval) pci_err(dev, "failed to populate child OF nodes (%d)\n", --=20 2.25.1