Received: by 10.223.185.116 with SMTP id b49csp1136243wrg; Fri, 23 Feb 2018 12:34:25 -0800 (PST) X-Google-Smtp-Source: AH8x226JYlP53dMrrdmpyCvfcmgxqDDZdQKie3Joavo6M6ga6G1mEFRnT/cr3qlAP0xZ+C1zdh8F X-Received: by 10.98.19.21 with SMTP id b21mr2905536pfj.236.1519418065288; Fri, 23 Feb 2018 12:34:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519418065; cv=none; d=google.com; s=arc-20160816; b=f6A9IcUy7CUF+gXHBZ3G9Xok8i7BmYwaTy+rJFFmubv5oHOnbHgaLaeCgqxh+NWxd0 W0pHIRdmvqxqSSK9NmUIPuOi3AneSoCSSLniDhGQuvw35BX+l1DdsDWQkLmc1U5Xhh1Q mvarem64k640K1uUgPXKvaruMnlfD/0VatpTKiRkLVrGbgf5cPklFl+aTGD/992gu53+ Fi7dQ2abeghrotN4arqQAEEE3ULEgJ6QgswFRrq187npM0PmCgXx5QJbCMeF4IsDxEeT Ttv4f/OgV6iCKDeCAEN3ztxjfDANt3hOUBR4x+saeFYiUxSjX5cQ+qxirnNtmYriVseH gkJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jyvgVjwgmLGtoS/+Z1QwUGbSa2EkK0ZFCiKkJeW+nns=; b=wFLCUBdcsjxhmZ+3jO3OXg/of0nh2ykhN57WNYL2DGeLAOqBx3jHJ13zCMZevFIG7+ ZuguDIPV0O4XCalsnOmPZ6mpgAa/V1pnHDpTUbDXryTmswvpZa/O5enVrPU3nqDyhRas ielfaoukVKc7qeDeSoKMdPjvcdwFO54Wlybvk5UHUWPrfEc4QTvglok8aVlmdpgAJBC/ Wxfoo4UswQD/VQFUFSrl1XcMVTqfiICb1Sl8u4VdGe7JPeXYVTitzGcbHStsHAvda6UI Yli4yL+H9PGqy74T6mO84/C/0BHMzHZFwu9N4cGWTvJlv1ac7G3E85kyKlu4CmM/pdKl tPTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m27si2296309pfg.64.2018.02.23.12.34.10; Fri, 23 Feb 2018 12:34:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753803AbeBWSfX (ORCPT + 99 others); Fri, 23 Feb 2018 13:35:23 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37242 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753770AbeBWSfT (ORCPT ); Fri, 23 Feb 2018 13:35:19 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E190F11D8; Fri, 23 Feb 2018 18:35:18 +0000 (UTC) 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.4 058/193] mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep Date: Fri, 23 Feb 2018 19:24:51 +0100 Message-Id: <20180223170335.072376251@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-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++) {