From patchwork Thu Oct 25 14:13:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149532 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1395815ljp; Thu, 25 Oct 2018 07:15:24 -0700 (PDT) X-Google-Smtp-Source: AJdET5eyNT3TFbA7qJLDI+35aYRm3mh2QUNNwx6sLi05h4/T9Wvj8QMPurccxNNCG1+Eig10Jy6O X-Received: by 2002:a17:902:765:: with SMTP id 92-v6mr1686985pli.263.1540476924480; Thu, 25 Oct 2018 07:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540476924; cv=none; d=google.com; s=arc-20160816; b=lGsZO4bKtUvt64cAsFerV/nGaLwm1RJCuC5ec9EOW5Q77CCljQ8Ew4gjIY6ZeyFTjd H8rPjnsIMqsyRA/V6dIWTwxI8pP2/YT6HfZ3yB2C5RKtWObH6cueKGP9q2VnPEC4Fr7R 1W6zpS3jjPmXoX7H3Ny5YXHIUx2zn0wyfiiHecLGZd4jKyyyqeWpPCWLsaWZE+Aw1LQL cTVx+Bt7WnHJC9+XrNZfSxTwoXx1pgi1NdrpG4V9nfZJPlu3K0yh+u90t6iNss4JSXHm Zc8EqHCy/WealyC45N4Oxa4iy8tU27xD0IqnaOteI01asUtn5PkKYIXHRceXiVZje/cu ULRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=fO7IaPWY7KjqFO0GNszcqLmwkiEVdsei56o7k0xnWhI=; b=hqm8AYD9QR9zt6lzVAjgwe3LSC2Ntu/hmRwX41Y1U+xD66rRijrZ0eLYU7eFiCrMyq PvDAUP2ZNQaolj41x22dGhuX9YlG+xXaR0cU+qQ1zmVCbLseX5agsM9DNOyMSdADBDb5 bGT7720YqTSnLXF+U+6Oq+EMaWIe+g5dXlZj2KXb4yV2nPuSqhm7D3T4V/vdfhODr+Y4 6E6eaMqZlrvUoySjM83Hci53npMMxrJB61ChxE3HKPH15gzAEqnJrE1lLurVdbCKLFEm 0g4umehiPoHLXtGSNPkTO8XhF1pNY68Isr2PadkK8h5GmAlrVncqQL3tQdQv/vlbRC/Z /58w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=es0ZK75X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p79-v6si8270497pfj.244.2018.10.25.07.15.23; Thu, 25 Oct 2018 07:15:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=es0ZK75X; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728918AbeJYWsS (ORCPT + 32 others); Thu, 25 Oct 2018 18:48:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:56832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728907AbeJYWsQ (ORCPT ); Thu, 25 Oct 2018 18:48:16 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D43032085A; Thu, 25 Oct 2018 14:15:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476919; bh=CIBOZAugqCEte1nJc7quNpkpOjQXgdyjfJLJNtl9xhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=es0ZK75X5ZwMvu+aG+fdYUfwxS3pXa4rMa4PawUBPFxihp/3V2JYSDJ5c+I69YdWz Fdk3tpXdJ5nDp8ci1MSOA0BhnZG9SE9IOay5CQhTI0/oOTL99vm8ZQ1UYKqRl5umxR BjC1MpXCTubHhDpgjeeGdy0AAEfdbVFdK0PCs8B8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Russell King , Sasha Levin Subject: [PATCH AUTOSEL 4.9 37/98] ARM: 8677/1: boot/compressed: fix decompressor header layout for v7-M Date: Thu, 25 Oct 2018 10:13:22 -0400 Message-Id: <20181025141423.213774-37-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141423.213774-1-sashal@kernel.org> References: <20181025141423.213774-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit 06a4b6d009a1b74a6ec46c5418b46cc53a79fcb8 ] As reported by Patrice, the header layout of the decompressor is incorrect when building for v7-M. In this case, the __nop macro resolves to 'mov r0, r0', which is emitted as a narrow encoding, resulting in the header data fields to end up at lower offsets than required. Given the variety of targets we need to support with the same code, the startup sequence is a bit of a jumble, and uses instructions and macros whose encoding widths cannot be specified (badr), or only exist in a narrow encoding (bx) So force the use of a wide encoding in __nop, and replace the start sequence with a simple jump to the label marking the start of code, preceded by a Thumb2 mode switch if required (using explicit wide encodings where appropriate). The label itself can be moved to the start of code [where it belongs] due to the larger range of branch instructions as compared to adr instructions. Reported-by: Patrice CHOTARD Acked-by: Nicolas Pitre Signed-off-by: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/boot/compressed/efi-header.S | 4 +--- arch/arm/boot/compressed/head.S | 17 ++++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/arch/arm/boot/compressed/efi-header.S b/arch/arm/boot/compressed/efi-header.S index 9d5dc4fda3c1..3f7d1b74c5e0 100644 --- a/arch/arm/boot/compressed/efi-header.S +++ b/arch/arm/boot/compressed/efi-header.S @@ -17,14 +17,12 @@ @ there. .inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000 #else - mov r0, r0 + W(mov) r0, r0 #endif .endm .macro __EFI_HEADER #ifdef CONFIG_EFI_STUB - b __efi_start - .set start_offset, __efi_start - start .org start + 0x3c @ diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index fc6d541549a2..2d7f2bb0d66a 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -130,19 +130,22 @@ start: .rept 7 __nop .endr - ARM( mov r0, r0 ) - ARM( b 1f ) - THUMB( badr r12, 1f ) - THUMB( bx r12 ) +#ifndef CONFIG_THUMB2_KERNEL + mov r0, r0 +#else + AR_CLASS( sub pc, pc, #3 ) @ A/R: switch to Thumb2 mode + M_CLASS( nop.w ) @ M: already in Thumb2 mode + .thumb +#endif + W(b) 1f .word _magic_sig @ Magic numbers to help the loader .word _magic_start @ absolute load/run zImage address .word _magic_end @ zImage end address .word 0x04030201 @ endianness flag - THUMB( .thumb ) -1: __EFI_HEADER - + __EFI_HEADER +1: ARM_BE8( setend be ) @ go BE8 if compiled for BE8 AR_CLASS( mrs r9, cpsr ) #ifdef CONFIG_ARM_VIRT_EXT From patchwork Thu Oct 25 14:14:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149533 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1397219ljp; Thu, 25 Oct 2018 07:16:21 -0700 (PDT) X-Google-Smtp-Source: AJdET5c7aYNPI/5eHp1GLn+kRHHmcNzEjPBJL2A++jBrQp4AItmGcRHhe1cP1Jy/A/RotddVHp3y X-Received: by 2002:a63:4243:: with SMTP id p64-v6mr1671828pga.127.1540476981667; Thu, 25 Oct 2018 07:16:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540476981; cv=none; d=google.com; s=arc-20160816; b=sEPp9RbaeEFcuxS/tseRBqb/hGDrZWqbrq9act7Bf6mkMZjuuqmy+yJKAfTOKJJFuu OeoaZygToXzRWgZ8D3KEYWKVT12yL1/nR3B/shdcGY1RposZcz7gZw2EuSzGXb2VJqwt FZvdlioho8gq3eZfYtcfz9o6iSNOaT4uuk+Sik3TAl6WQDBOxn/G2BbIwdbkzwVkdcCZ pKrAZYyio3b/PMy7YT9k3jVQcBPKCW8nijBxBm4er/c3xZ/I8HYKP9UenkWkO8lBee0c kOwb2HxmL/+zaqqr261Ramsq9J3NpGjpVXqlmPHUHUk+VNLi0Sl2vZYOdyVYd1bLTlpB GoVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=WBZgvMSl30OiPmPPDkP7nAVO4ubqS3mk5nNsvTffsZw=; b=tgCsvaIO8xKPDOvZg39rB9A6rAtQ0RuucxgJsjknUpuSqCCxwk4nBkVSn2nV845kr1 sp+BMoc9JuVCpoJxypTyotcj3nLPiNpa8taofrUBehRmtO8r6FvtTrpmvp8/RvKqqXWK SXLsox9lONuXI1O6dOUL9o+oYlnCfcuug6Q8GeHUeUhqX0ZpLzqfFXjiloKyQkkxm8ip Jr+E0fcm2Y9bBnMsPJ5VUXAK2uB0/ZwcLxUHQ5d1ukKwrD0cf+TTzmFfJfamQs/8eViT 8+OkVsaNS15JWtGKSgkbbpB6Chz0WQ5Sv4XDI3uuLIHTqXc4liACosF81Ucv49NEtbfw AbjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="STpXb/rr"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b35-v6si8322904plh.177.2018.10.25.07.16.20; Thu, 25 Oct 2018 07:16:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="STpXb/rr"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729302AbeJYWtO (ORCPT + 32 others); Thu, 25 Oct 2018 18:49:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727421AbeJYWtN (ORCPT ); Thu, 25 Oct 2018 18:49:13 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0315620848; Thu, 25 Oct 2018 14:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476977; bh=7/AXBXlqVLHSozKAzLiFYjb2J3zMulxLngF0jB098BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=STpXb/rrWYXgUYFothTa06FIQW1PQwfeZYaa3AxQ87jYDXDTH2w2Ni3dxVHtTOkt6 1ZLn8rpgD5205JnDdbtFAgEWtylBTS6Ph4J4hpeL1qHdBgIu13zv/FgfZZG56VZHaO CefsVc6upvDHoAS5oqYP4E1oULn+DTesnob4FZ/c= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Jessica Yu , Sasha Levin Subject: [PATCH AUTOSEL 4.9 77/98] module: fix DEBUG_SET_MODULE_RONX typo Date: Thu, 25 Oct 2018 10:14:02 -0400 Message-Id: <20181025141423.213774-77-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141423.213774-1-sashal@kernel.org> References: <20181025141423.213774-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 4d217a5adccf5e806790c37c61cc374a08bd7381 ] The newly added 'rodata_enabled' global variable is protected by the wrong #ifdef, leading to a link error when CONFIG_DEBUG_SET_MODULE_RONX is turned on: kernel/module.o: In function `disable_ro_nx': module.c:(.text.unlikely.disable_ro_nx+0x88): undefined reference to `rodata_enabled' kernel/module.o: In function `module_disable_ro': module.c:(.text.module_disable_ro+0x8c): undefined reference to `rodata_enabled' kernel/module.o: In function `module_enable_ro': module.c:(.text.module_enable_ro+0xb0): undefined reference to `rodata_enabled' CONFIG_SET_MODULE_RONX does not exist, so use the correct one instead. Fixes: 39290b389ea2 ("module: extend 'rodata=off' boot cmdline parameter to module mappings") Signed-off-by: Arnd Bergmann Signed-off-by: Jessica Yu Signed-off-by: Sasha Levin --- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/init/main.c b/init/main.c index 4313772d634a..3c7f71d8e704 100644 --- a/init/main.c +++ b/init/main.c @@ -915,7 +915,7 @@ static int try_to_run_init_process(const char *init_filename) static noinline void __init kernel_init_freeable(void); -#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_SET_MODULE_RONX) +#if defined(CONFIG_DEBUG_RODATA) || defined(CONFIG_DEBUG_SET_MODULE_RONX) bool rodata_enabled __ro_after_init = true; static int __init set_debug_rodata(char *str) { From patchwork Thu Oct 25 14:14:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149534 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1397705ljp; Thu, 25 Oct 2018 07:16:42 -0700 (PDT) X-Google-Smtp-Source: AJdET5dTeQD0T3RY+9/eII8YEvEeHpGEd4KuUA61TraUxIdGKioF258DF2pH/jb7XmdF8sICMZLF X-Received: by 2002:a17:902:930b:: with SMTP id bc11-v6mr1722141plb.101.1540477002069; Thu, 25 Oct 2018 07:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477002; cv=none; d=google.com; s=arc-20160816; b=V691JzK0OGrJ2Nh5+cUJD/L3lBLeBMXKZW1nvNV8dk1l5oKGbH1Phz/eplu577f2Zl 2vlhvKHYzd5Jy8fcvZ76DoZ70Q6Y3qLZbT9aTff6hBRUZtM2MioFpq8JXJlNfne8JbSR cpjuorHP4qbIIoERDO9hbyyXsy4mqmRUo7auJqoUTagabgb+ocU5GeQq4JtuAUCV6Oj+ 1IcSajOIfhWVQHcheU7j7PTIqJjmHdQmLmQUBeEevD1hZtigleWsJuWnfFuCYeKDO/Gv YmnT+6hcLrGi1eruTmSwquQNkBo2rZEUjYT7l57f6/psFwAyNukxD7k2EjwauLL+c9hK /8Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=7AvcNcLt5cCgr5lsl6KX2Qh3+uMZ+QtPY6lQ3YNPk3c=; b=DutzpO1W5/BU9bHyE7mJ4J83BrwV0cwXFEBD7Ja7WkFTMWQeDfsDX5TbCJ/1aOzw7R ZTs6s0IyzDtayTH1ilMq9NoOpSOfYoFrf5sXN48uZvqVbS4YDR5BAH3snoi5J4KNrpFC 0abI+xG5fE0+XVq6lhmRMtiKoJcAcqRPrLJWpAkFQODPAtjbTm791gv8+VMoyNUR7xuk GOzEHWCvBLgXadsmbyPrddq7wb+mJS+JA3D4e2wc9T/WmBIFBRXuzvTXnvrmKSGZ/Pbv L9LyByKCyvV7sGMoQsYRmqL5sSBAyXg8tR8EBe6K61CM9AI124aLN2ghF29k9f68YX+8 dBvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kGzvCEfz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r25-v6si8682509pfk.83.2018.10.25.07.16.41; Thu, 25 Oct 2018 07:16:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kGzvCEfz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729454AbeJYWtf (ORCPT + 32 others); Thu, 25 Oct 2018 18:49:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:58758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728100AbeJYWte (ORCPT ); Thu, 25 Oct 2018 18:49:34 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D9C7920848; Thu, 25 Oct 2018 14:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540476997; bh=XqxJCNXcKrGaarBOqqNsdvh3F84QXa13zEhkqTfJZG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGzvCEfzzZ66WEj59H8af3vHjq0oj38/gbNIDUmq/RYrSrDDtjtj1sJVs9ty9zUCn qe7yMPrZejtEi3ppHJy8kSljrebqPJcDE4i1mwATI3GqkKdtHFTcVF5hB6RSss18BQ bUR9VvOs3lQA737Ssnl+eTPm0PVIouQ+v4vy7poA= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Russell King , Greg Kroah-Hartman , Jiri Slaby , Peter Hurley , Aleksey Makarov , Sasha Levin Subject: [PATCH AUTOSEL 4.9 91/98] tty: serial: pl011: add ttyAMA for matching pl011 console Date: Thu, 25 Oct 2018 10:14:16 -0400 Message-Id: <20181025141423.213774-91-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141423.213774-1-sashal@kernel.org> References: <20181025141423.213774-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sudeep Holla [ Upstream commit aea9a80ba98a0c9b4de88850260e9fbdcc98360b ] Commit c7cef0a84912 ("console: Add extensible console matching") added match() method to struct console which allows the console to perform console command line matching instead of (or in addition to) default console matching (ie., by fixed name and index). Commit ad1696f6f09d ("ACPI: parse SPCR and enable matching console") introduced support for SPCR as matching console. Commit 10879ae5f12e ("serial: pl011: add console matching function") added the match method for pl011 console which checks for the console string to be "pl011" Now on a platform which has both SPCR in the ACPI tables and ttyAMA in the command line, the ttyAMA is chosen as "selected console" but it doesn't pass the matching console method which results in CON_CONSDEV not being set on the "selected console". As a result of that, the bootconsole(SPCR in the above case) is not unregistered and all the beginning boot messages are seen twice. This patch adds "ttyAMA" so that it's considered to match pl011 console. Fixes: 10879ae5f12e ("serial: pl011: add console matching function") Cc: Russell King Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Peter Hurley Cc: Aleksey Makarov Signed-off-by: Sudeep Holla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/amba-pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 41b0dd67fcce..11fb5464c43a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2361,7 +2361,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx, resource_size_t addr; int i; - if (strcmp(name, "pl011") != 0) + if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) return -ENODEV; if (uart_parse_earlycon(options, &iotype, &addr, &options))