From: dave.martin@linaro•org (Dave Martin)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: pl2x0/pl310: Refactor Kconfig to be more maintainable
Date: Tue, 6 Dec 2011 17:20:48 +0000 [thread overview]
Message-ID: <20111206172048.GG13769@linaro.org> (raw)
In-Reply-To: <4EDE4810.4020003@gmail.com>
On Tue, Dec 06, 2011 at 10:51:28AM -0600, Rob Herring wrote:
> On 12/06/2011 10:26 AM, Dave Martin wrote:
> > On Tue, Nov 29, 2011 at 01:25:55PM -0600, Rob Herring wrote:
> >> On 11/29/2011 10:32 AM, Dave Martin wrote:
> >>> Making CACHE_L2X0 depends on (huge list of MACH_ and ARCH_ configs)
> >>> is bothersome to maintain and likely to lead to merge conflicts.
> >>>
> >>> This patch moves the knowledge of which platforms have a L2x0 or
> >>> PL310 cache controller to the individual machines. To enable this,
> >>> a new HAVE_L2X0_L2CC config option is introduced to allow machines
> >>> to indicate that they have such a cache controller independently of
> >>> each other.
> >>>
> >>> Signed-off-by: Dave Martin <dave.martin@linaro•org>
> >>> ---
> >>> arch/arm/Kconfig | 8 ++++++++
> >>> arch/arm/mach-exynos/Kconfig | 1 +
> >>> arch/arm/mach-omap2/Kconfig | 1 +
> >>> arch/arm/mach-realview/Kconfig | 5 +++++
> >>> arch/arm/mach-vexpress/Kconfig | 1 +
> >>> arch/arm/mm/Kconfig | 13 ++++++++-----
> >>> arch/arm/plat-mxc/Kconfig | 1 +
> >>> 7 files changed, 25 insertions(+), 5 deletions(-)
> >>>
> >>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> >>> index 44789ef..4068fe5 100644
> >>> --- a/arch/arm/Kconfig
> >>> +++ b/arch/arm/Kconfig
> >>> @@ -339,6 +339,7 @@ config ARCH_HIGHBANK
> >>> select ARCH_WANT_OPTIONAL_GPIOLIB
> >>> select ARM_AMBA
> >>> select ARM_GIC
> >>> + select HAVE_L2X0_L2CC
> >>> select ARM_TIMER_SP804
> >>> select CLKDEV_LOOKUP
> >>> select CPU_V7
> >>
> >> These entries are sorted per rmk's review, so please keep it that way.
> >
> > Can you explain what order they should be in? Alphabetical?
>
> Yes, alphabetical.
>
> >
> >>
> >>> @@ -359,6 +360,7 @@ config ARCH_CLPS711X
> >>> config ARCH_CNS3XXX
> >>> bool "Cavium Networks CNS3XXX family"
> >>> select CPU_V6K
> >>> + select HAVE_L2X0_L2CC
> >>> select GENERIC_CLOCKEVENTS
> >>> select ARM_GIC
> >>> select MIGHT_HAVE_PCI
> >>
> >> But as you can see, that's rarely the case...
> >
> > Do you mean "things are not always in alphabetical order?"
> >
> > Apologies if I'm being obtuse -- your comments are rather terse for me.
>
> Yes.
>
> >
> > [...]
> >
> >>> +config HAVE_L2X0_L2CC
> >>> + bool
> >>> + default n
> >>
> >> n is the default already.
> >
> > Good point -- I'll kill that.
> >
> >>> + help
> >>> + This option should be selected by machines which have a L2x0
> >>> + or PL310 cache controller.
> >>> +
> >>> config CACHE_L2X0
> >>> bool "Enable the L2x0 outer cache controller"
> >>> - depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
> >>> - REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \
> >>> - ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
> >>> - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
> >>> - ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK
> >>> + depends on HAVE_L2X0_L2CC
> >>
> >> For platforms that run in non-secure mode, this shouldn't really be a
> >> user selectable option. Perhaps those should just select CACHE_L2X0
> >> directly. I'm not sure which one's those are other than Highbank and OMAP4.
> >
> > The idea here is to make the option user-selectable on platforms where it
> > makes sense (and only those platforms).
> >
> > So yes, I think that platforms which require this option _should_ select
> > it directly, rather than it being reverse-selected from arch/arm/mm/Kconfig.
> > This puts the knowledge in the logical place. Does this apply to OMAP3?
> > I think we're always running in the Normal World there too.
>
> No, as OMAP3 has the integrated L2 of the Cortex-A8.
Yes, I realised that after I'd posted ... I'll tweak the series and repost.
Thanks for the feedback
---Dave
next prev parent reply other threads:[~2011-12-06 17:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-29 16:32 [PATCH] ARM: pl2x0/pl310: Refactor Kconfig to be more maintainable Dave Martin
2011-11-29 19:25 ` Rob Herring
2011-11-29 22:18 ` Russell King - ARM Linux
2011-12-06 16:26 ` Dave Martin
2011-12-06 16:51 ` Rob Herring
2011-12-06 17:20 ` Dave Martin [this message]
2011-12-12 15:14 ` Dave Martin
2011-12-12 15:31 ` Rob Herring
2011-11-30 14:01 ` Shawn Guo
2011-11-30 14:03 ` Dave Martin
2011-11-30 14:26 ` Shawn Guo
2011-11-30 14:45 ` Dave Martin
2011-12-12 15:47 ` Uwe Kleine-König
2011-12-13 10:50 ` Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111206172048.GG13769@linaro.org \
--to=dave.martin@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox