From: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
To: seabios@seabios.org
Cc: mst@redhat.com, kevin@koconnor.net, joro@8bytes.org,
blauwirbel@gmail.com, paul@codesourcery.com, avi@redhat.com,
anthony@codemonkey.ws, av1474@comtv.ru, yamahata@valinux.co.jp,
kvm@vger.kernel.org, qemu-devel@nongnu.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Subject: [PATCH 4/4] iommu: provide ACPI tables
Date: Sat, 28 Aug 2010 18:02:58 +0300 [thread overview]
Message-ID: <1283007778-11012-4-git-send-email-eduard.munteanu@linux360.ro> (raw)
In-Reply-To: <1283007778-11012-1-git-send-email-eduard.munteanu@linux360.ro>
The OS needs an ACPI IVRS table to discover and use the IOMMU.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
src/acpi.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/src/acpi.c b/src/acpi.c
index 18830dc..c267c54 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -6,6 +6,7 @@
// This file may be distributed under the terms of the GNU LGPLv3 license.
#include "acpi.h" // struct rsdp_descriptor
+#include "iommu.h"
#include "util.h" // memcpy
#include "pci.h" // pci_find_device
#include "biosvar.h" // GET_EBDA
@@ -196,6 +197,36 @@ struct srat_memory_affinity
u32 reserved3[2];
} PACKED;
+/*
+ * IVRS (I/O Virtualization Reporting Structure) table.
+ *
+ * Describes the AMD IOMMU, as per:
+ * "AMD I/O Virtualization Technology (IOMMU) Specification", rev 1.26
+ */
+
+struct ivrs_ivhd
+{
+ u8 type;
+ u8 flags;
+ u16 length;
+ u16 devid;
+ u16 capab_off;
+ u32 iommu_base_low;
+ u32 iommu_base_high;
+ u16 pci_seg_group;
+ u16 iommu_info;
+ u32 reserved;
+ u8 entry[0];
+} PACKED;
+
+struct ivrs_table
+{
+ ACPI_TABLE_HEADER_DEF /* ACPI common table header. */
+ u32 iv_info;
+ u32 reserved[2];
+ struct ivrs_ivhd ivhd;
+} PACKED;
+
#include "acpi-dsdt.hex"
static void
@@ -586,6 +617,53 @@ static const struct pci_device_id acpi_find_tbl[] = {
PCI_DEVICE_END,
};
+#define IVRS_SIGNATURE 0x53525649 // IVRS
+#define IVRS_MAX_DEVS 32
+static void *
+build_ivrs(void)
+{
+ int iommu_bdf, bdf, max, i;
+ struct ivrs_table *ivrs;
+ struct ivrs_ivhd *ivhd;
+
+ iommu_bdf = pci_find_class(PCI_CLASS_SYSTEM_IOMMU);
+ if (iommu_bdf < 0)
+ return NULL;
+
+ ivrs = malloc_high(sizeof(struct ivrs_table) + 4 * IVRS_MAX_DEVS);
+ ivrs->iv_info = iommu_get_misc() & ~0x000F;
+
+ ivhd = &ivrs->ivhd;
+ ivhd->type = 0x10;
+ ivhd->flags = 0;
+ ivhd->length = sizeof(struct ivrs_ivhd);
+ ivhd->devid = iommu_get_bdf();
+ ivhd->capab_off = iommu_get_cap_offset();
+ ivhd->iommu_base_low = iommu_get_base();
+ ivhd->iommu_base_high = 0;
+ ivhd->pci_seg_group = 0;
+ ivhd->iommu_info = 0;
+ ivhd->reserved = 0;
+
+ i = 0;
+ foreachpci(bdf, max) {
+ if (bdf == ivhd->devid)
+ continue;
+ ivhd->entry[4 * i + 0] = 2;
+ ivhd->entry[4 * i + 1] = bdf & 0xFF;
+ ivhd->entry[4 * i + 2] = (bdf >> 8) & 0xFF;
+ ivhd->entry[4 * i + 3] = ~(1 << 3);
+ ivhd->length += 4;
+ if (++i >= IVRS_MAX_DEVS)
+ break;
+ }
+
+ build_header((void *) ivrs, IVRS_SIGNATURE,
+ sizeof(struct ivrs_table) + 4 * i, 1);
+
+ return ivrs;
+}
+
struct rsdp_descriptor *RsdpAddr;
#define MAX_ACPI_TABLES 20
@@ -625,6 +703,7 @@ acpi_bios_init(void)
ACPI_INIT_TABLE(build_madt());
ACPI_INIT_TABLE(build_hpet());
ACPI_INIT_TABLE(build_srat());
+ ACPI_INIT_TABLE(build_ivrs());
u16 i, external_tables = qemu_cfg_acpi_additional_tables();
--
1.7.1
next prev parent reply other threads:[~2010-08-28 15:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1283007778-11012-1-git-send-email-eduard.munteanu@linux360.ro>
2010-08-28 15:02 ` [PATCH 2/4] pci: add foreachcap() helper Eduard - Gabriel Munteanu
2010-09-03 2:48 ` [SeaBIOS] " Isaku Yamahata
2010-08-28 15:02 ` [PATCH 3/4] iommu: introduce AMD IOMMU support, initialize it Eduard - Gabriel Munteanu
2010-09-03 2:58 ` [SeaBIOS] " Isaku Yamahata
2010-08-28 15:02 ` Eduard - Gabriel Munteanu [this message]
2010-09-03 2:57 ` [SeaBIOS] [PATCH 4/4] iommu: provide ACPI tables Isaku Yamahata
2010-09-03 2:11 ` [PATCH 1/4] pci: expand tabs to spaces in pci_ids.h and pci_regs.h Kevin O'Connor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283007778-11012-4-git-send-email-eduard.munteanu@linux360.ro \
--to=eduard.munteanu@linux360.ro \
--cc=anthony@codemonkey.ws \
--cc=av1474@comtv.ru \
--cc=avi@redhat.com \
--cc=blauwirbel@gmail.com \
--cc=joro@8bytes.org \
--cc=kevin@koconnor.net \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=paul@codesourcery.com \
--cc=qemu-devel@nongnu.org \
--cc=seabios@seabios.org \
--cc=yamahata@valinux.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).