From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sn1nam02on0108.outbound.protection.outlook.com ([104.47.36.108]:20937 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032513AbeCAPhh (ORCPT ); Thu, 1 Mar 2018 10:37:37 -0500 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Dave Young , Ingo Molnar , Sasha Levin Subject: [added to the 4.1 stable tree] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Date: Thu, 1 Mar 2018 15:27:01 +0000 Message-ID: <20180301152116.1486-423-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-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: stable-owner@vger.kernel.org List-ID: From: Dave Young This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D [ 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 e10ccd299d66..5edcf1b37fa6 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -102,7 +102,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.14.1