From: Arnd Bergmann <arnd@arndb.de>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Arnd Bergmann <arnd@arndb.de>, Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Jon Mason <jonmason@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com,
Oza Pawandeep <oza.oza@broadcom.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] PCI: iproc: fix Stingray CRS defect handling
Date: Tue, 5 Sep 2017 09:19:45 +0200 [thread overview]
Message-ID: <20170905072004.3959082-2-arnd@arndb.de> (raw)
In-Reply-To: <20170905072004.3959082-1-arnd@arndb.de>
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 <arnd@arndb.de>
---
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;
}
--
2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] PCI: iproc: fix Stingray CRS defect handling
Date: Tue, 5 Sep 2017 09:19:45 +0200 [thread overview]
Message-ID: <20170905072004.3959082-2-arnd@arndb.de> (raw)
In-Reply-To: <20170905072004.3959082-1-arnd@arndb.de>
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 <arnd@arndb.de>
---
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;
}
--
2.9.0
next prev parent reply other threads:[~2017-09-05 7:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 7:19 [PATCH 1/2] PCI: iproc: export iproc_pcie_shutdown symbol Arnd Bergmann
2017-09-05 7:19 ` Arnd Bergmann
2017-09-05 7:19 ` Arnd Bergmann
2017-09-05 7:19 ` Arnd Bergmann [this message]
2017-09-05 7:19 ` [PATCH 2/2] PCI: iproc: fix Stingray CRS defect handling Arnd Bergmann
2017-09-05 17:57 ` Bjorn Helgaas
2017-09-05 17:57 ` Bjorn Helgaas
2017-09-05 17:57 ` Bjorn Helgaas
2017-09-05 13:42 ` [PATCH 1/2] PCI: iproc: export iproc_pcie_shutdown symbol Bjorn Helgaas
2017-09-05 13:42 ` Bjorn Helgaas
2017-09-05 13:42 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170905072004.3959082-2-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bhelgaas@google.com \
--cc=jonmason@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=oza.oza@broadcom.com \
--cc=rjui@broadcom.com \
--cc=sbranden@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.