From patchwork Thu Dec 7 21:46:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 121094 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8903050qgn; Thu, 7 Dec 2017 13:51:40 -0800 (PST) X-Google-Smtp-Source: AGs4zMY3XohNe8B/5OZ6oNI/2lGYJp9Hj9f19mYzTHlunRbjtagFbkECTIj/VgIbWOQWDa1TmXF6 X-Received: by 10.37.183.140 with SMTP id n12mr9748102ybh.9.1512683500485; Thu, 07 Dec 2017 13:51:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512683500; cv=none; d=google.com; s=arc-20160816; b=PMQxEzvQp3j7Vg7gZ3vasdH2riOHI2pOohFefHJuaiEsv8yHpTTJOHLBhDYZ/nlqT1 gZ3d1SVT7zI+IaEDtPtrC0S6E02zqmkmEqc8FvAqTyyl8dBX9NCXbPORMAAofRREwSuD ZEe3S/8NHfHIMpskYArW5IA4WCP4xtK0l0jVoWHkgIZ4N0Noqhho7ND4YOQZjTF7xCZ0 oBVMQYgnz0Auvfi/reZhft8CtmQwrHPRF3K99at4jVcSBD5E0HH7bt3KgE/dWR3zm08a MtAJ54oD6tL3uEMpc5PueojU/55cL8XT1LG1tgviEmF1QgnJj5wm/ijxqFgbP+8f2WYq a4Yw== 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:arc-authentication-results; bh=H9QSCS0RwFyWJma1fSfB50PbGNN6KaKfHl1fy3q1SE8=; b=XmpX5XucSGFtPfqMTTaFQVgjuHDp+aGDTZVnzuDv6uNgLGugxAJ8tqdGveN1lhds/E hFsVqHM2EczRUdcTyiYYNr5NbPbKJ8YqqgjmAiDHPEtng3ETrnCohlc/aGURtNlpXKdN m5ne2ewBLXjQUxVW9ySapYrOINaZXgPmDUVCdj0gIe3Jle4n5Vsw54p4qeMDB7ZsvIv3 eewGlxW/jdnbDngebfWPKK96HHtv4RAjWKcshUCzltz9SKvAN1HQYvTKcladi0q8fnQW Pgp9uvN7TtsStASIChKTFXmmRXzi66nhjLy90Jsv3tjsxzwA0ko2SYa9KIZx9Kuacxm8 XYWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=JhlcZi8c; 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 j69si1339394ybg.58.2017.12.07.13.51.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Dec 2017 13:51:40 -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=JhlcZi8c; 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]:34516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN44x-0007Qx-TE for patch@linaro.org; Thu, 07 Dec 2017 16:51:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN3zz-0003zq-H6 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN3zy-0006L7-E9 for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:31 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:32902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN3zy-0006KM-5D for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:30 -0500 Received: by mail-pg0-x242.google.com with SMTP id g7so5397961pgs.0 for ; Thu, 07 Dec 2017 13:46:30 -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=H9QSCS0RwFyWJma1fSfB50PbGNN6KaKfHl1fy3q1SE8=; b=JhlcZi8cC3OfcuZsPTu0P8jNVp50EGg2QaLd4j6n+iV6XTG4vaCnRmCzcc9Q1UZylv P0rbwuPWDUMojJwLrnxp5EjV/WCfsWK/c1UWEpoz6gnaFcJOtHzsuzKuQxfBiQefvAHu ntt2E0VMrMViRLcSxvnDMzsIpDgrIugH98gtsJ0hRmIFeZVm06Zfe9FjWitVwMkH+Kzi Xs2anP/AjyYX7PjjFgqO+SVEE2CXSq9M+UzjLCFKUi6fwvCDVpk4debwKEsOlGsJ0CCQ l+REAJS/RDcoi7S3C7seg9GJyJkN7HPNsrY8DKG1vYxDu0JTdMQmSxs384W5g2KqCO8H APFA== 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=H9QSCS0RwFyWJma1fSfB50PbGNN6KaKfHl1fy3q1SE8=; b=oEU2QkqG+IV6DEb5m3+5m2kMCjWS1wuQoLD2UmZRQGjz7Dx7z+Ue6qZaajkDWEWJ9d y7GjYqfioRRIueQEcuEt5YSzexsUJZhqufGKn59Y0h5VpgoI75VgU+9BfJTfYsdgoBtt 83KmCLEL5R2924uDUACwCHyJ0GuWYKz1Vxcx/naO/SR5bnRwx41H96HwDQoknlBfHYL4 d41BrMADwyT+OFmDQ2UNvI0sOAXkncDPQWak5zF4Xfiog/3s5bIara/OP7Jupp8MoZgd AcA0YJHZnxYg10ii3ljQzmS82UpZMZmEpIWRC5kpzSOKZtjnUhs8N6992clsqHdS9Veu yH3w== X-Gm-Message-State: AJaThX4VIvZC7/9P3O0bdXf575CSoys3wIQ9YBE/6oITZbUbx3Zot9l+ O+vmW9fxGJn5ZCiA1w6FENH1KME= X-Received: by 10.99.95.70 with SMTP id t67mr26984937pgb.49.1512683189069; Thu, 07 Dec 2017 13:46:29 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id t202sm8933213pgb.75.2017.12.07.13.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:46:26 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id CD93C8F4; Thu, 7 Dec 2017 15:46:23 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id BF95430000E; Thu, 7 Dec 2017 15:46:22 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:46:08 -0600 Message-Id: <1512683181-8420-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512683181-8420-1-git-send-email-minyard@acm.org> References: <1512683181-8420-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH 01/14] i2c:pm_smbus: Clean up some style issues 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 , Paolo Bonzini , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Fix some spacing issues, remove extraneous comments, add some defines instead of hard-coding numbers. Signed-off-by: Corey Minyard Cc: Michael S. Tsirkin Cc: Paolo Bonzini --- hw/i2c/pm_smbus.c | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 6fc3923..92c3aebd 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -23,8 +23,6 @@ #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus.h" -/* no save/load? */ - #define SMBHSTSTS 0x00 #define SMBHSTCNT 0x02 #define SMBHSTCMD 0x03 @@ -33,19 +31,34 @@ #define SMBHSTDAT1 0x06 #define SMBBLKDAT 0x07 -#define STS_HOST_BUSY (1) -#define STS_INTR (1<<1) -#define STS_DEV_ERR (1<<2) -#define STS_BUS_ERR (1<<3) -#define STS_FAILED (1<<4) -#define STS_SMBALERT (1<<5) -#define STS_INUSE_STS (1<<6) -#define STS_BYTE_DONE (1<<7) +#define STS_HOST_BUSY (1 << 0) +#define STS_INTR (1 << 1) +#define STS_DEV_ERR (1 << 2) +#define STS_BUS_ERR (1 << 3) +#define STS_FAILED (1 << 4) +#define STS_SMBALERT (1 << 5) +#define STS_INUSE_STS (1 << 6) +#define STS_BYTE_DONE (1 << 7) /* Signs of successfully transaction end : * ByteDoneStatus = 1 (STS_BYTE_DONE) and INTR = 1 (STS_INTR ) */ -//#define DEBUG +#define CTL_INTREN (1 << 0) +#define CTL_KILL (1 << 1) +#define CTL_LAST_BYTE (1 << 5) +#define CTL_START (1 << 6) +#define CTL_PEC_EN (1 << 7) +#define CTL_RETURN_MASK 0x1f + +#define PROT_QUICK 0 +#define PROT_BYTE 1 +#define PROT_BYTE_DATA 2 +#define PROT_WORD_DATA 3 +#define PROT_PROC_CALL 4 +#define PROT_BLOCK_DATA 5 +#define PROT_I2C_BLOCK_DATA 6 + +/*#define DEBUG*/ #ifdef DEBUG # define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) @@ -68,11 +81,12 @@ static void smb_transaction(PMSMBus *s) if ((s->smb_stat & STS_DEV_ERR) != 0) { goto error; } + switch(prot) { - case 0x0: + case PROT_QUICK: ret = smbus_quick_command(bus, addr, read); goto done; - case 0x1: + case PROT_BYTE: if (read) { ret = smbus_receive_byte(bus, addr); goto data8; @@ -80,7 +94,7 @@ static void smb_transaction(PMSMBus *s) ret = smbus_send_byte(bus, addr, cmd); goto done; } - case 0x2: + case PROT_BYTE_DATA: if (read) { ret = smbus_read_byte(bus, addr, cmd); goto data8; @@ -89,16 +103,17 @@ static void smb_transaction(PMSMBus *s) goto done; } break; - case 0x3: + case PROT_WORD_DATA: if (read) { ret = smbus_read_word(bus, addr, cmd); goto data16; } else { - ret = smbus_write_word(bus, addr, cmd, (s->smb_data1 << 8) | s->smb_data0); + ret = smbus_write_word(bus, addr, cmd, + (s->smb_data1 << 8) | s->smb_data0); goto done; } break; - case 0x5: + case PROT_I2C_BLOCK_DATA: if (read) { ret = smbus_read_block(bus, addr, cmd, s->smb_data); goto data8; @@ -149,8 +164,9 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, break; case SMBHSTCNT: s->smb_ctl = val; - if (val & 0x40) + if (s->smb_ctl & CTL_START) { smb_transaction(s); + } break; case SMBHSTCMD: s->smb_cmd = val; @@ -185,7 +201,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) break; case SMBHSTCNT: s->smb_index = 0; - val = s->smb_ctl & 0x1f; + val = s->smb_ctl & CTL_RETURN_MASK; break; case SMBHSTCMD: val = s->smb_cmd; @@ -208,7 +224,9 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) val = 0; break; } - SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", addr, val); + SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", + addr, val); + return val; }