From patchwork Mon Aug 29 21:14:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9304465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 92471601C0 for ; Mon, 29 Aug 2016 21:15:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F73F285D6 for ; Mon, 29 Aug 2016 21:15:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72AC328682; Mon, 29 Aug 2016 21:15:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0957E285D6 for ; Mon, 29 Aug 2016 21:15:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1beTtY-0000xs-Q4; Mon, 29 Aug 2016 21:15:04 +0000 Received: from mail-pf0-x22b.google.com ([2607:f8b0:400e:c00::22b]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beTtW-0000ju-Fa for linux-rockchip@lists.infradead.org; Mon, 29 Aug 2016 21:15:03 +0000 Received: by mail-pf0-x22b.google.com with SMTP id y134so48336pfg.0 for ; Mon, 29 Aug 2016 14:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=mb8klcMnsO3pNA8/fLtz3UAPZ02Guc3AoCD3eLHLCuU=; b=Uq/6EXtrx6NWny4ZCBzwVAkn4KdONfJ4WJRqA4uNqzeNPbpAThFOYe26lqF8V5kWo1 Alb+nggFlOks8wN+d5DBX8V+SAv+zZLIdeRQewFeivsZo/f78moUFwGdYVtJiq7eJaJZ GuGgVC7DORtyNeLBs7HTpndtieadob3D2x7L4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mb8klcMnsO3pNA8/fLtz3UAPZ02Guc3AoCD3eLHLCuU=; b=czxYPU6gfplmMbIyhHNy4nthW2G3vDhHES2neKnrp6pqn3iHb1VE/zkfxik7mtr7vX yUEBT1lPOGdLVnA/ApMr+rDLj6tzRGqfS2+i2qdomNFKghf1AYIJvghqE9MLxofznEmg jd+qiN8zu2yj/HrfYKl1Oxjf9kCsADAYUfSacmh7+4aFLMxnrmvbkrCSwte9dVv5WV7V ooRyhTM3G8Qasx+xAvcFXgX5QkAM/LgJYvHoRZWVob6XdD3YBJCTLrHrlJNZBMzhplSp QC/TGRYDItqKAd9eXjmHB45/BTUBrYgkFyjt/0YNIe5LCYV0IXMGAZC9/3v0ekTxUMXF MGgA== X-Gm-Message-State: AE9vXwNxn9L/djQSS0tk7jT7DtkvV8jVZbfjcHC3exlGTXPwUDwxEV5R6nwq8EW6HF13obQl X-Received: by 10.98.16.193 with SMTP id 62mr141503pfq.132.1472505281224; Mon, 29 Aug 2016 14:14:41 -0700 (PDT) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id fe8sm51546430pad.2.2016.08.29.14.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Aug 2016 14:14:40 -0700 (PDT) From: Brian Norris To: Bjorn Helgaas Subject: [PATCH] PCI: rockchip: Correct the register value for clearing client interrupts Date: Mon, 29 Aug 2016 14:14:11 -0700 Message-Id: <1472505251-122204-1-git-send-email-briannorris@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160829_141502_574767_C1F7EC1B X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brian Norris , Heiko Stuebner , linux-pci@vger.kernel.org, Shawn Lin , Wenrui Li , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Brian Norris MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP I'm pretty sure the bitwise 'or' was meant for the value parameter, not the register parameter. This resolves an interrupt storm, where if we receive any client IRQs (e.g., correctable errors), we fail to ever clear them properly, so they reoccur indefinitely. Fixes: 199410f6270e ("PCI: rockchip: Add Rockchip PCIe controller support") Signed-off-by: Brian Norris Cc: Shawn Lin --- Patched against git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/host-rockchip drivers/pci/host/pcie-rockchip.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c index 8fb47ee9eaee..e77aec3cc869 100644 --- a/drivers/pci/host/pcie-rockchip.c +++ b/drivers/pci/host/pcie-rockchip.c @@ -689,9 +689,10 @@ static irqreturn_t rockchip_pcie_client_irq_handler(int irq, void *arg) PCIE_CLIENT_INT_MSG | PCIE_CLIENT_INT_HOT_RST | PCIE_CLIENT_INT_DPA | PCIE_CLIENT_INT_FATAL_ERR | PCIE_CLIENT_INT_NFATAL_ERR | - PCIE_CLIENT_INT_CORR_ERR), - PCIE_CLIENT_INT_STATUS | - PCIE_CLIENT_INT_PHY); + PCIE_CLIENT_INT_CORR_ERR | + PCIE_CLIENT_INT_PHY), + PCIE_CLIENT_INT_STATUS); + return IRQ_HANDLED; }