Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp843417pxb; Tue, 3 Nov 2020 14:10:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJxx5WZ5IH3NMEZhWHQUVb5D9BXToEPdKHwnWBUHHouNt8hQEY1mxGRSlddJwIKVhQJsSN4q X-Received: by 2002:a50:eb87:: with SMTP id y7mr2716355edr.187.1604441419345; Tue, 03 Nov 2020 14:10:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604441419; cv=none; d=google.com; s=arc-20160816; b=h0MXCHgle//UiVhF3MxPGM5ejy8R66PYsOTQM46OwBiZKc+GG47QC3LHw7Chk+hp3C Zm0+pCn3Q1PSrnwiiAvGZbF2FWTvQ/ltf83tKmAz0hXg7yIO5Zo6yEfA6Bsea61clg/p zG13T2FGbKrJW/4fwHTZYOgcYl/WJsqxKK98bxWqOfdWOcfPW0Jq2ylDWChsb+aq6SBm Nl5rdFDhBb4AlkULxLlf5jMsVwxLDHl+prG85RXxbtX46Kwzol9IR7/1F/euEF+s+fpR exB3Gw9jGrZGEBxNDt22t/svFQWMGFRReQYCs5l1xK4b4YSEt/7btfquB3krjZ9uMT+L Y10Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B95qx1uz2INxn5cmssB53MWp4MtyvHnqoD/lJRCxrU0=; b=SVxbk/XRZmaq2aPxQK1Nz4VSm0SX5x8a2GqcThDOdif89p1qcyKkeGyL188jsEvk3f DeRElUdbJV1cGcQe8oJoMPJ1IBhM45P+azsGXfPHKGPWU45oIEbvIDcuO4c3in8RS04B TjW0plcYVyOnyKdvurshwCpuUGoCcqB3mNN8LyF0t5XS5eMtRNYexcZafufJK6vvy8xp mtB78sJKMIpth+DJ0exhByLko5R/BPebSdpvKHZJjqErV5QIDiTifqqzMEseeS66x/br zAbry/6YeR9pH5x0V+xbzBL1ZmQrsBUQELlyBuV9renFQmxuu2gMNWKtrUsl+e3e1zZM /nUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=plpwgtmb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i5si6065398edx.188.2020.11.03.14.09.56; Tue, 03 Nov 2020 14:10:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=plpwgtmb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730503AbgKCUmX (ORCPT + 99 others); Tue, 3 Nov 2020 15:42:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:54264 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730466AbgKCUmL (ORCPT ); Tue, 3 Nov 2020 15:42:11 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 88E9D223AC; Tue, 3 Nov 2020 20:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436131; bh=ruY3FDQer8bKNnnxuUUMdCtTRD27ZKEZZ3L6wa68aD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=plpwgtmblMjT4GPz4TvoxNrm4oaHiOLcTBxPsOA6Eie5ChUhFRRD/iQtO+t8lONVT v0dUVnL7/JVYaIhy3RZkkHi96aPdRm7CHrSvRsgxwBvrsStfI+nncVlkKuZUsczRlc bE/TlQ+hG/1MbM9f+HuUjroZau9dVP40l2UyzQYE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Douglas Anderson , Daniel Thompson , Sasha Levin Subject: [PATCH 5.9 099/391] kgdb: Make "kgdbcon" work properly with "kgdb_earlycon" Date: Tue, 3 Nov 2020 21:32:30 +0100 Message-Id: <20201103203353.531206270@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Douglas Anderson [ Upstream commit b18b099e04f450cdc77bec72acefcde7042bd1f3 ] On my system the kernel processes the "kgdb_earlycon" parameter before the "kgdbcon" parameter. When we setup "kgdb_earlycon" we'll end up in kgdb_register_callbacks() and "kgdb_use_con" won't have been set yet so we'll never get around to starting "kgdbcon". Let's remedy this by detecting that the IO module was already registered when setting "kgdb_use_con" and registering the console then. As part of this, to avoid pre-declaring things, move the handling of the "kgdbcon" further down in the file. Signed-off-by: Douglas Anderson Link: https://lore.kernel.org/r/20200630151422.1.I4aa062751ff5e281f5116655c976dff545c09a46@changeid Signed-off-by: Daniel Thompson Signed-off-by: Sasha Levin --- kernel/debug/debug_core.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index b16dbc1bf0567..404d6d47a11da 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c @@ -94,14 +94,6 @@ int dbg_switch_cpu; /* Use kdb or gdbserver mode */ int dbg_kdb_mode = 1; -static int __init opt_kgdb_con(char *str) -{ - kgdb_use_con = 1; - return 0; -} - -early_param("kgdbcon", opt_kgdb_con); - module_param(kgdb_use_con, int, 0644); module_param(kgdbreboot, int, 0644); @@ -920,6 +912,20 @@ static struct console kgdbcons = { .index = -1, }; +static int __init opt_kgdb_con(char *str) +{ + kgdb_use_con = 1; + + if (kgdb_io_module_registered && !kgdb_con_registered) { + register_console(&kgdbcons); + kgdb_con_registered = 1; + } + + return 0; +} + +early_param("kgdbcon", opt_kgdb_con); + #ifdef CONFIG_MAGIC_SYSRQ static void sysrq_handle_dbg(int key) { -- 2.27.0