From: Pavel Vasilyev <pavel@pavlinux.ru>
To: Yinghai Lu <yinghai@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH]: Not PCI_PROBE_MMCONF by default
Date: Wed, 09 Feb 2011 21:36:06 +0300 [thread overview]
Message-ID: <4D52DE96.80408@pavlinux.ru> (raw)
In-Reply-To: <AANLkTindvfxRfgRbLprzX5b2u-4P-XZmycV=ai9ez6H1@mail.gmail.com>
09.02.2011 19:43, Yinghai Lu пишет:
> On Wed, Feb 9, 2011 at 7:13 AM, Pavel Vasilyev <pavel@pavlinux.ru> wrote:
>> Hi All!
>>
>> Do not set PCI_PROBE_MMCONF flag by default, and enable
>> only if configured with CONFIG_PCI_MMCONFIG
>>
>> Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru>
>> ---
>> arch/x86/pci/common.c | 6 ++++--
>> 1 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
>> index 5fe7502..625b477 100644
>> --- a/arch/x86/pci/common.c
>> +++ b/arch/x86/pci/common.c
>> @@ -17,8 +17,7 @@
>> #include <asm/smp.h>
>> #include <asm/pci_x86.h>
>>
>> -unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
>> - PCI_PROBE_MMCONF;
>> +unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
>>
>> unsigned int pci_early_dump_regs;
>> static int pci_bf_sort;
>> @@ -535,6 +534,9 @@ char * __devinit pcibios_setup(char *str)
>> }
>> #endif
>> #ifdef CONFIG_PCI_MMCONFIG
>> +
>> + pci_probe |= PCI_PROBE_MMCONF;
>> +
>> else if (!strcmp(str, "nommconf")) {
>> pci_probe &= ~PCI_PROBE_MMCONF;
>> return NULL;
>>
>
> did you try to do the compile test with CONFIG_PCI_MMCONFIG?
Oops :)
Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru>
---
arch/x86/pci/common.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 5fe7502..48af4ce 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -17,8 +17,7 @@
#include <asm/smp.h>
#include <asm/pci_x86.h>
-unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
- PCI_PROBE_MMCONF;
+unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
unsigned int pci_early_dump_regs;
static int pci_bf_sort;
@@ -535,6 +534,9 @@ char * __devinit pcibios_setup(char *str)
}
#endif
#ifdef CONFIG_PCI_MMCONFIG
+
+ else if (pci_probe |= PCI_PROBE_MMCONF);
+
else if (!strcmp(str, "nommconf")) {
pci_probe &= ~PCI_PROBE_MMCONF;
return NULL;
--
Pavel.
next prev parent reply other threads:[~2011-02-09 18:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-09 15:13 [PATCH]: Not PCI_PROBE_MMCONF by default Pavel Vasilyev
2011-02-09 16:43 ` Yinghai Lu
2011-02-09 18:36 ` Pavel Vasilyev [this message]
2011-02-09 19:03 ` Pavel Vasilyev
2011-02-10 19:37 ` Pavel Vasilyev
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=4D52DE96.80408@pavlinux.ru \
--to=pavel@pavlinux.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=yinghai@kernel.org \
/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