summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVernon Mauery <vernux@us.ibm.com>2010-11-02 13:08:11 -0700
committerMatthew Garrett <mjg@redhat.com>2010-11-24 12:00:03 -0500
commit1d37db77c1aa199ae9a4114af7c0412c8417e949 (patch)
tree02f8c308fea9441487c815422a470c7f48bc9df9
parenta2262260f9eaee4acd56b5624b5d2bf4be9bb38a (diff)
downloadlinux-next-1d37db77c1aa199ae9a4114af7c0412c8417e949.tar.gz
ibm_rtl: _RTL_ is not available in UEFI mode
Some of the IBM servers that are supported by ibm_rtl can run in both Legacy mode (BIOS) and in UEFI mode. When running in UEFI mode, it is possible that the EBDA table exists but cannot be mapped and reports errors. We need to make sure that by default we don't try to probe the machines if they are running in UEFI mode. Signed-off-by: Vernon Mauery <vernux@us.ibm.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/platform/x86/ibm_rtl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index 5c975edb3c81..94a114aa8e28 100644
--- a/drivers/platform/x86/ibm_rtl.c
+++ b/drivers/platform/x86/ibm_rtl.c
@@ -28,6 +28,7 @@
#include <linux/io.h>
#include <linux/sysdev.h>
#include <linux/dmi.h>
+#include <linux/efi.h>
#include <linux/mutex.h>
#include <asm/bios_ebda.h>
@@ -238,7 +239,7 @@ static int __init ibm_rtl_init(void) {
if (force)
pr_warning("ibm-rtl: module loaded by force\n");
/* first ensure that we are running on IBM HW */
- else if (!dmi_check_system(ibm_rtl_dmi_table))
+ else if (efi_enabled || !dmi_check_system(ibm_rtl_dmi_table))
return -ENODEV;
/* Get the address for the Extended BIOS Data Area */