From nobody Sun Jun 7 22:20:55 2026 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; dmarc=pass(p=quarantine dis=none) header.from=bytedance.com ARC-Seal: i=1; a=rsa-sha256; t=1780577009; cv=none; d=zohomail.com; s=zohoarc; b=FABExqRouNI6uLGnDK1TDAL9VIoymWfgpHge6Kt0O8CQ3zYJ8dJ4JRUrykQ1X/3u9NBm8wmMcwO1QQ1CfFGfiM3Ud4ipddyGhHiJLSY26t9gYUx83BZyxWqQxTsorco5V55EPmF9jHrvZcuIsC7Vc+zQgYsA+4FcZWCvX/qj3D8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1780577009; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C1U/pafTgBeeiM015nLfMNulFdqqReE50PJzyG3bAA0=; b=M9ESc0KAQA02cgJRALhv3RMxx/HQ9n21blDtVdiPJ9vMNeY8I0VwYSvawYBmPTD3ZYI/ZKEmSfrZPKFXi3bPz8oBO7Ii9hvBp4q+oFVYqcqUAGAAhvEC2ciPg04Wob8JfyoH/hMbvjyESgfp+AvGKRHQdqWqG20RUJyLO1fKhD8= 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1780577009828410.6783066506092; Thu, 4 Jun 2026 05:43:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wV7Pk-0003JB-Ua; Thu, 04 Jun 2026 08:43:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wV6ka-0003wL-E9 for qemu-devel@nongnu.org; Thu, 04 Jun 2026 08:00:42 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wV6kU-0004lO-Ki for qemu-devel@nongnu.org; Thu, 04 Jun 2026 08:00:40 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-36bba9a1089so404831a91.3 for ; Thu, 04 Jun 2026 05:00:30 -0700 (PDT) Received: from n37-012-226.byted.org ([115.190.40.13]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85df034a2csm5043929a12.3.2026.06.04.05.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 05:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1780574429; x=1781179229; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=C1U/pafTgBeeiM015nLfMNulFdqqReE50PJzyG3bAA0=; b=bL2CVsJyQsRLrkKVtRmlwKTyY39BT0EcbcSt70wc3gWnTSk2i7y+mIT6Vocpb2fedA PaT5IcX4oPKE6KUxe6chFnMpCS9/MxMmymPCj+OXBY5rv0Xv+Dn4e9ZN6MEgq5Hps/E9 x517yaR5dbNSQBJLA9ETbSzQVKzXCxdMcXH1lRp1g9X2DBKd8PrrEJaRCvjn8FJJFS/6 JUyVinkz2r4HL7H1bThhis7Z2vctc0KwQYBg9hGXfwIwbPP0lm4g2Ubq7iPi09/+NnNs 87Dvihp4/T5D3VU96iC6JcZCnDKbujm8tIaWN3s66gEPKtg8qD6YYl25db2MnS7hze7c aeFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780574429; x=1781179229; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=C1U/pafTgBeeiM015nLfMNulFdqqReE50PJzyG3bAA0=; b=T3Kf1FvANWLBx7zwnAd5o+H9rnpMxICtIl7TgAiKYl9yvYi+ViVfrgAbl8gmU3wXtE N7wgmHidius2d7iZ41tlEa4wLXw5oFtcfuGdP+SPu1nAlZANamC59Ch/RZSp7NkiOiJw KPgom0ESPQT/E47wTYIWG+pkiksisQBz1SDnN4zORqKIsXeSFFZKaaFVd3yZZXFlGuKH ybZJMApsrUY4/q4uEcPaFfBW+dRJG9dRGazhRThDwfMKGOjsDivaaJopgwdDgEjs/ujB NWvj2U0D8nxo2pE7bpDCGxmGo8+/S/cLTUWSudluRSY9mKVI7QhFABs9LoJL/au2I6Bn ZVBQ== X-Gm-Message-State: AOJu0Yyih7P95618azhdtMnZWZgf1iUjLLsuEY55zPLtcy6bPEx5Qg+3 F6qpTAZjW94V8FN3JxsMSDTquzYmkXhqHwIW9zWgPycLPEzZv44zjEu1xZK8Nh1rrqQy2tNT2ca rMTLzSVVEDA== X-Gm-Gg: Acq92OFJtekWTuEPixDpg/hwAmR0ydUw08j5gNtfRStcWMYCbu/fbJJNYnU2Z60CvKa q9Kc0e+hsn56w6V+WGzQytRIhmMv/tzyiHmToNS/YaXhKND2NyOmDR2VlQyEggOE3CSa4aTVSjn Rors/fDby70rQY4CYvBdS43ArXIccs4GcEf24SWu1pc7DeTYAm5l8y/jyNfaj29G59xqRGJGx3A R7nNWULRiCCXYlpZ7BBPBO5NgZ1s1tCzjCPzMvHfvIG8bXNw8UsDbcKcXrrpuXLPHpNK4gYY8Ed BSwJQmmbARw6I0VdOalxXoodcFjDM02R9ZS5eEtMGRoroMevEmwGtYU3eXOJiRdSwh3zi1fWxJi qtVfpH4jjKEJwVRdUzGcd1+zWbeBeZnOBWjQF5tM6/owycUKGLgvpnp2K6qyYsY36HuUj/ehAcT 2iR+FXYzQsTCfuPppzDJCsUTPCQaDZGGl6Z4ho+STMoqcNhSNeBmQG X-Received: by 2002:a17:90b:1e07:b0:367:bc89:546e with SMTP id 98e67ed59e1d1-36e310fdaf5mr7293146a91.12.1780574428845; Thu, 04 Jun 2026 05:00:28 -0700 (PDT) From: Qingwei Hu To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, sunilvl@ventanamicro.com, palmer@dabbelt.com, alistair.francis@wdc.com, liwei1518@gmail.com, daniel.barboza@oss.qualcomm.com, zhiwei_liu@linux.alibaba.com, chao.liu.zevorn@gmail.com, Qingwei Hu Subject: [PATCH] hw/riscv/virt-acpi-build: Fix RINTC PLIC context ID for KVM Date: Thu, 4 Jun 2026 20:00:17 +0800 Message-Id: <20260604120017.398890-1-qingwei.hu@bytedance.com> X-Mailer: git-send-email 2.39.5 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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=qingwei.hu@bytedance.com; helo=mail-pj1-x1032.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 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 04 Jun 2026 08:42:50 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @bytedance.com) X-ZM-MESSAGEID: 1780577013282154100 Content-Type: text/plain; charset="utf-8" Each RISC-V MADT RINTC entry contains an External Interrupt Controller ID field. On the virt machine without AIA, this field identifies the S-mode PLIC context associated with the hart. TCG virt has both M-mode and S-mode PLIC contexts, so the S-mode context ID is odd and 2 * local_cpu_id + 1 is correct. KVM virt exposes only S-mode PLIC contexts, and those contexts are numbered contiguously from 0. Reporting the TCG context ID for KVM makes the guest enable a different PLIC context from the one used by QEMU. With ACPI enabled, this can leave PCI INTx interrupts pending in QEMU while the guest-programmed PLIC context remains disabled. A virtio-blk root disk can then stall during boot because its first interrupt is never delivered. Use local_cpu_id for KVM and keep the existing odd S-mode context ID for TCG. Fixes: d641da6ed43 ("hw/riscv/virt-acpi-build.c: Add PLIC in MADT") Signed-off-by: Qingwei Hu --- hw/riscv/virt-acpi-build.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 413d47d70e..6b06d9aa87 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -100,6 +100,8 @@ static void riscv_acpi_madt_add_rintc(uint32_t uid, build_append_int_noprefix(entry, ACPI_BUILD_INTC_ID( arch_ids->cpus[uid].props.node_id, + kvm_enabled() ? + local_cpu_id : 2 * local_cpu_id + 1), 4); } else { --=20 2.39.5