Patrick Georgi merged this change.

View Change

soc/nvidia/tegra124: Correct bitwise operators

We are treating reg_val like a bit mask, so use bitwise or instead of
boolean or, and use |= to enable certain bits instead of overwriting the
whole variable.

Change-Id: Ia8c0ea5a58e25b3b58ed82caba20f8e49a30fb68
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1287070
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34560
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/soc/nvidia/tegra124/sor.c
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 52b909e..1c151f5 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -348,10 +348,10 @@
 	}
 
 	reg_val = READL(pmc_base + APBDEV_PMC_IO_DPD2_REQ);
-	reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON ||
+	reg_val &= ~(APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
 		APBDEV_PMC_IO_DPD2_REQ_CODE_DEFAULT_MASK);
 
-	reg_val = up ? APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
+	reg_val |= up ? APBDEV_PMC_IO_DPD2_REQ_LVDS_ON |
 		APBDEV_PMC_IO_DPD2_REQ_CODE_DPD_OFF :
 		APBDEV_PMC_IO_DPD2_REQ_LVDS_OFF |
 		APBDEV_PMC_IO_DPD2_REQ_CODE_DPD_ON;

To view, visit change 34560. To unsubscribe, or for help writing mail filters, visit settings.