From patchwork Tue Sep 12 16:13:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 112328 Delivered-To: patches@linaro.org Received: by 10.140.106.117 with SMTP id d108csp5404593qgf; Tue, 12 Sep 2017 09:13:29 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4y+Kzp9LG38IfDfzqDv9nYxmN3KqTAZLFWoqYHPwz+fHmWRJaRtJxDeNRmNAN3hURLWb9U X-Received: by 10.223.176.46 with SMTP id f43mr13082989wra.206.1505232809432; Tue, 12 Sep 2017 09:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505232809; cv=none; d=google.com; s=arc-20160816; b=WfXA+kDcEKptO0+6rVOQ47YAKppNnZ0fvScMpzzfj4o7wwjbpPf8BaaM9PNwcKma2Z h0Cym/5sglVBR86IqXq6vhLv2EI1uOvR6qoZMz6PM7SpGsNj4m8wKNVIsWfvc1D8vCFK EQu+V63ybMLJl1iA/cNFXdV38C+QQYgKXyc/wyVXjJxGwzam8jEiLBXyvOzfcORVQuui qTfOECkHDG93P+1m+63qmLnqiWO1RYJbPZVdL9ogKI8i5WHi/0XXEINwNu0Az/LSAdFi xxdnwHPg1pU5B7beMcUsrssCMHDP3di/7ot5+i/TFH4VRgM644rOmFooa5dMrVUxclr3 p01g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=fgD9TPG+0TZXgXJb4L2mcLa/6rFq2yHjqPhWQ5vnc8w=; b=mJvRBrTNKCPTSRl3CksLZ8gZNFf2dgQS+/kI4pdJ3q0cEX6iTOy7Z8VVWec94ZpLcy c3Nv2cF7Ad9Dn6EM/jjPEvPEHcIGHrb2sdO8ePQIripavdOPzZz32u4AUpX+ts50iGSI gtg0kFXcLpmPceqTy8HmIVxWl4l2/fHwEyxCkx0OdElX3DlZbXMOffeod1F2c+Lak0dr 5h+i6k/KSYblG8H5cQRojYX8+zuAA4sn8DHnCkh19DCWg1TczUBp9Ht6cdsQvHIlu1r+ j4yXYzS/VjSBATHYEn7IpjFaOjc0bNvqAhwPzNsQ71Nxiekh1QH51C0Dn5lETv2x6cQV W7Ig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id q18si9500524wrf.10.2017.09.12.09.13.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Sep 2017 09:13:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1drnoW-0000w5-3e; Tue, 12 Sep 2017 17:13:28 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-stable@nongnu.org Subject: [PATCH] mps2-an511: Fix wiring of UART overflow interrupt lines Date: Tue, 12 Sep 2017 17:13:54 +0100 Message-Id: <1505232834-20890-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 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 --- hw/arm/mps2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis 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); }