From: "Yinghai Lu" <yhlu.kernel@gmail.com>
To: "Andrew Morton" <akpm@linux-foundation.org>
Cc: ak@suse.de, alan@lxorguk.ukuu.org.uk, ebiederm@xmission.com,
muli@il.ibm.com, vgoyal@in.ibm.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86-64: disable the GART in shutdown
Date: Sun, 24 Jun 2007 17:22:30 -0700 [thread overview]
Message-ID: <86802c440706241722o6d18d4acsf3293eb2a83c4688@mail.gmail.com> (raw)
In-Reply-To: <20070623095209.248684e7.akpm@linux-foundation.org>
On 6/23/07, Andrew Morton <akpm@linux-foundation.org> wrote:
> > void __init gart_iommu_init(void)
> > {
> > struct agp_kern_info info;
> > diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
> > index 9f80aad..64f2ab3 100644
> > --- a/arch/x86_64/kernel/pci-dma.c
> > +++ b/arch/x86_64/kernel/pci-dma.c
> > @@ -322,6 +322,13 @@ static int __init pci_iommu_init(void)
> > return 0;
> > }
> >
> > +void pci_iommu_shutdown(void)
> > +{
> > +#ifdef CONFIG_IOMMU
> > + gart_iommu_shutdown();
> > +#endif
> > +}
>
> It'd be better to avoid the ifdef-in-C by providing a stub function in a
> header file if !CONFIG_IOMMU. That's quite standard kernel practice and
> might help avoid some other problems...
move ifdef into gart_iommu_shudown()?
>
> > #ifdef CONFIG_PCI
> > /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
> >
> > diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86_64/kernel/reboot.c
> > index 7503068..e6e65c2 100644
> > --- a/arch/x86_64/kernel/reboot.c
> > +++ b/arch/x86_64/kernel/reboot.c
> > @@ -16,6 +16,7 @@
> > #include <asm/pgtable.h>
> > #include <asm/tlbflush.h>
> > #include <asm/apic.h>
> > +#include <asm/proto.h>
> >
> > /*
> > * Power off function, if any
> > @@ -81,6 +82,7 @@ static inline void kb_wait(void)
> > void machine_shutdown(void)
> > {
> > unsigned long flags;
> > +
> > /* Stop the cpus and apics */
> > #ifdef CONFIG_SMP
> > int reboot_cpu_id;
> > @@ -111,6 +113,8 @@ void machine_shutdown(void)
> > disable_IO_APIC();
> >
> > local_irq_restore(flags);
> > +
> > + pci_iommu_shutdown();
> > }
>
> And does the kernel work OK if CONFIG_PCI=n? I think so from inspection,
> by luck.
x86_64 always have that PCI enabled?
>
> > void machine_emergency_restart(void)
> > diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
> > index 85255db..fb9f73e 100644
> > --- a/include/asm-x86_64/proto.h
> > +++ b/include/asm-x86_64/proto.h
> > @@ -85,11 +85,13 @@ extern int exception_trace;
> > extern unsigned cpu_khz;
> > extern unsigned tsc_khz;
> >
> > +extern void pci_iommu_shutdown(void);
>
> This is the only pci-related function which is declared in proto.h. I
> suspect you chose the wrong header file for this declaration.
i tried to put that into dma_mapping.h, but htat will need more header
files before that to make the compiler happy, may need to find another
header file for it.
YH
next prev parent reply other threads:[~2007-06-25 0:22 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-22 19:19 [PATCH] x86-64: disable the GART before allocate aperture Yinghai Lu
2007-06-22 19:31 ` Muli Ben-Yehuda
2007-06-22 19:38 ` Yinghai Lu
2007-06-22 19:49 ` Yinghai Lu
2007-06-22 20:33 ` Alan Cox
2007-06-22 21:28 ` Andi Kleen
2007-06-22 21:38 ` Yinghai Lu
2007-06-22 21:41 ` Eric W. Biederman
2007-06-22 21:32 ` Eric W. Biederman
2007-06-22 21:45 ` Muli Ben-Yehuda
2007-06-22 21:59 ` Yinghai Lu
2007-06-22 22:19 ` Alan Cox
2007-06-22 22:32 ` Eric W. Biederman
2007-06-22 22:43 ` Yinghai Lu
2007-06-22 22:54 ` Alan Cox
2007-06-22 22:57 ` Yinghai Lu
2007-06-22 23:04 ` Alan Cox
2007-06-22 23:14 ` Eric W. Biederman
2007-06-23 0:14 ` Andi Kleen
2007-06-23 0:27 ` Yinghai Lu
2007-06-23 0:35 ` Muli Ben-Yehuda
2007-06-23 0:38 ` Andi Kleen
2007-06-23 2:34 ` [PATCH] x86-64: disable the GART in shutdown Yinghai Lu
2007-06-23 10:39 ` Muli Ben-Yehuda
2007-06-23 10:59 ` Andi Kleen
2007-06-23 11:09 ` Muli Ben-Yehuda
2007-06-23 11:08 ` Andi Kleen
2007-06-25 0:18 ` Yinghai Lu
2007-06-23 16:52 ` Andrew Morton
2007-06-25 0:22 ` Yinghai Lu [this message]
2007-06-25 2:10 ` Muli Ben-Yehuda
2007-06-25 19:34 ` [PATCH] x86-64: disable the GART in shutdown v2 Yinghai Lu
2007-06-25 19:41 ` Muli Ben-Yehuda
2007-06-25 19:52 ` Yinghai Lu
2007-06-25 19:56 ` Muli Ben-Yehuda
2007-06-25 21:48 ` [PATCH 1/2] x86-64: disable the GART in shutdown Yinghai Lu
2007-06-25 21:49 ` [PATCH 2/2] x86_84: move iommu declaration from proto to iommu.h Yinghai Lu
2007-06-26 11:43 ` Muli Ben-Yehuda
2007-06-23 9:08 ` [PATCH] x86-64: disable the GART before allocate aperture Alan Cox
2007-06-23 11:12 ` Vivek Goyal
2007-06-23 13:14 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86802c440706241722o6d18d4acsf3293eb2a83c4688@mail.gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=muli@il.ibm.com \
--cc=vgoyal@in.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).