2019-01-21 23:21:57

by Sinan Kaya

[permalink] [raw]
Subject: [for next][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")
Signed-off-by: Sinan Kaya <[email protected]>
---
drivers/mfd/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f461460a2aeb..76f9909cf396 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -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
--
2.19.0



2019-01-21 23:21:31

by Sinan Kaya

[permalink] [raw]
Subject: [for next][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")
Signed-off-by: Sinan Kaya <[email protected]>
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 568f339595ed..0519da6f8ee4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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
--
2.19.0


2019-01-22 12:57:06

by Borislav Petkov

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

On Mon, Jan 21, 2019 at 11:19:58PM +0000, Sinan Kaya wrote:
> 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")
> Signed-off-by: Sinan Kaya <[email protected]>
> ---
> arch/x86/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 568f339595ed..0519da6f8ee4 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -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?

--
Regards/Gruss,
Boris.

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

2019-01-22 14:41:44

by Sinan Kaya

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

On 1/22/19, Borislav Petkov <[email protected]> wrote:
> On Mon, Jan 21, 2019 at 11:19:58PM +0000, Sinan Kaya wrote:
>> 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")
>> Signed-off-by: Sinan Kaya <[email protected]>
>> ---
>> arch/x86/Kconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
>> index 568f339595ed..0519da6f8ee4 100644
>> --- a/arch/x86/Kconfig
>> +++ b/arch/x86/Kconfig
>> @@ -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?
>

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

> --
> Regards/Gruss,
> Boris.
>
> Good mailing practices for 400: avoid top-posting and trim the reply.
>

Subject: [tip:x86/urgent] 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")
Signed-off-by: Sinan Kaya <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: x86-ml <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4b4a7f32b68e..26387c7bf305 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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

2019-01-24 10:52:44

by Rafael J. Wysocki

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

On Tuesday, January 22, 2019 12:19:58 AM CET Sinan Kaya wrote:
> 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")
> Signed-off-by: Sinan Kaya <[email protected]>
> ---
> arch/x86/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 568f339595ed..0519da6f8ee4 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -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?



2019-01-24 10:54:35

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [for next][PATCH 1/2] mfd: Fix unmet dependency warning for MFD_TPS68470

On Tuesday, January 22, 2019 12:19:57 AM CET Sinan Kaya wrote:
> 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")
> Signed-off-by: Sinan Kaya <[email protected]>
> ---
> drivers/mfd/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index f461460a2aeb..76f9909cf396 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -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?




2019-01-24 17:44:28

by Sinan Kaya

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

On 1/24/2019 5:51 AM, Rafael J. Wysocki wrote:
>>
> Is anyone taking this or should I?
>
>
>

This got applied:

https://git.kernel.org/tip/625210cfa6c0c26ea422f655bf68288176f174e6

2019-01-24 17:45:17

by Sinan Kaya

[permalink] [raw]
Subject: Re: [for next][PATCH 1/2] mfd: Fix unmet dependency warning for MFD_TPS68470

On 1/24/2019 5:51 AM, Rafael J. Wysocki wrote:
> 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.

2019-01-28 07:22:32

by Lee Jones

[permalink] [raw]
Subject: Re: [for next][PATCH 1/2] mfd: Fix unmet dependency warning for MFD_TPS68470

On Thu, 24 Jan 2019, Sinan Kaya wrote:

> On 1/24/2019 5:51 AM, Rafael J. Wysocki wrote:
> > 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.

Acked-by: Lee Jones <[email protected]>

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

2019-01-30 23:58:33

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [for next][PATCH 1/2] mfd: Fix unmet dependency warning for MFD_TPS68470

On Monday, January 28, 2019 8:21:56 AM CET Lee Jones wrote:
> On Thu, 24 Jan 2019, Sinan Kaya wrote:
>
> > On 1/24/2019 5:51 AM, Rafael J. Wysocki wrote:
> > > 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.
>
> Acked-by: Lee Jones <[email protected]>

I've applied this one, thanks!