[coreboot-gerrit] Change in coreboot[master]: southbridge/amd/pi/hudson: Get rid of void pointer math

Richard Spiegel (Code Review) gerrit at coreboot.org
Fri Nov 2 16:25:13 CET 2018


Richard Spiegel has uploaded this change for review. ( https://review.coreboot.org/29438


Change subject: southbridge/amd/pi/hudson: Get rid of void pointer math
......................................................................

southbridge/amd/pi/hudson: Get rid of void pointer math

Pointer math with void pointers is illegal in many compilers, though it
works with GCC because it assumes size of void to be 1. Change the pointers
or add parenthesis to force a proper order that will not cause compile
errors if compiled with a different compiler, and more importantly, don't
have unsuspected side effects.

BUG=b:118484178
TEST=Build AMD Bettong.

Change-Id: I4167c7eeb9339937b064e81e615ceb65f4689082
Signed-off-by: Richard Spiegel <richard.spiegel at silverbackltd.com>
---
M src/southbridge/amd/pi/hudson/early_setup.c
1 file changed, 7 insertions(+), 7 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/29438/1

diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 47d20af..eabdfb9 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -292,19 +292,19 @@
 void hudson_set_spi100(u16 norm, u16 fast, u16 alt, u16 tpm)
 {
 	uintptr_t base = hudson_spibase();
-	write16((void *)base + SPI100_SPEED_CONFIG,
+	write16((void *)(base + SPI100_SPEED_CONFIG),
 				(norm << SPI_NORM_SPEED_NEW_SH) |
 				(fast << SPI_FAST_SPEED_NEW_SH) |
 				(alt << SPI_ALT_SPEED_NEW_SH) |
 				(tpm << SPI_TPM_SPEED_NEW_SH));
-	write16((void *)base + SPI100_ENABLE, SPI_USE_SPI100);
+	write16((void *)(base + SPI100_ENABLE), SPI_USE_SPI100);
 }
 
 void hudson_disable_4dw_burst(void)
 {
 	uintptr_t base = hudson_spibase();
-	write16((void *)base + SPI100_HOST_PREF_CONFIG,
-			read16((void *)base + SPI100_HOST_PREF_CONFIG)
+	write16((void *)(base + SPI100_HOST_PREF_CONFIG),
+			read16((void *)(base + SPI100_HOST_PREF_CONFIG))
 					& ~SPI_RD4DW_EN_HOST);
 }
 
@@ -312,7 +312,7 @@
 void hudson_set_readspeed(u16 norm, u16 fast)
 {
 	uintptr_t base = hudson_spibase();
-	write16((void *)base + SPI_CNTRL1, (read16((void *)base + SPI_CNTRL1)
+	write16((void *)(base + SPI_CNTRL1), (read16((void *)base + SPI_CNTRL1)
 					& ~SPI_CNTRL1_SPEED_MASK)
 					| (norm << SPI_NORM_SPEED_SH)
 					| (fast << SPI_FAST_SPEED_SH));
@@ -321,8 +321,8 @@
 void hudson_read_mode(u32 mode)
 {
 	uintptr_t base = hudson_spibase();
-	write32((void *)base + SPI_CNTRL0,
-			(read32((void *)base + SPI_CNTRL0)
+	write32((void *)(base + SPI_CNTRL0),
+			(read32((void *)(base + SPI_CNTRL0))
 					& ~SPI_READ_MODE_MASK) | mode);
 }
 

-- 
To view, visit https://review.coreboot.org/29438
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4167c7eeb9339937b064e81e615ceb65f4689082
Gerrit-Change-Number: 29438
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Spiegel <richard.spiegel at silverbackltd.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181102/7d8b7c11/attachment.html>


More information about the coreboot-gerrit mailing list