Commit 0dfe6e7ed47feeb22f3cf8c7d8ac7e65bd4e87f5

Authored by Corey Minyard
Committed by Linus Torvalds
1 parent eb6d78ec21

ipmi: Turn off default probing of interfaces

The default probing can cause problems with some system, slow booting,
extra CPU usages, etc.  Turn it off by default and give a config option
to enable it.

From: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 13 additions and 1 deletions Side-by-side Diff

drivers/char/ipmi/Kconfig
... ... @@ -50,6 +50,18 @@
50 50 Currently, only KCS and SMIC are supported. If
51 51 you are using IPMI, you should probably say "y" here.
52 52  
  53 +config IPMI_SI_PROBE_DEFAULTS
  54 + bool 'Probe for all possible IPMI system interfaces by default'
  55 + default n
  56 + depends on IPMI_SI
  57 + help
  58 + Modern systems will usually expose IPMI interfaces via a discoverable
  59 + firmware mechanism such as ACPI or DMI. Older systems do not, and so
  60 + the driver is forced to probe hardware manually. This may cause boot
  61 + delays. Say "n" here to disable this manual probing. IPMI will then
  62 + only be available on older systems if the "ipmi_si_intf.trydefaults=1"
  63 + boot argument is passed.
  64 +
53 65 config IPMI_WATCHDOG
54 66 tristate 'IPMI Watchdog Timer'
55 67 help
drivers/char/ipmi/ipmi_si_intf.c
... ... @@ -1239,7 +1239,7 @@
1239 1239 #ifdef CONFIG_PCI
1240 1240 static bool si_trypci = 1;
1241 1241 #endif
1242   -static bool si_trydefaults = 1;
  1242 +static bool si_trydefaults = IS_ENABLED(CONFIG_IPMI_SI_PROBE_DEFAULTS);
1243 1243 static char *si_type[SI_MAX_PARMS];
1244 1244 #define MAX_SI_TYPE_STR 30
1245 1245 static char si_type_str[MAX_SI_TYPE_STR];