Ports request pull.

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Ports request pull.

Luke Yelavich-4
The following changes since commit 0aef5eeaa03790763531560e736398aaa5caecba:
  Andy Whitcroft (1):
        UBUNTU: Start new release

are available in the git repository at:

  git://kernel.ubuntu.com/themuso/ubuntu-karmic.git master

Luke Yelavich (2):
      UBUNTU: [Config] re-enable and build the ide-pmac driver into powerpc kernels
      UBUNTU: [Config] Build the ServerWorks Frodo / Apple K2 SATA driver into the kernel

Michael Casadevall (2):
      UBUNTU: [Config] updates ia64 config and d-i folders to allow succesful build
      UBUNTU: [Config] Update powerpc and sparc for 2.6.31

 debian/config/config.common.ports                  |  722 +++++++++++++++-----
 debian/config/ia64/config.common.ia64              |  690 ++++---------------
 debian/config/powerpc/config.common.powerpc        |  487 +-------------
 debian/config/powerpc/config.flavour.powerpc       |   77 +--
 debian/config/powerpc/config.flavour.powerpc-smp   |   53 +--
 debian/config/powerpc/config.flavour.powerpc64-smp |   70 +--
 debian/config/sparc/config.common.sparc            |  412 +-----------
 debian/config/sparc/config.flavour.sparc64         |   11 -
 debian/config/sparc/config.flavour.sparc64-smp     |   11 -
 debian/d-i/exclude-modules.ia64                    |    4 +
 10 files changed, 781 insertions(+), 1756 deletions(-)
 create mode 100644 debian/d-i/exclude-modules.ia64

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (204 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Ports request pull.

Andy Whitcroft-3
On Wed, Jul 01, 2009 at 07:42:06PM +1000, Luke Yelavich wrote:

> The following changes since commit 0aef5eeaa03790763531560e736398aaa5caecba:
>   Andy Whitcroft (1):
>         UBUNTU: Start new release
>
> are available in the git repository at:
>
>   git://kernel.ubuntu.com/themuso/ubuntu-karmic.git master
>
> Luke Yelavich (2):
>       UBUNTU: [Config] re-enable and build the ide-pmac driver into powerpc kernels
>       UBUNTU: [Config] Build the ServerWorks Frodo / Apple K2 SATA driver into the kernel
>
> Michael Casadevall (2):
>       UBUNTU: [Config] updates ia64 config and d-i folders to allow succesful build
>       UBUNTU: [Config] Update powerpc and sparc for 2.6.31
>
>  debian/config/config.common.ports                  |  722 +++++++++++++++-----
>  debian/config/ia64/config.common.ia64              |  690 ++++---------------
>  debian/config/powerpc/config.common.powerpc        |  487 +-------------
>  debian/config/powerpc/config.flavour.powerpc       |   77 +--
>  debian/config/powerpc/config.flavour.powerpc-smp   |   53 +--
>  debian/config/powerpc/config.flavour.powerpc64-smp |   70 +--
>  debian/config/sparc/config.common.sparc            |  412 +-----------
>  debian/config/sparc/config.flavour.sparc64         |   11 -
>  debian/config/sparc/config.flavour.sparc64-smp     |   11 -
>  debian/d-i/exclude-modules.ia64                    |    4 +
>  10 files changed, 781 insertions(+), 1756 deletions(-)
>  create mode 100644 debian/d-i/exclude-modules.ia64

I pulled your proposed tree and tried compiling this lot on the porters.
Although things look better I didn't manage to get any successful builds.

The sparc64 porter is actually broken for jaunty and karmic builds, the
chroots fail so I didn't get a test build there.

For powerpc I got the following build failure:

    ERROR: "atomic64_set" [net/rds/rds.ko] undefined!
    ERROR: "atomic64_read" [net/rds/rds.ko] undefined!

For ia64 I got the following build failure:

    /home/apw/karmic-ia64/ubuntu-2.6/drivers/video/aty/radeon_pm.c:1718:
    warning: 'radeon_reinitialize_M10' defined but not used
      CC      drivers/video/aty/radeon_monitor.o
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:42:22: error:
    asm/e820.h: No such file or directory
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c: In function
    'iommu_prepare_static_identity_mapping':
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
    'e820' undeclared (first use in this function)
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
    (Each undeclared identifier is reported only once
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
    for each function it appears in.)
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2097: error:
    dereferencing pointer to incomplete type
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2097: error:
    'E820_RAM' undeclared (first use in this function)
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
    dereferencing pointer to incomplete type
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
    dereferencing pointer to incomplete type
    /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
    dereferencing pointer to incomplete type
    make[4]: *** [drivers/pci/intel-iommu.o] Error 1
    make[3]: *** [drivers/pci] Error 2
    make[3]: *** Waiting for unfinished jobs....

For now I guess I'll let you chew that over and submit an updated version?

-apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: Ports request pull.

Michael Casadevall-5
Andy Whitcroft wrote:

> On Wed, Jul 01, 2009 at 07:42:06PM +1000, Luke Yelavich wrote:
>> The following changes since commit 0aef5eeaa03790763531560e736398aaa5caecba:
>>   Andy Whitcroft (1):
>>         UBUNTU: Start new release
>>
>> are available in the git repository at:
>>
>>   git://kernel.ubuntu.com/themuso/ubuntu-karmic.git master
>>
>> Luke Yelavich (2):
>>       UBUNTU: [Config] re-enable and build the ide-pmac driver into powerpc kernels
>>       UBUNTU: [Config] Build the ServerWorks Frodo / Apple K2 SATA driver into the kernel
>>
>> Michael Casadevall (2):
>>       UBUNTU: [Config] updates ia64 config and d-i folders to allow succesful build
>>       UBUNTU: [Config] Update powerpc and sparc for 2.6.31
>>
>>  debian/config/config.common.ports                  |  722 +++++++++++++++-----
>>  debian/config/ia64/config.common.ia64              |  690 ++++---------------
>>  debian/config/powerpc/config.common.powerpc        |  487 +-------------
>>  debian/config/powerpc/config.flavour.powerpc       |   77 +--
>>  debian/config/powerpc/config.flavour.powerpc-smp   |   53 +--
>>  debian/config/powerpc/config.flavour.powerpc64-smp |   70 +--
>>  debian/config/sparc/config.common.sparc            |  412 +-----------
>>  debian/config/sparc/config.flavour.sparc64         |   11 -
>>  debian/config/sparc/config.flavour.sparc64-smp     |   11 -
>>  debian/d-i/exclude-modules.ia64                    |    4 +
>>  10 files changed, 781 insertions(+), 1756 deletions(-)
>>  create mode 100644 debian/d-i/exclude-modules.ia64
>
> I pulled your proposed tree and tried compiling this lot on the porters.
> Although things look better I didn't manage to get any successful builds.
>
> The sparc64 porter is actually broken for jaunty and karmic builds, the
> chroots fail so I didn't get a test build there.
>
> For powerpc I got the following build failure:
>
>     ERROR: "atomic64_set" [net/rds/rds.ko] undefined!
>     ERROR: "atomic64_read" [net/rds/rds.ko] undefined!
>
> For ia64 I got the following build failure:
>
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/video/aty/radeon_pm.c:1718:
>     warning: 'radeon_reinitialize_M10' defined but not used
>       CC      drivers/video/aty/radeon_monitor.o
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:42:22: error:
>     asm/e820.h: No such file or directory
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c: In function
>     'iommu_prepare_static_identity_mapping':
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
>     'e820' undeclared (first use in this function)
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
>     (Each undeclared identifier is reported only once
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2094: error:
>     for each function it appears in.)
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2097: error:
>     dereferencing pointer to incomplete type
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2097: error:
>     'E820_RAM' undeclared (first use in this function)
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
>     dereferencing pointer to incomplete type
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
>     dereferencing pointer to incomplete type
>     /home/apw/karmic-ia64/ubuntu-2.6/drivers/pci/intel-iommu.c:2099: error:
>     dereferencing pointer to incomplete type
>     make[4]: *** [drivers/pci/intel-iommu.o] Error 1
>     make[3]: *** [drivers/pci] Error 2
>     make[3]: *** Waiting for unfinished jobs....
>
> For now I guess I'll let you chew that over and submit an updated version?
>
> -apw
There's an ia64 patch missing from the stack since I accidently included
config changes, and didn't get a chance to resubmit it into Luke's tree.
I stripped out the config changes and attached it to this email.

I plan to sit down with sparc sometime this weekend and fix it (I have
SPARC uniprocessor hardware, but its got a hosed karmic installation on
it). I also hope to submit patches sometime this week to simply the
ports kernels down to one sparc kernel, and two powerpc kernels (but
that's for a separate mail).
Michael.

From ef9f36e6c81793f542bf3888d9f7e0c1e6e401a2 Mon Sep 17 00:00:00 2001
From: Michael Casadevall <[hidden email]>
Date: Sun, 28 Jun 2009 20:43:16 -0400
Subject: [PATCH 2/3] UBUNTU: [Upstream] Patch to fix iommu on ia64 architectures
 OriginalAuthor: Chris Wright <[hidden email]>
 OriginalLocation: http://patchwork.kernel.org/patch/32495/
 Bug: #384695

Drop the e820 scanning and use existing function for finding valid RAM
regions to add to 1:1 mapping.

This corrects an FTBFS on ia64, and allows the kernel to successfully be
 compiled

Signed-off-by: Michael Casadevall <[hidden email]>
---
 drivers/pci/intel-iommu.c                   |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index e53eacd..420afa8 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -39,7 +39,6 @@
 #include <linux/sysdev.h>
 #include <asm/cacheflush.h>
 #include <asm/iommu.h>
-#include <asm/e820.h>
 #include "pci.h"
 
 #define ROOT_SIZE VTD_PAGE_SIZE
@@ -1908,7 +1907,6 @@ static inline int iommu_prepare_rmrr_dev(struct dmar_rmrr_unit *rmrr,
  rmrr->end_address + 1);
 }
 
-#ifdef CONFIG_DMAR_GFX_WA
 struct iommu_prepare_data {
  struct pci_dev *pdev;
  int ret;
@@ -1943,6 +1941,7 @@ static int __init iommu_prepare_with_active_regions(struct pci_dev *pdev)
  return data.ret;
 }
 
+#ifdef CONFIG_DMAR_GFX_WA
 static void __init iommu_prepare_gfx_mapping(void)
 {
  struct pci_dev *pdev = NULL;
@@ -2081,7 +2080,6 @@ static int domain_add_dev_info(struct dmar_domain *domain,
 
 static int iommu_prepare_static_identity_mapping(void)
 {
- int i;
  struct pci_dev *pdev = NULL;
  int ret;
 
@@ -2091,17 +2089,10 @@ static int iommu_prepare_static_identity_mapping(void)
 
  printk(KERN_INFO "IOMMU: Setting identity map:\n");
  for_each_pci_dev(pdev) {
- for (i = 0; i < e820.nr_map; i++) {
- struct e820entry *ei = &e820.map[i];
-
- if (ei->type == E820_RAM) {
- ret = iommu_prepare_identity_map(pdev,
- ei->addr, ei->addr + ei->size);
- if (ret)  {
- printk(KERN_INFO "1:1 mapping to one domain failed.\n");
- return -EFAULT;
- }
- }
+ ret = iommu_prepare_with_active_regions(pdev);
+ if (ret) {
+ printk(KERN_INFO "1:1 mapping to one domain failed.\n");
+ return -EFAULT;
  }
  ret = domain_add_dev_info(si_domain, pdev);
  if (ret)
--
1.6.3.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: Ports request pull.

Andy Whitcroft-3
On Wed, Jul 01, 2009 at 09:30:46AM -0400, Michael Casadevall wrote:

> Date: Sun, 28 Jun 2009 20:43:16 -0400
> Subject: [PATCH 2/3] UBUNTU: [Upstream] Patch to fix iommu on ia64 architectures
>  OriginalAuthor: Chris Wright <[hidden email]>
>  OriginalLocation: http://patchwork.kernel.org/patch/32495/
>  Bug: #384695

This patch is now upstream so I'll used the upstream version there.
Thanks for the pointer.

-apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: Ports request pull.

Andy Whitcroft-3
On Wed, Jul 01, 2009 at 03:26:13PM +0100, Andy Whitcroft wrote:

> On Wed, Jul 01, 2009 at 09:30:46AM -0400, Michael Casadevall wrote:
>
> > Date: Sun, 28 Jun 2009 20:43:16 -0400
> > Subject: [PATCH 2/3] UBUNTU: [Upstream] Patch to fix iommu on ia64 architectures
> >  OriginalAuthor: Chris Wright <[hidden email]>
> >  OriginalLocation: http://patchwork.kernel.org/patch/32495/
> >  Bug: #384695
>
> This patch is now upstream so I'll used the upstream version there.
> Thanks for the pointer.

Ok, as this significantly improves our ports compiles I have merged these
two pieces into the karmic tree.

-apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team