From nobody Tue Apr 1 09:20:27 2025 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=1742617976; cv=none; d=zohomail.com; s=zohoarc; b=l/MDSWJ6lGrI6pTGAbLtjq4c9vZ7hSt2ePYGUdmH4yJ5esqp/XF+oBjXdvEo17tJ8gQPbgk6Xh+UoJXwEtDfDnnJ6Le0Y6b6o4W/QFTIGBx36WCcmNdf9mozEcHwYmS46+riCwWhMLWzdiLStjT1J5+vASRZvQA4MLdp6SOlrq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742617976; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GtxJMuQFfyWdLGQe0v57AqcYNUIPDkb5VuMIF6MREw4=; b=HjYhPSYICj1E7h/cmd3eHT7MmFqVPeTBZUeNQhg+7f9jEeV8+9d2wJ+pMb/ziJysOaacMm2RKDGB1FNYHa8ayYQnMUfRjjVMp28lYkR3Gh4meDy5JtObe3LTeEqQqeYgpSDjvwVFAxB4md2FdQFS84gXEaZhk1nDRobeelcJDtI= 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 174261797630741.331194156408515; Fri, 21 Mar 2025 21:32:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvqWZ-0006wQ-2m; Sat, 22 Mar 2025 00:31:55 -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 1tvqWX-0006vM-1L for qemu-devel@nongnu.org; Sat, 22 Mar 2025 00:31:53 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvqWV-0002XS-CR for qemu-devel@nongnu.org; Sat, 22 Mar 2025 00:31:52 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2239c066347so62903295ad.2 for ; Fri, 21 Mar 2025 21:31:51 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.199.215]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm26824645ad.252.2025.03.21.21.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 21:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1742617909; x=1743222709; darn=nongnu.org; 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=GtxJMuQFfyWdLGQe0v57AqcYNUIPDkb5VuMIF6MREw4=; b=f/irDYweBkAh+o/7gzlCdSYmjlrpOR6NzVZSecnCpxegQddcoJwqeUI1IKq9ZimQwl /qEPT1NUT4MyWcXfpVHP4/1X45v6gJnXbMB9FenteQez3xFL/4WYwkZBRP41KsGyfWko 8K8j/6KJh7guN4i1hhFhLsvgmIFRAylQYh0i1AvEfLQzArH9BMtCEK+spHlqOD1dONll XIPv2SKgxjV+auzhPagO0enkQYdMQ8uD3nubglRARsF176+4I2MtL6Pq9S+Z3fZzRGi2 lP8iFL2Ns12VPVnYJZjc62661AZN5THw1PSo2jZr1XO3YcOXwCmpC/L4Tu9ipgbwR/GF J7yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742617909; x=1743222709; 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=GtxJMuQFfyWdLGQe0v57AqcYNUIPDkb5VuMIF6MREw4=; b=Re75XAYvfLioIOC0bjEvsZjUaFtTwWyuPG/zBQQClH82nIsROFl/5BXh3fUtOEs3Rn ktY0CMfxCyqtSqHQf12uDxKnxRcUY9HPIIN77RH96vyEpEZyPCEwX12IUjFXkuloQ1FG A0AYI00uj32SO0p8s7n4CTUloR9IyQTIQHOWNOFYTc/x2rNqgUW+URa1l2lWD5dSVJum KAz7Cj2o4cnebqZ7jbpTrDvxR7CQUoIoWWYX/YnACVHv+/t/R0j75JbsojrtUtjfko4k Q65fohgn11QwR2TiGyei47j9d+x3jaxPVtuLoxdpC3Tmr+kYsyI/xnYj9EFihJ1XW1ON bQ1g== X-Forwarded-Encrypted: i=1; AJvYcCVT3r6/sjYb5VO2KMBqmLBXvXL9WFJhEAmLXHPhgWm4nsoZHVztMrNbh3hVi9p4FCVhEI7xTcYbpl7e@nongnu.org X-Gm-Message-State: AOJu0YzN1TWtIQx4KKQR5AMTqOJDUxzjbcwg+NcCk3AUw89TPt5Ww5j2 wC4Ie2wYBKK0N7BRZKFtJfc9sTBfz3+mue/f+J7OmadMryMD3fm6EBvFbMvISIo= X-Gm-Gg: ASbGnctqjljdk4wTNL9Mn1xbt4N8J7OmIkKoma0YKGcEmKCgJHgeOmzQSDssK2P3ejv XHYUETc6kB8+kTNGtrANAiw+KWkebUv3HqcAFRTsvWhBLlrjQ3ByRjaBmiVJLbZ3tQS8d7XJg9N yV/S9291JyrCyvX9msUGuFduNI3Nyc2niMp7XYzhBWHNyoxfr07CmVYN5Q57901i/E80365wrCB JtHrcXVvX197bM5GSsFTuIO3958bqgb019NYtzAj6kHlwE5AVL40sObJ7mRzwBlXPRnOocUczyY EREmPv7gDIdeFZMxUUeCU463goL26Bv6Q6tg1IyYnlyYe+ijZyMp5s4= X-Google-Smtp-Source: AGHT+IHB+eFYNHkX6/Xlag0mI3TwtVaS6R9ciRl6HfFtKSPQN+vtqYmDF/1AEvuF8s471V9tzms4Fw== X-Received: by 2002:a17:902:8b85:b0:223:4b8d:32f1 with SMTP id d9443c01a7336-22780c7e3bdmr71877945ad.1.1742617909629; Fri, 21 Mar 2025 21:31:49 -0700 (PDT) From: Sunil V L To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Andrew Jones , Anup Patel , Atish Patra , Sunil V L Subject: [PATCH v2 1/2] hw/riscv/virt: Add the BDF of IOMMU to RISCVVirtState structure Date: Sat, 22 Mar 2025 10:01:37 +0530 Message-ID: <20250322043139.2003479-2-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250322043139.2003479-1-sunilvl@ventanamicro.com> References: <20250322043139.2003479-1-sunilvl@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=2607:f8b0:4864:20::630; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-x630.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=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: 1742617977865116600 Content-Type: text/plain; charset="utf-8" When the IOMMU is implemented as a PCI device, its BDF is created locally in virt.c. However, the same BDF is also required in virt-acpi-build.c to support ACPI. Therefore, make this information part of the global RISCVVirtState structure so that it can be accessed outside of virt.c as well. Signed-off-by: Sunil V L Reviewed-by: Daniel Henrique Barboza --- hw/riscv/virt.c | 1 + include/hw/riscv/virt.h | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index dae46f4733..ce256fb3b3 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1116,6 +1116,7 @@ static void create_fdt_iommu(RISCVVirtState *s, uint1= 6_t bdf) qemu_fdt_setprop_cells(fdt, pci_node, "iommu-map", 0, iommu_phandle, 0, bdf, bdf + 1, iommu_phandle, bdf + 1, 0xffff - bdf); + s->pci_iommu_bdf =3D bdf; } =20 static void finalize_fdt(RISCVVirtState *s) diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 48a14bea2e..7b4c2c8b7d 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -63,6 +63,7 @@ struct RISCVVirtState { const MemMapEntry *memmap; struct GPEXHost *gpex_host; OnOffAuto iommu_sys; + uint16_t pci_iommu_bdf; }; =20 enum { --=20 2.43.0 From nobody Tue Apr 1 09:20:27 2025 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=1742617976; cv=none; d=zohomail.com; s=zohoarc; b=SHRV+TG3tEIAR1SMWXpmIkProkl6ONSldFjAx0CP/S3TMrPg1IXbxcXI2sqArC0OgIwpQmGSONxLh4dBO3tuoi1Wvg9UtjTU5bLWwZ2R9PNaSyy/+O/P5gsTH0kDPsGxHL43iGigiSWTraKDWKbsrTtPVGnw/5QP/CFSfusu/3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742617976; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4UDuZZEvx52TYf4VWrZHlqnYHUptgGVGsYU0XYdLZzM=; b=QGUDzQNqxBibVibw1eCpNwVl7Z1GjSJ/RQWo6SVlJlA6kQKuWIP5n+1IoC0LELsvScaDO9blSd5i4VarcwZLX3DjDwiZO6ai3T/noYiDjz7VH3miN4nhD2MWUuUkm3TpABzU4a29vpsGYWCjLG7Hktn+1tpFJw7g4B3sSNwKECE= 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 1742617976279242.40245568305465; Fri, 21 Mar 2025 21:32:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvqWd-0006xe-1y; Sat, 22 Mar 2025 00:31: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 1tvqWb-0006x2-Hq for qemu-devel@nongnu.org; Sat, 22 Mar 2025 00:31:57 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tvqWZ-0002YF-Aq for qemu-devel@nongnu.org; Sat, 22 Mar 2025 00:31:57 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22409077c06so37100285ad.1 for ; Fri, 21 Mar 2025 21:31:54 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.199.215]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2278120a5b6sm26824645ad.252.2025.03.21.21.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 21:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1742617914; x=1743222714; darn=nongnu.org; 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=4UDuZZEvx52TYf4VWrZHlqnYHUptgGVGsYU0XYdLZzM=; b=Ov2BwwqZrK0Voq7D2gfAOEy5xWm6ZGqHRMRuGvTurzNWR65f9h+0IBicV/r0WDC3z/ 5ZTzVpZhfu2LqiUFbA+Konsrwj0EDtm/7HZENmTB1SfqWr44Aqs2oX0PcqhjqRrX3nmn W0/r9jGsy7Yuns3DpKJHZerGG6cu3jPl1Ame2+AamMrSgJrKohAMLj/V0T3gPisw03i8 XbpCm2DgdVFRB0rjLQTvOO7FO/1st+GoMLGPabJXiMiQinA0paakqjIeM8GUefhE739O h6XRW5JHjD3uVOLJrioKyhhuT9iEJWKKHw07/pDTLBdZaTq6l2eEEbaf09dUWXgThArr yIhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742617914; x=1743222714; 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=4UDuZZEvx52TYf4VWrZHlqnYHUptgGVGsYU0XYdLZzM=; b=pWtGE0G3t1zgVfegKimuYckoYfGCckh6EViBcVgT7Lj4ppZZ3eHeJ7u1PnwQu0ixO7 bErXK1+m7R7F9vbu3rrhXQB0HqxKA6cdusrYCk/bOu61jZIyI+bG4x0qrFp/5UbcN0z/ afGMTT8jYF7UjrAUWqUiuGXML8KCmxWPKlLzlmthScW1ky2bdynSHghN+sQm7cjO3kM9 Jk4wEifKj+ricFZoLPeCf3TPJssnTmKxSZQzAIe02delnbzKdFW1DduZQmX4ZkfCFVTk uv8NHDmEGlHzF5yk91B4Ndx13XTp7KfirjHH0ghiQpRhdVlTgUxv1vDceruCK1lkpbGl ulew== X-Forwarded-Encrypted: i=1; AJvYcCXr8WyJMw2iSJmeqEW+ejrme+zXj2P8c9KTtjGQXWVACA8VpnYKKNZF/8ZEYWAkIytVXtW+ndsH3QJm@nongnu.org X-Gm-Message-State: AOJu0Yzv2RCuFbeorrmWOdP9AZ5i29Oul109SKGHU8ps7jzlsXUfnA0y uc6wKnRblfM0ys7Ylagjc1gZKYKZ1Ugl1FXimS66+btMO96RQLmYD7gYgemJVFI= X-Gm-Gg: ASbGncu6vHJObX4DK2OVDlWXmJplv+e2kk/M5tVkzVdSCruJ/VAoBx6nD/W5tMobTHu VaQEw/kl1VALLks3w7/W7zxanATTq9BteIfFDtPm3oJRLyiOlDRGX/AHwKA1Y4W7mkTP2DcXUBp FDhib9iP1xyQNKtThroS3kvULsk2UrwQJFbf8AvtFRTGmr+aCz7oE+gQSljWh/1ujdTGgz8sscg 6p7o94mFbpsBrmIOmmwzZhL/5AypelqXmy7wCAUj26rzkyk2vqemwFSGW5D/Q6jMrGcyjfMKCSy /6gFhGBzu/lLG5w/V9jm3ynOh/yER8c/CP6jRV4Hn4jUxOXM/hIaiKw= X-Google-Smtp-Source: AGHT+IH5JNv4ufMNsERTCd+u631Iq0qIpmi6A6i7ibP6FSElmT5iQ00ptU1/D/4P+c4HhCADil0GAA== X-Received: by 2002:a17:903:32c3:b0:224:1774:1ecd with SMTP id d9443c01a7336-22780c5599amr75325645ad.4.1742617913669; Fri, 21 Mar 2025 21:31:53 -0700 (PDT) From: Sunil V L To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: Alistair Francis , Palmer Dabbelt , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Andrew Jones , Anup Patel , Atish Patra , Sunil V L Subject: [PATCH v2 2/2] hw/riscv/virt-acpi-build: Add support for RIMT Date: Sat, 22 Mar 2025 10:01:38 +0530 Message-ID: <20250322043139.2003479-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250322043139.2003479-1-sunilvl@ventanamicro.com> References: <20250322043139.2003479-1-sunilvl@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=2607:f8b0:4864:20::62e; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-x62e.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=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: 1742617978021116600 Content-Type: text/plain; charset="utf-8" RISC-V IO Mapping Table (RIMT) is a new static ACPI table used to communicate IOMMU information to the OS. Add support for creating this table when the IOMMU is present. The specification is frozen and available at [1]. [1] - https://github.com/riscv-non-isa/riscv-acpi-rimt/releases/download/v0= .99/rimt-spec.pdf Signed-off-by: Sunil V L Reviewed-by: Daniel Henrique Barboza --- hw/riscv/virt-acpi-build.c | 215 +++++++++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 1ad6800508..1eef2fb4eb 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -198,6 +198,32 @@ acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart= _memmap, aml_append(scope, dev); } =20 +/* + * Add DSDT entry for the IOMMU platform device. + * ACPI ID for IOMMU is defined in the section 6.2 of RISC-V BRS spec. + * https://github.com/riscv-non-isa/riscv-brs/releases/download/v0.8/riscv= -brs-spec.pdf + */ +static void acpi_dsdt_add_iommu_sys(Aml *scope, const MemMapEntry *iommu_m= emmap, + uint32_t iommu_irq) +{ + uint32_t i; + + Aml *dev =3D aml_device("IMU0"); + aml_append(dev, aml_name_decl("_HID", aml_string("RSCV0004"))); + aml_append(dev, aml_name_decl("_UID", aml_int(0))); + + Aml *crs =3D aml_resource_template(); + aml_append(crs, aml_memory32_fixed(iommu_memmap->base, + iommu_memmap->size, AML_READ_WRITE)= ); + for (i =3D iommu_irq; i < iommu_irq + 4; i++) { + aml_append(crs, aml_interrupt(AML_CONSUMER, AML_EDGE, AML_ACTIVE_L= OW, + AML_EXCLUSIVE, &i, 1)); + } + + aml_append(dev, aml_name_decl("_CRS", crs)); + aml_append(scope, dev); +} + /* * Serial Port Console Redirection Table (SPCR) * Rev: 1.10 @@ -450,6 +476,9 @@ static void build_dsdt(GArray *table_data, } =20 acpi_dsdt_add_uart(scope, &memmap[VIRT_UART0], UART0_IRQ); + if (virt_is_iommu_sys_enabled(s)) { + acpi_dsdt_add_iommu_sys(scope, &memmap[VIRT_IOMMU_SYS], IOMMU_SYS_= IRQ); + } =20 if (socket_count =3D=3D 1) { virtio_acpi_dsdt_add(scope, memmap[VIRT_VIRTIO].base, @@ -602,6 +631,187 @@ static void build_madt(GArray *table_data, acpi_table_end(linker, &table); } =20 +#define ID_MAPPING_ENTRY_SIZE 20 +#define IOMMU_ENTRY_SIZE 40 +#define RISCV_INTERRUPT_WIRE_OFFSSET 40 +#define ROOT_COMPLEX_ENTRY_SIZE 20 +#define RIMT_NODE_OFFSET 48 + +/* + * ID Mapping Structure + */ +static void build_rimt_id_mapping(GArray *table_data, uint32_t source_id_b= ase, + uint32_t num_ids, uint32_t dest_id_base) +{ + /* Source ID Base */ + build_append_int_noprefix(table_data, source_id_base, 4); + /* Number of IDs */ + build_append_int_noprefix(table_data, num_ids, 4); + /* Destination Device ID Base */ + build_append_int_noprefix(table_data, source_id_base, 4); + /* Destination IOMMU Offset */ + build_append_int_noprefix(table_data, dest_id_base, 4); + /* Flags */ + build_append_int_noprefix(table_data, 0, 4); +} + +struct AcpiRimtIdMapping { + uint32_t source_id_base; + uint32_t num_ids; +}; +typedef struct AcpiRimtIdMapping AcpiRimtIdMapping; + +/* Build the rimt ID mapping to IOMMU for a given PCI host bridge */ +static int rimt_host_bridges(Object *obj, void *opaque) +{ + GArray *idmap_blob =3D opaque; + + if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) { + PCIBus *bus =3D PCI_HOST_BRIDGE(obj)->bus; + + if (bus && !pci_bus_bypass_iommu(bus)) { + int min_bus, max_bus; + + pci_bus_range(bus, &min_bus, &max_bus); + + AcpiRimtIdMapping idmap =3D { + .source_id_base =3D min_bus << 8, + .num_ids =3D (max_bus - min_bus + 1) << 8, + }; + g_array_append_val(idmap_blob, idmap); + } + } + + return 0; +} + +static int rimt_idmap_compare(gconstpointer a, gconstpointer b) +{ + AcpiRimtIdMapping *idmap_a =3D (AcpiRimtIdMapping *)a; + AcpiRimtIdMapping *idmap_b =3D (AcpiRimtIdMapping *)b; + + return idmap_a->source_id_base - idmap_b->source_id_base; +} + +/* + * RISC-V IO Mapping Table (RIMT) + * https://github.com/riscv-non-isa/riscv-acpi-rimt/releases/download/v0.9= 9/rimt-spec.pdf + */ +static void build_rimt(GArray *table_data, BIOSLinker *linker, + RISCVVirtState *s) +{ + int i, nb_nodes, rc_mapping_count; + size_t node_size, iommu_offset =3D 0; + uint32_t id =3D 0; + g_autoptr(GArray) iommu_idmaps =3D g_array_new(false, true, + sizeof(AcpiRimtIdMapping)= ); + + AcpiTable table =3D { .sig =3D "RIMT", .rev =3D 1, .oem_id =3D s->oem_= id, + .oem_table_id =3D s->oem_table_id }; + + acpi_table_begin(&table, table_data); + + object_child_foreach_recursive(object_get_root(), + rimt_host_bridges, iommu_idmaps); + + /* Sort the ID mapping by Source ID Base*/ + g_array_sort(iommu_idmaps, rimt_idmap_compare); + + nb_nodes =3D 2; /* RC, IOMMU */ + rc_mapping_count =3D iommu_idmaps->len; + /* Number of RIMT Nodes */ + build_append_int_noprefix(table_data, nb_nodes, 4); + + /* Offset to Array of RIMT Nodes */ + build_append_int_noprefix(table_data, RIMT_NODE_OFFSET, 4); + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ + + iommu_offset =3D table_data->len - table.table_offset; + /* IOMMU Device Structure */ + build_append_int_noprefix(table_data, 0, 1); /* Type - IOMMU*/ + build_append_int_noprefix(table_data, 1, 1); /* Revision */ + node_size =3D IOMMU_ENTRY_SIZE; + build_append_int_noprefix(table_data, node_size, 2); /* Length */ + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ + build_append_int_noprefix(table_data, id++, 2); /* ID */ + if (virt_is_iommu_sys_enabled(s)) { + /* Hardware ID */ + build_append_int_noprefix(table_data, 'R', 1); + build_append_int_noprefix(table_data, 'S', 1); + build_append_int_noprefix(table_data, 'C', 1); + build_append_int_noprefix(table_data, 'V', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '4', 1); + /* Base Address */ + build_append_int_noprefix(table_data, + s->memmap[VIRT_IOMMU_SYS].base, 8); + build_append_int_noprefix(table_data, 0, 4); /* Flags */ + } else { + /* Hardware ID */ + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '1', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '0', 1); + build_append_int_noprefix(table_data, '1', 1); + build_append_int_noprefix(table_data, '4', 1); + + build_append_int_noprefix(table_data, 0, 8); /* Base Address */ + build_append_int_noprefix(table_data, 1, 4); /* Flags */ + } + + build_append_int_noprefix(table_data, 0, 4); /* Proximity Domain= */ + build_append_int_noprefix(table_data, 0, 2); /* PCI Segment numb= er */ + /* PCIe B/D/F */ + if (virt_is_iommu_sys_enabled(s)) { + build_append_int_noprefix(table_data, 0, 2); + } else { + build_append_int_noprefix(table_data, s->pci_iommu_bdf, 2); + } + /* Number of interrupt wires */ + build_append_int_noprefix(table_data, 0, 2); + /* Interrupt wire array offset */ + build_append_int_noprefix(table_data, RISCV_INTERRUPT_WIRE_OFFSSET, 2); + + /* PCIe Root Complex Node */ + build_append_int_noprefix(table_data, 1, 1); /* Type */ + build_append_int_noprefix(table_data, 1, 1); /* Revision */ + node_size =3D ROOT_COMPLEX_ENTRY_SIZE + + ID_MAPPING_ENTRY_SIZE * rc_mapping_count; + build_append_int_noprefix(table_data, node_size, 2); /* Length */ + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ + build_append_int_noprefix(table_data, id++, 2); /* ID */ + build_append_int_noprefix(table_data, 0, 4); /* Flags */ + build_append_int_noprefix(table_data, 0, 2); /* Reserved */ + /* PCI Segment number */ + build_append_int_noprefix(table_data, 0, 2); + /* ID mapping array offset */ + build_append_int_noprefix(table_data, ROOT_COMPLEX_ENTRY_SIZE, 2); + /* Number of ID mappings */ + build_append_int_noprefix(table_data, rc_mapping_count, 2); + + /* Output Reference */ + AcpiRimtIdMapping *range; + + /* ID mapping array */ + for (i =3D 0; i < iommu_idmaps->len; i++) { + range =3D &g_array_index(iommu_idmaps, AcpiRimtIdMapping, i); + if (virt_is_iommu_sys_enabled(s)) { + range->source_id_base =3D 0; + } else { + range->source_id_base =3D s->pci_iommu_bdf + 1; + } + range->num_ids =3D 0xffff - s->pci_iommu_bdf; + build_rimt_id_mapping(table_data, range->source_id_base, + range->num_ids, iommu_offset); + } + + acpi_table_end(linker, &table); +} + /* * ACPI spec, Revision 6.5+ * 5.2.16 System Resource Affinity Table (SRAT) @@ -679,6 +889,11 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBui= ldTables *tables) acpi_add_table(table_offsets, tables_blob); build_rhct(tables_blob, tables->linker, s); =20 + if (virt_is_iommu_sys_enabled(s) || s->pci_iommu_bdf) { + acpi_add_table(table_offsets, tables_blob); + build_rimt(tables_blob, tables->linker, s); + } + acpi_add_table(table_offsets, tables_blob); spcr_setup(tables_blob, tables->linker, s); =20 --=20 2.43.0