From patchwork Thu Feb 1 23:23:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 10196151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A9A32601A0 for ; Thu, 1 Feb 2018 23:31:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A13DC22A6B for ; Thu, 1 Feb 2018 23:31:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95CCE27F97; Thu, 1 Feb 2018 23:31:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0803D22A6B for ; Thu, 1 Feb 2018 23:31:44 +0000 (UTC) Received: from localhost ([::1]:44364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOKV-0007tG-Jg for patchwork-qemu-devel@patchwork.kernel.org; Thu, 01 Feb 2018 18:31:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ehOIh-0005IY-Vx for qemu-devel@nongnu.org; Thu, 01 Feb 2018 18:30:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ehOCm-0001um-Qz for qemu-devel@nongnu.org; Thu, 01 Feb 2018 18:24:51 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54172 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ehOCm-0001tL-8x for qemu-devel@nongnu.org; Thu, 01 Feb 2018 18:23:44 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w11NJ9rA128730 for ; Thu, 1 Feb 2018 18:23:43 -0500 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fv9tmp7mw-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 01 Feb 2018 18:23:43 -0500 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Feb 2018 18:23:42 -0500 Received: from b01cxnp23034.gho.pok.ibm.com (9.57.198.29) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 1 Feb 2018 18:23:40 -0500 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w11NNdNb43253892; Thu, 1 Feb 2018 23:23:39 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B9D33AC040; Thu, 1 Feb 2018 18:24:58 -0500 (EST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id A4247AC03F; Thu, 1 Feb 2018 18:24:58 -0500 (EST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Thu, 1 Feb 2018 18:23:35 -0500 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1517527416-31328-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1517527416-31328-1-git-send-email-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18020123-0044-0000-0000-000003D99F87 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008460; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000248; SDB=6.00983689; UDB=6.00498911; IPR=6.00762967; BA=6.00005808; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019326; XFM=3.00000015; UTC=2018-02-01 23:23:41 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020123-0045-0000-0000-000008090B77 Message-Id: <1517527416-31328-2-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-01_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802010279 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 1/2] tpm: Split off tpm_crb_reset function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, stefanb@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Split off the tpm_crb_reset function part from tpm_crb_realize that we need to run every time the machine resets. Signed-off-by: Stefan Berger --- hw/tpm/tpm_crb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 687d255..624e2e9 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -232,6 +232,11 @@ static void tpm_crb_realize(DeviceState *dev, Error **errp) TPM_CRB_ADDR_BASE, &s->mmio); memory_region_add_subregion(get_system_memory(), TPM_CRB_ADDR_BASE + sizeof(s->regs), &s->cmdmem); +} + +static void tpm_crb_reset(DeviceState *dev) +{ + CRBState *s = CRB(dev); tpm_backend_reset(s->tpmbe); @@ -274,6 +279,7 @@ static void tpm_crb_class_init(ObjectClass *klass, void *data) dc->realize = tpm_crb_realize; dc->props = tpm_crb_properties; + dc->reset = tpm_crb_reset; dc->vmsd = &vmstate_tpm_crb; dc->user_creatable = true; tc->model = TPM_MODEL_TPM_CRB;