aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorBiwen Li <biwen.li@nxp.com>2019-10-14 12:42:32 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2019-10-19 14:29:38 +0200
commitddff739d15e0307767a4bf984e50bca5b5a702dd (patch)
treea41c3f75dc80b7efd743b927987d746dded1996f /target
parent8c8212c680a12c926f0e5d5918236ae219d728fe (diff)
downloadupstream-ddff739d15e0307767a4bf984e50bca5b5a702dd.tar.gz
upstream-ddff739d15e0307767a4bf984e50bca5b5a702dd.tar.bz2
upstream-ddff739d15e0307767a4bf984e50bca5b5a702dd.zip
kernel: layerscape: fix compilation error
This fixes a compilation error as follows: drivers/staging/fsl_qbman/qman_config.c:815:29: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] if ((qman_ip_rev & 0xFF00) == QMAN_REV31) { Signed-off-by: Biwen Li <biwen.li@nxp.com> (cherry picked from commit 53b73131e9b38bcae556555de53203d52321794c)
Diffstat (limited to 'target')
-rw-r--r--target/linux/layerscape/patches-4.14/713-sdk_qbman-Fix-error-in-IP-revision-comparison.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-4.14/713-sdk_qbman-Fix-error-in-IP-revision-comparison.patch b/target/linux/layerscape/patches-4.14/713-sdk_qbman-Fix-error-in-IP-revision-comparison.patch
new file mode 100644
index 0000000000..b310e26855
--- /dev/null
+++ b/target/linux/layerscape/patches-4.14/713-sdk_qbman-Fix-error-in-IP-revision-comparison.patch
@@ -0,0 +1,28 @@
+From b43b4fdd5caa4f66fd712c77589c167c952ec659 Mon Sep 17 00:00:00 2001
+From: Roy Pledge <roy.pledge@nxp.com>
+Date: Mon, 6 May 2019 11:18:57 -0400
+Subject: [PATCH] sdk_qbman: Fix error in IP revision comparison
+
+The comparison for QMAN_REV31 was incorrect as it
+would always fail due to the wrong mask.
+
+This fixes the following error in newer GCC versions:
+"error: bitwise comparison always evaluates to false
+ [-Werror=tautological-compare]"
+
+Signed-off-by: Roy Pledge <roy.pledge@nxp.com>
+---
+ drivers/staging/fsl_qbman/qman_config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/staging/fsl_qbman/qman_config.c
++++ b/drivers/staging/fsl_qbman/qman_config.c
+@@ -812,7 +812,7 @@ int qman_set_sdest(u16 channel, unsigned
+
+ if (!qman_have_ccsr())
+ return -ENODEV;
+- if ((qman_ip_rev & 0xFF00) == QMAN_REV31) {
++ if ((qman_ip_rev & 0xFFFF) == QMAN_REV31) {
+ /* LS1043A - only one L2 cache */
+ cpu_idx = 0;
+ }