From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id B37516B000C for ; Fri, 23 Feb 2018 13:48:08 -0500 (EST) Received: by mail-wr0-f197.google.com with SMTP id v16so6058071wrv.14 for ; Fri, 23 Feb 2018 10:48:08 -0800 (PST) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id 190si1647078wmn.174.2018.02.23.10.48.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 10:48:07 -0800 (PST) From: Greg Kroah-Hartman Subject: [PATCH 4.9 082/145] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Date: Fri, 23 Feb 2018 19:26:28 +0100 Message-Id: <20180223170735.360444676@linuxfoundation.org> In-Reply-To: <20180223170724.669759283@linuxfoundation.org> References: <20180223170724.669759283@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-mm@kvack.org List-ID: To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Young , Thomas Gleixner , Linus Torvalds , Peter Zijlstra , bp@suse.de, linux-efi@vger.kernel.org, linux-mm@kvack.org, Ingo Molnar , Sasha Levin 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Young [ Upstream commit 7f6f60a1ba52538c16f26930bfbcfe193d9d746a ] 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 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 Signed-off-by: Greg Kroah-Hartman --- mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -103,7 +103,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++) { -- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3723396-1519415122-2-3055957858852948789 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1519415122; b=ZSt97Mdolw+G0MzTbYXBPjAfs6LUB1Y/Cj7DJ82A7I0Paqu 7D9qsWAMqWTMC4tFROfcp9eugLaI6Cn0YGHV+GLbrpn7XD0hIM9QRCdCeS57Z8ie 2aYeZ8SFPOT0AcyMiSymawy72ggE0e1sRpx4dPS+dnwrBhgiBslRbcF2JVE7LGv7 YtiTQjGDLY8BJxrMLs6dfZMeD0LJsgr8p86QQiL7d4UIu6cw+cpoDtK8JVcvObY5 La99XySxCxopANQZUlQCyiV3Cds7t3XXgSfrrDatszpdZZIr7v5xhpmlmBfFSGdB yZN6GJCRYwL+Lg5AbgH0yE8tkKvgEDwj1kRQoXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=arctest; t=1519415122; bh=qsyD5uEPpODdjOHUKHfbCbzMQ1 YS+WFIzoZkr/t8hRg=; b=N1Lyw6uhlAcNfWcaiWrTAJqI9wptgHIcPJGLD9G0yu q7Fi98KGawZ7WZoWoy9qTJUj7/f7CVh6oIPG5M/NPDcLrnrEaW8P98BCJ9iInjht TNXY7tjXUicch1L2g4UZf37E1eJoYwUAzBZsclzbJSXZVHgHPP04DfnZhVzGYhLx W8SuKM1QVgElfOcxT19LyKC0OFTd1yi80RA7H/0g+pmjKNhZ5FQ+ozGCENTQWVzh chb7IcAcC5M9YooPTZVUyQEcUjmIqdKeHuufepY3ezKD47A+bze8O4satA14sDTa XRMJRYC4oiMsUxEqYSvOax+HBeUQcAIdAp7isgmHPqbQ== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754905AbeBWTpK (ORCPT ); Fri, 23 Feb 2018 14:45:10 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:44792 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934316AbeBWSsG (ORCPT ); Fri, 23 Feb 2018 13:48:06 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Young , Thomas Gleixner , Linus Torvalds , Peter Zijlstra , bp@suse.de, linux-efi@vger.kernel.org, linux-mm@kvack.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.9 082/145] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Date: Fri, 23 Feb 2018 19:26:28 +0100 Message-Id: <20180223170735.360444676@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170724.669759283@linuxfoundation.org> References: <20180223170724.669759283@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Young [ Upstream commit 7f6f60a1ba52538c16f26930bfbcfe193d9d746a ] 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 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 Signed-off-by: Greg Kroah-Hartman --- mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -103,7 +103,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++) {