Patchwork [1/1] UBUNTU: [Config] enable various HVC consoles

login
register
mail settings
Submitter Andy Whitcroft
Date Jan. 21, 2013, noon
Message ID <1358769642-23528-2-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/214112/
State New
Headers show

Comments

Andy Whitcroft - Jan. 21, 2013, noon
Larger powerpc boxes use the HVC console support.  Enable these for the
powerpc64-smp kernel.

BugLink: http://bugs.launchpad.net/bugs/1102206
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/config/config.common.ubuntu          | 3 ++-
 debian.master/config/powerpc/config.common.powerpc | 1 -
 debian.master/config/ppc64/config.common.ppc64     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
Tim Gardner - Jan. 21, 2013, 1:10 p.m.
On 01/21/2013 05:00 AM, Andy Whitcroft wrote:
> Larger powerpc boxes use the HVC console support.  Enable these for the
> powerpc64-smp kernel.
>
> BugLink: http://bugs.launchpad.net/bugs/1102206
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>   debian.master/config/config.common.ubuntu          | 3 ++-
>   debian.master/config/powerpc/config.common.powerpc | 1 -
>   debian.master/config/ppc64/config.common.ppc64     | 1 -
>   3 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index f240c29..d145e8e 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2079,7 +2079,8 @@ CONFIG_HTC_PASIC3=m
>   CONFIG_HT_IRQ=y
>   CONFIG_HUGETLBFS=y
>   CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
> -CONFIG_HVCS=m
> +CONFIG_HVCS=y

I am curious why hvcs doesn't show up in the ABI modules list? There 
should be a couple of modules prefixed with hvcs in 
debian.master/abi/3.2.0-36.57/powerpc/powerpc64-smp.modules

./drivers/tty/hvc/Makefile:obj-$(CONFIG_HVCS)		+= hvcs.o
./arch/powerpc/platforms/pseries/Makefile:obj-$(CONFIG_HVCS)		+= hvcserver.o

rtg
Adam Conrad - Jan. 21, 2013, 6:33 p.m.
On Mon, Jan 21, 2013 at 06:10:38AM -0700, Tim Gardner wrote:
> 
> I am curious why hvcs doesn't show up in the ABI modules list? There
> should be a couple of modules prefixed with hvcs in
> debian.master/abi/3.2.0-36.57/powerpc/powerpc64-smp.modules

Probably because HVCS was previously only showing up on ppc64 (not
powerpc64), perhaps due to a dependency.  See the before and after
of applying Andy's patch:

Before:
(precise)adconrad@sagari:~/old/linux-3.2.0$ grep HVCS CONFIGS/*
CONFIGS/ppc64-config.flavour.powerpc64-smp:CONFIG_HVCS=m
After:
(precise)adconrad@sagari:~/old/linux-3.2.0$ grep HVCS ../../linux-3.2.0/CONFIGS/*
../../linux-3.2.0/CONFIGS/powerpc-config.flavour.powerpc64-smp:CONFIG_HVCS=y
../../linux-3.2.0/CONFIGS/ppc64-config.flavour.powerpc64-smp:CONFIG_HVCS=y

Note that ppc64-* != powerpc-* (we don't actually build the former
right now, only the latter).

... Adam

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f240c29..d145e8e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2079,7 +2079,8 @@  CONFIG_HTC_PASIC3=m
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
-CONFIG_HVCS=m
+CONFIG_HVCS=y
+CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_OLD_HVSI=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index be8b572..9651912 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -93,7 +93,6 @@  CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
 CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
-# CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_DESIGNWARE_CORE=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 8ef1cb9..02d3b25 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -104,7 +104,6 @@  CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_HVC_CONSOLE=y
 CONFIG_HZ=250
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_DESIGNWARE_CORE=m