From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F89EC34021 for ; Mon, 17 Feb 2020 18:12:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D281A2070B for ; Mon, 17 Feb 2020 18:12:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="E/9LvTYY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D281A2070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3ksG-0005TV-V6 for qemu-devel@archiver.kernel.org; Mon, 17 Feb 2020 13:12:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42103) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3kiI-0002q8-JZ for qemu-devel@nongnu.org; Mon, 17 Feb 2020 13:01:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3kiF-0002P1-Ue for qemu-devel@nongnu.org; Mon, 17 Feb 2020 13:01:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49284 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j3kiF-0002Oi-PA for qemu-devel@nongnu.org; Mon, 17 Feb 2020 13:01:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581962503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IgawMG19E3RU0NZxjOXs3aj3YANRC8kx8UiFxJUF2XU=; b=E/9LvTYYGPmTyooVkXnh8wAnqpXKdS4D5rRpYEdJa+ggaR+oLgzzwntcwQuDzBmfLUjYAO UjtWOYm0Fva1YcWIroL5W842iXoXQ7u6Th6XWbMNRH/mdLTBNG+rcZol++4kjhsCt6rk+A Ll/A75pXLl6Flf30JJFo6UoJBBsmzpU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-137-XXolDiF5N-qm6vy_sypIFw-1; Mon, 17 Feb 2020 13:01:41 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91653A0CC6; Mon, 17 Feb 2020 18:01:39 +0000 (UTC) Received: from [10.36.116.239] (ovpn-116-239.ams2.redhat.com [10.36.116.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CFD18681F; Mon, 17 Feb 2020 18:01:30 +0000 (UTC) Subject: Re: [RFC v2 2/6] tpm: Use TPMState as a common struct To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , eric.auger.pro@gmail.com, stefanb@linux.ibm.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org References: <20200214183704.14389-1-eric.auger@redhat.com> <20200214183704.14389-3-eric.auger@redhat.com> From: Auger Eric Message-ID: Date: Mon, 17 Feb 2020 19:01:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: XXolDiF5N-qm6vy_sypIFw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, lersek@redhat.com, ardb@kernel.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Philippe, On 2/17/20 10:21 AM, Philippe Mathieu-Daud=C3=A9 wrote: > Hi Eric, >=20 > On 2/14/20 7:37 PM, Eric Auger wrote: >> As we plan to introdce a SysBus TPM TIS device, let's >> make the TPMState a common struct usable by both the >> ISADevice and the SysBusDevice. TPMStateISA embeds the >> struct and inherits from the ISADevice. >> >> The prototype of functions bound to be used by both >> the ISA and SysBus devices is changed to take TPMState >> handle. >> >> A bunch of structs also are renamed to be specialized >> for the ISA device. Besides those transformations, no >> functional change is expected. >> >> Signed-off-by: Eric Auger >> --- >> =C2=A0 hw/tpm/tpm_tis.c | 146 +++++++++++++++++++++++++++++-------------= ----- >> =C2=A0 1 file changed, 91 insertions(+), 55 deletions(-) >> >> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c >> index c609737272..fc6d7ca579 100644 >> --- a/hw/tpm/tpm_tis.c >> +++ b/hw/tpm/tpm_tis.c >> @@ -65,7 +65,6 @@ typedef struct TPMLocality { >> =C2=A0 } TPMLocality; >> =C2=A0 =C2=A0 typedef struct TPMState { >> -=C2=A0=C2=A0=C2=A0 ISADevice busdev; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 MemoryRegion mmio; >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned char buffer[TPM_TIS_BUFFE= R_MAX]; >> @@ -91,7 +90,15 @@ typedef struct TPMState { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPMPPI ppi; >> =C2=A0 } TPMState; >> =C2=A0 -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS_ISA) >> +typedef struct TPMStateISA { >> +=C2=A0=C2=A0=C2=A0 /*< private >*/ >> +=C2=A0=C2=A0=C2=A0 ISADevice parent_obj; >> + >> +=C2=A0=C2=A0=C2=A0 /*< public >*/ >> +=C2=A0=C2=A0=C2=A0 TPMState state; /* not a QOM object */ >> +} TPMStateISA; >> + >> +#define TPM_TIS_ISA(obj) OBJECT_CHECK(TPMStateISA, (obj), >> TYPE_TPM_TIS_ISA) >> =C2=A0 =C2=A0 #define DEBUG_TIS 0 >> =C2=A0 @@ -281,9 +288,8 @@ static void tpm_tis_prep_abort(TPMState *s, >> uint8_t locty, uint8_t newlocty) >> =C2=A0 /* >> =C2=A0=C2=A0 * Callback from the TPM to indicate that the response was r= eceived. >> =C2=A0=C2=A0 */ >> -static void tpm_tis_request_completed(TPMIf *ti, int ret) >> +static void tpm_tis_request_completed(TPMState *s, int ret) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D TPM(ti); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t locty =3D s->cmd.locty; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t l; >> =C2=A0 @@ -338,7 +344,7 @@ static uint32_t tpm_tis_data_read(TPMState *s= , >> uint8_t locty) >> =C2=A0 } >> =C2=A0 =C2=A0 #ifdef DEBUG_TIS >> -static void tpm_tis_dump_state(void *opaque, hwaddr addr) >> +static void tpm_tis_dump_state(TPMState *s, hwaddr addr) >> =C2=A0 { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 static const unsigned regs[] =3D { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPM_TIS_REG_ACCES= S, >> @@ -353,7 +359,6 @@ static void tpm_tis_dump_state(void *opaque, >> hwaddr addr) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 int idx; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t locty =3D tpm_tis_locality_from_a= ddr(addr); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 hwaddr base =3D addr & ~0xfff; >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D opaque; >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 printf("tpm_tis: active locality= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 : %d\n" >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= "tpm_tis: state of locality %d : %d\n" >> @@ -363,7 +368,7 @@ static void tpm_tis_dump_state(void *opaque, >> hwaddr addr) >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for (idx =3D 0; regs[idx] !=3D 0xf= ff; idx++) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 printf("tpm_tis: = 0x%04x : 0x%08x\n", regs[idx], >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4)); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (int)tpm_tis_mmio_read(s, base + regs[idx], 4)); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 printf("tpm_tis: r/w offset=C2=A0= =C2=A0=C2=A0 : %d\n" >> @@ -488,7 +493,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, >> hwaddr addr, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; >> =C2=A0 #ifdef DEBUG_TIS >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 case TPM_TIS_REG_DEBUG: >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm_tis_dump_state(opaque, a= ddr); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm_tis_dump_state(s, addr); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 break; >> =C2=A0 #endif >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> @@ -835,10 +840,8 @@ static const MemoryRegionOps tpm_tis_memory_ops =3D= { >> =C2=A0 /* >> =C2=A0=C2=A0 * Get the TPMVersion of the backend device being used >> =C2=A0=C2=A0 */ >> -static enum TPMVersion tpm_tis_get_tpm_version(TPMIf *ti) >> +static enum TPMVersion tpm_tis_get_tpm_version(TPMState *s) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D TPM(ti); >> - >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (tpm_backend_had_startup_error(s->be_d= river)) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return TPM_VERSIO= N_UNSPEC; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> @@ -850,9 +853,8 @@ static enum TPMVersion >> tpm_tis_get_tpm_version(TPMIf *ti) >> =C2=A0=C2=A0 * This function is called when the machine starts, resets o= r due to >> =C2=A0=C2=A0 * S3 resume. >> =C2=A0=C2=A0 */ >> -static void tpm_tis_reset(DeviceState *dev) >> +static void tpm_tis_reset(TPMState *s) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D TPM(dev); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 int c; >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 s->be_tpm_version =3D tpm_backend_= get_tpm_version(s->be_driver); >> @@ -896,15 +898,14 @@ static void tpm_tis_reset(DeviceState *dev) >> =C2=A0 =C2=A0 /* persistent state handling */ >> =C2=A0 -static int tpm_tis_pre_save(void *opaque) >> +static int tpm_tis_pre_save(TPMState *s) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D opaque; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t locty =3D s->active_locty; >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 trace_tpm_tis_pre_save(locty, s->r= w_offset); >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (DEBUG_TIS) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm_tis_dump_state(opaque, 0= ); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm_tis_dump_state(s, 0); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* >> @@ -929,34 +930,78 @@ static const VMStateDescription vmstate_locty =3D = { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 }; >> =C2=A0 -static const VMStateDescription vmstate_tpm_tis =3D { >> +/* ISA */ >> + >> +static int tpm_tis_pre_save_isa(void *opaque) >> +{ >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D opaque; >> + >> +=C2=A0=C2=A0=C2=A0 return tpm_tis_pre_save(&isadev->state); >> +} >> + >> +static const VMStateDescription vmstate_tpm_tis_isa =3D { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .name =3D "tpm-tis", >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .version_id =3D 0, >> -=C2=A0=C2=A0=C2=A0 .pre_save=C2=A0 =3D tpm_tis_pre_save, >> +=C2=A0=C2=A0=C2=A0 .pre_save=C2=A0 =3D tpm_tis_pre_save_isa, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .fields =3D (VMStateField[]) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_BUFFER(buffer, TPMSt= ate), >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT16(rw_offset, TP= MState), >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(active_locty, = TPMState), >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(aborting_locty= , TPMState), >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(next_locty, TP= MState), >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_BUFFER(state.buffer,= TPMStateISA), >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT16(state.rw_offs= et, TPMStateISA), >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(state.active_l= octy, TPMStateISA), >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(state.aborting= _locty, TPMStateISA), >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_UINT8(state.next_loc= ty, TPMStateISA), >=20 > On a second thought these fields seem to belong to a TPMCommonState. > Why not QOM'ify an abstract common parent between ISA and SysBus? This would mean we have double QOM inheritance (ISADevice and Sysbus device already being QOM devices). As far as I know this is not supported (see qom/object.h). Here I use the same trick as the one being used in hw/vfio/platform or pci.c and also used in hw/block/fdc.c - as pointed out by Stefan- : see FDCtrlSysBus and FDCtrlISABus. Thanks Eric >=20 >> =C2=A0 -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_STRUCT_ARRAY(= loc, TPMState, TPM_TIS_NUM_LOCALITIES, 0, >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_STRUCT_ARRAY(state.l= oc, TPMStateISA, >> TPM_TIS_NUM_LOCALITIES, 0, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vmstate_locty, TPMLocality), >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 VMSTATE_EN= D_OF_LIST() >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 }; >> =C2=A0 -static Property tpm_tis_properties[] =3D { >> -=C2=A0=C2=A0=C2=A0 DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS= _IRQ), >> -=C2=A0=C2=A0=C2=A0 DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver), >> -=C2=A0=C2=A0=C2=A0 DEFINE_PROP_BOOL("ppi", TPMState, ppi_enabled, true)= , >> +static void tpm_tis_isa_request_completed(TPMIf *ti, int ret) >> +{ >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D TPM_TIS_ISA(ti); >> +=C2=A0=C2=A0=C2=A0 TPMState *s =3D &isadev->state; >> + >> +=C2=A0=C2=A0=C2=A0 tpm_tis_request_completed(s, ret); >> +} >> + >> +static enum TPMVersion tpm_tis_isa_get_tpm_version(TPMIf *ti) >> +{ >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D TPM_TIS_ISA(ti); >> +=C2=A0=C2=A0=C2=A0 TPMState *s =3D &isadev->state; >> + >> +=C2=A0=C2=A0=C2=A0 return tpm_tis_get_tpm_version(s); >> +} >> + >> +static void tpm_tis_isa_reset(DeviceState *dev) >> +{ >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D TPM_TIS_ISA(dev); >> +=C2=A0=C2=A0=C2=A0 TPMState *s =3D &isadev->state; >> + >> +=C2=A0=C2=A0=C2=A0 return tpm_tis_reset(s); >> +} >> + >> +static Property tpm_tis_isa_properties[] =3D { >> +=C2=A0=C2=A0=C2=A0 DEFINE_PROP_UINT32("irq", TPMStateISA, state.irq_num= , TPM_TIS_IRQ), >> +=C2=A0=C2=A0=C2=A0 DEFINE_PROP_TPMBE("tpmdev", TPMStateISA, state.be_dr= iver), >> +=C2=A0=C2=A0=C2=A0 DEFINE_PROP_BOOL("ppi", TPMStateISA, state.ppi_enabl= ed, true), >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DEFINE_PROP_END_OF_LIST(), >> =C2=A0 }; >> =C2=A0 -static void tpm_tis_realizefn(DeviceState *dev, Error **errp) >> +static void tpm_tis_isa_initfn(Object *obj) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D TPM(dev); >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D TPM_TIS_ISA(obj); >> +=C2=A0=C2=A0=C2=A0 TPMState *s =3D &isadev->state; >> + >> +=C2=A0=C2=A0=C2=A0 memory_region_init_io(&s->mmio, obj, &tpm_tis_memory= _ops, >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 s, "tpm-tis-mmio", >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 TPM_TIS_NUM_LOCALITIES << >> TPM_TIS_LOCALITY_SHIFT); >> +} >> + >> +static void tpm_tis_isa_realizefn(DeviceState *dev, Error **errp) >> +{ >> +=C2=A0=C2=A0=C2=A0 TPMStateISA *isadev =3D TPM_TIS_ISA(dev); >> +=C2=A0=C2=A0=C2=A0 TPMState *s =3D &isadev->state; >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (!tpm_find()) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 error_setg(errp, = "at most one TPM device is permitted"); >> @@ -973,55 +1018,46 @@ static void tpm_tis_realizefn(DeviceState *dev, >> Error **errp) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 -=C2=A0=C2=A0=C2=A0 isa_init_irq(&s->busdev, &s->irq, s->irq_num)= ; >> +=C2=A0=C2=A0=C2=A0 isa_init_irq(ISA_DEVICE(dev), &s->irq, s->irq_num); >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 memory_region_add_subregion(isa_ad= dress_space(ISA_DEVICE(dev)), >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPM_TIS_ADDR_BASE, &s->= mmio); >> =C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (s->ppi_enabled) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tpm_ppi_init(&s->= ppi, isa_address_space(ISA_DEVICE(dev)), >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPM_PPI_ADDR_BASE, OBJE= CT(s)); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPM_PPI_ADDR_BASE, OBJE= CT(dev)); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 } >> =C2=A0 -static void tpm_tis_initfn(Object *obj) >> -{ >> -=C2=A0=C2=A0=C2=A0 TPMState *s =3D TPM(obj); >> - >> -=C2=A0=C2=A0=C2=A0 memory_region_init_io(&s->mmio, OBJECT(s), &tpm_tis_= memory_ops, >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 s, "tpm-tis-mmio", >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 TPM_TIS_NUM_LOCALITIES << >> TPM_TIS_LOCALITY_SHIFT); >> -} >> - >> -static void tpm_tis_class_init(ObjectClass *klass, void *data) >> +static void tpm_tis_isa_class_init(ObjectClass *klass, void *data) >> =C2=A0 { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DeviceClass *dc =3D DEVICE_CLASS(klass); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 TPMIfClass *tc =3D TPM_IF_CLASS(klass); >> =C2=A0 -=C2=A0=C2=A0=C2=A0 dc->realize =3D tpm_tis_realizefn; >> -=C2=A0=C2=A0=C2=A0 device_class_set_props(dc, tpm_tis_properties); >> -=C2=A0=C2=A0=C2=A0 dc->reset =3D tpm_tis_reset; >> -=C2=A0=C2=A0=C2=A0 dc->vmsd=C2=A0 =3D &vmstate_tpm_tis; >> +=C2=A0=C2=A0=C2=A0 device_class_set_props(dc, tpm_tis_isa_properties); >> +=C2=A0=C2=A0=C2=A0 dc->vmsd=C2=A0 =3D &vmstate_tpm_tis_isa; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 tc->model =3D TPM_MODEL_TPM_TIS; >> -=C2=A0=C2=A0=C2=A0 tc->get_version =3D tpm_tis_get_tpm_version; >> -=C2=A0=C2=A0=C2=A0 tc->request_completed =3D tpm_tis_request_completed; >> +=C2=A0=C2=A0=C2=A0 dc->realize =3D tpm_tis_isa_realizefn; >> +=C2=A0=C2=A0=C2=A0 dc->reset =3D tpm_tis_isa_reset; >> +=C2=A0=C2=A0=C2=A0 tc->request_completed =3D tpm_tis_isa_request_comple= ted; >> +=C2=A0=C2=A0=C2=A0 tc->get_version =3D tpm_tis_isa_get_tpm_version; >> =C2=A0 } >> =C2=A0 -static const TypeInfo tpm_tis_info =3D { >> +static const TypeInfo tpm_tis_isa_info =3D { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .name =3D TYPE_TPM_TIS_ISA, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .parent =3D TYPE_ISA_DEVICE, >> -=C2=A0=C2=A0=C2=A0 .instance_size =3D sizeof(TPMState), >> -=C2=A0=C2=A0=C2=A0 .instance_init =3D tpm_tis_initfn, >> -=C2=A0=C2=A0=C2=A0 .class_init=C2=A0 =3D tpm_tis_class_init, >> +=C2=A0=C2=A0=C2=A0 .instance_size =3D sizeof(TPMStateISA), >> +=C2=A0=C2=A0=C2=A0 .instance_init =3D tpm_tis_isa_initfn, >> +=C2=A0=C2=A0=C2=A0 .class_init=C2=A0 =3D tpm_tis_isa_class_init, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .interfaces =3D (InterfaceInfo[]) { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 { TYPE_TPM_IF }, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 { } >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 } >> =C2=A0 }; >> =C2=A0 -static void tpm_tis_register(void) >> +static void tpm_tis_isa_register(void) >> =C2=A0 { >> -=C2=A0=C2=A0=C2=A0 type_register_static(&tpm_tis_info); >> +=C2=A0=C2=A0=C2=A0 type_register_static(&tpm_tis_isa_info); >> =C2=A0 } >> =C2=A0 -type_init(tpm_tis_register) >> +type_init(tpm_tis_isa_register) >> >=20