From patchwork Thu Sep 14 17:52:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 112598 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1054119qgf; Thu, 14 Sep 2017 11:00:41 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBqnOW9Z2ULPo3KxerhJ0jB3YQ8zyNYBiD3CmqrRR7XR/6MtY0rSnSh5wKLAENyIFHXidy1 X-Received: by 10.55.98.214 with SMTP id w205mr3688174qkb.355.1505412040065; Thu, 14 Sep 2017 11:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505412040; cv=none; d=google.com; s=arc-20160816; b=Dn370KBdUJOiSV6VKX4r7bhk2wYBMbobBytBPri4dqaE22FRIIpfcZhjW9hOqEWQ17 xLH4/yFpltLo4mOh+c5Bci5ROxF5RJNSxrxJqps/TBrLAAdNpYiK5Am7jTXxcsSjaz82 pwcOyjGWhEfiRtsU9nyDwCBjAn9IbD5IoCJoK6S0+0hH8lRAO/ZnTezsx6pKBWJ0CnB+ cRwOMs2lQjPEO+sJJi3KWoxVyWWY0bkNxAROty0+LNbuGPiEAdrwOeXdogUL8K6IvIoS udwkC1eP63YimOT8lO4HiigFADHCU7kHvUoqtNhL71AgJBwdEFKebATkSXN8svRgsouD eWdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=GSoJ8QP9UDeZ1ihtS4ssGN4pX7CqU4ZhPKk6DSvp8dE=; b=ovLsTX7UpmkqWH1OQKEXVlWFAHowOdRTQvgx7dXJTgsFASDJYrXUYLB0k6GgDMvyvB KGVxmYdVlfWVtKc693zV2s0v/xtrQtslVBwG+zFjm134Mifh4AN/sabtNva8CZklGPPf LDdQgKMhEa56TGMJAl6DaKfE1+RTFZqv8sIXGwHyq6t3YS9vpxDMci38BpKUiKk1RvbR uoPVvyMMs+FX0d1Ib2R1qAfrKj+W9nCwC8QvVShmCINssPrWohtTAX09trHXm3/YgM6h hdoJW3I4/wiu69/W/Wws2MnEl9CtgfG5bxpsXhaomundcXqIwn9k2DolpHTAFm6woanw UJFg== ARC-Authentication-Results: i=1; mx.google.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i34si17328807qtb.207.2017.09.14.11.00.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Sep 2017 11:00:40 -0700 (PDT) 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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsYRK-0000IC-24 for patch@linaro.org; Thu, 14 Sep 2017 14:00:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsYJa-00086k-QL for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsYJZ-00080Q-VS for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:38 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37370) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsYJZ-0007yZ-Nm for qemu-devel@nongnu.org; Thu, 14 Sep 2017 13:52:37 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dsYJY-0005uU-J4 for qemu-devel@nongnu.org; Thu, 14 Sep 2017 18:52:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Sep 2017 18:52:53 +0100 Message-Id: <1505411573-27848-19-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505411573-27848-1-git-send-email-peter.maydell@linaro.org> References: <1505411573-27848-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 18/18] mps2-an511: Fix wiring of UART overflow interrupt lines 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fix an error that meant we were wiring every UART's overflow interrupts into the same inputs 0 and 1 of the OR gate, rather than giving each its own input. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Message-id: 1505232834-20890-1-git-send-email-peter.maydell@linaro.org --- hw/arm/mps2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index abb0ab6..769cff8 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -287,8 +287,8 @@ static void mps2_common_init(MachineState *machine) cmsdk_apb_uart_create(uartbase[i], qdev_get_gpio_in(txrx_orgate_dev, 0), qdev_get_gpio_in(txrx_orgate_dev, 1), - qdev_get_gpio_in(orgate_dev, 0), - qdev_get_gpio_in(orgate_dev, 1), + qdev_get_gpio_in(orgate_dev, i * 2), + qdev_get_gpio_in(orgate_dev, i * 2 + 1), NULL, uartchr, SYSCLK_FRQ); }