Messages in this thread Patch in this message | | | Date | Tue, 12 Dec 2017 02:53:17 -0800 | From | tip-bot for Dave Young <> | Subject | [tip:core/urgent] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep |
| |
Commit-ID: 7f6f60a1ba52538c16f26930bfbcfe193d9d746a Gitweb: https://git.kernel.org/tip/7f6f60a1ba52538c16f26930bfbcfe193d9d746a Author: Dave Young <dyoung@redhat.com> AuthorDate: Sat, 9 Dec 2017 12:16:10 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 11 Dec 2017 14:54:44 +0100
mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep
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 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 <dyoung@redhat.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> 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 <mingo@kernel.org> --- 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 d04ac1e..1826f19 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot) 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++) {
| |