* [PATCH]: Not PCI_PROBE_MMCONF by default
@ 2011-02-09 15:13 Pavel Vasilyev
2011-02-09 16:43 ` Yinghai Lu
0 siblings, 1 reply; 5+ messages in thread
From: Pavel Vasilyev @ 2011-02-09 15:13 UTC (permalink / raw)
To: LKML
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;
--
Pavel.
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH]: Not PCI_PROBE_MMCONF by default
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
0 siblings, 1 reply; 5+ messages in thread
From: Yinghai Lu @ 2011-02-09 16:43 UTC (permalink / raw)
To: pavel; +Cc: LKML
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?
Yinghai
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH]: Not PCI_PROBE_MMCONF by default
2011-02-09 16:43 ` Yinghai Lu
@ 2011-02-09 18:36 ` Pavel Vasilyev
2011-02-09 19:03 ` Pavel Vasilyev
2011-02-10 19:37 ` Pavel Vasilyev
0 siblings, 2 replies; 5+ messages in thread
From: Pavel Vasilyev @ 2011-02-09 18:36 UTC (permalink / raw)
To: Yinghai Lu; +Cc: LKML
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.
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH]: Not PCI_PROBE_MMCONF by default
2011-02-09 18:36 ` Pavel Vasilyev
@ 2011-02-09 19:03 ` Pavel Vasilyev
2011-02-10 19:37 ` Pavel Vasilyev
1 sibling, 0 replies; 5+ messages in thread
From: Pavel Vasilyev @ 2011-02-09 19:03 UTC (permalink / raw)
To: LKML, Yinghai Lu
09.02.2011 21:36, Pavel Vasilyev пишет:
> 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
>>>
Something was tired already. It's time to sleep :)
Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru>
---
arch/x86/pci/common.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 5fe7502..0a3e56a 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -17,8 +17,12 @@
#include <asm/smp.h>
#include <asm/pci_x86.h>
+#ifdef CONFIG_PCI_MMCONFIG
unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
PCI_PROBE_MMCONF;
+#else
+unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
+#endif
unsigned int pci_early_dump_regs;
static int pci_bf_sort;
--
Pavel.
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH]: Not PCI_PROBE_MMCONF by default
2011-02-09 18:36 ` Pavel Vasilyev
2011-02-09 19:03 ` Pavel Vasilyev
@ 2011-02-10 19:37 ` Pavel Vasilyev
1 sibling, 0 replies; 5+ messages in thread
From: Pavel Vasilyev @ 2011-02-10 19:37 UTC (permalink / raw)
To: LKML
09.02.2011 21:36, Pavel Vasilyev пишет:
>>>
>>> Do not set PCI_PROBE_MMCONF flag by default, and enable
>>> only if configured with CONFIG_PCI_MMCONFIG
>> did you try to do the compile test with CONFIG_PCI_MMCONFIG?
>
Yet another version
Signed-off-by: Pavel Vasilyev <pavel@pavlinux.ru>
--
arch/x86/pci/common.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 5fe7502..0a3e56a 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -17,8 +17,12 @@
#include <asm/smp.h>
#include <asm/pci_x86.h>
+#ifdef CONFIG_PCI_MMCONFIG
unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
PCI_PROBE_MMCONF;
+#else
+unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
+#endif
unsigned int pci_early_dump_regs;
static int pci_bf_sort;
--
Pavel.
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-10 19:40 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2011-02-09 19:03 ` Pavel Vasilyev
2011-02-10 19:37 ` Pavel Vasilyev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox