Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2471551yba; Mon, 15 Apr 2019 12:20:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqyixRD26UsEbysYVxwgtwAt10LvuYS3KCUjT1cob38bYE0FPA8Xjr4NON5B3HN8vRBu+K7b X-Received: by 2002:a63:720e:: with SMTP id n14mr71127188pgc.93.1555356002045; Mon, 15 Apr 2019 12:20:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356002; cv=none; d=google.com; s=arc-20160816; b=pNS6uD80g/jThR8WYKfdkAYVxpWyqCqIClqLFGm0MyUh8jPVVIDkmYg7rpGERRH7zU U03FrcBGaLctH/9iHhUmaI5WMSNkMXT1GiJ0cdwDWlAkGLWPDDmqTA2lQj4CKWP/lUXg jwgfPDB9as0BpSoDoW2zgcQ9hxDJZgIBg177vGqOJmsJMR7P/xdhdTcDbMjLFJNtl0Y2 4YxP0lZQ4dMjP3RosOigYQZFFeKZG/Iv51KXS12n8vEuHVib0X126XEuFPu44cBlzHab RiqF/QIkVYSxmsYXAiqZQZbKMIQHEbBQ/JIqi0tGFRYXBF2tChnviXJzEU1/10HK8egk 01QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ozmg1G+8720DTqZuwd0EAISXbdaA2J5Jmfl8QAdhqII=; b=gtnrmNhjn4jTnxcu0Up6gnv9LxT3j7CngqtjXk4x4npr19RW1PcAcQCCWOT5Dw669s whpLqtbjSlfSvvvEzVy+tMQNMKVeRGBNiTfoxrUX/sxDNlfp/P9FBrJevoTPFQeJwgPw UlZMf7A2ULwa2p4Anm+6rkxtZuLARcINJmALYguw8mt5mgos8nAXm2zOmSGxgx0i4bBX tFe6w1L9cJN3SaQOAZNx5V1c9XMh8U2Mb3ON2THqWUSGL5ubp3vw2EGwFPvKjZAjy20M 2h/k6vYiv21JXf8inXigRp9sfnD3As1O4BLm5Jc24tOLnvdLLbk5aFbx6cb6ekc1MS8R 1QwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CtMHv3wi; 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 j64si21795123pgd.537.2019.04.15.12.19.46; Mon, 15 Apr 2019 12:20:02 -0700 (PDT) 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; dkim=pass header.i=@kernel.org header.s=default header.b=CtMHv3wi; 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 S1731480AbfDOTRT (ORCPT + 99 others); Mon, 15 Apr 2019 15:17:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:49908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731405AbfDOTMa (ORCPT ); Mon, 15 Apr 2019 15:12:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 521B9218DA; Mon, 15 Apr 2019 19:12:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355549; bh=RqMzeHO0/nO2zE2+lwmErEH+ewxaUdTxcNW4FEtKBpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CtMHv3wi8z20mn6+XPYbB5iVrh6FOhKH3fYPAn7rQeIIVXo0ejbYbxryhLsFNZUcv cGwkUanXYJj2KyGa2xDIUfn3+MuAlLW88pvaNsVCXBnnz261BZ0Ibj+D/osJK2PJoe 24blENi3/6yEkPz3c0D4RHL0uPAOJMdcJrgitlIk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Helge Deller Subject: [PATCH 5.0 062/117] parisc: Detect QEMU earlier in boot process Date: Mon, 15 Apr 2019 21:00:32 +0200 Message-Id: <20190415183748.087422732@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183744.887851196@linuxfoundation.org> References: <20190415183744.887851196@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Helge Deller commit d006e95b5561f708d0385e9677ffe2c46f2ae345 upstream. While adding LASI support to QEMU, I noticed that the QEMU detection in the kernel happens much too late. For example, when a LASI chip is found by the kernel, it registers the LASI LED driver as well. But when we run on QEMU it makes sense to avoid spending unnecessary CPU cycles, so we need to access the running_on_QEMU flag earlier than before. This patch now makes the QEMU detection the fist task of the Linux kernel by moving it to where the kernel enters the C-coding. Fixes: 310d82784fb4 ("parisc: qemu idle sleep support") Signed-off-by: Helge Deller Cc: stable@vger.kernel.org # v4.14+ Signed-off-by: Greg Kroah-Hartman --- arch/parisc/kernel/process.c | 6 ------ arch/parisc/kernel/setup.c | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -210,12 +210,6 @@ void __cpuidle arch_cpu_idle(void) static int __init parisc_idle_init(void) { - const char *marker; - - /* check QEMU/SeaBIOS marker in PAGE0 */ - marker = (char *) &PAGE0->pad0; - running_on_qemu = (memcmp(marker, "SeaBIOS", 8) == 0); - if (!running_on_qemu) cpu_idle_poll_ctrl(1); --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c @@ -396,6 +396,9 @@ void __init start_parisc(void) int ret, cpunum; struct pdc_coproc_cfg coproc_cfg; + /* check QEMU/SeaBIOS marker in PAGE0 */ + running_on_qemu = (memcmp(&PAGE0->pad0, "SeaBIOS", 8) == 0); + cpunum = smp_processor_id(); init_cpu_topology();