From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517179035-2-8998578625793025291 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, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' 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=1517179034; b=Y4/9E4LLhTzNRWVGZa8YiJjOC81o5XWsACdZYKGDHGlwdX8 JH2I4iW09fb8MXpscDIVesdxU57VEN/oqM9DN3AMF6y/9aHsu2CQsenXSl0w89IF RKNIynH4ZHzSnNodTk2d1oLpmAYDHSIuCgQXqnqGKQ44NiYdIG17yYw+SiZ3NVW2 GLvZ0/m3saU5uVOatqdzNMgCXkuVtvHOUKFDhrEHydhmOc7Ee1vErWxG7TDrxkVb uJOtYEf0BIsx3CmGWvgMr+xpQ1qeSuw54p6D1qkqkG5fdXVaNEeg/8w1Bb6NToCo CJ0u9VSfsiAJ+oNs1TFYJB9bMKIOd+M5P7SyweQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179034; bh=59Xl7S l+zewSapwa1508geWwrWhtoqZhNAHGDAUcuOM=; b=M9v1I1EpCVylJXBp38d3du XcmS5szFcb3xpS0CakcC+F4Qda/mZrqHq7/nISAriCN0wNBoysfRy3DbKRVU3aEs b4lE/+0N6NSd0cGYnN99ERJqy8vvU0EtAb1PJ1Icy9Ve0sxGuLzcYtnGPXgluypP 0uRrWAf7VYldXHJ2cKYkwyHMM/RVCTsUDzj9Yz+14uTcFdLLcLItlrpPI/N/8MtE 3QE3rXNGkm5hi4gjYuhTzM9HHbJaslOpXtMHR3LSwGaAm6uNqF6p7/SLTCoxK0y1 W/BHeNWqi0Itgu1dPC8V8kAMKmBVhv/vq0bBLtePqa7onuzzNbBm/tvVrI9J2WDg == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=G1zMZbE+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=G1zMZbE+ x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932604AbeA1Wab (ORCPT ); Sun, 28 Jan 2018 17:30:31 -0500 Received: from mail-by2nam03on0092.outbound.protection.outlook.com ([104.47.42.92]:41884 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932199AbeA1Wa3 (ORCPT ); Sun, 28 Jan 2018 17:30:29 -0500 From: Sasha Levin 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 Subject: [PATCH AUTOSEL for 4.4 33/36] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Thread-Topic: [PATCH AUTOSEL for 4.4 33/36] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Thread-Index: AQHTmIddI4SB953a202suF+m7A7EnA== Date: Sun, 28 Jan 2018 22:28:48 +0000 Message-ID: <20180128222815.29479-33-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1114;7:qF5rncub+Vp3PUQ1W7Xu0R4j8hw/nCElHFLb9O1R50+OCNY2ohJg+geg1RwgbxWaBIF/bnFo9iGwSYo1rog2cd6l41mcIGcZh0uPz2KH399edy7zWluQqFx5OY69+J3q6v+/PbOn4VIxCBCLjQp+KHMDsgJuaZazeLzOrIZclJVpQ4TrE2LUU6mXSgjtjfXtKIFYs1YzSsFEbC08r9vufi2ehbezkPyv9UEXkEOWchcoXTZutwoFcPfkgl3/VS6o x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b38da360-e214-426a-cb5c-08d5669eb9f7 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(966005)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(6306002)(53936002)(106356001)(2501003)(66066001)(22906009)(142933001)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: 9bJcS/f+gnWmF4uTRm/FHKyZ2dLHK3k85VLKvoVtoasPIs0iR88tNcBE7GtaUC61b0TrB+TBJoBbFsTyQS+JpA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b38da360-e214-426a-cb5c-08d5669eb9f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:48.2184 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 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: 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 6d5717bd7197..57540de2b44c 100644 --- a/mm/early_ioremap.c +++ b/mm/early_ioremap.c @@ -103,7 +103,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