diff mbox

[3/3] hw/arm/virt-acpi-build: Add PMU IRQ number in ACPI table

Message ID 1458899181-17896-4-git-send-email-zhaoshenglong@huawei.com
State Superseded
Headers show

Commit Message

Shannon Zhao March 25, 2016, 9:46 a.m. UTC
From: Shannon Zhao <shannon.zhao@linaro.org>


Add PMU IRQ number in ACPI table, then we can use PMU in guest through
ACPI.

Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>

---
 hw/arm/virt-acpi-build.c | 3 +++
 1 file changed, 3 insertions(+)

-- 
2.0.4

Comments

Andrew Jones April 22, 2016, 2:43 p.m. UTC | #1
On Fri, Mar 25, 2016 at 05:46:21PM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>

> 

> Add PMU IRQ number in ACPI table, then we can use PMU in guest through

> ACPI.

> 

> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>

> ---

>  hw/arm/virt-acpi-build.c | 3 +++

>  1 file changed, 3 insertions(+)

> 

> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c

> index 6a86b2c..7a377e5 100644

> --- a/hw/arm/virt-acpi-build.c

> +++ b/hw/arm/virt-acpi-build.c

> @@ -490,6 +490,9 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)

>          gicc->arm_mpidr = armcpu->mp_affinity;

>          gicc->uid = i;

>          gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED);

> +

> +        if (armcpu->has_pmu)

> +            gicc->performance_interrupt = VIRTUAL_PMU_IRQ + 16;


missing cpu_to_le32(). Actually this function is missing lots of those.
Here's another place we could use a PPI() macro to avoid sprinkling
16's around everywhere.

>      }

>  

>      if (guest_info->gic_version == 3) {

> -- 

> 2.0.4


Otherwise looks good.

drew
diff mbox

Patch

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 6a86b2c..7a377e5 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -490,6 +490,9 @@  build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
         gicc->arm_mpidr = armcpu->mp_affinity;
         gicc->uid = i;
         gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED);
+
+        if (armcpu->has_pmu)
+            gicc->performance_interrupt = VIRTUAL_PMU_IRQ + 16;
     }
 
     if (guest_info->gic_version == 3) {