From d45b113fb589b2b9903e05c215a7be015209f1f1 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Thu, 23 Dec 2021 12:32:04 +0100 Subject: [PATCH] soc/intel/{skl,cnl}: Guard USB macro parameters Add parentheses around the parameter of the `USB_PORT_WAKE_ENABLE` macro to prevent unintentional operator precedence problems. Change-Id: I61fbacc129cbfb42ade7e64ee40cd07c98d87683 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/60324 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: Felix Singer --- src/soc/intel/cannonlake/include/soc/usb.h | 2 +- src/soc/intel/skylake/include/soc/usb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/cannonlake/include/soc/usb.h b/src/soc/intel/cannonlake/include/soc/usb.h index 66b3f8b07c..20b3149dd7 100644 --- a/src/soc/intel/cannonlake/include/soc/usb.h +++ b/src/soc/intel/cannonlake/include/soc/usb.h @@ -191,6 +191,6 @@ struct usb3_port_config { * to Port 1, Bit n corresponds to Port (n+1). This bitmap is later used to * decide what ports need to set PORTSCN/PORTSCXUSB3 register bits. */ -#define USB_PORT_WAKE_ENABLE(x) (1 << (x - 1)) +#define USB_PORT_WAKE_ENABLE(x) (1 << ((x) - 1)) #endif diff --git a/src/soc/intel/skylake/include/soc/usb.h b/src/soc/intel/skylake/include/soc/usb.h index d87c859efa..79126037c5 100644 --- a/src/soc/intel/skylake/include/soc/usb.h +++ b/src/soc/intel/skylake/include/soc/usb.h @@ -185,6 +185,6 @@ struct usb3_port_config { * to Port 1, Bit n corresponds to Port (n+1). This bitmap is later used to * decide what ports need to set PORTSCN/PORTSCXUSB3 register bits. */ -#define USB_PORT_WAKE_ENABLE(x) (1 << (x - 1)) +#define USB_PORT_WAKE_ENABLE(x) (1 << ((x) - 1)) #endif