Skip to contentSkip to conversation

mfd: Fix unmet dependency warning for MFD_TPS68470

PATCH Applied Sinan Kaya 5 participants 11 messages Jan 21, 2019 – Jan 30, 2019

Subsystems (4)
lore
Share & tools
lore

Sinan Kaya

author
#0 lore raw

PATCH 1/2 mfd: Fix unmet dependency warning for MFD_TPS68470

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

WARNING: unmet direct dependencies detected for I2C_DESIGNWARE_PLATFORM
Depends on [n]: I2C [=y] && HAS_IOMEM [=y] && (ACPI [=y] && COMMON_CLK [=n] || !ACPI [=y]) Selected by [y]:
- MFD_TPS68470 [=y] && HAS_IOMEM [=y] && ACPI [=y] && I2C [=y]=y

MFD_TPS68470 is an ACPI only device and selects I2C_DESIGNWARE_PLATFORM. I2C_DESIGNWARE_PLATFORM does not have any configuration today for ACPI support without CONFIG_PCI set.

For sake of a quick fix this introduces a new mandatory dependency to the driver which may survive without it. Otherwise we need to revisit the driver architecture to address this properly.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
---
 drivers/mfd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/Kconfig +1 -1
index f461460a2aeb..76f9909cf396 100644
@@ -1419,7 +1419,7 @@ config MFD_TPS65217
 
 config MFD_TPS68470
 	bool "TI TPS68470 Power Management / LED chips"
-	depends on ACPI && I2C=y
+	depends on ACPI && PCI && I2C=y
 	select MFD_CORE
 	select REGMAP_I2C
 	select I2C_DESIGNWARE_PLATFORM
Signature · 1 line
2.19.0
author
#1 lore raw

PATCH 2/2 x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

PCI_LOCKLESS_CONFIG depends on PCI but this dependency has not been mentioned in the Kconfig.

Add an explicit dependency here.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
index 568f339595ed..0519da6f8ee4 100644
@@ -199,7 +199,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select NEED_SG_DMA_LENGTH
 	select PCI_DOMAINS			if PCI
-	select PCI_LOCKLESS_CONFIG
+	select PCI_LOCKLESS_CONFIG		if PCI
 	select PERF_EVENTS
 	select RTC_LIB
 	select RTC_MC146818_LIB
Signature · 1 line
2.19.0
maintainer
#2 lore raw

Re: [for next][PATCH 2/2] x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

Quoted 22 lines · Sinan Kaya

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

PCI_LOCKLESS_CONFIG depends on PCI but this dependency has not been mentioned in the Kconfig.

Add an explicit dependency here.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +0 -0
index 568f339595ed..0519da6f8ee4 100644

arch/x86/Kconfig config X86 · line 205

Quoted 8 lines
arch/x86/Kconfig +1 -1
@@ -199,7 +199,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select NEED_SG_DMA_LENGTH
 	select PCI_DOMAINS			if PCI
-	select PCI_LOCKLESS_CONFIG
+	select PCI_LOCKLESS_CONFIG		if PCI
 	select PERF_EVENTS
 	select RTC_LIB
 	select RTC_MC146818_LIB

AFAICT, this is not really fixing a random config build issue but only correcting the dependency, right?

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
author
#3 lore raw

Re: [for next][PATCH 2/2] x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

Quoted 27 lines · Borislav Petkov
Quoted 26 lines · Sinan Kaya

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

PCI_LOCKLESS_CONFIG depends on PCI but this dependency has not been mentioned in the Kconfig.

Add an explicit dependency here.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI

set")

---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +0 -1
index 568f339595ed..0519da6f8ee4 100644
@@ -199,7 +199,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select NEED_SG_DMA_LENGTH
 	select PCI_DOMAINS			if PCI
-	select PCI_LOCKLESS_CONFIG
Quoted 9 lines

arch/x86/Kconfig config X86

Quoted 5 lines
arch/x86/Kconfig +1 -1
+	select PCI_LOCKLESS_CONFIG		if PCI
 	select PERF_EVENTS
 	select RTC_LIB
 	select RTC_MC146818_LIB
--

AFAICT, this is not really fixing a random config build issue but only correcting the dependency, right?

This is fixing a warning found by randconfig on this thread 'linux-next: Tree for Jan 16 (PCI config warning?)'

Quoted 6 lines

--
Regards/Gruss,
Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.

#4 lore raw

[tip:x86/urgent] x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

In reply to Sinan Kaya
x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled
Commit-ID:  625210cfa6c0c26ea422f655bf68288176f174e6
Gitweb:     https://git.kernel.org/tip/625210cfa6c0c26ea422f655bf68288176f174e6
Author:     Sinan Kaya <[email protected]>
AuthorDate: Mon, 21 Jan 2019 23:19:58 +0000
Committer:  Borislav Petkov <[email protected]>
CommitDate: Tue, 22 Jan 2019 17:06:28 +0100

