From patchwork Tue Sep 5 07:19:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9938077 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 CB2B1601EB for ; Tue, 5 Sep 2017 07:35:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD2A628161 for ; Tue, 5 Sep 2017 07:35:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1B80288B7; Tue, 5 Sep 2017 07:35:49 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 41FB528161 for ; Tue, 5 Sep 2017 07:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8knVgPFYGDKYx7J/ExDIK/Ivu2c/Pw4wZG0Yj4jNRWk=; b=KKY3orTNNFGe+Ps0fqRYf1p8ew /MDEPrdV+wlAteD0umhoKe26pQIEGtO/rXDXi94WdeYkaep6Fe2Oy94XgTr4rsIy445KY2qQKJQgl i5mGlr4wzTtnqJkupk8BT2r6vMW9O70gzcHZOoNjZRh+UbL9CNGw9FVzuL4XLgR99CLj3njF9B0Qr hX9LvIpaqhozszUHODKslNE0QKVKAq04mFwnYWVrZbCu8+jrirhL5OGTvhn9ZVXM7iWujrSCtmHIH W5WBkPaOWTMdbDLVG13VKUdn2ULUXTzN751mjTWntciXAiAgqOfHmlFJ+o9F2UXYostTtW4chnJS4 XvEoU/pQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dp8OZ-0004xs-9W; Tue, 05 Sep 2017 07:35:39 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dp8AF-00063G-0u for linux-arm-kernel@lists.infradead.org; Tue, 05 Sep 2017 07:20:57 +0000 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MMnK3-1dpxEU3eIx-008XyS; Tue, 05 Sep 2017 09:20:26 +0200 From: Arnd Bergmann To: Bjorn Helgaas Subject: [PATCH 2/2] PCI: iproc: fix Stingray CRS defect handling Date: Tue, 5 Sep 2017 09:19:45 +0200 Message-Id: <20170905072004.3959082-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170905072004.3959082-1-arnd@arndb.de> References: <20170905072004.3959082-1-arnd@arndb.de> X-Provags-ID: V03:K0:zGuc58DaM0+i44U9+dkIo41sMp9w09Ky0WMpJqy3ODz+4vJjdQf 1XbTOFQfk5TMSmqGpHetO9v3qJJobyKPnHq9HbXQFNJ62AP8R8jCdaqZ5SCrv9V0MGp7FQ8 PCmr6ZWtRb/HgM61EOxszlIRLdI/6u2a+b+CetD9MPfSq70EA281Acpw4qPU4h35CGmXeXn qWEbBmA/vrFuJuja4ohGw== X-UI-Out-Filterresults: notjunk:1; V01:K0:6OJuOIHgeAU=:xC3VRt+GdAopps/52wjtF2 c5MEUOjeWg7OOxWZF7dI4ol4TuSM/ZcraG4E0ucqOP2+0OahiqbEsgm6lYU45VPTqxfya9X3K SdYbPRZ2dxRujoFI2MSEqwuXf6azCOcWW/H0yWJJjvd+B+BJIpyKfLbKN2hMjp9JfQjxEe8HQ VRtGzF3btyJxkeIzNcDKTVPdh+Ei7mnIAMQk0O3unTKHiPadPcSIAs0HKB8Kd921Y2W2m+fh/ r+YM7joz6fdcfb79n1jSKvefzbX4v1pO+bYgLlIiN6z0/7+BC3Ngei9JSX5mXiM4zwPaI83DC rwXlZ8pnDD9M9HvJT2JX93XaBh5eKyGYyQ+Yhb9eUcVnj8o8USOSSKpl3KdgVJHLyU3M0XM8i bTYKmo/lY7w5kcOATScrPmKISEkIc072uIVBVVvLtgJdV3QKtliZp9KunJZ05AU8JfQwF5JX9 FaMZtt9CEnL4yDF2H9IZVJNInakP74MMdqYwt7V+86+nN0YvC6bfMagoZq31ah39M2Mgscl3B VK8bscWLb9AULjkgU2ep3XRnvYnNlwEtqTwjBtrLzjH8tCBbWChNqqP9ZYgJHeboIppOw7cLv pJu/DCRM6dNgey/MDU3lslzrbjV+/qb2QG0KnMzBrLoeXfSyHStkKRDJgUJYc3+mD/ZxUowp6 LoaSH6OiEL+5UuOPBBr/vXEPnZziAs2Q8dXJLScd2MaYOruZ0qxu49POZp9r5S7iPUxU8f7TH x7Fd32o42ZP8LF9jqG5tNibMfkdjF6L8sLEwzA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170905_002052_165586_345C1670 X-CRM114-Status: GOOD ( 10.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Arnd Bergmann , Scott Branden , Jon Mason , Ray Jui , linux-kernel@vger.kernel.org, Oza Pawandeep , linux-pci@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The condition that was used to detect the PCI_EXP_RTCAP flag access is wrong, as pointed out by gcc-8: drivers/pci/host/pcie-iproc.c: In function 'iproc_pcie_config_read': drivers/pci/host/pcie-iproc.c:531:22: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] if ((where & ~0x3) == PCI_EXP_CAP + PCI_EXP_RTCAP) This adds the same bit mask to the other end as well, so the condition is evaluated correctly for any access. Fixes: ac8d3e852f75 ("PCI: iproc: Work around Stingray CRS defects") Signed-off-by: Arnd Bergmann --- drivers/pci/host/pcie-iproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index d7f4c29aed96..f2df9c2266b9 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -528,7 +528,7 @@ static int iproc_pcie_config_read(struct pci_bus *bus, unsigned int devfn, return ret; /* Don't advertise CRS SV support */ - if ((where & ~0x3) == PCI_EXP_CAP + PCI_EXP_RTCAP) + if ((where & ~0x3) == ((PCI_EXP_CAP + PCI_EXP_RTCAP) & ~0x03)) *val &= ~(PCI_EXP_RTCAP_CRSVIS << 16); return PCIBIOS_SUCCESSFUL; }