[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250502123145.4066635-2-andriy.shevchenko@linux.intel.com>
Date: Fri, 2 May 2025 15:29:37 +0300
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Ashish Kalra <ashish.kalra@....com>,
"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
linux-kernel@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
x86@...nel.org,
"H. Peter Anvin" <hpa@...or.com>,
David Woodhouse <dwmw@...zon.co.uk>,
Denis Mukhin <dmukhin@...d.com>
Subject: [PATCH v1 1/6] x86/boot: Convert early_serial_base to unsigned long
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@...ux.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 38f17a1e1e36..753f429b28cb 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -274,7 +274,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 70a8d1706d0f..5b8db03f40ad 100644
--- a/arch/x86/boot/compressed/early_serial_console.c
+++ b/arch/x86/boot/compressed/early_serial_console.c
@@ -1,6 +1,6 @@
#include "misc.h"
/* This might be accessed before .bss is cleared, so use .data instead. */
-int early_serial_base __section(".data");
+unsigned long early_serial_base __section(".data");
#include "../early_serial_console.c"
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index dd8d1a85f671..f083360c84c1 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -127,10 +127,10 @@ extern unsigned char _pgtable[];
#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..7a7766fa16e5 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;
@@ -46,9 +46,9 @@ static void early_serial_init(int port, int baud)
static void parse_earlyprintk(void)
{
int baud = DEFAULT_BAUD;
+ unsigned long port = 0;
char arg[32];
int pos = 0;
- int 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 f7eb976b0a4b..e2ab8b8076ef 100644
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
@@ -13,7 +13,7 @@
#include "boot.h"
-int early_serial_base;
+unsigned long early_serial_base;
#define XMTRDY 0x20
--
2.47.2
Powered by blists - more mailing lists