From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an1T6-0004Qx-Ci for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:10:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1an1T3-0007RU-5q for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:10:48 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:42100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an1T2-0007RN-UR for qemu-devel@nongnu.org; Mon, 04 Apr 2016 06:10:45 -0400 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Apr 2016 04:10:42 -0600 Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 5E51B19D804E for ; Mon, 4 Apr 2016 03:58:32 -0600 (MDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u34AAdPC44564716 for ; Mon, 4 Apr 2016 10:10:39 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 u34AAdxG010999 for ; Mon, 4 Apr 2016 06:10:39 -0400 References: <1459733876-22908-1-git-send-email-stefanb@us.ibm.com> <1459733876-22908-3-git-send-email-stefanb@us.ibm.com> <20160404120048-mutt-send-email-mst@redhat.com> From: Stefan Berger Message-ID: <57023D9E.1090301@linux.vnet.ibm.com> Date: Mon, 4 Apr 2016 06:10:38 -0400 MIME-Version: 1.0 In-Reply-To: <20160404120048-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [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: "Michael S. Tsirkin" , Stefan Berger Cc: imammedo@redhat.com, qemu-devel@nongnu.org, crobinso@redhat.com On 04/04/2016 05:01 AM, Michael S. Tsirkin wrote: > On Sun, Apr 03, 2016 at 09:37:56PM -0400, Stefan Berger wrote: >> 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 > Is this doing anything at all then? It's fixing the retrieval of data from the TPM model. > I'd rather keep cleanups until post-2.6. > >> --- >> 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