| Message ID | 1634805.kh17mYrJe5@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 21, 2013 at 10:02 AM, Arnd Bergmann <arnd@arndb.de> wrote: > On Thursday 21 February 2013 17:31:07 Shawn Guo wrote: >> > >> > I've bisected this down to 0fa2fd9a0d: "Merge branch 'linusw/devel' of >> > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git into >> > gpio/next". Both parent commits build fine. >> > >> > I've played around a bit, and selecting ARCH_REQUIRE_GPIOLIB in the arm64 >> > Kconfig fixes the issue, but I'm unfamilar with gpio{,lib} and I'm not sure >> > that's the best/correct way of solving this. >> >> Kconfig GENERIC_GPIO is designed as an option defined at architecture >> level and select by platform who knows how gpio driver/API is >> implemented. The following change should fix the error. >> >> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig >> index f532ce5..aca4a25 100644 >> --- a/arch/arm64/Kconfig >> +++ b/arch/arm64/Kconfig >> @@ -93,7 +93,7 @@ config IOMMU_HELPER >> def_bool SWIOTLB >> >> config GENERIC_GPIO >> - def_bool y >> + bool >> >> source "init/Kconfig" > > But we have no arm64 platforms that would pick GENERIC_GPIO, it's expected > to come from GPIOLIB anyway. I think the right fix is this: > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index ab4aa54..3fab0db 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -3,6 +3,7 @@ config ARM64 > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > select ARCH_WANT_COMPAT_IPC_PARSE_VERSION > select ARCH_WANT_FRAME_POINTERS > + select ARCH_WANT_OPTIONAL_GPIOLIB > select ARM_AMBA > select ARM_ARCH_TIMER > select CLONE_BACKWARDS > @@ -92,9 +93,6 @@ config SWIOTLB > config IOMMU_HELPER > def_bool SWIOTLB > > -config GENERIC_GPIO > - def_bool y > - > source "init/Kconfig" > > source "kernel/Kconfig.freezer" I've not asked Linus to pull the GPIO tree yet because of this issue. Can someone please test this on aarch64 and send me a properly formatted patch? g.
On Thu, Feb 21, 2013 at 10:02:15AM +0000, Arnd Bergmann wrote: > On Thursday 21 February 2013 17:31:07 Shawn Guo wrote: > > > > > > I've bisected this down to 0fa2fd9a0d: "Merge branch 'linusw/devel' of > > > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git into > > > gpio/next". Both parent commits build fine. > > > > > > I've played around a bit, and selecting ARCH_REQUIRE_GPIOLIB in the arm64 > > > Kconfig fixes the issue, but I'm unfamilar with gpio{,lib} and I'm not sure > > > that's the best/correct way of solving this. > > > > Kconfig GENERIC_GPIO is designed as an option defined at architecture > > level and select by platform who knows how gpio driver/API is > > implemented. The following change should fix the error. > > > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > > index f532ce5..aca4a25 100644 > > --- a/arch/arm64/Kconfig > > +++ b/arch/arm64/Kconfig > > @@ -93,7 +93,7 @@ config IOMMU_HELPER > > def_bool SWIOTLB > > > > config GENERIC_GPIO > > - def_bool y > > + bool > > > > source "init/Kconfig" > > But we have no arm64 platforms that would pick GENERIC_GPIO, it's expected > to come from GPIOLIB anyway. I think the right fix is this: > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index ab4aa54..3fab0db 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -3,6 +3,7 @@ config ARM64 > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > select ARCH_WANT_COMPAT_IPC_PARSE_VERSION > select ARCH_WANT_FRAME_POINTERS > + select ARCH_WANT_OPTIONAL_GPIOLIB > select ARM_AMBA > select ARM_ARCH_TIMER > select CLONE_BACKWARDS > @@ -92,9 +93,6 @@ config SWIOTLB > config IOMMU_HELPER > def_bool SWIOTLB > > -config GENERIC_GPIO > - def_bool y > - In my soc-armv8-model branch, the ARCH_VEXPRESS selects ARCH_REQUIRE_GPIOLIB which in turn selects GENERIC_GPIO but this seems to be defined in the arch Kconfig.
On Thu, Feb 21, 2013 at 10:42:57AM +0000, Arnd Bergmann wrote: > An architecture should not unconditionally enable 'GENERIC_GPIO' > without providing an implementation. In case of arm64, selecting > ARCH_WANT_OPTIONAL_GPIOLIB is the right solution, because it > lets us enable GPIOLIB when configuring the kernel, and that > implicitly turns on GENERIC_GPIO. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > ---- > On Thursday 21 February 2013 10:36:41 Grant Likely wrote: > > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > > > index ab4aa54..3fab0db 100644 > > > --- a/arch/arm64/Kconfig > > > +++ b/arch/arm64/Kconfig > > > @@ -3,6 +3,7 @@ config ARM64 > > > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > > > select ARCH_WANT_COMPAT_IPC_PARSE_VERSION > > > select ARCH_WANT_FRAME_POINTERS > > > + select ARCH_WANT_OPTIONAL_GPIOLIB > > > select ARM_AMBA > > > select ARM_ARCH_TIMER > > > select CLONE_BACKWARDS > > > @@ -92,9 +93,6 @@ config SWIOTLB > > > config IOMMU_HELPER > > > def_bool SWIOTLB > > > > > > -config GENERIC_GPIO > > > - def_bool y > > > - > > > source "init/Kconfig" > > > > > > source "kernel/Kconfig.freezer" > > > > I've not asked Linus to pull the GPIO tree yet because of this issue. > > Can someone please test this on aarch64 and send me a properly > > formatted patch? > > It was wrong, the new version below is good though. Tested with defconfig > and allyesconfig on arm64. I found a few more trivial issues with arm64 > allyesconfig that I fixed up as well. I'll send separate patches > for those. That's what I just tried, it looks ok to me: Acked-by: Catalin Marinas <catalin.marinas@arm.com> Maybe Mark can try it with -next (I only tested with 3.8). Thanks.
On Thu, Feb 21, 2013 at 10:46:44AM +0000, Catalin Marinas wrote: > On Thu, Feb 21, 2013 at 10:42:57AM +0000, Arnd Bergmann wrote: > > An architecture should not unconditionally enable 'GENERIC_GPIO' > > without providing an implementation. In case of arm64, selecting > > ARCH_WANT_OPTIONAL_GPIOLIB is the right solution, because it > > lets us enable GPIOLIB when configuring the kernel, and that > > implicitly turns on GENERIC_GPIO. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > ---- > > On Thursday 21 February 2013 10:36:41 Grant Likely wrote: > > > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > > > > index ab4aa54..3fab0db 100644 > > > > --- a/arch/arm64/Kconfig > > > > +++ b/arch/arm64/Kconfig > > > > @@ -3,6 +3,7 @@ config ARM64 > > > > select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE > > > > select ARCH_WANT_COMPAT_IPC_PARSE_VERSION > > > > select ARCH_WANT_FRAME_POINTERS > > > > + select ARCH_WANT_OPTIONAL_GPIOLIB > > > > select ARM_AMBA > > > > select ARM_ARCH_TIMER > > > > select CLONE_BACKWARDS > > > > @@ -92,9 +93,6 @@ config SWIOTLB > > > > config IOMMU_HELPER > > > > def_bool SWIOTLB > > > > > > > > -config GENERIC_GPIO > > > > - def_bool y > > > > - > > > > source "init/Kconfig" > > > > > > > > source "kernel/Kconfig.freezer" > > > > > > I've not asked Linus to pull the GPIO tree yet because of this issue. > > > Can someone please test this on aarch64 and send me a properly > > > formatted patch? > > > > It was wrong, the new version below is good though. Tested with defconfig > > and allyesconfig on arm64. I found a few more trivial issues with arm64 > > allyesconfig that I fixed up as well. I'll send separate patches > > for those. > > That's what I just tried, it looks ok to me: > > Acked-by: Catalin Marinas <catalin.marinas@arm.com> > > Maybe Mark can try it with -next (I only tested with 3.8). I've just tried the updated patch on next-20130222; arm64 defconfig builds successfully. Thanks, Mark.
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index ab4aa54..3fab0db 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -3,6 +3,7 @@ config ARM64 select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select ARCH_WANT_FRAME_POINTERS + select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_ARCH_TIMER select CLONE_BACKWARDS @@ -92,9 +93,6 @@ config SWIOTLB config IOMMU_HELPER def_bool SWIOTLB -config GENERIC_GPIO - def_bool y - source "init/Kconfig" source "kernel/Kconfig.freezer"