From patchwork Sun Apr 28 18:26:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maksim Ratnikov X-Patchwork-Id: 240271 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F1632C00BB for ; Mon, 29 Apr 2013 04:26:43 +1000 (EST) Received: from localhost ([::1]:35850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWWJ7-0000mJ-Cu for incoming@patchwork.ozlabs.org; Sun, 28 Apr 2013 14:26:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWWIq-0000mB-Os for qemu-devel@nongnu.org; Sun, 28 Apr 2013 14:26:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWWIo-0000Y5-9w for qemu-devel@nongnu.org; Sun, 28 Apr 2013 14:26:24 -0400 Received: from mail-oa0-f42.google.com ([209.85.219.42]:43769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWWIo-0000Y0-2r for qemu-devel@nongnu.org; Sun, 28 Apr 2013 14:26:22 -0400 Received: by mail-oa0-f42.google.com with SMTP id i10so5481966oag.29 for ; Sun, 28 Apr 2013 11:26:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to :content-type; bh=u/BBysOkoz4uX5BOsEmphdrxFaYJmSyWVvUu1NknbQY=; b=PUAmPgsTln0zAfMCM1Ys+xF3VBbm0SwncJ/PPD4qChJbkJaZJRRShTdxMdOINzhgAN U213uXREq36LkKHrpidVox1iN8L7U3gfyLJ0VB/5eCX8Qe11GuJxnyKdX7iwU6SmvHdz 213/HBqmMKVi5sHfEncXPEC0/7/9Zf4ktcn9l3W5TxaTJ8ZOOQdJPsslI2rU2ef63OEO ms6mGs109bfmc4clllVc5nu8E7VH5Tqt48OKVXA2neMDOsvrDMoBJvHr1HWphoqHJdL9 d4Y9KK5tuka4w94CfzrbrnIF0ME0ORLyxY0IVWY8RvsPPEX70vFDC+rOa5woQzQYHixF ZhYw== MIME-Version: 1.0 X-Received: by 10.60.50.70 with SMTP id a6mr23228957oeo.43.1367173581209; Sun, 28 Apr 2013 11:26:21 -0700 (PDT) Received: by 10.76.150.138 with HTTP; Sun, 28 Apr 2013 11:26:21 -0700 (PDT) Date: Sun, 28 Apr 2013 22:26:21 +0400 Message-ID: From: Maksim Ratnikov To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.219.42 Subject: [Qemu-devel] [PATCH] Extend support of SMBUS(module pm_smbus.c) HST_STS register. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Previous realization doesn't consider flags in the status register. Add DS and INTR bits of HST_STS register set after transaction execution. Update bits resetting in HST_STS register. Update error processing: if DEV_ERR bit are set transaction isn't execution. Signed-off-by: Maksim_Ratnikov --- hw/i2c/pm_smbus.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) if (read) { @@ -60,6 +67,7 @@ static void smb_transaction(PMSMBus *s) } else { smbus_send_byte(bus, addr, cmd); } + s->smb_stat |= 0x82; break; case 0x2: if (read) { @@ -67,6 +75,7 @@ static void smb_transaction(PMSMBus *s) } else { smbus_write_byte(bus, addr, cmd, s->smb_data0); } + s->smb_stat |= 0x82; break; case 0x3: if (read) { @@ -77,6 +86,7 @@ static void smb_transaction(PMSMBus *s) } else { smbus_write_word(bus, addr, cmd, (s->smb_data1 << 8) | s->smb_data0); } + s->smb_stat |= 0x82; break; case 0x5: if (read) { @@ -84,6 +94,7 @@ static void smb_transaction(PMSMBus *s) } else { smbus_write_block(bus, addr, cmd, s->smb_data, s->smb_data0); } + s->smb_stat |= 0x82; break; default: goto error; @@ -102,7 +113,7 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val); switch(addr) { case SMBHSTSTS: - s->smb_stat = 0; + s->smb_stat = (~(val & 0xff)) & s->smb_stat; s->smb_index = 0; break; case SMBHSTCNT: diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 0b5bb89..d5f5c56 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -50,9 +50,16 @@ static void smb_transaction(PMSMBus *s) i2c_bus *bus = s->smbus; SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot); + /* Transaction isn't exec if DEV_ERR bit set */ + if ((s->smb_stat & 0x04) != 0) + goto error; switch(prot) { case 0x0: smbus_quick_command(bus, addr, read); + /* Set successfully transaction end: + * ByteDoneStatus = 1 (HST_STS bit #7) and INTR = 1 (HST_STS bit #1) + */ + s->smb_stat |= 0x82; break; case 0x1: