2 files changed, 10 insertions, 8 deletions
diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h
index dee45f227b..037517c88f 100644
--- a/payloads/libpayload/include/endian.h
+++ b/payloads/libpayload/include/endian.h
@@ -86,28 +86,30 @@ static inline uint16_t be16dec(const void *pp)
 {
 	uint8_t const *p = (uint8_t const *)pp;
 
-	return ((p[0] << 8) | p[1]);
+	return (uint16_t)((p[0] << 8) | p[1]);
 }
 
 static inline uint32_t be32dec(const void *pp)
 {
 	uint8_t const *p = (uint8_t const *)pp;
 
-	return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+	return (((uint32_t)p[0] << 24) | (uint32_t)(p[1] << 16) |
+		(uint32_t)(p[2] << 8) | p[3]);
 }
 
 static inline uint16_t le16dec(const void *pp)
 {
 	uint8_t const *p = (uint8_t const *)pp;
 
-	return ((p[1] << 8) | p[0]);
+	return (uint16_t)((p[1] << 8) | p[0]);
 }
 
 static inline uint32_t le32dec(const void *pp)
 {
 	uint8_t const *p = (uint8_t const *)pp;
 
-	return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
+	return ((uint32_t)(p[3] << 24) | (uint32_t)(p[2] << 16) |
+		(uint32_t)(p[1] << 8) | p[0]);
 }
 
 static inline void bebitenc(void *pp, uint32_t u, uint8_t b)
diff --git a/payloads/libpayload/include/pci.h b/payloads/libpayload/include/pci.h
index ff07d5c94d..a1bac4ab60 100644
--- a/payloads/libpayload/include/pci.h
+++ b/payloads/libpayload/include/pci.h
@@ -91,11 +91,11 @@ typedef u32 pcidev_t;
 #define HEADER_TYPE_CARDBUS       2
 #define HEADER_TYPE_MULTIFUNCTION 0x80
 
-#define PCI_ADDR(_bus, _dev, _fn, _reg) \
-(0x80000000 | (_bus << 16) | (_dev << 11) | (_fn << 8) | (_reg & ~3))
+#define PCI_DEV(_bus, _dev, _fn) (0x80000000 | \
+(uint32_t)(_bus << 16) | (uint32_t)(_dev << 11) | (uint32_t)(_fn << 8))
 
-#define PCI_DEV(_bus, _dev, _fn) \
-(0x80000000 | (_bus << 16) | (_dev << 11) | (_fn << 8))
+#define PCI_ADDR(_bus, _dev, _fn, _reg) \
+(PCI_DEV(_bus, _dev, _fn) | (uint8_t)(_reg & ~3))
 
 #define PCI_BUS(_d)  ((_d >> 16) & 0xff)
 #define PCI_SLOT(_d) ((_d >> 11) & 0x1f)