From patchwork Fri Dec 30 15:21:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89383 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6487930qgi; Fri, 30 Dec 2016 07:28:47 -0800 (PST) X-Received: by 10.200.33.162 with SMTP id 31mr47087160qty.166.1483111727192; Fri, 30 Dec 2016 07:28:47 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e2si25054844qkf.169.2016.12.30.07.28.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:28:47 -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; 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]:40329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz6s-0007J2-M0 for patch@linaro.org; Fri, 30 Dec 2016 10:28:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0O-0002Go-TQ for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0N-0000Dc-Nx for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:04 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:33437) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0N-0000DR-Iq for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:03 -0500 Received: by mail-pf0-x244.google.com with SMTP id 127so12188027pfg.0 for ; Fri, 30 Dec 2016 07:22:03 -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=IVcTimTvnkOhan0To000Fz+/TY7oJu1Fsjh5LE/b/qw=; b=BeSmnyfUNlT99HKoq7ynwnJUlmPD/f2aAQeqqdfomjog32Ue7+yUPxNNxzKPlhOc9p Nczb8aHvWX41qPsxLL5mlgHzr9VxMf+kLdiw/VaiZ+q5nao8K6vfDXMbjEwCQPT1hGLW P7MuYn+qnuj0QgsONw+UoHy9J084cYPMFP1R51O4HcnXkTj2WRjYnPW+GXKtVUrAsXKM seWqtLYHHM5HsR4y3Feh07ie4rRtRElNBI9pIu28dzKcmAV6MIyX5CgS3F1WYz3Wvph3 Hub5/KhkIWNpJ7cxbD4S6VpCl+PGdJP9gpMbvzgQkaVJZMPpTHT4Hx5VAAZafKbuC9L7 k3uA== 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=IVcTimTvnkOhan0To000Fz+/TY7oJu1Fsjh5LE/b/qw=; b=UDqeULsKHaCwFA6VtUhgcrKEuH6xJaNTGiqSCFlZuXEKUgnQ9MJO+eh2hVjcL7x+9D PhkPGkUletGdAiBzk8u5KuF2ts5dqMFfAgx88Wbz5aH0Bo/31CDTCHDg5PxmWxYGDZqb 63IQhcWE/yfqI4HMXOAKsB4uPiB0VSaDCImebvmdORTmFf4dKmmq7zuAxlyO04XOUSGh Xf0KiH69flxPTly5VggbH9ZsJifdZgL5yM4y39+Osrn2uyOGQxJXuFbLLsrtu5FE6E8v 9d7PlEmtcYOkW20I+h3yLjGiwgUyFUnhsiW5TQJjWrySGTZFV4ExuHgqxumHVVUBEeaE g31w== X-Gm-Message-State: AIkVDXJZKvtbCKrUdMaCoQBJ3hJyT+UP6Cf8tlcoJraUBodkuDsf5Z7dZCAASqc2eoPmnw== X-Received: by 10.99.107.4 with SMTP id g4mr86829516pgc.108.1483111322795; Fri, 30 Dec 2016 07:22:02 -0800 (PST) Received: from serve.minyard.net ([47.184.183.230]) by smtp.gmail.com with ESMTPSA id s8sm113522528pfj.45.2016.12.30.07.22.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:22:01 -0800 (PST) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:3850:e313:ed7:8ae4]) by serve.minyard.net (Postfix) with ESMTPA id F05ACA10E; Fri, 30 Dec 2016 09:21:56 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 94FBA30008F; Fri, 30 Dec 2016 09:21:53 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:39 -0600 Message-Id: <1483111310-24808-9-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH 08/19] i2c:pm_smbus: Add interrupt handling 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 , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Add the necessary code so that interrupts actually work from the pm_smbus device. Signed-off-by: Corey Minyard --- hw/i2c/pm_smbus.c | 14 +++++++++++++- hw/i2c/smbus_ich9.c | 17 +++++++++++++++++ include/hw/i2c/pm_smbus.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 92e3cc5..8838360 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -205,6 +205,12 @@ error: return; } +static bool +smb_irq_value(PMSMBus *s) +{ + return ((s->smb_stat & ~STS_HOST_BUSY) != 0) && (s->smb_ctl & CTL_INTREN); +} + static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, unsigned width) { @@ -300,7 +306,9 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, } out: - return; + if (s->set_irq) { + s->set_irq(s, smb_irq_value(s)); + } } static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) @@ -352,6 +360,10 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", addr, val); + if (s->set_irq) { + s->set_irq(s, smb_irq_value(s)); + } + return val; } diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index 85c7260..5bc34de 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -41,6 +41,8 @@ typedef struct ICH9SMBState { PCIDevice dev; + bool irq_enabled; + PMSMBus smb; } ICH9SMBState; @@ -50,6 +52,7 @@ static const VMStateDescription vmstate_ich9_smbus = { .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, ICH9SMBState), + VMSTATE_BOOL(irq_enabled, ICH9SMBState), VMSTATE_STRUCT(smb, ICH9SMBState, 1, pmsmb_vmstate, PMSMBus), VMSTATE_END_OF_LIST() } @@ -111,11 +114,25 @@ static void ich9_smb_class_init(ObjectClass *klass, void *data) dc->cannot_instantiate_with_device_add_yet = true; } +static void ich9_smb_set_irq(PMSMBus *pmsmb, bool enabled) +{ + ICH9SMBState *s = pmsmb->opaque; + + if (enabled == s->irq_enabled) { + return; + } + + s->irq_enabled = enabled; + pci_set_irq(&s->dev, enabled); +} + I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base) { PCIDevice *d = pci_create_simple_multifunction(bus, devfn, true, TYPE_ICH9_SMB_DEVICE); ICH9SMBState *s = ICH9_SMB_DEVICE(d); + s->smb.set_irq = ich9_smb_set_irq; + s->smb.opaque = s; return s->smb.smbus; } diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h index b1e1970..cfe596f 100644 --- a/include/hw/i2c/pm_smbus.h +++ b/include/hw/i2c/pm_smbus.h @@ -23,6 +23,8 @@ typedef struct PMSMBus { /* Set by the user. */ bool i2c_enable; + void (*set_irq)(struct PMSMBus *s, bool enabled); + void *opaque; /* Internally used by pm_smbus. */