public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vernon Mauery <vernux@us.ibm.com>
To: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Platform driver x86 <platform-driver-x86@vger.kernel.org>
Subject: [Patch 2/2] ibm_rtl: check for efi_enabled
Date: Fri, 22 Oct 2010 14:17:13 -0700	[thread overview]
Message-ID: <20101022211713.GI8754@lucy> (raw)
In-Reply-To: <20101021150928.GC8754@lucy>

I tested ibm_rtl on an IBM machine that is supported by this driver in 
Legacy BIOS mode, but which was running in UEFI mode and the system 
complained about remapping the EBDA because the EBDA should not have 
been there to start with.  This patch fixes that:

--Vernon

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>

diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
index c5a0061..3cff0e5 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 */

      parent reply	other threads:[~2010-10-22 21:17 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-05 22:47 [Patch] IBM Real-Time "SMI Free" mode driver -v7 Vernon Mauery
2010-10-21 13:54 ` Matthew Garrett
2010-10-21 14:23   ` Vernon Mauery
2010-10-21 14:25     ` Matthew Garrett
2010-10-21 14:38       ` Vernon Mauery
2010-10-21 14:42         ` Matthew Garrett
2010-10-21 15:09           ` Vernon Mauery
2010-10-22 21:13             ` [Patch 1/2] ibm_rtl: DMI match should include all IBM machines Vernon Mauery
2010-10-22 21:17             ` Vernon Mauery [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101022211713.GI8754@lucy \
    --to=vernux@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox