From patchwork Thu Jan 8 17:33:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 42877 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9B2B02055F for ; Thu, 8 Jan 2015 17:52:19 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id z20sf22092863igj.1 for ; Thu, 08 Jan 2015 09:52:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=X+mvwDm+vr1Pn8AOUdL7ok1tvW0/cAtOFuV7bYlKkDQ=; b=DsFkxhVvUpoys2fZZtFGnmwyq8VqVfJnaZRa+ngi9+be4ZNI5xuystf3iAlqvPPl/j S3L+T+BB/SRKYYjo1y5ZfZcP9/5xPjadeq5wQ32OADi57KKptGr377NSbKi3FeGL9iG/ /lgTEviEg1wIjHfjP66IJk2JAIPGmQN7qV2XiZBF9+rET4U4NntXZcconH6HM05q0NZ3 MxIRBE8NWswqCDWQ2wdtIxfHen5fNIbobT9y4aYXNXSOnB/cuZNeE9NIU72KC/ylTMsO eA8kmlJr6dk9T86AEH1iF721FCVXo8zw4C+xcLfNRQrCmBs6K9PN9p3g744QCR6QBCMX 2SMA== X-Gm-Message-State: ALoCoQlENJMUsl+wN4N25j4sPPsHqQ45dLEY4CALi+R0X+QdfKUXlVd/XOiqNd7R9LADLWciN3dT X-Received: by 10.182.55.99 with SMTP id r3mr7313062obp.8.1420739539228; Thu, 08 Jan 2015 09:52:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.7 with SMTP id a7ls1132025qga.87.gmail; Thu, 08 Jan 2015 09:52:19 -0800 (PST) X-Received: by 10.221.58.7 with SMTP id wi7mr7729852vcb.66.1420739539125; Thu, 08 Jan 2015 09:52:19 -0800 (PST) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id q13si9765776laa.27.2015.01.08.09.52.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Jan 2015 09:52:18 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id w7so4444775lbi.2 for ; Thu, 08 Jan 2015 09:52:18 -0800 (PST) X-Received: by 10.152.8.11 with SMTP id n11mr14655622laa.38.1420739538767; Thu, 08 Jan 2015 09:52:18 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp72462lbb; Thu, 8 Jan 2015 09:52:18 -0800 (PST) X-Received: by 10.224.66.200 with SMTP id o8mr18182636qai.13.1420739537176; Thu, 08 Jan 2015 09:52:17 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m7si7906480qag.36.2015.01.08.09.52.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 08 Jan 2015 09:52:17 -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; Received: from localhost ([::1]:47215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9HFn-0008Nf-TI for patch@linaro.org; Thu, 08 Jan 2015 12:52:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9GzJ-0003Hg-5E for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9GzB-0006Df-65 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:13 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:54982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9GzB-0006DI-17 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:05 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 12:35:04 -0500 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Jan 2015 12:35:01 -0500 Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 0ABA4C90041; Thu, 8 Jan 2015 12:27:03 -0500 (EST) Received: from d01av05.pok.ibm.com (d01av05.pok.ibm.com [9.56.224.195]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t08HZ0S328770488; Thu, 8 Jan 2015 17:35:00 GMT Received: from d01av05.pok.ibm.com (localhost [127.0.0.1]) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t08HZ0kn024815; Thu, 8 Jan 2015 12:35:00 -0500 Received: from localhost (morrigu.austin.ibm.com [9.41.105.45]) by d01av05.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t08HZ0jo024805; Thu, 8 Jan 2015 12:35:00 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 8 Jan 2015 11:33:16 -0600 Message-Id: <1420738472-23267-13-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15010817-0037-0000-0000-0000004BC2EE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.182.137 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 12/88] hw/arm/virt: fix pl011 and pl031 irq flags 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mdroth@linux.vnet.ibm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell The pl011 and pl031 devices both use level triggered interrupts, but the device tree we construct was incorrectly telling the kernel to configure the GIC to treat them as edge triggered. This meant that output from the pl011 would hang after a while. Signed-off-by: Peter Maydell Message-id: 1410274423-9461-1-git-send-email-peter.maydell@linaro.org Acked-by: Christoffer Dall Cc: qemu-stable@nongnu.org (cherry picked from commit 0be969a2d974971628fc4ed95834d22ecf0fd497) Signed-off-by: Michael Roth --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c8fdac4..bdc1573 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -371,7 +371,7 @@ static void create_uart(const VirtBoardInfo *vbi, qemu_irq *pic) 2, base, 2, size); qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", GIC_FDT_IRQ_TYPE_SPI, irq, - GIC_FDT_IRQ_FLAGS_EDGE_LO_HI); + GIC_FDT_IRQ_FLAGS_LEVEL_HI); qemu_fdt_setprop_cells(vbi->fdt, nodename, "clocks", vbi->clock_phandle, vbi->clock_phandle); qemu_fdt_setprop(vbi->fdt, nodename, "clock-names", @@ -396,7 +396,7 @@ static void create_rtc(const VirtBoardInfo *vbi, qemu_irq *pic) 2, base, 2, size); qemu_fdt_setprop_cells(vbi->fdt, nodename, "interrupts", GIC_FDT_IRQ_TYPE_SPI, irq, - GIC_FDT_IRQ_FLAGS_EDGE_LO_HI); + GIC_FDT_IRQ_FLAGS_LEVEL_HI); qemu_fdt_setprop_cell(vbi->fdt, nodename, "clocks", vbi->clock_phandle); qemu_fdt_setprop_string(vbi->fdt, nodename, "clock-names", "apb_pclk"); g_free(nodename);