diff mbox

[stable] ARM: tegra: unify Tegra's Kconfig a bit more

Message ID 1380917411-25869-1-git-send-email-swarren@wwwdotorg.org
State Not Applicable, archived
Headers show

Commit Message

Stephen Warren Oct. 4, 2013, 8:10 p.m. UTC
From: Stephen Warren <swarren@nvidia.com>

Move all common select clauses from ARCH_TEGRA_*_SOC to ARCH_TEGRA to
eliminate duplication. The USB-related selects all should have been
common too, but were missing from Tegra114 previously. Move these to
ARCH_TEGRA too. The latter fixes a build break when only Tegra114
support was enabled, but not Tegra20 or Tegra30 support.

This is 20984c44b5a08620778ea14fa5807489170fd5ca in v3.12-rc1.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reported-by: Paul Walmsley <pwalmsley@nvidia.com>
[auto-builders for 3.11.x are failing due to this]
Cc: stable # v3.11
---
 arch/arm/mach-tegra/Kconfig | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

Comments

Greg Kroah-Hartman Oct. 5, 2013, 11:38 p.m. UTC | #1
On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Move all common select clauses from ARCH_TEGRA_*_SOC to ARCH_TEGRA to
> eliminate duplication. The USB-related selects all should have been
> common too, but were missing from Tegra114 previously. Move these to
> ARCH_TEGRA too. The latter fixes a build break when only Tegra114
> support was enabled, but not Tegra20 or Tegra30 support.
> 
> This is 20984c44b5a08620778ea14fa5807489170fd5ca in v3.12-rc1.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Reported-by: Paul Walmsley <pwalmsley@nvidia.com>
> [auto-builders for 3.11.x are failing due to this]

What autobuilders?  I haven't heard of this before.

> Cc: stable # v3.11
> ---
>  arch/arm/mach-tegra/Kconfig | 21 ++++++---------------
>  1 file changed, 6 insertions(+), 15 deletions(-)

This fails to apply to the 3.11-stable tree, if you want it there, can
you provide a version that actually does apply, and that you have tested
to work properly?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Walmsley Oct. 7, 2013, 6:18 a.m. UTC | #2
Hi Greg,

On 10/05/2013 04:38 PM, Greg KH wrote:
> On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
>> [auto-builders for 3.11.x are failing due to this]
> What autobuilders?  I haven't heard of this before.

There's an experimental system here that automatically builds and 
test-boots -stable kernels on some Tegra platforms.  The output isn't 
public yet -- that's planned, but there are still a few bugs left in the 
test system that would be good to clean up first.

The output is similar to this:

http://nvt.pwsan.com/pub/linux/testlogs/

Will certainly send you a link when it's ready to go.


- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Warren Oct. 7, 2013, 4:47 p.m. UTC | #3
On 10/05/2013 05:38 PM, Greg KH wrote:
> On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> Move all common select clauses from ARCH_TEGRA_*_SOC to ARCH_TEGRA to
>> eliminate duplication. The USB-related selects all should have been
>> common too, but were missing from Tegra114 previously. Move these to
>> ARCH_TEGRA too. The latter fixes a build break when only Tegra114
>> support was enabled, but not Tegra20 or Tegra30 support.
>>
>> This is 20984c44b5a08620778ea14fa5807489170fd5ca in v3.12-rc1.
>>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
>> Reported-by: Paul Walmsley <pwalmsley@nvidia.com>
>> [auto-builders for 3.11.x are failing due to this]
> 
> What autobuilders?  I haven't heard of this before.
> 
>> Cc: stable # v3.11
>> ---
>>  arch/arm/mach-tegra/Kconfig | 21 ++++++---------------
>>  1 file changed, 6 insertions(+), 15 deletions(-)
> 
> This fails to apply to the 3.11-stable tree, if you want it there, can
> you provide a version that actually does apply, and that you have tested
> to work properly?

Sorry about that. I've sent V2.

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Walmsley Oct. 8, 2013, 6 a.m. UTC | #4
On 10/06/2013 11:18 PM, Paul Walmsley wrote:
> Hi Greg,
>
> On 10/05/2013 04:38 PM, Greg KH wrote:
>> On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
>>> [auto-builders for 3.11.x are failing due to this]
>> What autobuilders?  I haven't heard of this before.
> There's an experimental system here that automatically builds and
> test-boots -stable kernels on some Tegra platforms.

Well, here's a public link for it:

http://nvt.pwsan.com/pub/linux-stable/testlogs/

So far it's seeded with v3.11.[34].  It should update automatically as 
new releases come out.  So far the tests are quite basic (build + boot 
to minimal userspace).  Please let Stephen and I know if you have any 
comments or suggestions.


- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman Oct. 10, 2013, 11:11 p.m. UTC | #5
On Mon, Oct 07, 2013 at 11:00:56PM -0700, Paul Walmsley wrote:
> 
> On 10/06/2013 11:18 PM, Paul Walmsley wrote:
> >Hi Greg,
> >
> >On 10/05/2013 04:38 PM, Greg KH wrote:
> >>On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
> >>>[auto-builders for 3.11.x are failing due to this]
> >>What autobuilders?  I haven't heard of this before.
> >There's an experimental system here that automatically builds and
> >test-boots -stable kernels on some Tegra platforms.
> 
> Well, here's a public link for it:
> 
> http://nvt.pwsan.com/pub/linux-stable/testlogs/
> 
> So far it's seeded with v3.11.[34].  It should update automatically
> as new releases come out.  So far the tests are quite basic (build +
> boot to minimal userspace).  Please let Stephen and I know if you
> have any comments or suggestions.

That's great to see.  Testing the -rc stable releases would be great, to
find if I break anything, as I don't have Tegra hardware to test them
out on.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman Oct. 14, 2013, 6 p.m. UTC | #6
Greg KH <gregkh@linuxfoundation.org> writes:

> On Mon, Oct 07, 2013 at 11:00:56PM -0700, Paul Walmsley wrote:
>> 
>> On 10/06/2013 11:18 PM, Paul Walmsley wrote:
>> >Hi Greg,
>> >
>> >On 10/05/2013 04:38 PM, Greg KH wrote:
>> >>On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
>> >>>[auto-builders for 3.11.x are failing due to this]
>> >>What autobuilders?  I haven't heard of this before.
>> >There's an experimental system here that automatically builds and
>> >test-boots -stable kernels on some Tegra platforms.
>> 
>> Well, here's a public link for it:
>> 
>> http://nvt.pwsan.com/pub/linux-stable/testlogs/
>> 
>> So far it's seeded with v3.11.[34].  It should update automatically
>> as new releases come out.  So far the tests are quite basic (build +
>> boot to minimal userspace).  Please let Stephen and I know if you
>> have any comments or suggestions.
>
> That's great to see.  Testing the -rc stable releases would be great, to
> find if I break anything, as I don't have Tegra hardware to test them
> out on.

Greg, FYI... you might be interested in the ARM kernel build/boot
reports being posted here: 

  http://lists.linaro.org/pipermail/kernel-build-reports/2013-October/thread.html

Along with mainline/next/arm-soc we're building/booting your stable
queues for v3.10 and v3.11.  See the "queue: build:..." and "queue:
boot:..." reports.

This builds all the ARM defconfigs, and does minimal boot test on a pile
of different ARM boards.

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Walmsley Oct. 14, 2013, 6:11 p.m. UTC | #7
Hi Greg,

On 10/10/2013 04:11 PM, Greg KH wrote:
> On Mon, Oct 07, 2013 at 11:00:56PM -0700, Paul Walmsley wrote:
>
>> Well, here's a public link for it:
>>
>> http://nvt.pwsan.com/pub/linux-stable/testlogs/
>>
>> So far it's seeded with v3.11.[34].  It should update automatically
>> as new releases come out.  So far the tests are quite basic (build +
>> boot to minimal userspace).  Please let Stephen and I know if you
>> have any comments or suggestions.
> That's great to see.  Testing the -rc stable releases would be great, to
> find if I break anything, as I don't have Tegra hardware to test them
> out on.

Could you point out the -rc stable releases that you're referring to?  
Took a look at the linux-stable.git and stable-queue.git trees but was 
unsure what matched that description.

Would this be something like applying the queue-* patches and testing on 
a nightly basis?

- Paul
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman Oct. 14, 2013, 6:20 p.m. UTC | #8
On Mon, Oct 14, 2013 at 11:11:29AM -0700, Paul Walmsley wrote:
> Hi Greg,
> 
> On 10/10/2013 04:11 PM, Greg KH wrote:
> >On Mon, Oct 07, 2013 at 11:00:56PM -0700, Paul Walmsley wrote:
> >
> >>Well, here's a public link for it:
> >>
> >>http://nvt.pwsan.com/pub/linux-stable/testlogs/
> >>
> >>So far it's seeded with v3.11.[34].  It should update automatically
> >>as new releases come out.  So far the tests are quite basic (build +
> >>boot to minimal userspace).  Please let Stephen and I know if you
> >>have any comments or suggestions.
> >That's great to see.  Testing the -rc stable releases would be great, to
> >find if I break anything, as I don't have Tegra hardware to test them
> >out on.
> 
> Could you point out the -rc stable releases that you're referring
> to?  Took a look at the linux-stable.git and stable-queue.git trees
> but was unsure what matched that description.

The -rc releases do not end up in a git tree, they show up in the
kernel.org/pub/linux/kernel/v3.0/stable-review/ directory when I
announce a -rc release is out for testing.

