From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com,
ian.jackson@eu.citrix.com, julien.grall@arm.com,
jbeulich@suse.com, zhaoshenglong@huawei.com,
boris.ostrovsky@oracle.com, roger.pau@citrix.com
Subject: [PATCH v1 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables
Date: Tue, 5 Jul 2016 15:05:10 -0400 [thread overview]
Message-ID: <1467745519-9868-12-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1467745519-9868-1-git-send-email-boris.ostrovsky@oracle.com>
Non-hvmloader users may be building tables in virtual address space
and therefore we need to make sure that values that end up in tables
are physical addresses.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
tools/firmware/hvmloader/acpi/build.c | 47 +++++++++++++++++----------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 0adb3d6..4b0302c 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -126,7 +126,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
lapic = (struct acpi_20_madt_lapic *)(madt + 1);
config->ainfo.nr_cpus =config-> hvminfo->nr_vcpus;
- config->ainfo.madt_lapic0_addr = (uint32_t)lapic;
+ config->ainfo.madt_lapic0_addr = ctxt->mem_ops.v2p(ctxt, lapic);
for ( i = 0; i < config->hvminfo->nr_vcpus; i++ )
{
memset(lapic, 0, sizeof(*lapic));
@@ -143,7 +143,8 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
madt->header.length = (unsigned char *)lapic - (unsigned char *)madt;
set_checksum(madt, offsetof(struct acpi_header, checksum),
madt->header.length);
- config->ainfo.madt_csum_addr = (uint32_t)&madt->header.checksum;
+ config->ainfo.madt_csum_addr =
+ ctxt->mem_ops.v2p(ctxt, &madt->header.checksum);
return madt;
}
@@ -311,7 +312,7 @@ static int construct_passthrough_tables(struct acpi_ctxt *ctxt,
break;
memcpy(buffer, header, header->length);
- table_ptrs[nr_tables++] = (unsigned long)buffer;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, buffer);
total += header->length;
acpi_pt_addr += header->length;
}
@@ -337,7 +338,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
{
madt = construct_madt(ctxt, config);
if (!madt) return -1;
- table_ptrs[nr_tables++] = (unsigned long)madt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, madt);
}
/* HPET. */
@@ -345,7 +346,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
{
hpet = construct_hpet(ctxt, config);
if (!hpet) return -1;
- table_ptrs[nr_tables++] = (unsigned long)hpet;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, hpet);
}
/* WAET. */
@@ -353,7 +354,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
{
waet = construct_waet(ctxt, config);
if ( !waet ) return -1;
- table_ptrs[nr_tables++] = (unsigned long)waet;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, waet);
}
if ( config->table_flags & ACPI_BUILD_SSDT_PM )
@@ -361,7 +362,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_pm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_pm, sizeof(ssdt_pm));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
}
if ( config->table_flags & ACPI_BUILD_SSDT_S3 )
@@ -369,7 +370,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s3), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s3, sizeof(ssdt_s3));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
} else {
printf("S3 disabled\n");
}
@@ -379,7 +380,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s4), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s4, sizeof(ssdt_s4));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
} else {
printf("S4 disabled\n");
}
@@ -393,12 +394,12 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
tcpa = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16);
if (!tcpa) return -1;
memset(tcpa, 0, sizeof(*tcpa));
- table_ptrs[nr_tables++] = (unsigned long)tcpa;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, tcpa);
tcpa->header.signature = ACPI_2_0_TCPA_SIGNATURE;
tcpa->header.length = sizeof(*tcpa);
@@ -426,11 +427,11 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
struct acpi_20_slit *slit = construct_slit(ctxt, config);
if ( srat )
- table_ptrs[nr_tables++] = (unsigned long)srat;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, srat);
else
printf("Failed to build SRAT, skipping...\n");
if ( slit )
- table_ptrs[nr_tables++] = (unsigned long)slit;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, slit);
else
printf("Failed to build SLIT, skipping...\n");
}
@@ -527,8 +528,8 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
memcpy(fadt_10, &Fadt, sizeof(struct acpi_10_fadt));
fadt_10->header.length = sizeof(struct acpi_10_fadt);
fadt_10->header.revision = ACPI_1_0_FADT_REVISION;
- fadt_10->dsdt = (unsigned long)dsdt;
- fadt_10->firmware_ctrl = (unsigned long)facs;
+ fadt_10->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt_10->firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
set_checksum(fadt_10,
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_10_fadt));
@@ -536,10 +537,10 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
fadt = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_fadt), 16);
if (!fadt) goto oom;
memcpy(fadt, &Fadt, sizeof(struct acpi_20_fadt));
- fadt->dsdt = (unsigned long)dsdt;
- fadt->x_dsdt = (unsigned long)dsdt;
- fadt->firmware_ctrl = (unsigned long)facs;
- fadt->x_firmware_ctrl = (unsigned long)facs;
+ fadt->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt->firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
+ fadt->x_firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
set_checksum(fadt,
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
@@ -553,7 +554,7 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
16);
if (!xsdt) goto oom;
memcpy(xsdt, &Xsdt, sizeof(struct acpi_header));
- xsdt->entry[0] = (unsigned long)fadt;
+ xsdt->entry[0] = ctxt->mem_ops.v2p(ctxt, fadt);
for ( i = 0; secondary_tables[i]; i++ )
xsdt->entry[i+1] = secondary_tables[i];
xsdt->header.length = sizeof(struct acpi_header) + (i+1)*sizeof(uint64_t);
@@ -566,7 +567,7 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
16);
if (!rsdt) goto oom;
memcpy(rsdt, &Rsdt, sizeof(struct acpi_header));
- rsdt->entry[0] = (unsigned long)fadt_10;
+ rsdt->entry[0] = ctxt->mem_ops.v2p(ctxt, fadt_10);
for ( i = 0; secondary_tables[i]; i++ )
rsdt->entry[i+1] = secondary_tables[i];
rsdt->header.length = sizeof(struct acpi_header) + (i+1)*sizeof(uint32_t);
@@ -580,8 +581,8 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
rsdp = (struct acpi_20_rsdp *)config->rsdp;
memcpy(rsdp, &Rsdp, sizeof(struct acpi_20_rsdp));
- rsdp->rsdt_address = (unsigned long)rsdt;
- rsdp->xsdt_address = (unsigned long)xsdt;
+ rsdp->rsdt_address = ctxt->mem_ops.v2p(ctxt, rsdt);
+ rsdp->xsdt_address = ctxt->mem_ops.v2p(ctxt, xsdt);
set_checksum(rsdp,
offsetof(struct acpi_10_rsdp, checksum),
sizeof(struct acpi_10_rsdp));
--
1.7.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-05 19:05 UTC|newest]
Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 19:04 [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 01/20] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-07-06 14:47 ` Konrad Rzeszutek Wilk
2016-07-08 9:52 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code Boris Ostrovsky
2016-07-07 16:58 ` Ian Jackson
2016-07-07 17:09 ` Boris Ostrovsky
2016-07-07 17:15 ` Wei Liu
2016-07-07 17:45 ` Boris Ostrovsky
2016-07-08 15:06 ` Konrad Rzeszutek Wilk
2016-07-08 15:50 ` Ian Jackson
2016-07-08 15:57 ` Boris Ostrovsky
2016-07-08 16:21 ` Ian Jackson
2016-07-11 12:10 ` Wei Liu
2016-07-11 14:47 ` Lars Kurth
2016-07-11 14:54 ` Konrad Rzeszutek Wilk
2016-07-11 15:06 ` Boris Ostrovsky
2016-07-11 15:38 ` Ian Jackson
2016-07-11 15:47 ` Ian Jackson
2016-07-11 16:07 ` Boris Ostrovsky
2016-07-08 10:10 ` Jan Beulich
2016-07-08 14:39 ` Boris Ostrovsky
2016-07-08 15:11 ` Jan Beulich
2016-07-08 16:14 ` Boris Ostrovsky
2016-08-01 10:09 ` Jan Beulich
2016-08-01 14:06 ` Boris Ostrovsky
2016-08-01 14:18 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 03/20] acpi/hvmloader: Initialize vm_gid data outside " Boris Ostrovsky
2016-07-08 10:18 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 04/20] acpi/hvmloader: Decide which SSDTs to install in hvmloader Boris Ostrovsky
2016-07-08 10:27 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 05/20] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-07-08 10:46 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-07-08 13:36 ` Jan Beulich
2016-07-08 15:08 ` Boris Ostrovsky
2016-07-08 15:14 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 07/20] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-07-08 13:38 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 08/20] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-07-08 13:41 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 09/20] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-07-08 13:42 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 10/20] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-07-08 13:58 ` Jan Beulich
2016-07-08 15:23 ` Boris Ostrovsky
2016-07-08 15:35 ` Jan Beulich
2016-07-08 16:19 ` Boris Ostrovsky
2016-07-19 9:11 ` Jan Beulich
2016-07-19 14:08 ` Boris Ostrovsky
2016-07-05 19:05 ` Boris Ostrovsky [this message]
2016-07-08 14:31 ` [PATCH v1 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Jan Beulich
2016-07-05 19:05 ` [PATCH v1 12/20] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
2016-07-08 14:51 ` Jan Beulich
2016-07-08 15:41 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 13/20] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
2016-07-08 15:51 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 14/20] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
2016-08-03 16:00 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 15/20] x86: Add more checks verifying that PIT/PIC/IOAPIC are emulated Boris Ostrovsky
2016-08-03 16:04 ` Jan Beulich
2016-07-05 19:05 ` [PATCH v1 16/20] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-08-03 16:11 ` Jan Beulich
2016-08-03 16:15 ` Andrew Cooper
2016-07-05 19:05 ` [PATCH v1 17/20] libacpi: Build DSDT for PVH guests Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 18/20] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
2016-07-06 10:00 ` Julien Grall
2016-07-06 15:43 ` Boris Ostrovsky
2016-07-05 19:05 ` [PATCH v1 19/20] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
2016-07-07 16:47 ` Wei Liu
2016-07-07 17:02 ` Boris Ostrovsky
2016-07-07 17:16 ` Wei Liu
2016-07-05 19:05 ` [PATCH v1 20/20] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-07-06 11:05 ` Julien Grall
2016-07-06 15:50 ` Boris Ostrovsky
2016-07-06 16:04 ` Julien Grall
2016-07-06 16:30 ` Boris Ostrovsky
2016-07-06 17:03 ` Julien Grall
2016-07-06 17:33 ` Boris Ostrovsky
2016-07-07 8:38 ` Jan Beulich
2016-07-07 15:08 ` Boris Ostrovsky
2016-07-07 15:12 ` Julien Grall
2016-07-07 15:24 ` Jan Beulich
2016-07-08 10:55 ` Wei Liu
2016-07-08 14:48 ` Boris Ostrovsky
2016-07-08 16:07 ` Wei Liu
2016-07-08 17:20 ` Boris Ostrovsky
2016-07-11 10:47 ` Wei Liu
2016-07-11 13:33 ` Boris Ostrovsky
2016-07-11 13:39 ` Julien Grall
2016-07-11 13:42 ` Wei Liu
2016-07-11 13:58 ` Julien Grall
2016-07-11 13:41 ` Wei Liu
2016-07-11 14:40 ` Boris Ostrovsky
2016-07-12 14:30 ` Wei Liu
2016-07-11 14:00 ` Anthony PERARD
2016-07-06 16:04 ` [PATCH v1 00/20] Make ACPI builder available to components other than hvmloader Roger Pau Monné
2016-07-06 16:32 ` Boris Ostrovsky
2016-07-07 8:35 ` Jan Beulich
2016-07-07 9:14 ` Julien Grall
2016-07-07 9:20 ` Jan Beulich
2016-07-07 9:29 ` Julien Grall
2016-07-07 15:04 ` Boris Ostrovsky
2016-07-07 15:10 ` Jan Beulich
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=1467745519-9868-12-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/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).