Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753923AbdLIEQ1 (ORCPT ); Fri, 8 Dec 2017 23:16:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54014 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753674AbdLIEQZ (ORCPT ); Fri, 8 Dec 2017 23:16:25 -0500 Date: Sat, 9 Dec 2017 12:16:10 +0800 From: Dave Young To: tglx@linutronix.de, bp@suse.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-efi@vger.kernel.org Subject: [PATCH resend] fix boot hang with earlyprintk=efi,keep Message-ID: <20171209041610.GA3249@dhcp-128-65.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.1 (2017-09-22) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 09 Dec 2017 04:16:25 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 955 Lines: 27 earlyprintk=efi,keep does not work any more with a warning in mm/early_ioremap.c: WARN_ON(system_state != SYSTEM_BOOTING): Boot just hangs because of the earlyprintk within earlyprintk implementation code. This is caused by a new introduced middle state in below commit: commit 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 --- v1->v2: update patch log correct some typos mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-x86.orig/mm/early_ioremap.c +++ linux-x86/mm/early_ioremap.c @@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_add enum fixed_addresses idx; int i, slot; - WARN_ON(system_state != SYSTEM_BOOTING); + WARN_ON(system_state >= SYSTEM_RUNNING); slot = -1; for (i = 0; i < FIX_BTMAPS_SLOTS; i++) {