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: 150412 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5330924ljp; Wed, 7 Nov 2018 07:55:08 -0800 (PST) X-Google-Smtp-Source: AJdET5cpbAXZ1EJlMNbv8TIxXpNjAieK70vjz66mWvoZUni4hmNEPwNNYRH1l6uBR2vjpC1pRnXz X-Received: by 2002:a0c:fb4c:: with SMTP id b12mr740325qvq.177.1541606108499; Wed, 07 Nov 2018 07:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541606108; cv=none; d=google.com; s=arc-20160816; b=YtMjy9vTOBAF09aE1yiyvBIaHLsZCVHp7fOeq3SkaPu+L8Wr/86Ew4c85XAFoNK+rq PVnYCj4I+NKnB4zOFnrmX/d3suJESE7fbnox7lE/dHP72cieewshI2X4QlLS8+hqGbEl 7YCp+Beas9so5cJtrQERojS9g9nAmCpPgIzmMiShEn+/ljnxjuKqP1OgM52kUbXFhugI 45N/yVrQyc22o3z/8IGLSuLtRnAhT5vN2mN3iTLMAGE1JneUtQs+8WYn/cFlH/oyVM6Z PP/PohGo0+iu4erSfMwBaVDgvQaEEQ14K7siEinhFmS9RvS95bQY2N/aiauChqwFFqCV wdCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cpGCQ4FQuSa6alGvvAvyR+rBcjvBlMmN0ZECBEFfdVY=; b=ob+/JVWbJod9DlUzJYttv+9CIyDawGE27tmtNJD2z7jyO3PpDKRsfhnRUMYEB93d6D 60PDnnXRh4P235QpwHWG33vpvSBsb1quS1hGx0qaU0CadQ4ihXevKIyKnVW8GAi9b4k1 WXd++ABQBIWpUe9HuaXCxKwkOAgXeL2wQzoKDMcqAUbP/RPKM6u3YQHAxHy92wWg8XdI FIJRjoIUz0xFl2ghXK++wPHwHjtlgCbM2g+fXod+xVFOcPJU+a+K2rny6CdorKyyknLm s9pcmfFtVoikbSq3HQtKgUHNyRK4D9oPjjUoQudQRTBWeWmT8QpqvvQuXp0yVuL7/j+9 gotA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=W1XYmujF; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e15-v6si760805qta.181.2018.11.07.07.55.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Nov 2018 07:55:08 -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 header.s=20161025 header.b=W1XYmujF; 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]:49043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAd-0000Xy-P4 for patch@linaro.org; Wed, 07 Nov 2018 10:55:07 -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-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+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 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(-) -- 2.17.1 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 */ From patchwork Wed Nov 7 15:54:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 150413 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5333311ljp; Wed, 7 Nov 2018 07:57:26 -0800 (PST) X-Google-Smtp-Source: AJdET5fmGejNxRY+8CCg/vzDr15jZkox4vLoi7TBIK8BUnktByDmwvLtqHVeRZUSExYMaCopMp4l X-Received: by 2002:ac8:2502:: with SMTP id 2mr763172qtm.53.1541606246719; Wed, 07 Nov 2018 07:57:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541606246; cv=none; d=google.com; s=arc-20160816; b=ckQRlMQeoknoroof2ksst3r80ycAQ0RoF2la+Gx1fJy2yGnlhU5tGj0VpLmQSq1g5M DDCn8BzqJM20Csjmff+s9MgFOJ30I883rz3pr+LBKzwtShKrYFs0gw1CBc13Mi3k7vCh 2LHJvXXaKtQ6MLosaOMRNCt2tE5BqmkxXki5gCuLV6Md+5XK2Pji5Hrvi72CdDMUMs4f s6qxA8ydxrD/uHrmLy3BhuvqoH2GH36lknVue7udIM7Dgt/qwboGvf5N/XV86Xq5ZLoN jx3AlrgDugT6URgEfr8/7YWdeRUztgSxlFwKfayAdV3uw4P3Dz6X9/UeAttR1bJpDVu7 G7Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=8xqSjUYkwwjdsYgVk8WvbCHHJbp3df5fHmedLk0wo7g=; b=E6zJ4E8JAaLr30yHbK0JQXIrzSnZjRyHC6Dh9stQYN23zkZ2hVqx/mRiLvaVxVzbCk HbqXsriSnn5YxNrMI5/gDCXtuznUiJx0K5HRHnEbVaY7PitgIoxbtfKT5V2x3NsWJA8b Uz7dBbSwU8G++0Rd3LPf4Fih5s2CuFx35ixuyHqnvcMwZkw8mIy6O+HWsy4A5eFgmva+ GXM5uGGESz7JQdemkYZS9dS7aYWlPmYqL4wOOS4vGS6yCH/WdhookMV/40S07w4Vf4fy N7o5ap//U0ci8l912aDssKE3z+gQe4iR9qXuShaXtP1JKhfdaRGy6f3P3tEyImIOY9gm OcoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=rZ4Vv+Ma; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g81si781129qkh.88.2018.11.07.07.57.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Nov 2018 07:57: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 header.s=20161025 header.b=rZ4Vv+Ma; 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]:49057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQCs-0002Ov-6x for patch@linaro.org; Wed, 07 Nov 2018 10:57:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAG-0000Wc-4P for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKQAE-00024j-ES for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:44 -0500 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:45032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKQAC-0001ww-9M for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:42 -0500 Received: by mail-oi1-x243.google.com with SMTP id k19-v6so14162913oic.11 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=8xqSjUYkwwjdsYgVk8WvbCHHJbp3df5fHmedLk0wo7g=; b=rZ4Vv+Ma/impi+320zU0gF9G8HrRMYDKD21kglXlTLifhmhP3aF1mz7HNMQOXVQa7E vZAZ4YZ4psgOTqgfYk4SndB3l9dENysPqZNn93DquE5i8y9DmxX7+PjlXnjW1vWo+rlH gQdvoHKuOPtl0Tc9H6a5bT0YDuUu8YulVwZL0qIAlhmeIx9TfKFzT+JGcIGD2oEqph1S nGDyMYBNt3OgqsNbCP8TwZfiEyF7whiB3Ti8VQwY87+Cmv5Bi/z8/Rj2fWw7prUlhovi w+/i0X1mHNwW1OK67cHSmo+/KTx22RFq4kBwSTZnGsetF9w4F9qZpDuqlipMijo8nF4R OAkA== 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=8xqSjUYkwwjdsYgVk8WvbCHHJbp3df5fHmedLk0wo7g=; b=mE78Ag8tDIchM/CWbPeI7YF4wvFJFoJ6WgIZu9stDovL+gUFXahLsvgEZwX1YROGic DUg5EW74Pc68L+JdTzkB6J+fnpeQUALH9Tdv36xjXZgNJx9JQdsi9EYPWrRnk5Od8wDR SiM+g9NBWsvlnQoYFXat9doNNfI41QspAMYKr9qE54dIl4XUfqua6D/z7oJhLl7U6v+I ygYjbpew77hZCJhGY3dtZ9nLekOMdSwgsqUxxVna75jBBJrCqpGeLZ3wCV8NoMv8VHMW abvqmFSy4iY0Gf2C/h8Lww0xcgWk8JohMC+V9Ns3dEJeDGbvbVP6wTu3xA5/oxMn9J8n QDUg== X-Gm-Message-State: AGRZ1gIb4GrXzn9O4fo9YKfD3FpBVw3BjV/Oki/7CAv2wiOyJn6cOUsX dipoeBg5KNfxsRZqcpQPXhujfSM= X-Received: by 2002:aca:b655:: with SMTP id g82-v6mr396543oif.195.1541606072025; Wed, 07 Nov 2018 07:54:32 -0800 (PST) Received: from serve.minyard.net ([47.184.170.128]) by smtp.gmail.com with ESMTPSA id k57sm388146ote.26.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 376A2EE6; Wed, 7 Nov 2018 09:54:29 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 4F5F2301153; 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:04 -0600 Message-Id: <20181107155405.24013-3-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::243 Subject: [Qemu-devel] [PATCH 2/3] i2c: Add an SMBus vmstate structure 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard There is no vmstate handling for SMBus, so no device sitting on SMBus can have a state transfer that works reliable. So add it. Signed-off-by: Corey Minyard Cc: Paolo Bonzini Cc: Michael S. Tsirkin Cc: Dr. David Alan Gilbert --- hw/i2c/smbus.c | 14 ++++++++++++++ include/hw/i2c/smbus.h | 18 +++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index 6ff77c582f..b0774d7683 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -349,6 +349,20 @@ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, return 0; } +const VMStateDescription vmstate_smbus_device = { + .name = TYPE_SMBUS_DEVICE, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_I2C_SLAVE(i2c, SMBusDevice), + VMSTATE_INT32(mode, SMBusDevice), + VMSTATE_INT32(data_len, SMBusDevice), + VMSTATE_UINT8_ARRAY(data_buf, SMBusDevice, SMBUS_DATA_MAX_LEN), + VMSTATE_UINT8(command, SMBusDevice), + VMSTATE_END_OF_LIST() + } +}; + static void smbus_device_class_init(ObjectClass *klass, void *data) { I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass); diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index d8b1b9ee81..7b52020121 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -53,14 +53,16 @@ typedef struct SMBusDeviceClass uint8_t (*read_data)(SMBusDevice *dev, uint8_t cmd, int n); } SMBusDeviceClass; +#define SMBUS_DATA_MAX_LEN 34 /* command + len + 32 bytes of data. */ + struct SMBusDevice { /* The SMBus protocol is implemented on top of I2C. */ I2CSlave i2c; /* Remaining fields for internal use only. */ - int mode; - int data_len; - uint8_t data_buf[34]; /* command + len + 32 bytes of data. */ + int32_t mode; + int32_t data_len; + uint8_t data_buf[SMBUS_DATA_MAX_LEN]; uint8_t command; }; @@ -93,4 +95,14 @@ void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf); void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, const uint8_t *eeprom_spd, int size); +extern const VMStateDescription vmstate_smbus_device; + +#define VMSTATE_SMBUS_DEVICE(_field, _state) { \ + .name = (stringify(_field)), \ + .size = sizeof(SMBusDevice), \ + .vmsd = &vmstate_smbus_device, \ + .flags = VMS_STRUCT, \ + .offset = vmstate_offset_value(_state, _field, SMBusDevice), \ +} + #endif From patchwork Wed Nov 7 15:54:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 150411 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5330899ljp; Wed, 7 Nov 2018 07:55:06 -0800 (PST) X-Google-Smtp-Source: AJdET5fThCAVItDsNx5j+T26ZpOZQKq9zvek1MRJ+UrLocgHTC5aICdbUafJ86zj/q1fP4A1Ubbb X-Received: by 2002:ac8:674b:: with SMTP id n11mr762687qtp.104.1541606106877; Wed, 07 Nov 2018 07:55:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541606106; cv=none; d=google.com; s=arc-20160816; b=Mx86IYtS6HA1S92CkbptXCpvpFTWWfxCYdrdKdc/xo+ylW/NBUwU9+zuVHnOnoVrYz bBXFbuelupmcrokHNi26+bqf8f3CvjXZ43WZj+2ENDb/f6Mhh9i5B7ahMSgG+ZNijE93 b0dX47WPvlanAPOkKkTv9qDaqHbG7XjlcNWvWtDCv0oGQIOievnPQXPJwS0aiCB521Ud SgIixgYy4h+2J+9UGSK6L+tCGbMZ6kvGn4WfqbuFxmZXSsCho2YUA7MmmfchQHIkjf1+ m7xIbwKReBymYcaadl/TCP5ooIycIkLAHQa96/IwkPCOpPS2QaKYJ2rqI2dG5gLll887 thTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=uy2OKLTiDnFEns3o9LzMnFpxj5U0/822p3D8iG2rJbQ=; b=dx6HnIkU2FlfLKs2wju8mJFL8UyaaDFC8CkFRpErE3mbWvALoyv29UWR/sAPPXpXWy QHEW6F0KZirqAYJmywFCnd0P5dm2azQmED3QR+hFPQ88Pp9x/gXvE3uPbqK+23eSYiMD 27Y0O4cGBZe4zWqe08M2LXwQg9vVXp4dFH74BKzsCVyjvbcbvCogjja+efdq5hihvmFw NHLBYdlDGl1yPV5sZFm6vWwkt9fedBVO+23Cw/vDOj2feWkkTRPmrqqF2K7LhyoyrmS+ xcaHkPDB+Vhm0RIoh2wrWzwJZxKixdOzbbXOMLe5DVYhLHeniZu/xAJpLKEqm/k//Oti 0LIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=AmdosAyK; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f132-v6si727700qkb.45.2018.11.07.07.55.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Nov 2018 07:55:06 -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 header.s=20161025 header.b=AmdosAyK; 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]:49042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAc-0000X2-9d for patch@linaro.org; Wed, 07 Nov 2018 10:55:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAE-0000VJ-Fg for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKQAA-00020b-91 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:42 -0500 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:36242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKQA8-0001xP-FL for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:37 -0500 Received: by mail-oi1-x244.google.com with SMTP id r127-v6so14209887oie.3 for ; Wed, 07 Nov 2018 07:54:33 -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=uy2OKLTiDnFEns3o9LzMnFpxj5U0/822p3D8iG2rJbQ=; b=AmdosAyKvPXRBnhOOuEJAoqrTT/OlhEcHRq4+7wg2ISyO7H7nIxbxrC2sTPTW2lJax DIZJYqW9cM8wSCy/GnQd4FrHty2hsUnbM/7k8s4n9nG0SwmACu4O9rbUP0AxFd9ou20x 4DP9N9smVAXStPmHRSpA1mddUcAXxzpHJN9RRy8bbakNpuG84AsVM0sOK4dH3OFtiHBd KmxUEMo/sN3E8fcBRhIbneChqUW1kv72QC6mvSWs2r566iqkdMpDPfxEg+Ir097pgebW H3YtN1GETN2j4pLNmitDAGCEaKQWTeum5zcdEWe1jCG2A0n69SxDLCvU52UVAc1Mb6yA VmjA== 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=uy2OKLTiDnFEns3o9LzMnFpxj5U0/822p3D8iG2rJbQ=; b=TGQZ+VTmtnbJ/t2dDv8Vq6k1iILFZWdTDzldOWdkLFcRAc4K5HV8ySJQYdY9yy2OsM N0irebCX0KShmyP+Sro1V6RkPImPhj0fMc3O8ait9Lf+9vm64mtfrprmXNYi4NS5AlFs XXAuHjmlhJBev+ZUlNkZy3AsHr/nNnglSczZkrnWEXFk7/qYGw6gAWA4264u+mcDQ1I3 L2oFZj2FwWOjb4rbILWoWe0S3/pYvSPSUuCpWV8m6X8i9gNQHpIMabhbYI5wEG8XuIEP SxdCVWOgArbqCaooILPgRQModNLxprjkMtBmr1DH8E2IMREyzzp5cUg6m+Xnu8knBM01 RAGw== X-Gm-Message-State: AGRZ1gISyLaY0VSl5VMpmgej292VHOZ7lyIRrUf9kHmQuMoCEXhwl+/l 0zHn6gOkctABXfltXC8gniOcuZA= X-Received: by 2002:a54:488f:: with SMTP id r15-v6mr457446oic.80.1541606072791; Wed, 07 Nov 2018 07:54:32 -0800 (PST) Received: from serve.minyard.net ([47.184.170.128]) by smtp.gmail.com with ESMTPSA id i35sm345275ote.69.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 4614DF26; Wed, 7 Nov 2018 09:54:29 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 5E2D9301154; 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:05 -0600 Message-Id: <20181107155405.24013-4-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::244 Subject: [Qemu-devel] [PATCH 3/3] i2c: Add vmstate handling to the smbus eeprom 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard This was if the eeprom is accessed during a state transfer, the transfer will be reliable. Signed-off-by: Corey Minyard Cc: Paolo Bonzini Cc: Michael S. Tsirkin Cc: Dr. David Alan Gilbert --- hw/i2c/smbus_eeprom.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index f18aa3de35..d4430b0c5d 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -29,6 +29,8 @@ //#define DEBUG +#define TYPE_SMBUS_EEPROM_DEVICE "smbus-eeprom" + typedef struct SMBusEEPROMDevice { SMBusDevice smbusdev; void *data; @@ -97,6 +99,17 @@ static uint8_t eeprom_read_data(SMBusDevice *dev, uint8_t cmd, int n) return eeprom_receive_byte(dev); } +static const VMStateDescription vmstate_smbus_eeprom = { + .name = TYPE_SMBUS_EEPROM_DEVICE, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_SMBUS_DEVICE(smbusdev, SMBusEEPROMDevice), + VMSTATE_UINT8(offset, SMBusEEPROMDevice), + VMSTATE_END_OF_LIST() + } +}; + static void smbus_eeprom_realize(DeviceState *dev, Error **errp) { SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev; @@ -121,12 +134,13 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) sc->write_data = eeprom_write_data; sc->read_data = eeprom_read_data; dc->props = smbus_eeprom_properties; + dc->vmsd = &vmstate_smbus_eeprom; /* Reason: pointer property "data" */ dc->user_creatable = false; } static const TypeInfo smbus_eeprom_info = { - .name = "smbus-eeprom", + .name = TYPE_SMBUS_EEPROM_DEVICE, .parent = TYPE_SMBUS_DEVICE, .instance_size = sizeof(SMBusEEPROMDevice), .class_init = smbus_eeprom_class_initfn,