Message ID | 1534870966-9287-68-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HjMIk1RE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vyxd2LMSz9s5b for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:55:01 +1000 (AEST) Received: from localhost ([::1]:55211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsArq-000320-WA for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:54:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA53-0002Vl-4b for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4o-0007Ci-Ci for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:27 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38391) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA4n-00077J-HN for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:18 -0400 Received: by mail-wr1-x441.google.com with SMTP id w11-v6so13897592wrc.5 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:04:15 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ADFFXom5iNIFTwymwNdZAOMCVy/8n3vmNA6fvWLZ6qY=; b=HjMIk1RE2ErqgFDRbdWJs4Krm+H9dFmQBl++9PIvajX6VNd5DuAb9K24ulHgXjWPw6 TG0OUwvUpmg9WCbnBaS6zskbCfYITGR3V4PdtJSIH5997V2kmouHuCK511zWH9WSi7dy ndPPASmFSPpaau2USrNUVF5IxUkGc2HxWp4L1551KBoLbIbW+gelsaEJNhFyph6D9Dga LTUMu6m/sbNmq2+LMM8sRL103UN1TJ9W/6bqztugfxwBlwRbsgAHweMRESI+lZONo55X CAUMCllw+8Bhr9yoSQ/4qwwwP3NnE2ALuLk44SV8Lu07EIwwb/K+p6+/XecjoipD5KTo RpWQ== 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:mime-version:content-transfer-encoding; bh=ADFFXom5iNIFTwymwNdZAOMCVy/8n3vmNA6fvWLZ6qY=; b=io3Kp3h8sJ4VXf4xV1KSRwHnr0gic6TQ+pr5rfCPuRyB9litowz9F+jr9eySwZJTJB wMaeCSs5tKMtodOUUdxqyorC+q7aSMaQOnCyl9pRXYl0u/F6RuKdbVpeFNj0eS9qrGaY udjbca45ijK1tIT/9vy6ixY5ehZqKRdR8F3Si90p9qXbH0vMye52gE3dbnVr6kBvPIZd PAAxoVxj8k6OY+4wtirkvetAW+SdLxlNQDCM+v1+kUIcgs99ZzqncgLouQ2yNSnP4Nvu IqZbwoVsxHrGtPDu3BZmENJRjtjNnao0yzFwqkrhmHofAJqNI8zqMIlOxi4j4O9Q8FHB ZQlQ== X-Gm-Message-State: AOUpUlHOirOu1EBz/zPeDrAuVw8bXSo4hRsJRzn6y8jOwuir98qNx8iS tRPwUnOAm3OtzjwwbLTn8YANxI/1 X-Google-Smtp-Source: AA+uWPx5NDBsm4kCJWva/YOSDqHjeYv/97FZid2fWcCOKEZf+VaYyxChPi75NDeXOZb55Xib/4OWkg== X-Received: by 2002:adf:8161:: with SMTP id 88-v6mr32055453wrm.22.1534871054300; Tue, 21 Aug 2018 10:04:14 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.04.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:13 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:39 +0200 Message-Id: <1534870966-9287-68-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PULL 67/74] i2c: pm_smbus: Don't delay host status register busy bit when interrupts are enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Corey Minyard <cminyard@mvista.com>, =?utf-8?q?Herv=C3=A9_Poussineau?= <hpoussin@reactos.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 6322f07..91ee444 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -80,9 +80,6 @@ static void smb_transaction(PMSMBus *s) I2CBus *bus = s->smbus; int ret; - assert(s->smb_stat & STS_HOST_BUSY); - s->smb_stat &= ~STS_HOST_BUSY; - SMBUS_DPRINTF("SMBus trans addr=0x%02x prot=0x%02x\n", addr, prot); /* Transaction isn't exec if STS_DEV_ERR bit set */ if ((s->smb_stat & STS_DEV_ERR) != 0) { @@ -209,9 +206,18 @@ error: static void smb_transaction_start(PMSMBus *s) { - /* Do not execute immediately the command ; it will be - * executed when guest will read SMB_STAT register */ - s->smb_stat |= STS_HOST_BUSY; + if (s->smb_ctl & CTL_INTREN) { + smb_transaction(s); + } else { + /* Do not execute immediately the command; it will be + * executed when guest will read SMB_STAT register. This + * is to work around a bug in AMIBIOS (that is working + * around another bug in some specific hardware) where + * it waits for STS_HOST_BUSY to be set before waiting + * checking for status. If STS_HOST_BUSY doesn't get + * set, it gets stuck. */ + s->smb_stat |= STS_HOST_BUSY; + } } static bool @@ -330,6 +336,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) val = s->smb_stat; if (s->smb_stat & STS_HOST_BUSY) { /* execute command now */ + s->smb_stat &= ~STS_HOST_BUSY; smb_transaction(s); } break;