[PATCH] spl: CONFIG_SPL_PCI_PNP should depend on CONFIG_SPL_PCI

CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com --- common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bee231b583..089bc9c0cb 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1153,6 +1153,18 @@ config SPL_PCI necessary driver support. This enables the drivers in drivers/pci as part of an SPL build.
+config SPL_PCI_PNP + bool "Enable Plug & Play support for PCI" + depends on SPL_PCI + help + Enable PCI memory and I/O space resource allocation and assignment. + + This is required to auto configure the enumerated devices. + + This is normally not done in SPL, but can be enabled if devices must + be set up in the SPL phase. Often it is enough to manually configure + one device, so this option can be disabled. + config SPL_PCH bool "Support PCH drivers" help diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index aca439d921..60d98d1464 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -40,17 +40,6 @@ config PCI_PNP help Enable PCI memory and I/O space resource allocation and assignment.
-config SPL_PCI_PNP - bool "Enable Plug & Play support for PCI" - help - Enable PCI memory and I/O space resource allocation and assignment. - - This is required to auto configure the enumerated devices. - - This is normally not done in SPL, but can be enabled if devices must - be set up in the SPL phase. Often it is enough to manually configure - one device, so this option can be disabled. - config PCI_REGION_MULTI_ENTRY bool "Enable Multiple entries of region type MEMORY in ranges for PCI" help

On Mon, Jul 24, 2023 at 09:03:10AM +0200, Heinrich Schuchardt wrote:
CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
Reviewed-by: Leo Yu-Chi Liang ycliang@andestech.com

On Mon, 24 Jul 2023 at 01:51, Leo Liang ycliang@andestech.com wrote:
On Mon, Jul 24, 2023 at 09:03:10AM +0200, Heinrich Schuchardt wrote:
CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
Reviewed-by: Leo Yu-Chi Liang ycliang@andestech.com
Reviewed-by: Simon Glass sjg@chromium.org

On Mon, Jul 24, 2023 at 09:03:10AM +0200, Heinrich Schuchardt wrote:
CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
Lets not move this out of drivers/pci/Kconfig, just add the dependency.

On 24.07.23 17:14, Tom Rini wrote:
On Mon, Jul 24, 2023 at 09:03:10AM +0200, Heinrich Schuchardt wrote:
CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
Lets not move this out of drivers/pci/Kconfig, just add the dependency.
Hello Tom,
when you configure boot methods you will enable SPL_PCI and with the patch SPL_PCI_PNP will pop up beneath. If you leave SPL_PCI_PNP in the old place, you will have a hard time figuring out why yout PCI is not working.
Why would you prefer to keep SPL_PCI_PNP outside of the SPL menu?
Best regards
Heinrich

On Mon, Jul 24, 2023 at 07:46:09PM +0200, Heinrich Schuchardt wrote:
On 24.07.23 17:14, Tom Rini wrote:
On Mon, Jul 24, 2023 at 09:03:10AM +0200, Heinrich Schuchardt wrote:
CONFIG_SPL_PCI_PNP=y without CONFIG_SPL_PCI=y makes no sense.
Move CONFIG_SPL_PCI_PNP to the SPL menu and add the missing dependency.
Fixes: 32f5e9e5c1a7 ("nvme: pci: Enable for SPL") Signed-off-by: Heinrich Schuchardt heinrich.schuchardt@canonical.com
common/spl/Kconfig | 12 ++++++++++++ drivers/pci/Kconfig | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-)
Lets not move this out of drivers/pci/Kconfig, just add the dependency.
Hello Tom,
when you configure boot methods you will enable SPL_PCI and with the patch SPL_PCI_PNP will pop up beneath. If you leave SPL_PCI_PNP in the old place, you will have a hard time figuring out why yout PCI is not working.
Why would you prefer to keep SPL_PCI_PNP outside of the SPL menu?
We should move SPL_PCI out of common/spl/Kconfig as well then. It's 1500 lines, and yes there's likely more options still that should be moved out.
participants (4)
-
Heinrich Schuchardt
-
Leo Liang
-
Simon Glass
-
Tom Rini