From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amtTF-0005H4-PE for qemu-devel@nongnu.org; Sun, 03 Apr 2016 21:38:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amtTC-000334-Ft for qemu-devel@nongnu.org; Sun, 03 Apr 2016 21:38:25 -0400 Received: from e18.ny.us.ibm.com ([129.33.205.208]:56116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amtTC-00032o-CF for qemu-devel@nongnu.org; Sun, 03 Apr 2016 21:38:22 -0400 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 3 Apr 2016 21:38:19 -0400 Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 6EAA038C803B for ; Sun, 3 Apr 2016 21:38:16 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u341cGtE36634766 for ; Mon, 4 Apr 2016 01:38:16 GMT Received: from d01av01.pok.ibm.com (localhost [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u341cGO7009940 for ; Sun, 3 Apr 2016 21:38:16 -0400 From: Stefan Berger Date: Sun, 3 Apr 2016 21:37:56 -0400 Message-Id: <1459733876-22908-3-git-send-email-stefanb@us.ibm.com> In-Reply-To: <1459733876-22908-1-git-send-email-stefanb@us.ibm.com> References: <1459733876-22908-1-git-send-email-stefanb@us.ibm.com> Subject: [Qemu-devel] [PATCH 2/2] acpi: tpm: Get the interrupt the device model is using List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, mst@redhat.com Cc: imammedo@redhat.com, Stefan Berger , crobinso@redhat.com Get the interrupt the TPM device model is using. Do not activate the interrupt in the ACPI description yet since the current default value clashes with other devices. Signed-off-by: Stefan Berger --- hw/i386/acpi-build.c | 5 +++-- hw/tpm/tpm_tis.c | 5 ++++- include/sysemu/tpm.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index e11c721..ae872a1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -105,6 +105,7 @@ typedef struct AcpiMiscInfo { bool is_piix4; bool has_hpet; TPMVersion tpm_version; + uint32_t tpm_irq_num; const unsigned char *dsdt_code; unsigned dsdt_size; uint16_t pvpanic_port; @@ -203,7 +204,7 @@ static void acpi_get_misc_info(AcpiMiscInfo *info) } info->has_hpet = hpet_find(); - info->tpm_version = tpm_get_version(); + info->tpm_version = tpm_get_parameters(&info->tpm_irq_num); info->pvpanic_port = pvpanic_port(); info->applesmc_io_base = applesmc_port(); } @@ -2345,7 +2346,7 @@ build_dsdt(GArray *table_data, GArray *linker, crs = aml_resource_template(); aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE, AML_READ_WRITE)); - //aml_append(crs, aml_irq_no_flags(TPM_TIS_IRQ)); + //aml_append(crs, aml_irq_no_flags(misc->tpm_irq_num)); aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(sb_scope, dev); } diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 381e726..9f5b2f7 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -967,9 +967,12 @@ static int tpm_tis_do_startup_tpm(TPMState *s) /* * Get the TPMVersion of the backend device being used */ -TPMVersion tpm_tis_get_tpm_version(Object *obj) +TPMVersion tpm_tis_get_tpm_parameters(Object *obj, uint32_t *irq_num) { TPMState *s = TPM(obj); + TPMTISEmuState *tis = &s->s.tis; + + *irq_num = tis->irq_num; return tpm_backend_get_tpm_version(s->be_driver); } diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index c8afa17..5be45d9 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -26,17 +26,17 @@ typedef enum TPMVersion { TPM_VERSION_2_0 = 2, } TPMVersion; -TPMVersion tpm_tis_get_tpm_version(Object *obj); +TPMVersion tpm_tis_get_tpm_parameters(Object *obj, uint32_t *irq_num); #define TYPE_TPM_TIS "tpm-tis" -static inline TPMVersion tpm_get_version(void) +static inline TPMVersion tpm_get_parameters(uint32_t *irq_num) { #ifdef CONFIG_TPM Object *obj = object_resolve_path_type("", TYPE_TPM_TIS, NULL); if (obj) { - return tpm_tis_get_tpm_version(obj); + return tpm_tis_get_tpm_parameters(obj, irq_num); } #endif return TPM_VERSION_UNSPEC; -- 2.5.5