From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 1/6] x86/boot: Convert early_serial_base to unsigned long
Date: Sun, 14 Jan 2018 16:32:49 +0200 [thread overview]
Message-ID: <20180114143254.15429-1-andriy.shevchenko@linux.intel.com> (raw)
As a preparatory of adding flexible serial I/O accessors, convert
early_serial_base to unsigned long to cover all possible bus addresses
on the system.
No functional change intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/boot/boot.h | 2 +-
arch/x86/boot/compressed/early_serial_console.c | 2 +-
arch/x86/boot/compressed/misc.h | 4 ++--
arch/x86/boot/early_serial_console.c | 6 +++---
arch/x86/boot/tty.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index ef5a9cc66fb8..d9f8279774f6 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -299,7 +299,7 @@ int check_knl_erratum(void);
int validate_cpu(void);
/* early_serial_console.c */
-extern int early_serial_base;
+extern unsigned long early_serial_base;
void console_init(void);
/* edd.c */
diff --git a/arch/x86/boot/compressed/early_serial_console.c b/arch/x86/boot/compressed/early_serial_console.c
index 261e81fb9582..5e3a66478754 100644
--- a/arch/x86/boot/compressed/early_serial_console.c
+++ b/arch/x86/boot/compressed/early_serial_console.c
@@ -1,5 +1,5 @@
#include "misc.h"
-int early_serial_base;
+unsigned long early_serial_base;
#include "../early_serial_console.c"
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 9d323dc6b159..d36d4398a6b0 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -101,10 +101,10 @@ static inline void finalize_identity_maps(void)
#ifdef CONFIG_EARLY_PRINTK
/* early_serial_console.c */
-extern int early_serial_base;
+extern unsigned long early_serial_base;
void console_init(void);
#else
-static const int early_serial_base;
+static const unsigned long early_serial_base;
static inline void console_init(void)
{ }
#endif
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c
index b25c53527a94..a5aec142c91a 100644
--- a/arch/x86/boot/early_serial_console.c
+++ b/arch/x86/boot/early_serial_console.c
@@ -23,7 +23,7 @@
#define DEFAULT_BAUD 9600
-static void early_serial_init(int port, int baud)
+static void early_serial_init(unsigned long port, int baud)
{
unsigned char c;
unsigned divisor;
@@ -48,7 +48,7 @@ static void parse_earlyprintk(void)
int baud = DEFAULT_BAUD;
char arg[32];
int pos = 0;
- int port = 0;
+ unsigned long port = 0;
if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) {
char *e;
@@ -118,7 +118,7 @@ static void parse_console_uart8250(void)
{
char optstr[64], *options;
int baud = DEFAULT_BAUD;
- int port = 0;
+ unsigned long port = 0;
/*
* console=uart8250,io,0x3f8,115200n8
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c
index def2451f46ae..d1d34c6ca153 100644
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
@@ -15,7 +15,7 @@
#include "boot.h"
-int early_serial_base;
+unsigned long early_serial_base;
#define XMTRDY 0x20
--
2.15.1
next reply other threads:[~2018-01-14 14:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-14 14:32 Andy Shevchenko [this message]
2018-01-14 14:32 ` [PATCH v1 2/6] x86/boot: Introduce helpers for serial I/O Andy Shevchenko
2018-01-14 14:32 ` [PATCH v1 3/6] x86/boot: Add MMIO byte accessors Andy Shevchenko
2018-01-14 14:32 ` [PATCH v1 4/6] x86/boot: Assume MMIO if serial base address supplied via earlyprintk Andy Shevchenko
2018-01-16 3:13 ` Ingo Molnar
2018-01-16 10:55 ` Andy Shevchenko
2018-01-16 15:55 ` Ingo Molnar
2018-05-03 10:45 ` Andy Shevchenko
2018-01-14 14:32 ` [PATCH v1 5/6] x86/boot: Allow longer parameter list for earlyprintk Andy Shevchenko
2018-01-16 3:11 ` Ingo Molnar
2018-01-16 10:57 ` Andy Shevchenko
2018-01-16 15:51 ` Ingo Molnar
2018-05-03 11:48 ` Andy Shevchenko
2018-01-14 14:32 ` [PATCH v1 6/6] x86/boot: Support nocfg parameter " Andy Shevchenko
2018-01-16 3:12 ` Ingo Molnar
2018-01-16 11:00 ` Andy Shevchenko
2018-01-16 15:53 ` Ingo Molnar
2025-05-02 12:29 [PATCH v1 0/6] x86/boot: Enable earlyprintk on MMIO (8-bit) Andy Shevchenko
2025-05-02 12:29 ` [PATCH v1 1/6] x86/boot: Convert early_serial_base to unsigned long Andy Shevchenko
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=20180114143254.15429-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@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
Powered by JetHome