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: 10672609 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 77BE114D6 for ; Wed, 7 Nov 2018 15:58:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 646D92C79E for ; Wed, 7 Nov 2018 15:58:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 580442C7B0; Wed, 7 Nov 2018 15:58:06 +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 E4F3F2C79E for ; Wed, 7 Nov 2018 15:58:05 +0000 (UTC) Received: from localhost ([::1]:49059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQDV-0003s8-9l for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Nov 2018 10:58:05 -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-Google-Smtp-Source: AJdET5dHBIS4eAQKJpeNfIxTuKiLV940hahOJ9oN2xRA/gNlskwQLM+g78mPBtkHOqR/RHJvNVcdlg== 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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