Skip to contentSkip to conversation

2.6.17-git build breakage

DISCUSSION Jeff Garzik 5 participants 7 messages Jun 20, 2006 – Jun 21, 2006 Agpgart driver

lore
Share & tools
lore
#0 lore raw

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

2) forcedeth: git tree conflict, Herbert sent a patch

3) pci-gart (ouch!) link: no fix seen yet

[...]
LD init/built-in.o
LD .tmp_vmlinux1
arch/x86_64/kernel/built-in.o: In function `pci_iommu_init':
arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_amd64_init' arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_bridge' arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'
make: *** [.tmp_vmlinux1] Error 1

#1 lore raw
Quoted 4 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Quoted 4 lines

2) forcedeth: git tree conflict, Herbert sent a patch

3) pci-gart (ouch!) link: no fix seen yet

Quoted 8 lines

[...]
LD init/built-in.o
LD .tmp_vmlinux1
arch/x86_64/kernel/built-in.o: In function `pci_iommu_init':
arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_amd64_init' arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_bridge' arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'
make: *** [.tmp_vmlinux1] Error 1

hm. I could swear we fixed that multiple times, but I don't seem to be able to locate the patch.

This one, perhaps?

use select for GART_IOMMU to enable AGP

From: Roman Zippel <[email protected]>

The AGP default doesn't work well with other selects, so use a select for GART_IOMMU as well. Remove a redundant default for SWIOTLB as well.

---

 arch/x86_64/Kconfig      |    5 ++---
 drivers/char/agp/Kconfig |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)
arch/x86_64/Kconfig +2 -3
Index: linux/arch/x86_64/Kconfig
===================================================================
@@ -389,6 +389,7 @@ config GART_IOMMU
 	bool "K8 GART IOMMU support"
 	default y
 	select SWIOTLB
+	select AGP
 	depends on PCI
 	help
 	  Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
@@ -401,11 +402,9 @@ config GART_IOMMU
   	  northbridge and a software emulation used on other systems without
 	  hardware IOMMU.  If unsure, say Y.
 
-# need this always enabled with GART_IOMMU for the VIA workaround
+# need this always selected by GART_IOMMU for the VIA workaround
 config SWIOTLB
 	bool
-	default y
-	depends on GART_IOMMU
 
 config X86_MCE
 	bool "Machine check support" if EMBEDDED
drivers/char/agp/Kconfig +1 -2
Index: linux/drivers/char/agp/Kconfig
===================================================================
@@ -1,7 +1,6 @@
 config AGP
-	tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+	tristate "/dev/agpgart (AGP Support)"
 	depends on ALPHA || IA64 || PPC || X86
-	default y if GART_IOMMU
 	---help---
 	  AGP (Accelerated Graphics Port) is a bus system mainly used to
 	  connect graphics cards to the rest of the system.
#2 lore raw
Quoted 23 lines · Andrew Morton
Quoted 4 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Quoted 4 lines

2) forcedeth: git tree conflict, Herbert sent a patch

3) pci-gart (ouch!) link: no fix seen yet

Quoted 8 lines

[...]
LD init/built-in.o
LD .tmp_vmlinux1
arch/x86_64/kernel/built-in.o: In function `pci_iommu_init':
arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_amd64_init' arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_bridge' arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'
make: *** [.tmp_vmlinux1] Error 1

Quoted 4 lines

hm. I could swear we fixed that multiple times, but I don't seem to be able to locate the patch.

This one, perhaps?

Is it new anyways? I don't think either me nor Dave changed anything in this area yet post .17

Anyways looks good although the old code worked at some point ...

-Andi

Quoted 8 lines

use select for GART_IOMMU to enable AGP

From: Roman Zippel <[email protected]>

The AGP default doesn't work well with other selects, so use a select for GART_IOMMU as well. Remove a redundant default for SWIOTLB as well.

#3 lore raw
Quoted 21 lines · Andi Kleen
Quoted 20 lines · Andrew Morton
Quoted 3 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Quoted 12 lines

2) forcedeth: git tree conflict, Herbert sent a patch

3) pci-gart (ouch!) link: no fix seen yet

[...]
LD init/built-in.o
LD .tmp_vmlinux1
arch/x86_64/kernel/built-in.o: In function `pci_iommu_init':
arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_amd64_init' arch/x86_64/kernel/pci-gart.c:619: undefined reference to agp_bridge' arch/x86_64/kernel/pci-gart.c:619: undefined reference to `agp_copy_info'
make: *** [.tmp_vmlinux1] Error 1

Quoted 6 lines
Quoted 4 lines

hm. I could swear we fixed that multiple times, but I don't seem to be able to locate the patch.

This one, perhaps?

Is it new anyways? I don't think either me nor Dave changed anything in this area yet post .17

'make allyesconfig' works on x86-64 in 2.6.17, yes.

Jeff

#4 lore raw
In reply to Andrew Morton
Quoted 9 lines · Andrew Morton
Quoted 4 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Actually, not as far as I can tell.

I got "s390: add __raw_writeq required by __iowrite64_copy" which was apparently the requisite patch for the actual iowrite64_patch.

But no iowrite64 patch itself. Andrew?

Lins

#5 lore raw
Quoted 10 lines · On Tue, 20 Jun 2006 19:59:45 -0700 (PDT) Linus Torvalds <[email protected]>…
Quoted 6 lines · Andrew Morton
Quoted 3 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Actually, not as far as I can tell.

I got "s390: add __raw_writeq required by __iowrite64_copy" which was apparently the requisite patch for the actual iowrite64_patch.

oop.

Quoted 1 line

But no iowrite64 patch itself. Andrew?

Sent.

#6 lore raw
In reply to Linus Torvalds
Quoted 15 lines · Linus Torvalds
Quoted 11 lines · Andrew Morton
Quoted 5 lines · On Tue, 20 Jun 2006 03:49:05 -0400 Jeff Garzik <[email protected]> wrote:

On the latest 'git pull', on x86-64 SMP 'make allmodconfig', I get the following build breakage:

1) myri10ge: needs iowrite64_copy from -mm

Patch has been sent.

Quoted 7 lines

Actually, not as far as I can tell.

I got "s390: add __raw_writeq required by __iowrite64_copy" which was apparently the requisite patch for the actual iowrite64_patch.

But no iowrite64 patch itself. Andrew?

myri10ge actually also needs pci-add-pci_cap_id_vndr.patch (Greg-KH will send it soon).

Brice