lkml.org 
[lkml]   [2019]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 1/7] x86/boot: Convert early_serial_base to unsigned long
Date
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 32a09eb5c101..f41291903da7 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 fd13655e0f9b..6f2bdf813949 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -110,10 +110,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 023bf1c3de8b..2b663beda582 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.20.1
\
 
 \ /
  Last update: 2019-03-19 19:44    [W:0.159 / U:0.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site