From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91859C77B7C for ; Wed, 19 Apr 2023 22:19:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15773900030; Wed, 19 Apr 2023 18:19:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08F59900003; Wed, 19 Apr 2023 18:19:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8932900030; Wed, 19 Apr 2023 18:19:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C6BDA900003 for ; Wed, 19 Apr 2023 18:19:19 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 4A17116043E for ; Wed, 19 Apr 2023 22:19:19 +0000 (UTC) X-FDA: 80699557638.10.7C3C70C Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf18.hostedemail.com (Postfix) with ESMTP id 5EEF11C0016 for ; Wed, 19 Apr 2023 22:19:17 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=KY3qeDku; spf=pass (imf18.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681942757; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=P8D5qQaAsWRyihppL8lxgNE7a17gNAwjOwZEXYQRMgE=; b=C1MW81V5rl6Vt8ayv/eJ+tvD4kqbyQ81xCunikOo8LFy6T4RX/qj0eKqavB8Asvdjj7HWj mtGPJLPh0areBI9P15gFZ7afNUrmVGUqdy1H/QKrhfqdLkLnXVmvUtCmUBrdBqWGbcie5l f6UFXDyntw22KHBuoLVy+GYOcrAdNGY= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=KY3qeDku; spf=pass (imf18.hostedemail.com: domain of atishp@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=atishp@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681942757; a=rsa-sha256; cv=none; b=2LfXJM2DGx8UUYQXDxUbMWkvbCmukoEJf5LH246FlWg9no4hnTRLFNuYF4T/fjEZfU9SRY iUTabuOgrhXqYoPtDXIRVTN8vvlV7NQ0mtddpZcXI0Lmfs7jFMSaw9nL00BLuFTDpJr2MB heDMhzFHw0BIo4JnD47ykR3n3mjWvYM= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1a5197f00e9so4663775ad.1 for ; Wed, 19 Apr 2023 15:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1681942756; x=1684534756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P8D5qQaAsWRyihppL8lxgNE7a17gNAwjOwZEXYQRMgE=; b=KY3qeDkuqx7ojUE9edJo91m4yJkLaFWv5WBr0z1XBW37m3Ugju5gvpwIFDQff0jKms +hgKcILxSjrfAbaSn/gsJas5jFwQYwJwvq++pUZKG2L4GsKhyqTPcUu6xp5ypSE2166a M9MbN1bFoVVAdPgWpFhugIMpkrykve+HvKmx+0rzvYuv5b7fjLguHE92nxuCMfaazyT0 EjqjUkf7F7QIDOnYykXPXccd7CL3t2WBS+Rd2ML5ADa2yHIE2iBIctAwVUyHJ5XwQDtq 3t1dyXic09IH7MeVfo82H9l2jXFUHVEBVSeBHFYy8QxMmo1hXkdwnKJUN8t2qaLHF1ux +z5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681942756; x=1684534756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P8D5qQaAsWRyihppL8lxgNE7a17gNAwjOwZEXYQRMgE=; b=bKBIa3Xtx7lLURopRG5bbvbSNJijkKvsQ6eX2JAsTbOC07ShUuvtcu6gVt80GKH1gp h6buWPBni7RMQms5RsR1tJ1UsBWFGr+iMW2jFMcxYnFX2Oic9NcyzFbs+ndWMjjBLH/f GKiIN5kBCaWsrdPH2+2xb5wXSTyFJB2YVCiGHbg1ZkxYv+JpxDDfXpyYWsLV0Bo+9H2t zsqDyPwM1xKLVXpgiFE8i+9UK/iXq12dbLuJOgy9+3SoyRNfOkCERkCLBtwboFfc9jFh 6DT9ih+G81Chp+0n6a9XI0qV2MA16XpQ3HT4ewcizGiqct/7j2b6MC+sDMh1GgNfzPh6 XEtA== X-Gm-Message-State: AAQBX9cg+0UnKr0mE74spfnWWkeH0DiOArPA7tJxRw9CVub6hnqYCBoQ otNI5TWJC6/5P1pidE8AV7BseQ== X-Google-Smtp-Source: AKy350ZigrT04ztZNfYo7vxPOIAk65YMZhdMrGeFS26zGyCIXgxICUZh5tguDmZpxCxB9++y2y9iww== X-Received: by 2002:a17:903:2288:b0:1a5:2db2:2bb with SMTP id b8-20020a170903228800b001a52db202bbmr8899588plh.15.1681942756356; Wed, 19 Apr 2023 15:19:16 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id jn11-20020a170903050b00b00196807b5189sm11619190plb.292.2023.04.19.15.19.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 15:19:16 -0700 (PDT) From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Atish Patra , Alexandre Ghiti , Andrew Jones , Andrew Morton , Anup Patel , Atish Patra , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Suzuki K Poulose , Will Deacon , Marc Zyngier , Sean Christopherson , linux-coco@lists.linux.dev, Dylan Reid , abrestic@rivosinc.com, Samuel Ortiz , Christoph Hellwig , Conor Dooley , Greg Kroah-Hartman , Guo Ren , Heiko Stuebner , Jiri Slaby , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, Mayuresh Chitale , Palmer Dabbelt , Paolo Bonzini , Paul Walmsley , Rajnesh Kanwal , Uladzislau Rezki Subject: [RFC 48/48] drivers/hvc: sbi: Disable HVC console for TVMs Date: Wed, 19 Apr 2023 15:17:16 -0700 Message-Id: <20230419221716.3603068-49-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230419221716.3603068-1-atishp@rivosinc.com> References: <20230419221716.3603068-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5EEF11C0016 X-Stat-Signature: 6mfogajcuiwujt7synw5me6mf9h5pjx8 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1681942757-644189 X-HE-Meta: U2FsdGVkX18+RV10UmhS7J5xR9CrKvApFIYIgpch6cynYPwbcO+t7qz3NT/B1RAA7v1ctgO62RNKXh7JMYsXxQQyx2PBPHVQ69gpyCigZ8a/A4o1E8crM9QGbXVG3OodupgLFiJnU+CHWELbWcOo+SMRe2cETiPBYq38WTDgDbiyQQtVqijlgtrcxIZOCd6C2haZe414s8IscB8mSmUIgq6kQ+VSt1W8I+2zV23q0hNQySFvIuRlH3N4EPLJHzvbA63khjp8YdhHcxUl6duk4S3gB7LJCLT1x7IO8rSrLj7iugjSPhmRvgFgj/y4cjt5q751BrUOssevwUDU2dzeWEOvu1BT3ST3/93FnvaXEv5HUjPzzU+2FynhkjLda1la1/ICHHM3vk5NAD4SQoPbpyXb+BIzuUWobYYuY7RzVAqwsaFoZep1OOxqfCyNYvdX3vGuWbTh2pfKKEqf62kO7sUfO37K3quPoZE3czM7KLT1tnMtw7hrlGexoH2j3tMbCHQrF2RcyGlgogHsHwkXDs6rfKeoMoRQf01JT++KKxu5ns02dzYLniQS6rO/3yU70yN5j4a84iMHmac96/C2BQvssUncOcU6RO6z6xHUACWmfs7Bgnh6krU43NjsCavBYW8jg11pb6rlAZJY+4gnA7cle5lG31G7s5GoQ7oOsxJiUUWr5JaBNYXYBp608xkPvvGvDNzqs3bMCUCWiCTZvcaFNZZDC6EP2nZbUfsJnPAlzSPgRo4JrEd2RVZccCJnaECvEej+AR/lbl8dBZhXvvizK8dju53aw/4siv2tqe7t6K5EdfoLgJEzzrFZWHNczOvtat25WdPE14To5BL3CFg9BI+wh/CVFhGMSdQmapy9ICqq6TQ6bycP+mOdjNP2oZviEzs/It/rO55g25M/YHPw1/31SfdvK6ArMd7/7/TgL8O6dNun18tUguQLcYPrl4KnA4FOOgGrBrIUsRP 8vl3M5vS CYk27vuJcdmMYE6uJnNMHRvVTsndPOmUY3hq0k76WvHzR+H3r2YPMW6camNNDkkEGNIWOTp7VZLOaQPg/I3/PCkR/cewSSeGycqEH+5ggeBtuRdPpIy9Q4f95JmKP5Z9vKJzbbzg83z2WSAAE7yao07K8ANWmtmV7kscy7xjEkyVSu8GfxKCJ+8rU3qbZu1EUQw2gespp5uvfaP7jJvh+67e7YZsaSbHPcT/ZnWdlIH9hZd7H9Am0EHh3tIfyLZcOKuyxlR2AT4TFNDevGoI8/D1TVoduT24gj/VukE6npFE+rtyx1gyZfANUUNB8QDaSjdaIyPvYYnKMC/aWZBQ4Pi4SPcnAwjACfXSP4peoD18qk1j8M/Mpn6grtbBb/KzmmOh2ebIwI891a0KczjKawuo+M0ZwUjK5cYK2oKGoFKLyMGGTaD9AZQghg7SDXf7w1T4ok+LaL9twLQJ8VyHLF0+KAHvVZcjt8dt4HwAsw/XrN0KMZ+hwe7scCl9X/XbFVciTKVZroqoIf+Hn4NqnemDLeQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If two same type of console is used in command line, kernel picks up the first registered one instead of the preferred one. The fix was proposed and NACK'ed due to a possible regression for other users. https://lore.kernel.org/all/Y+tziG0Uo5ey+Ocy@alley/ HVC sbi console makes it impossible to use virtio console which is preferred anyways. We could have disabled HVC console for TVMs but same kernel image must work on both host and the the guest. There are genuine reasons for requiring the hvc sbi cosnole for the host. Do not initialize the hvc console for the TVMs so that virtio console can be used. Signed-off-by: Atish Patra --- drivers/tty/hvc/hvc_riscv_sbi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/tty/hvc/hvc_riscv_sbi.c b/drivers/tty/hvc/hvc_riscv_sbi.c index 83cfe00..dee96c5 100644 --- a/drivers/tty/hvc/hvc_riscv_sbi.c +++ b/drivers/tty/hvc/hvc_riscv_sbi.c @@ -11,6 +11,7 @@ #include #include +#include #include #include "hvc_console.h" @@ -103,6 +104,10 @@ static int __init hvc_sbi_init(void) { int err; + /* Prefer virtio console as hvc console for guests */ + if (is_cove_guest()) + return 0; + if ((sbi_spec_version >= sbi_mk_version(1, 0)) && (sbi_probe_extension(SBI_EXT_DBCN) > 0)) { err = PTR_ERR_OR_ZERO(hvc_alloc(0, 0, &hvc_sbi_dbcn_ops, 16)); -- 2.25.1