> Would this be something like applying the queue-* patches and
> testing on a nightly basis?

Yes, that is good to do as well, as that is what the -rc releases are
created from.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman Oct. 14, 2013, 6:20 p.m. UTC | #9
On Mon, Oct 14, 2013 at 11:00:27AM -0700, Kevin Hilman wrote:
> Greg KH <gregkh@linuxfoundation.org> writes:
> 
> > On Mon, Oct 07, 2013 at 11:00:56PM -0700, Paul Walmsley wrote:
> >> 
> >> On 10/06/2013 11:18 PM, Paul Walmsley wrote:
> >> >Hi Greg,
> >> >
> >> >On 10/05/2013 04:38 PM, Greg KH wrote:
> >> >>On Fri, Oct 04, 2013 at 02:10:11PM -0600, Stephen Warren wrote:
> >> >>>[auto-builders for 3.11.x are failing due to this]
> >> >>What autobuilders?  I haven't heard of this before.
> >> >There's an experimental system here that automatically builds and
> >> >test-boots -stable kernels on some Tegra platforms.
> >> 
> >> Well, here's a public link for it:
> >> 
> >> http://nvt.pwsan.com/pub/linux-stable/testlogs/
> >> 
> >> So far it's seeded with v3.11.[34].  It should update automatically
> >> as new releases come out.  So far the tests are quite basic (build +
> >> boot to minimal userspace).  Please let Stephen and I know if you
> >> have any comments or suggestions.
> >
> > That's great to see.  Testing the -rc stable releases would be great, to
> > find if I break anything, as I don't have Tegra hardware to test them
> > out on.
> 
> Greg, FYI... you might be interested in the ARM kernel build/boot
> reports being posted here: 
> 
>   http://lists.linaro.org/pipermail/kernel-build-reports/2013-October/thread.html
> 
> Along with mainline/next/arm-soc we're building/booting your stable
> queues for v3.10 and v3.11.  See the "queue: build:..." and "queue:
> boot:..." reports.
> 
> This builds all the ARM defconfigs, and does minimal boot test on a pile
> of different ARM boards.

Thanks, I'll try to watch this, thanks for letting me know about it.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index add345e..e963db2 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,18 +2,24 @@  config ARCH_TEGRA
 	bool "NVIDIA Tegra" if ARCH_MULTI_V7
 	select ARCH_HAS_CPUFREQ
 	select ARCH_REQUIRE_GPIOLIB
+	select ARM_GIC
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select CLKSRC_OF
 	select COMMON_CLK
+	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if LOCAL_TIMERS
 	select HAVE_CLK
 	select HAVE_SMP
 	select MIGHT_HAVE_CACHE_L2X0
+	select PINCTRL
 	select SOC_BUS
 	select SPARSE_IRQ
+	select USB_ARCH_HAS_EHCI if USB_SUPPORT
+	select USB_ULPI if USB_PHY
+	select USB_ULPI_VIEWPORT if USB_PHY
 	select USE_OF
 	help
 	  This enables support for NVIDIA Tegra based systems.
@@ -27,15 +33,9 @@  config ARCH_TEGRA_2x_SOC
 	select ARM_ERRATA_720789
 	select ARM_ERRATA_754327 if SMP
 	select ARM_ERRATA_764369 if SMP
-	select ARM_GIC
-	select CPU_V7
-	select PINCTRL
 	select PINCTRL_TEGRA20
 	select PL310_ERRATA_727915 if CACHE_L2X0
 	select PL310_ERRATA_769419 if CACHE_L2X0
-	select USB_ARCH_HAS_EHCI if USB_SUPPORT
-	select USB_ULPI if USB_PHY
-	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	  Support for NVIDIA Tegra AP20 and T20 processors, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -44,14 +44,8 @@  config ARCH_TEGRA_3x_SOC
 	bool "Enable support for Tegra30 family"
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369 if SMP
-	select ARM_GIC
-	select CPU_V7
-	select PINCTRL
 	select PINCTRL_TEGRA30
 	select PL310_ERRATA_769419 if CACHE_L2X0
-	select USB_ARCH_HAS_EHCI if USB_SUPPORT
-	select USB_ULPI if USB_PHY
-	select USB_ULPI_VIEWPORT if USB_PHY
 	help
 	  Support for NVIDIA Tegra T30 processor family, based on the
 	  ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -60,10 +54,7 @@  config ARCH_TEGRA_114_SOC
 	bool "Enable support for Tegra114 family"
 	select HAVE_ARM_ARCH_TIMER
 	select ARM_ERRATA_798181
-	select ARM_GIC
 	select ARM_L1_CACHE_SHIFT_6
-	select CPU_V7
-	select PINCTRL
 	select PINCTRL_TEGRA114
 	help
 	  Support for NVIDIA Tegra T114 processor family, based on the