From patchwork Tue Feb 1 13:58:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 81311 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D5B5BB70E4 for ; Wed, 2 Feb 2011 00:59:00 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PkGkn-0003PO-RZ; Tue, 01 Feb 2011 13:58:45 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1PkGkl-0003PA-RD for kernel-team@lists.ubuntu.com; Tue, 01 Feb 2011 13:58:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PkGkl-0003cQ-Kz for ; Tue, 01 Feb 2011 13:58:43 +0000 Received: from p5b2e4269.dip.t-dialin.net ([91.46.66.105] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1PkGkl-0000L5-Da for kernel-team@lists.ubuntu.com; Tue, 01 Feb 2011 13:58:43 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [Natty] [Config] Set physical start and alignment 1M for virtual i386 Date: Tue, 1 Feb 2011 14:58:42 +0100 Message-Id: <1296568722-18819-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 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 --- 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