From patchwork Wed Nov 7 15:54:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 10672607 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA88413BF for ; Wed, 7 Nov 2018 15:56:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A87CB2BCC4 for ; Wed, 7 Nov 2018 15:56:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C9A42C6E9; Wed, 7 Nov 2018 15:56:01 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 310162BCC4 for ; Wed, 7 Nov 2018 15:56:01 +0000 (UTC) Received: from localhost ([::1]:49051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQBU-0001WU-98 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Nov 2018 10:56:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAF-0000WS-L6 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKQAE-00024e-EA for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:43 -0500 Received: from mail-oi1-x241.google.com ([2607:f8b0:4864:20::241]:34990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKQAC-0001wi-6c for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:42 -0500 Received: by mail-oi1-x241.google.com with SMTP id v198-v6so14226842oif.2 for ; Wed, 07 Nov 2018 07:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cpGCQ4FQuSa6alGvvAvyR+rBcjvBlMmN0ZECBEFfdVY=; b=W1XYmujFZ2pN+v+xNFdncccGYjiG29NANKKbDzJJp88WEMpflXdpUuJzQKDpUFk/NM aYGBBA8VVYDd5mNfYBAM/xoHEoyw+c5zUgx4F0BCYAboH5+ORBfTUbJAYZvQVRoCJ0yp HgLRP7o2kL2OiubHsUnHoW/dtOVo+UVdPQqB7ET42RVkZXl2FcYKy8zrP24n1baf8utA 7GFFsphhKPxRlCrIJVnJLHKVxlEpyQ1N67CnSkCUvokuzSQWfw77BMN0qVUo4E1BfmqT kU4QOAmXn+lisxUAmRhP+BEe0TCPj6e/qAGbsRSp4ZLk6nCmGgfQ2/7h+fB8BqBN6ZGp RY9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cpGCQ4FQuSa6alGvvAvyR+rBcjvBlMmN0ZECBEFfdVY=; b=aKBE1i7Msfqgu4jakSU+swluNVvVN4+pUD6lC5y9HcZRaHzzBGSIulaIHvPSRlgSYn +zgX5Rx83LYMoNM6qwiyASo6LW/Os6qnV5pSzmc6+EWMSksYacxSBSCeDHy6V4wSkalF M0QsxKxoHF/89br3U2v3cz3gsyO1zOMtbC8BOhGgi10WvEnzp6USff02Mv8h3hWUj/oA RLAR3ClfHdmTrQe1/AxO5rFxE3WWwhiw3fwYoq4z/mTu7l4YPA4v3rY1NDy4MZ5TX/n8 6fISNjonT3nZUmCLXkFQpSnhFLK6x762f+jNd50sIPIqEse5eMUNsJ0yF2u/ptE3NZIZ U8rw== X-Gm-Message-State: AGRZ1gKAlq8JR2GnmeCYYzozLWP1i2zgbtO1QR97aAu7rxma33+qp4rJ nz+Uylu1vvW1aJlpl3A8M38U8B0= X-Google-Smtp-Source: AJdET5dFpobYpZ0s05A2tqZ9HLIcH7JXlwIzi5xi63uZKBFbW8zjHkmvZM/fCFg17yDYzTIn1TrMww== X-Received: by 2002:aca:504c:: with SMTP id e73-v6mr456224oib.136.1541606071526; Wed, 07 Nov 2018 07:54:31 -0800 (PST) Received: from serve.minyard.net ([47.184.170.128]) by smtp.gmail.com with ESMTPSA id p11sm384813otb.46.2018.11.07.07.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 07:54:30 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 101DCBDE; Wed, 7 Nov 2018 09:54:29 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 430F0301151; Wed, 7 Nov 2018 09:54:28 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 7 Nov 2018 09:54:03 -0600 Message-Id: <20181107155405.24013-2-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181107155405.24013-1-minyard@acm.org> References: <20181107155405.24013-1-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::241 Subject: [Qemu-devel] [PATCH 1/3] i2c:pm_smbus: Fix state transfer 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: Paolo Bonzini , Corey Minyard , "Dr . David Alan Gilbert" , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Corey Minyard Transfer the state information for the SMBus registers and internal data so it will work on a VM transfer. Signed-off-by: Corey Minyard Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Dr. David Alan Gilbert --- hw/acpi/piix4.c | 3 ++- hw/i2c/pm_smbus.c | 20 ++++++++++++++++++++ hw/i2c/smbus_ich9.c | 5 +++-- include/hw/i2c/pm_smbus.h | 2 ++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index e330f24c71..313305f5a0 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -309,7 +309,7 @@ static const VMStateDescription vmstate_cpuhp_state = { */ static const VMStateDescription vmstate_acpi = { .name = "piix4_pm", - .version_id = 3, + .version_id = 4, .minimum_version_id = 3, .minimum_version_id_old = 1, .load_state_old = acpi_load_old, @@ -320,6 +320,7 @@ static const VMStateDescription vmstate_acpi = { VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState), VMSTATE_UINT16(ar.pm1.cnt.cnt, PIIX4PMState), VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState), + VMSTATE_STRUCT(smb, PIIX4PMState, 4, pmsmb_vmstate, PMSMBus), VMSTATE_TIMER_PTR(ar.tmr.timer, PIIX4PMState), VMSTATE_INT64(ar.tmr.overflow_time, PIIX4PMState), VMSTATE_STRUCT(ar.gpe, PIIX4PMState, 2, vmstate_gpe, ACPIGPE), diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 685a2378ed..4d021bb017 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -402,6 +402,26 @@ static const MemoryRegionOps pm_smbus_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; +const VMStateDescription pmsmb_vmstate = { + .name = "pmsmb", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(smb_stat, PMSMBus), + VMSTATE_UINT8(smb_ctl, PMSMBus), + VMSTATE_UINT8(smb_cmd, PMSMBus), + VMSTATE_UINT8(smb_addr, PMSMBus), + VMSTATE_UINT8(smb_data0, PMSMBus), + VMSTATE_UINT8(smb_data1, PMSMBus), + VMSTATE_UINT32(smb_index, PMSMBus), + VMSTATE_UINT8_ARRAY(smb_data, PMSMBus, PM_SMBUS_MAX_MSG_SIZE), + VMSTATE_UINT8(smb_auxctl, PMSMBus), + VMSTATE_BOOL(i2c_enable, PMSMBus), + VMSTATE_BOOL(op_done, PMSMBus), + VMSTATE_END_OF_LIST() + } +}; + void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk) { smb->op_done = true; diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 2a8b49e02f..4202b71da5 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -47,10 +47,11 @@ typedef struct ICH9SMBState { static const VMStateDescription vmstate_ich9_smbus = { .name = "ich9_smb", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, struct ICH9SMBState), + VMSTATE_PCI_DEVICE(dev, ICH9SMBState), + VMSTATE_STRUCT(smb, ICH9SMBState, 2, pmsmb_vmstate, PMSMBus), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index 060d3c6ac0..471345eaa2 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -35,4 +35,6 @@ typedef struct PMSMBus { void pm_smbus_init(DeviceState *parent, PMSMBus *smb, bool force_aux_blk); +extern const VMStateDescription pmsmb_vmstate; + #endif /* PM_SMBUS_H */