From patchwork Thu Feb 28 18:16:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 159416 Delivered-To: patch@linaro.org Received: by 2002:ac9:18c7:0:0:0:0:0 with SMTP id i7csp983148oce; Thu, 28 Feb 2019 10:28:10 -0800 (PST) X-Google-Smtp-Source: APXvYqwM/IMZvx6MzwN18xnjXcWWOdUlfOejG52KHCn1NCKmEkiMJPGYHJvOdTsEtQyjgO1mffvI X-Received: by 2002:a81:7bc5:: with SMTP id w188mr257460ywc.265.1551378490586; Thu, 28 Feb 2019 10:28:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551378490; cv=none; d=google.com; s=arc-20160816; b=zLdVbJs0gP+YRnA+46rpau7e+gswPXUGR3h0Z8gLDkB3tuQ8puH0tLvpi1pcx5xSEG HEhv6vZXUZj/lCedbcHy3myZ1WUV0TTMv02oVym6ZO9q54NBcJMVrQ+sMtc0cw794Lb0 CWTHN9BMGFk0vz2WMc9H0YKpiD7x6GND7GIgbqVHPjNAQVBllW+cWVhp1m/VIo9xRPRY a+ltg/T0X05wLvSBHsC5jkr5zdJ5XwXb96m9o8Eo5Uue6U7qLpgC5bwlWuWi7F73+o5T 6dbQbj6PH8p5GsBW6/FO3SuaCqTnrhZGAE44h/K9GMwx/6Hyq3Mkifvo9IoJNUodgiYR Fvlw== 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=+I7WOBJKScZxxI8BQQihtBpw1M5lszgobVCD62ghJ6E=; b=BMBZ5mU1HjZfFcn8cVM3hoRw8fyHgAPfXbAsAY+gRB3FRIv2U6VVh98SPZ7rEjppCR UFp0GQpAbWJ7a2NlsFBYv1l9mvTYFHI3XF//J53bxQh4rjF9WodwGcbNp1k868zMyfrN gnITvr8nYmnLJYs3K6iUAexfVFjVNyKLt/gYydEACcStFCGY972YJRDAW3NmYulV5xHa yTEuxWACKURQ/31qL5ym/tIOkLaqZ+HYsMh4DY03X1egxWbtd/F0k7OoLQyTzpCn0V4r xB1P4UtFJAQqAiED+tSE0P5YiC48b2BNw3fzoYCZaVDoy3MOnLirQhkVD251Wt6aK21y zPmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZH8dDKw3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 192si9617017ybm.318.2019.02.28.10.28.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Feb 2019 10:28:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=ZH8dDKw3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:44638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzQPi-0008Iu-2J for patch@linaro.org; Thu, 28 Feb 2019 13:28:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzQFo-0000aE-1j for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:18:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzQFc-0002ME-TH for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:17:56 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:35969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzQFY-0002A4-EJ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:17:42 -0500 Received: by mail-ot1-x342.google.com with SMTP id v62so18538838otb.3 for ; Thu, 28 Feb 2019 10:17:19 -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=+I7WOBJKScZxxI8BQQihtBpw1M5lszgobVCD62ghJ6E=; b=ZH8dDKw3yyU0WjdD2bjbg5iTTj1B5lKgdfMy5cKoq4fcH1VYmNMuiC+xMwFMwqsBX2 ah1WG8yqWh5Ri9glKpJVUMIL1lpCZFVa9Dcfd6BotuKOHqQE0jZHSsAY4RitOD7ea4fQ CLqLaBVG9iVf31mGK4E1sNx/1eqFxiEadUGx/evYtR6iCzmqxiGg8tOUQ3YbtO4W6K1I fY7XS6Z1XyV9e4we5FBLvRT42gxlkU60ft78Xfy5L76iPldxVMpLJMdc+T1SdpyMawyN vH4RMbjHOXNGSy3Kz53PeJ/i6dNqOTi62QEVnX0R53ZM+mAyUt50kpeQcsgtZz1jdAvo 9RBg== 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=+I7WOBJKScZxxI8BQQihtBpw1M5lszgobVCD62ghJ6E=; b=p6XmUo1MWkFkuFaPHgh1YEJIeLFIbYXAOO0E0uCKRBTUrP454BwJNLfbxSxvNUXPv4 bume62QDaBm/96HANuP/SkMqRM42M1C3QeiN+FaLy+HFooS0hdF8EfxXxjzsO+4CsNQ5 +UM4hFeecxSjmdp+fhK0671g94BAq1YQXmp1f8F0VWLNb/Dl/VtSMQjRPusDTpDOh6m8 1q4GAnZwlAiL9Kqk8pxPJ5fskzI2odq4/9J2TscBW9vfr+stcU5BL/+b/N2kBir+Rqbk rxX9JusUQdqAzR21+nw3IUSeb4l37drkozaEii3eHjEVm1XPta8IHNhTHNtLTZoDtEBj B4gg== X-Gm-Message-State: APjAAAV7yhKdQf7B9coZKufzlt8yNUwO35c3rpTa9Y3Njig/iSqSi4Da MVMWmPtbj2jQfuXKvVU+jQ== X-Received: by 2002:a9d:6012:: with SMTP id h18mr576565otj.341.1551377838089; Thu, 28 Feb 2019 10:17:18 -0800 (PST) Received: from serve.minyard.net ([47.184.128.64]) by smtp.gmail.com with ESMTPSA id k25sm2751650otl.58.2019.02.28.10.17.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 10:17:16 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id D8B1A1808F5; Thu, 28 Feb 2019 18:17:13 +0000 (UTC) Received: by t430.minyard.net (Postfix, from userid 1000) id 9EB54302AF8; Thu, 28 Feb 2019 12:17:13 -0600 (CST) From: minyard@acm.org To: Peter Maydell Date: Thu, 28 Feb 2019 12:16:56 -0600 Message-Id: <20190228181710.2477-6-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228181710.2477-1-minyard@acm.org> References: <20190228181710.2477-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::342 Subject: [Qemu-devel] [PULL 05/19] i2c:smbus: Correct the working of quick commands 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 , QEMU Developers , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard The logic of handling quick SMBus commands was wrong. If you get a finish event with no data, that's a quick command. Document the quick command while we are at it. Signed-off-by: Corey Minyard --- hw/i2c/smbus_slave.c | 35 +++++++++++++++++++---------------- include/hw/i2c/smbus_slave.h | 5 +++++ 2 files changed, 24 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c index 6e4d542f51..6a89a286e3 100644 --- a/hw/i2c/smbus_slave.c +++ b/hw/i2c/smbus_slave.c @@ -54,9 +54,7 @@ static void smbus_do_write(SMBusDevice *dev) { SMBusDeviceClass *sc = SMBUS_DEVICE_GET_CLASS(dev); - if (dev->data_len == 0) { - smbus_do_quick_cmd(dev, 0); - } else if (dev->data_len == 1) { + if (dev->data_len == 1) { DPRINTF("Send Byte\n"); if (sc->send_byte) { sc->send_byte(dev, dev->data_buf[0]); @@ -120,19 +118,24 @@ static int smbus_i2c_event(I2CSlave *s, enum i2c_event event) break; case I2C_FINISH: - switch (dev->mode) { - case SMBUS_WRITE_DATA: - smbus_do_write(dev); - break; - case SMBUS_RECV_BYTE: - smbus_do_quick_cmd(dev, 1); - break; - case SMBUS_READ_DATA: - BADF("Unexpected stop during receive\n"); - break; - default: - /* Nothing to do. */ - break; + if (dev->data_len == 0) { + if (dev->mode == SMBUS_WRITE_DATA || dev->mode == SMBUS_READ_DATA) { + smbus_do_quick_cmd(dev, dev->mode == SMBUS_READ_DATA); + } + } else { + switch (dev->mode) { + case SMBUS_WRITE_DATA: + smbus_do_write(dev); + break; + + case SMBUS_READ_DATA: + BADF("Unexpected stop during receive\n"); + break; + + default: + /* Nothing to do. */ + break; + } } dev->mode = SMBUS_IDLE; dev->data_len = 0; diff --git a/include/hw/i2c/smbus_slave.h b/include/hw/i2c/smbus_slave.h index 46b8948f0f..5ef1c72ad0 100644 --- a/include/hw/i2c/smbus_slave.h +++ b/include/hw/i2c/smbus_slave.h @@ -40,6 +40,11 @@ typedef struct SMBusDevice SMBusDevice; typedef struct SMBusDeviceClass { I2CSlaveClass parent_class; + + /* + * An operation with no data, special in SMBus. + * This may be NULL, quick commands are ignore in that case. + */ void (*quick_cmd)(SMBusDevice *dev, uint8_t read); void (*send_byte)(SMBusDevice *dev, uint8_t val); uint8_t (*receive_byte)(SMBusDevice *dev);