From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756545AbZDGFxr (ORCPT ); Tue, 7 Apr 2009 01:53:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752138AbZDGFxg (ORCPT ); Tue, 7 Apr 2009 01:53:36 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:60773 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799AbZDGFxg (ORCPT ); Tue, 7 Apr 2009 01:53:36 -0400 Date: Tue, 7 Apr 2009 07:52:45 +0200 From: Ingo Molnar To: David Woodhouse Cc: torvalds@linux-foundation.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: Re: [GIT *] intel-iommu updates for 2.6.30 (second batch) Message-ID: <20090407055245.GA10406@elte.hu> References: <1238839639.3560.37.camel@macbook.infradead.org> <20090407053739.GA10500@elte.hu> <1239083045.22733.383.camel@macbook.infradead.org> <20090407054818.GA5557@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20090407054818.GA5557@elte.hu> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > * David Woodhouse wrote: > > > On Tue, 2009-04-07 at 07:37 +0200, Ingo Molnar wrote: > > > I suspect these bits are the ones that broke the upstream build: > > > > > > drivers/pci/dmar.c:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or > > > ‘__attribute__’ before ‘dmar_tbl_size’ > > > drivers/pci/dmar.c:62: warning: ‘struct acpi_dmar_device_scope’ > > > declared inside parameter list > > > drivers/pci/dmar.c:62: warning: its scope is only this definition or > > > declaration, which is probably not what you want > > > > Yeah, was being included implicitly for me, but > > certain configs don't do that. Alexander Beregalov sent a patch > > for that, which I added to my tree before Linus pulled it. > > > > Commit 46f06b72378d3187f0d12f7a60d020676bfbf332 is the fix. > > No, that does not fix it - it's still broken with > v2.6.29-9854-gd508afb. Try the config i sent. The problem is INTR_REMAP. That brings in DMAR but not ACPI. The patch below fixes it, but it is only an ugly workaround: we really dont want 'depends on ACPI' dependencies to spread like that. ACPI is a hardware discovery mechanism. It might be the only way to discover these pieces of hardware at the moment, but we should not tie method of discovery to hardware support. I'd suggest a dmar_acpi.c splitout of the ACPI bits. More testing too please - this was really an avoidable bug. Ingo --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux2/arch/x86/Kconfig =================================================================== --- linux2.orig/arch/x86/Kconfig +++ linux2/arch/x86/Kconfig @@ -268,7 +268,7 @@ config SMP_SUPPORT config X86_X2APIC bool "Support x2apic" - depends on X86_LOCAL_APIC && X86_64 + depends on X86_LOCAL_APIC && X86_64 && ACPI select INTR_REMAP ---help--- This enables x2apic support on CPUs that have this feature.