From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id C6AC96B0003 for ; Sun, 28 Jan 2018 17:28:22 -0500 (EST) Received: by mail-pg0-f69.google.com with SMTP id i1so2901482pgv.22 for ; Sun, 28 Jan 2018 14:28:22 -0800 (PST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0139.outbound.protection.outlook.com. [104.47.36.139]) by mx.google.com with ESMTPS id d12-v6si6792840plr.442.2018.01.28.14.28.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Jan 2018 14:28:21 -0800 (PST) From: Sasha Levin Subject: [PATCH AUTOSEL for 4.14 094/100] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Date: Sun, 28 Jan 2018 22:27:01 +0000 Message-ID: <20180128222547.7398-94-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: owner-linux-mm@kvack.org List-ID: To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Cc: Dave Young , Linus Torvalds , Peter Zijlstra , "bp@suse.de" , "linux-efi@vger.kernel.org" , "linux-mm@kvack.org" , Ingo Molnar , Sasha Levin From: Dave Young [ Upstream commit 7f6f60a1ba52538c16f26930bfbcfe193d9d746a ] earlyprintk=3Defi,keep does not work any more with a warning in mm/early_ioremap.c: WARN_ON(system_state !=3D SYSTEM_BOOTING): Boot just hangs because of the earlyprintk within the earlyprintk implementation code itself. This is caused by a new introduced middle state in: 69a78ff226fe ("init: Introduce SYSTEM_SCHEDULING state") early_ioremap() is fine in both SYSTEM_BOOTING and SYSTEM_SCHEDULING states, original condition should be updated accordingly. Signed-off-by: Dave Young Acked-by: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Cc: bp@suse.de Cc: linux-efi@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20171209041610.GA3249@dhcp-128-65.nay.redhat= .com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c index d04ac1ec0559..1826f191e72c 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned lon= g size, pgprot_t prot) enum fixed_addresses idx; int i, slot; =20 - WARN_ON(system_state !=3D SYSTEM_BOOTING); + WARN_ON(system_state >=3D SYSTEM_RUNNING); =20 slot =3D -1; for (i =3D 0; i < FIX_BTMAPS_SLOTS; i++) { --=20 2.11.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org