Просмотр исходного кода

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 <[email protected]>
Biwen Li 6 лет назад
Родитель
Сommit
53b73131e9

+ 28 - 0
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 <[email protected]>
+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 <[email protected]>
+---
+ 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;
+ 	}