From patchwork Fri Dec 30 15:21:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89393 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6493252qgi; Fri, 30 Dec 2016 07:42:26 -0800 (PST) X-Received: by 10.237.34.213 with SMTP id q21mr40151097qtc.127.1483112546286; Fri, 30 Dec 2016 07:42:26 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r24si34801178qtb.183.2016.12.30.07.42.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:42:26 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMzK5-0001zR-UI for patch@linaro.org; Fri, 30 Dec 2016 10:42:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0V-0002Od-Si for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0U-0000IY-R5 for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:11 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0U-0000IC-L8 for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:10 -0500 Received: by mail-pf0-x242.google.com with SMTP id c4so22163381pfb.3 for ; Fri, 30 Dec 2016 07:22:10 -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=DGR/wcUWO1c0zPMnv6RomkogL9947JxqDcOBhqw9q0Y=; b=QTWAEduAqJ9UbvmPBYt8RRKQD9lqVduNp3oYj2RaaWYU9J0X7J2riKzU0HW9Qquju+ kY17pnSHxtjS4hImyxlO9JkEVuG9u4B9C40Ncn7aRRjAuUqIP+nNy38X/ik4mhGC07q+ m3JLRUkrBTut1vCydU37zqw5oDzk3FZ7cJPRPHMb+Uc/AZAA5YETS57v5JcqQHayBSRr zUnzJlwHo6B01/gElFiUcHPh3EGZ4idytdhbuxRkWjRaw+l1/jtZWsUlqeO6DczsZoIJ YywQuRp5ctuqnqJecurwNOy12Rf3NiY6FS2ORsMfB1tmLN6RKeszHzYXZM1sCfjoPCw+ 0HHw== 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=DGR/wcUWO1c0zPMnv6RomkogL9947JxqDcOBhqw9q0Y=; b=QOHTz0RNW2RGmActGPZF3p4TSL8DtsKEM3v0bLZmgXdbd6t95ayuLnURnmiLCX5cT/ BEg6OSFvvZtiVAN6I22tTLrtzfVZHpKE7Z0F2ogFqs/40KumdF9IPMHnZXFRonUisWsN oPP/MdfV5+BFBOdk9URGwd5yKFZezJ4Ocl77GN0Go/OsQRJztrlRoYJelMoPW4KL92ng 48v4y/zexVFfvwxzuVNW+lEGjLqgPyqyzziYGFXY/UK3VcqtjF8cjD5p2ZhvH4P7v8nG jcVExsxMHdU61LTAZq2rZGRRfWxG1BNrIcqK3NcbfpKJyS6lOom8rF65O9DRWTAid7gA EUfg== X-Gm-Message-State: AIkVDXKTjR0hcw2CS+npc+Rh6sE3nFnp2e1X0RZ9jvS5oOKdj/NhYGsCceL4F8DJ50VV2A== X-Received: by 10.84.210.8 with SMTP id z8mr87001805plh.94.1483111329840; Fri, 30 Dec 2016 07:22:09 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id i76sm113407105pfk.89.2016.12.30.07.22.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:22:08 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id E5BD1A26E; Fri, 30 Dec 2016 09:21:57 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 4087F30007D; Fri, 30 Dec 2016 09:21:53 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:38 -0600 Message-Id: <1483111310-24808-8-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH 07/19] 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: Corey Minyard , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- hw/acpi/piix4.c | 1 + hw/i2c/pm_smbus.c | 19 +++++++++++++++++++ hw/i2c/smbus_ich9.c | 3 ++- include/hw/i2c/pm_smbus.h | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 17d36bd..d64b53b 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -321,6 +321,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, 1, 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 686d411..92e3cc5 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -370,6 +370,25 @@ 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_VBUFFER_UINT32(smb_data, PMSMBus, 1, NULL, 0, smb_index), + 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) { smb->op_done = true; diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 686ed09..85c7260 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -49,7 +49,8 @@ static const VMStateDescription vmstate_ich9_smbus = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, struct ICH9SMBState), + VMSTATE_PCI_DEVICE(dev, ICH9SMBState), + VMSTATE_STRUCT(smb, ICH9SMBState, 1, pmsmb_vmstate, PMSMBus), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index 99d5489..b1e1970 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -33,4 +33,6 @@ typedef struct PMSMBus { void pm_smbus_init(DeviceState *parent, PMSMBus *smb); +extern const VMStateDescription pmsmb_vmstate; + #endif /* PM_SMBUS_H */