linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Kagstrom <simon.kagstrom@netinsight.net>
To: x86@kernel.org, linux-serial@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: mingo@redhat.com, tglx@linutronix.de, alan@linux.intel.com,
	akpm@linux-foundation.org, hpa@zytor.com
Subject: [PATCH 2/2]: x86 real mode: Set delay port according to kernel config
Date: Wed, 17 Mar 2010 13:30:56 +0100	[thread overview]
Message-ID: <20100317133056.289d8dc7@marrow.netinsight.se> (raw)
In-Reply-To: <20100317132849.7d49939b@marrow.netinsight.se>

Port 0x80 is not safe to use on all x86 boards (see
arch/x86/kernel/io_delay.c), so optionally use 0xed from the kernel
config instead.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
---
 arch/x86/boot/boot.h |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 98239d2..79880b1 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -73,7 +73,12 @@ static inline u32 inl(u32 port)
 
 static inline void io_delay(void)
 {
+#ifdef CONFIG_IO_DELAY_0XED
+	const u16 DELAY_PORT = 0xed;
+#else
 	const u16 DELAY_PORT = 0x80;
+#endif
+
 	asm volatile("outb %%al,%0" : : "dN" (DELAY_PORT));
 }
 
-- 
1.6.0.4


      parent reply	other threads:[~2010-03-17 12:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-17 12:28 [PATCH 0/2]: x86: Honor IO_DELAY IO port settings Simon Kagstrom
2010-03-17 12:30 ` [PATCH 1/2]: serial8250: Use native_io_delay on the x86 Simon Kagstrom
2010-03-17 13:01   ` Alan Cox
2010-03-17 14:09     ` Simon Kagstrom
2010-03-17 18:25   ` H. Peter Anvin
2010-03-17 18:36     ` Alan Cox
2010-03-17 18:43       ` H. Peter Anvin
2010-03-17 12:30 ` Simon Kagstrom [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=20100317133056.289d8dc7@marrow.netinsight.se \
    --to=simon.kagstrom@netinsight.net \
    --cc=akpm@linux-foundation.org \
    --cc=alan@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).