: Not PCI_PROBE_MMCONF by default

PATCH In review Pavel Vasilyev 2 participants 5 messages Feb 9, 2011 – Feb 10, 2011

Subsystems (2)

x86 PCI

lore

Share & tools

lore

Pavel Vasilyev

author

2011-02-09 15:19 UTC #0 lore raw

PATCH 1/1 : 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(-)

arch/x86/pci/common.c +4 -2

index 5fe7502..625b477 100644
@@ -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;

Signature · 1 line

                                                         Pavel.

Yinghai Lu

2011-02-09 16:43 UTC #1 lore raw

Quoted 26 lines · Pavel Vasilyev

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(-)

arch/x86/pci/common.c +1 -2

index 5fe7502..625b477 100644
@@ -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;

arch/x86/pci/common.c char * __devinit pcibios_setup(char *str) · line 542

Quoted 9 lines

arch/x86/pci/common.c +3 -0

@@ -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

Pavel Vasilyev

author

2011-02-09 18:38 UTC #2 lore raw

09.02.2011 19:43, Yinghai Lu пишет:

Quoted 23 lines · Pavel Vasilyev

Quoted 22 lines

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(-)

arch/x86/pci/common.c +1 -2

index 5fe7502..625b477 100644
@@ -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;

Quoted 15 lines

arch/x86/pci/common.c char * __devinit pcibios_setup(char *str) · line 542

Quoted 13 lines

arch/x86/pci/common.c +3 -0

 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(-)

arch/x86/pci/common.c +4 -2

index 5fe7502..48af4ce 100644
@@ -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;

Signature · 1 line

                                                         Pavel.

Pavel Vasilyev

author

2011-02-09 19:05 UTC #3 lore raw

09.02.2011 21:36, Pavel Vasilyev пишет:

Quoted 7 lines

09.02.2011 19:43, Yinghai Lu пишет:
Quoted 6 lines · Pavel Vasilyev
Quoted 5 lines
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(-)

arch/x86/pci/common.c +4 -0

index 5fe7502..0a3e56a 100644
@@ -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;

Signature · 1 line

                                                         Pavel.

Pavel Vasilyev

author

2011-02-10 19:40 UTC #4 lore raw

In reply to Pavel Vasilyev

09.02.2011 21:36, Pavel Vasilyev пишет:

Quoted 6 lines

Quoted 5 lines
Quoted 3 lines
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(-)

arch/x86/pci/common.c +4 -0

index 5fe7502..0a3e56a 100644
@@ -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;

Signature · 1 line

                                                         Pavel.