From: Marcel Apfelbaum <marcel@redhat.com>
To: qemu-devel@nongnu.org
Cc: seabios@seabios.org, kraxel@redhat.com, mst@redhat.com,
quintela@redhat.com, agraf@suse.de, marcel@redhat.com,
alex.williamson@redhat.com, kevin@koconnor.net,
qemu-ppc@nongnu.org, hare@suse.de, imammedo@redhat.com,
amit.shah@redhat.com, pbonzini@redhat.com, leon.alrae@imgtec.com,
aurelien@aurel32.net, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v4 for-2.3 11/25] hw/apci: add _PRT method for extra PCI root busses
Date: Sun, 8 Mar 2015 13:16:13 +0200 [thread overview]
Message-ID: <1425813387-31231-12-git-send-email-marcel@redhat.com> (raw)
In-Reply-To: <1425813387-31231-1-git-send-email-marcel@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
---
hw/i386/acpi-build.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index e5709e8..e7a1a36 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -664,6 +664,70 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
aml_append(parent_scope, method);
}
+static Aml *build_link(Aml *lnk, Aml *lnk_pkg, const char *link_name, int idx)
+{
+ Aml *if_ctx, *pkg;
+
+ if_ctx = aml_if(aml_equal(lnk, aml_int(idx)));
+ pkg = aml_package(4);
+ aml_append(pkg, aml_int(0));
+ aml_append(pkg, aml_int(0));
+ aml_append(pkg, aml_name(link_name, ""));
+ aml_append(pkg, aml_int(0));
+ aml_append(if_ctx, aml_store(pkg, lnk_pkg));
+
+ return if_ctx;
+}
+
+static Aml *build_prt(void)
+{
+ Aml *method, *while_ctx, *pin, *slot, *lnk, *pkg, *res;
+
+ method = aml_method("_PRT", 0);
+ res = aml_local(0);
+ pin = aml_local(1);
+ slot = aml_local(2);
+ lnk = aml_local(3);
+ pkg = aml_local(4);
+
+ aml_append(method, aml_store(aml_package(128), res));
+ aml_append(method, aml_store(aml_int(0), pin));
+
+ /* while (pin < 128) */
+ while_ctx = aml_while(aml_lless(pin, aml_int(128)));
+ {
+ /* slot = pin >> 2 */
+ aml_append(while_ctx,
+ aml_store(aml_shiftright(pin, aml_int(2)), slot));
+ /* lnk = (slot + pin) & 3 */
+ aml_append(while_ctx,
+ aml_store(aml_and(aml_add(pin, slot), aml_int(3)), lnk));
+
+ /* pkg[2] = "LNK[A|B|C|D]", selection based on lnk % 3 */
+ aml_append(while_ctx, build_link(lnk, pkg, "LNKD", 0));
+ aml_append(while_ctx, build_link(lnk, pkg, "LNKA", 1));
+ aml_append(while_ctx, build_link(lnk, pkg, "LNKB", 2));
+ aml_append(while_ctx, build_link(lnk, pkg, "LNKC", 3));
+
+ /* pkg[0] = 0x[slot]FFFF */
+ aml_append(while_ctx,
+ aml_store(aml_or(aml_shiftleft(slot, aml_int(16)), aml_int(0xFFFF)),
+ aml_index(pkg, aml_int(0))));
+ /* pkg[1] = pin & 3 */
+ aml_append(while_ctx,
+ aml_store(aml_and(pin, aml_int(3)), aml_index(pkg, aml_int(1))));
+ /* res[pin] = pkg */
+ aml_append(while_ctx, aml_store(pkg, aml_index(res, pin)));
+ /* pin++ */
+ aml_append(while_ctx, aml_increment(pin));
+ }
+ aml_append(method, while_ctx);
+ /* return res*/
+ aml_append(method, aml_return(res));
+
+ return method;
+}
+
static void
build_ssdt(GArray *table_data, GArray *linker,
AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc,
@@ -708,6 +772,7 @@ build_ssdt(GArray *table_data, GArray *linker,
aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A03")));
aml_append(dev,
aml_name_decl("_BBN", aml_int((uint8_t)bus_info->bus)));
+ aml_append(dev, build_prt());
aml_append(scope, dev);
aml_append(ssdt, scope);
}
--
2.1.0
next prev parent reply other threads:[~2015-03-08 11:17 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-08 11:16 [Qemu-devel] [PATCH v4 for-2.3 00/25] hw/pc: implement multiple primary busses for pc machines Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 01/25] acpi: fix aml_equal term implementation Marcel Apfelbaum
2015-03-09 10:28 ` Igor Mammedov
2015-03-09 11:04 ` Michael S. Tsirkin
2015-03-09 12:26 ` Igor Mammedov
2015-03-09 14:46 ` Michael S. Tsirkin
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 02/25] acpi: add aml_or() term Marcel Apfelbaum
2015-03-09 7:58 ` Shannon Zhao
2015-03-09 9:22 ` Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 03/25] acpi: add aml_add() term Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 04/25] acpi: add aml_lless() term Marcel Apfelbaum
2015-03-09 8:03 ` Shannon Zhao
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 05/25] acpi: add aml_index() term Marcel Apfelbaum
2015-03-09 10:39 ` Igor Mammedov
2015-03-09 11:00 ` Michael S. Tsirkin
2015-03-09 11:37 ` Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 06/25] acpi: add aml_shiftleft() term Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 07/25] acpi: add aml_shiftright() term Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 08/25] acpi: add aml_increment() term Marcel Apfelbaum
2015-03-09 8:08 ` Shannon Zhao
2015-03-09 8:16 ` Shannon Zhao
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 09/25] acpi: add aml_while() term Marcel Apfelbaum
2015-03-09 8:20 ` Shannon Zhao
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 10/25] hw/acpi: add support for multiple root busses Marcel Apfelbaum
2015-03-08 16:10 ` Michael S. Tsirkin
2015-03-08 18:00 ` Marcel Apfelbaum
2015-03-08 11:16 ` Marcel Apfelbaum [this message]
2015-03-10 17:07 ` [Qemu-devel] [PATCH v4 for-2.3 11/25] hw/apci: add _PRT method for extra PCI " Michael S. Tsirkin
2015-03-10 17:26 ` Marcel Apfelbaum
2015-03-10 17:40 ` Michael S. Tsirkin
2015-03-11 1:06 ` Shannon Zhao
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 12/25] hw/acpi: add _CRS method for extra " Marcel Apfelbaum
2015-03-08 16:27 ` Michael S. Tsirkin
2015-03-08 18:14 ` Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 13/25] hw/acpi: remove from root bus 0 the crs resources used by other busses Marcel Apfelbaum
2015-03-08 16:13 ` Kevin O'Connor
2015-03-08 17:51 ` Marcel Apfelbaum
2015-03-08 18:26 ` Kevin O'Connor
2015-03-08 18:32 ` Marcel Apfelbaum
2015-03-08 18:34 ` Michael S. Tsirkin
2015-03-08 18:46 ` Kevin O'Connor
2015-03-09 8:44 ` Michael S. Tsirkin
2015-03-10 13:09 ` Stefan Hajnoczi
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 14/25] hw/pci: move pci bus related code to separate files Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 15/25] hw/pci: made pci_bus_is_root a PCIBusClass method Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 16/25] hw/pci: made pci_bus_num " Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 17/25] hw/pci: introduce TYPE_PCI_MAIN_HOST_BRIDGE interface Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 18/25] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 19/25] hw/pci: implement iteration over multiple host bridges Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 20/25] hw/pci: introduce PCI Expander Bridge (PXB) Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 21/25] hw/pci: inform bios if the system has more than one pci bridge Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 22/25] hw/pci: piix - suport multiple host bridges Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 23/25] hw/pxb: add map_irq func Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 24/25] hw/pci_bus: add support for NUMA nodes Marcel Apfelbaum
2015-03-08 11:16 ` [Qemu-devel] [PATCH v4 for-2.3 25/25] hw/pxb: add numa_node parameter Marcel Apfelbaum
2015-03-09 7:43 ` [Qemu-devel] [PATCH v4 for-2.3 00/25] hw/pc: implement multiple primary busses for pc machines Gerd Hoffmann
2015-03-09 9:20 ` Marcel Apfelbaum
2015-03-09 10:18 ` Gerd Hoffmann
2015-03-09 10:21 ` Marcel Apfelbaum
2015-03-09 14:19 ` Gerd Hoffmann
2015-03-09 16:26 ` Marcel Apfelbaum
2015-03-09 16:55 ` Gerd Hoffmann
2015-03-09 19:21 ` Marcel Apfelbaum
2015-03-10 6:23 ` [Qemu-devel] [Qemu-ppc] " Alexey Kardashevskiy
2015-03-10 11:03 ` Marcel Apfelbaum
2015-03-10 8:36 ` [Qemu-devel] " Gerd Hoffmann
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=1425813387-31231-12-git-send-email-marcel@redhat.com \
--to=marcel@redhat.com \
--cc=agraf@suse.de \
--cc=alex.williamson@redhat.com \
--cc=amit.shah@redhat.com \
--cc=aurelien@aurel32.net \
--cc=hare@suse.de \
--cc=imammedo@redhat.com \
--cc=kevin@koconnor.net \
--cc=kraxel@redhat.com \
--cc=leon.alrae@imgtec.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
--cc=seabios@seabios.org \
/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).