Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756080AbbDGO3i (ORCPT ); Tue, 7 Apr 2015 10:29:38 -0400 Received: from numascale.com ([213.162.240.84]:58087 "EHLO numascale.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754699AbbDGO3g (ORCPT ); Tue, 7 Apr 2015 10:29:36 -0400 From: Daniel J Blueman To: "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Steffen Persvold , Daniel J Blueman Subject: [PATCH] x86: Fix earlyprintk ttyS2/3 Date: Tue, 7 Apr 2015 22:29:17 +0800 Message-Id: <1428416957-19278-1-git-send-email-daniel@numascale.com> X-Mailer: git-send-email 2.1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cpanel21.proisp.no X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - numascale.com X-Get-Message-Sender-Via: cpanel21.proisp.no: authenticated_id: daniel@numascale.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1285 Lines: 40 Quite a few platforms use ttyS2 for their serial-over-LAN, so fix early printk support for ttyS2 and 3, avoiding the need to hard-code the IO port. Signed-off-by: Daniel J Blueman --- arch/x86/boot/early_serial_console.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index 5df2869..4f4c2e6 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c @@ -71,15 +71,16 @@ static void parse_earlyprintk(void) else pos = e - arg; } else if (!strncmp(arg + pos, "ttyS", 4)) { - static const int bases[] = { 0x3f8, 0x2f8 }; - int idx = 0; + static const int bases[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8}; + unsigned idx = 0; if (!strncmp(arg + pos, "ttyS", 4)) pos += 4; - if (arg[pos++] == '1') - idx = 1; + if ((arg[pos] - '0') < (sizeof(bases) / sizeof(bases[0]))) + idx = arg[pos] - '0'; + pos++; port = bases[idx]; } -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/