From nobody Sun May 19 05:50:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1686936153; cv=none; d=zohomail.com; s=zohoarc; b=Zu4nv54mhE9s6/IjB6F0Apo1hxyI+jhiAdIqftHFloZbpE1PK8Hvxj31kXSsvny1k7W8jK736lZlb5xiy43jFsr3IE1Cu3QufTEjEmmutD6PbKA2Ce8V6JjqucoAvwU2robLJKwzIgBBVfQetOizbzbtWzeMk8oqO0dObsKOXTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686936153; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0qY1waEWBuc6KJfgZJsQyHUvmvZuv7F98uQqKiiM+5Q=; b=a8An3/m0gOs73fjZUM5djp3hxB2XwQFSkAJ3oBuuYi4SbRA2Xn71Xovfs0/GHQzuzQfpfCDAlnXFsgo0wwd26nV6FY87LRVk8x27Mt3qzSL4nL+eaWdbrobWBhuaEilI8D69fKrWGwDCdKKaaRTulU8W+CpwKvswukiFr/nxzTI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686936153054318.87432792673314; Fri, 16 Jun 2023 10:22:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAD95-0000iX-Fh; Fri, 16 Jun 2023 13:21:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAD8z-0000hx-Ti for qemu-devel@nongnu.org; Fri, 16 Jun 2023 13:21:55 -0400 Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAD8x-0001pF-59 for qemu-devel@nongnu.org; Fri, 16 Jun 2023 13:21:52 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1a9b0ec6f4cso1030899fac.0 for ; Fri, 16 Jun 2023 10:21:50 -0700 (PDT) Received: from grind.. ([177.170.117.210]) by smtp.gmail.com with ESMTPSA id w24-20020a4ae4d8000000b005584e0c8f9csm7095732oov.3.2023.06.16.10.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 10:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1686936109; x=1689528109; 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=0qY1waEWBuc6KJfgZJsQyHUvmvZuv7F98uQqKiiM+5Q=; b=QNGxwGMhapduYRDgUzp4L+21VWzQB5oYoYnGWkopTeIkKgjuEVqqINKRtQSdgP+Gzn xbqTEYVwhqFrQPTqnLAOUyB/EtDtRZinJ4ZsgRNAWuJkZMJUwOwFLWMwr1wC1OKRI/BN 63VvwOZ8+/D0vX6NDs+K9s0uXNFr77549ESmc4svKT8ivbl6+ebRRsCiQ+Yy4UXgjanp yv/Dx09sD2Y2T2c02IyoJH9CcNcw4RU+9F/c4TtsuL1jHWqN32slJNOP5qlvlSugW3no tlxaRcxhSnNNEe6O9NoKJKv5WjenUCGaRpTjhe/4zYjlT/cwbwLmBPKgWP4wiiyx8YyA fcMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686936109; x=1689528109; 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=0qY1waEWBuc6KJfgZJsQyHUvmvZuv7F98uQqKiiM+5Q=; b=MUmH4nJOeke/sm3wcipwLFOkZOQYOPtBRH/NnZsnts9Ti7fE88Slev/MDg+ZSK6UKc 2apm7LjxvEqMmXaRMBW99ETVjqA8e57ayyy29+i2YUQQtzFkYsPDzUOoc7OslW/0dlMH tesHHibK/DHbLWhk0XEnU+rAkgHKv1otsmjDStJQKiCnbnDo2YegN0YGNjmPI4Kjt27r yQXGXsqCFK+1hesY97KcDuLavMlz9ZxFpNYerdNiljn3UmOljOcoxxMgs3PB6mbiNjlt jqyvRBE7gJRlO/ibV4spoSe1AeUJNXVehXV3Yxlm7Ue0/d2Bep+/BZA089rt0b+ibbpQ Zscg== X-Gm-Message-State: AC+VfDw282ZCYy8QTCgqnz/7YPc2PnhZuxggneAVaksloe2Kkuow7My/ qOWlXLzceImCHekZJq/6Agg3Yq5lKWeH/m5oXAc= X-Google-Smtp-Source: ACHHUZ4jt/vtIZssBTFiIHJeD9Dt2aJsj90A+ysFm78+2XNR3yqmWGCZmEqkFsYFY3cPTUVtPn9BVg== X-Received: by 2002:a05:6870:ea04:b0:177:ad57:cb36 with SMTP id g4-20020a056870ea0400b00177ad57cb36mr3585882oap.27.1686936109592; Fri, 16 Jun 2023 10:21:49 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH 1/1] hw/riscv/virt.c: check for 'ssaia' with KVM AIA Date: Fri, 16 Jun 2023 14:21:41 -0300 Message-Id: <20230616172141.756386-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230616172141.756386-1-dbarboza@ventanamicro.com> References: <20230616172141.756386-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x2b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1686936154636100002 Content-Type: text/plain; charset="utf-8" KVM AIA relies on ext_ssaia support present in the host. At this moment we're not checking. A KVM guest is doomed to hung if we use any 'aia' option, aside from 'aia=3Dnone', and KVM does not support 'ssaia'. Add a check for it. The placement is intentional: we need to check before riscv_imsic_realize(), where the TCG logic can force cpu->cfg.ext_ssaia to be 'true' and overwrite what KVM set before. Signed-off-by: Daniel Henrique Barboza --- hw/riscv/virt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index f025a0fcaf..c192059186 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1409,6 +1409,18 @@ static void virt_machine_init(MachineState *machine) RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MT= IME, RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, true); } + } else { + /* + * With KVM enabled, check if the user wants to use AIA + * and we have the proper support for it. + */ + RISCVCPU *cpu =3D &s->soc[i].harts[0]; + + if (s->aia_type !=3D VIRT_AIA_TYPE_NONE && !cpu->cfg.ext_ssaia= ) { + error_report("Unable to set AIA: host does not " + "have extension 'ssaia' enabled"); + exit(1); + } } =20 /* Per-socket interrupt controller */ --=20 2.40.1