2011-02-09 15:19:22

by Pavel Vasilyev

Subject: [PATCH]: Not PCI_PROBE_MMCONF by default

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 <[email protected]>
---
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.

2011-02-09 16:43:48

by Yinghai Lu

Subject: Re: [PATCH]: Not PCI_PROBE_MMCONF by default

On Wed, Feb 9, 2011 at 7:13 AM, Pavel Vasilyev <[email protected]> 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 <[email protected]>
> ---
> ?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

2011-02-09 18:38:40

by Pavel Vasilyev

Subject: Re: [PATCH]: Not PCI_PROBE_MMCONF by default

09.02.2011 19:43, Yinghai Lu пишет:
> On Wed, Feb 9, 2011 at 7:13 AM, Pavel Vasilyev <[email protected]> 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 <[email protected]>
>> ---
>> 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 <[email protected]>
---
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.

2011-02-09 19:05:49

by Pavel Vasilyev

Subject: Re: [PATCH]: Not PCI_PROBE_MMCONF by default

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 <[email protected]> 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 <[email protected]>
---
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.

2011-02-10 19:40:06

by Pavel Vasilyev

Subject: Re: [PATCH]: Not PCI_PROBE_MMCONF by default

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 <[email protected]>
--
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.