[Natty,Config] Set physical start and alignment 1M for virtual i386

With the latest Natty kernel we find t1.micro again (but differently) broken
for i386. This has been tracked down to a change of PHYSICAL_START from
0x100000 (1M) to 0x1000000 (16M) which is ok when booten in Xen directly but
results on a crash when booted by pv-grub.

The following change resets the value for virtual (and gets it in sync with
the alignment for the rest of i386).

We carried different values though got that silently updated after some
recent rebases.

-Stefan

From 7dccaa633817869293dd7f410c3a323132e42df5 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Tue, 1 Feb 2011 14:46:14 +0100
Subject: [PATCH] UBUNTU: [Config] Set physical start and alignment 1M for virtual i386

BugLink: http://bugs.launchpad.net/bugs/710754

This also sets the PHYSICAL_ALIGNMENT to 16M for normal i386 flavours
because this is the default since around 2.6.31 and we just happened to
carry an older default value. But a recent update of the configuration
changed the PHYSICAL_START to the new default of 16M. So now both values
are in sync again.

That said, unfortunately there seems to be a problem with pv-grub on
i386 when the physical start is set to 16M which prevents booting the
t1.micro instances on EC2 (again). Therefor the physical start and
alignment is changed back for the virtual flavour of i386.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 debian.master/config/i386/config.common.i386       |    2 --
 debian.master/config/i386/config.flavour.generic   |    2 ++
 .../config/i386/config.flavour.generic-pae         |    2 ++
 debian.master/config/i386/config.flavour.virtual   |    2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

On 02/01/2011 06:58 AM, Stefan Bader wrote:
> With the latest Natty kernel we find t1.micro again (but differently) broken
> for i386. This has been tracked down to a change of PHYSICAL_START from
> 0x100000 (1M) to 0x1000000 (16M) which is ok when booten in Xen directly but
> results on a crash when booted by pv-grub.
>
> The following change resets the value for virtual (and gets it in sync with
> the alignment for the rest of i386).
>
> We carried different values though got that silently updated after some
> recent rebases.
>
> -Stefan
>
>  From 7dccaa633817869293dd7f410c3a323132e42df5 Mon Sep 17 00:00:00 2001
> From: Stefan Bader<stefan.bader@canonical.com>
> Date: Tue, 1 Feb 2011 14:46:14 +0100
> Subject: [PATCH] UBUNTU: [Config] Set physical start and alignment 1M for virtual i386
>
> BugLink: http://bugs.launchpad.net/bugs/710754
>
> This also sets the PHYSICAL_ALIGNMENT to 16M for normal i386 flavours
> because this is the default since around 2.6.31 and we just happened to
> carry an older default value. But a recent update of the configuration
> changed the PHYSICAL_START to the new default of 16M. So now both values
> are in sync again.
>
> That said, unfortunately there seems to be a problem with pv-grub on
> i386 when the physical start is set to 16M which prevents booting the
> t1.micro instances on EC2 (again). Therefor the physical start and
> alignment is changed back for the virtual flavour of i386.
>
> Signed-off-by: Stefan Bader<stefan.bader@canonical.com>
> ---
>   debian.master/config/i386/config.common.i386       |    2 --
>   debian.master/config/i386/config.flavour.generic   |    2 ++
>   .../config/i386/config.flavour.generic-pae         |    2 ++
>   debian.master/config/i386/config.flavour.virtual   |    2 ++
>   4 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 59b9c61..f6719f0 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -292,8 +292,6 @@ CONFIG_PCCARD=m
>   CONFIG_PCI_IOV=y
>   CONFIG_PCI_STUB=m
>   CONFIG_PDC_ADMA=y
> -CONFIG_PHYSICAL_ALIGN=0x100000
> -CONFIG_PHYSICAL_START=0x1000000
>   CONFIG_PID_NS=y
>   CONFIG_PLX_HERMES=m
>   CONFIG_PM_DEBUG=y
> diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
> index 260d311..b282bda 100644
> --- a/debian.master/config/i386/config.flavour.generic
> +++ b/debian.master/config/i386/config.flavour.generic
> @@ -8,6 +8,8 @@ CONFIG_HIGHMEM4G=y
>   # CONFIG_HIGHMEM64G is not set
>   CONFIG_INTEL_IDLE=y
>   # CONFIG_IOMMU_HELPER is not set
> +CONFIG_PHYSICAL_ALIGN=0x1000000
> +CONFIG_PHYSICAL_START=0x1000000
>   # CONFIG_PHYS_ADDR_T_64BIT is not set
>   CONFIG_SCSI_SPI_ATTRS=m
>   CONFIG_SCSI_SYM53C8XX_2=m
> diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
> index 461ccfd..7a12bef 100644
> --- a/debian.master/config/i386/config.flavour.generic-pae
> +++ b/debian.master/config/i386/config.flavour.generic-pae
> @@ -8,6 +8,8 @@ CONFIG_DEBUG_RODATA=y
>   CONFIG_HIGHMEM64G=y
>   CONFIG_INTEL_IDLE=y
>   CONFIG_IOMMU_HELPER=y
> +CONFIG_PHYSICAL_ALIGN=0x1000000
> +CONFIG_PHYSICAL_START=0x1000000
>   CONFIG_PHYS_ADDR_T_64BIT=y
>   CONFIG_SCSI_SPI_ATTRS=y
>   CONFIG_SCSI_SYM53C8XX_2=y
> diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
> index b09691c..c72e8f7 100644
> --- a/debian.master/config/i386/config.flavour.virtual
> +++ b/debian.master/config/i386/config.flavour.virtual
> @@ -8,6 +8,8 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
>   CONFIG_HIGHMEM64G=y
>   # CONFIG_INTEL_IDLE is not set
>   CONFIG_IOMMU_HELPER=y
> +CONFIG_PHYSICAL_ALIGN=0x100000
> +CONFIG_PHYSICAL_START=0x100000
>   CONFIG_PHYS_ADDR_T_64BIT=y
>   CONFIG_SCSI_SPI_ATTRS=y
>   CONFIG_SCSI_SYM53C8XX_2=y

applied and pushed