x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

After commit

5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")

dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

PCI_LOCKLESS_CONFIG depends on PCI but this dependency has not been mentioned in the Kconfig so add an explicit dependency here and fix

WARNING: unmet direct dependencies detected for PCI_LOCKLESS_CONFIG
Depends on [n]: PCI [=n]
Selected by [y]:
- X86 [=y]

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc x86-ml <[email protected]>
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +1 -1
index 4b4a7f32b68e..26387c7bf305 100644
@@ -198,7 +198,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select NEED_SG_DMA_LENGTH
 	select PCI_DOMAINS			if PCI
-	select PCI_LOCKLESS_CONFIG
+	select PCI_LOCKLESS_CONFIG		if PCI
 	select PERF_EVENTS
 	select RTC_LIB
 	select RTC_MC146818_LIB
#5 lore raw

Re: [for next][PATCH 2/2] x86/Kconfig: Select PCI_LOCKLESS_CONFIG if PCI is enabled

In reply to Sinan Kaya
Quoted 22 lines · CET Sinan Kaya

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

PCI_LOCKLESS_CONFIG depends on PCI but this dependency has not been mentioned in the Kconfig.

Add an explicit dependency here.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/Kconfig +0 -0
index 568f339595ed..0519da6f8ee4 100644

arch/x86/Kconfig config X86 · line 205

Quoted 8 lines
arch/x86/Kconfig +1 -1
@@ -199,7 +199,7 @@ config X86
 	select IRQ_FORCED_THREADING
 	select NEED_SG_DMA_LENGTH
 	select PCI_DOMAINS			if PCI
-	select PCI_LOCKLESS_CONFIG
+	select PCI_LOCKLESS_CONFIG		if PCI
 	select PERF_EVENTS
 	select RTC_LIB
 	select RTC_MC146818_LIB

Is anyone taking this or should I?

#7 lore raw
In reply to Sinan Kaya
Quoted 30 lines · CET Sinan Kaya

After 'commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")' dependencies on CONFIG_PCI that previously were satisfied implicitly through dependencies on CONFIG_ACPI have to be specified directly.

WARNING: unmet direct dependencies detected for I2C_DESIGNWARE_PLATFORM
Depends on [n]: I2C [=y] && HAS_IOMEM [=y] && (ACPI [=y] && COMMON_CLK [=n] || !ACPI [=y]) Selected by [y]:
- MFD_TPS68470 [=y] && HAS_IOMEM [=y] && ACPI [=y] && I2C [=y]=y

MFD_TPS68470 is an ACPI only device and selects I2C_DESIGNWARE_PLATFORM. I2C_DESIGNWARE_PLATFORM does not have any configuration today for ACPI support without CONFIG_PCI set.

For sake of a quick fix this introduces a new mandatory dependency to the driver which may survive without it. Otherwise we need to revisit the driver architecture to address this properly.

Fixes 5d32a66541c46 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set")
---
 drivers/mfd/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/Kconfig +0 -0
index f461460a2aeb..76f9909cf396 100644

drivers/mfd/Kconfig config MFD_TPS65217 · line 1425

Quoted 8 lines
drivers/mfd/Kconfig +1 -1
@@ -1419,7 +1419,7 @@ config MFD_TPS65217
 
 config MFD_TPS68470
 	bool "TI TPS68470 Power Management / LED chips"
-	depends on ACPI && I2C=y
+	depends on ACPI && PCI && I2C=y
 	select MFD_CORE
 	select REGMAP_I2C
 	select I2C_DESIGNWARE_PLATFORM

Is anyone taking this or should I?

author
#8 lore raw
Quoted 1 line · Rafael J. Wysocki

Is anyone taking this or should I?

Nobody replied to this yet. I was hoping this series to go through acpi tree like the rest of the other fixes.

Acked-by
#9 lore raw
Quoted 5 lines · Sinan Kaya
Quoted 1 line · Rafael J. Wysocki

Is anyone taking this or should I?

Nobody replied to this yet. I was hoping this series to go through acpi tree like the rest of the other fixes.

[post-vacation reply]

That's not how these things are usually handled, but I taking into consideration the trivialises of the patch, I don't really mind.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#10 lore raw
Quoted 8 lines · CET Lee Jones
Quoted 5 lines · Sinan Kaya
Quoted 1 line · Rafael J. Wysocki

Is anyone taking this or should I?

Nobody replied to this yet. I was hoping this series to go through acpi tree like the rest of the other fixes.

Quoted 6 lines

[post-vacation reply]

That's not how these things are usually handled, but I taking into consideration the trivialises of the patch, I don't really mind.

I've applied this one, thanks!