Patrick Georgi merged this change.
sb/amd/rs780: Use 32 bit variable to avoid truncation
The {read,write}_index functions expect a 32 bit value, as
do the bitwise operations.
Found-by: Coverity Scan #1229584
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Change-Id: Idc2bc46c899d5a4e8b089644dca076a88d97dd7c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32528
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
---
M src/southbridge/amd/rs780/ht.c
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/southbridge/amd/rs780/ht.c b/src/southbridge/amd/rs780/ht.c
index 94df233..8943fc1 100644
--- a/src/southbridge/amd/rs780/ht.c
+++ b/src/southbridge/amd/rs780/ht.c
@@ -24,24 +24,24 @@
void avoid_lpc_dma_deadlock(struct device *nb_dev, struct device *sb_dev)
{
struct device *cpu_f0;
- u8 reg;
+ u32 reg32;
cpu_f0 = pcidev_on_root(0x18, 0);
set_nbcfg_enable_bits(cpu_f0, 0x68, 3 << 21, 1 << 21);
- reg = nbpcie_p_read_index(sb_dev, 0x10);
- reg |= 0x100; /* bit9=1 */
- nbpcie_p_write_index(sb_dev, 0x10, reg);
+ reg32 = nbpcie_p_read_index(sb_dev, 0x10);
+ reg32 |= 0x100; /* bit9=1 */
+ nbpcie_p_write_index(sb_dev, 0x10, reg32);
- reg = nbpcie_p_read_index(nb_dev, 0x10);
- reg |= 0x100; /* bit9=1 */
- nbpcie_p_write_index(nb_dev, 0x10, reg);
+ reg32 = nbpcie_p_read_index(nb_dev, 0x10);
+ reg32 |= 0x100; /* bit9=1 */
+ nbpcie_p_write_index(nb_dev, 0x10, reg32);
/* Enable NP protocol over PCIE for memory-mapped writes targeting LPC
* Set this bit to avoid a deadlock condition. */
- reg = htiu_read_index(nb_dev, 0x6);
- reg |= 0x1000000; /* bit26 */
- htiu_write_index(nb_dev, 0x6, reg);
+ reg32 = htiu_read_index(nb_dev, 0x6);
+ reg32 |= 0x1000000; /* bit26 */
+ htiu_write_index(nb_dev, 0x6, reg32);
}
static void pcie_init(struct device *dev)
To view, visit change 32528. To unsubscribe, or for help writing mail filters, visit settings.