gpio: extend flags size to accommodate GPIO_ flags

Widen the flags field from 16-bit to 32-bit to fit all of the
current GPIO_flags. Also reorder fields within struct to allow arm
compiler to use 16-bit instructions instead of 32-bit instructions when
accessing fields (which is important for kevin board, otherwise
it runs out of space)

Lastly, re-tool macros to all reordering of gpio_alt_func struct fields.

BRANCH=none
BUG=b:109884927
TEST=builds on all boards

Change-Id: I20b136c94a607c19031a88bddd255cc34cc57bbd
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1096018
Reviewed-by: Furquan Shaikh <furquan@chromium.org>

11 files changed, 32 insertions, 40 deletions

diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h
index 0e6e319007..a79ecf2ee0 100644
--- a/chip/g/config_chip.h
+++ b/chip/g/config_chip.h
@@ -56,7 +56,7 @@
 
 /* Magic for gpio.inc */
 #define GPIO_PIN(port, index) (port), (1 << (index))
-#define GPIO_PIN_MASK(port, mask) (port), (mask)
+#define GPIO_PIN_MASK(p, m) .port = (p), .mask = (m)
 #define DUMMY_GPIO_BANK 0
 
 #define PCLK_FREQ  (24 * 1000 * 1000)
diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h
index dceb685ed5..8cb8bba79c 100644
--- a/chip/host/config_chip.h
+++ b/chip/host/config_chip.h
@@ -45,7 +45,7 @@ extern char __host_flash[CONFIG_FLASH_SIZE];
 #undef CONFIG_COMMON_TIMER
 
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 #define I2C_PORT_COUNT 1
 
diff --git a/chip/ish/config_chip.h b/chip/ish/config_chip.h
index 422e49936f..224f63b627 100644
--- a/chip/ish/config_chip.h
+++ b/chip/ish/config_chip.h
@@ -74,6 +74,6 @@
 
 /* GPIO - to be implemented */
 #define GPIO_PIN(index) (index)
-#define GPIO_PIN_MASK(pin, mask) ((pin), (mask))
+#define GPIO_PIN_MASK(p, m) .port = (p), .mask = (m)
 
 #endif  /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/it83xx/config_chip.h b/chip/it83xx/config_chip.h
index c56a974ba1..5e7a501a8f 100644
--- a/chip/it83xx/config_chip.h
+++ b/chip/it83xx/config_chip.h
@@ -109,6 +109,6 @@
 #define CONFIG_CHIP_PRE_INIT
 
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 #endif  /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/lm4/config_chip.h b/chip/lm4/config_chip.h
index 9d3c53ded2..4db95cc42d 100644
--- a/chip/lm4/config_chip.h
+++ b/chip/lm4/config_chip.h
@@ -102,6 +102,6 @@
 #define CONFIG_CHIP_PRE_INIT
 
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 #endif  /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/mchp/config_chip.h b/chip/mchp/config_chip.h
index 4272f47d9b..183440a8c4 100644
--- a/chip/mchp/config_chip.h
+++ b/chip/mchp/config_chip.h
@@ -183,8 +183,7 @@
 #define GPIO_BANK_MASK(index) (1ul << ((index) & 0x1F))
 
 #define GPIO_PIN(index) GPIO_BANK(index), GPIO_BANK_MASK(index)
-
-#define GPIO_PIN_MASK(bank, mask) (bank), (mask)
+#define GPIO_PIN_MASK(p, m) .port = (p), .mask = (m)
 
 #ifndef __ASSEMBLER__
 
diff --git a/chip/mec1322/config_chip.h b/chip/mec1322/config_chip.h
index 206e444038..609891a688 100644
--- a/chip/mec1322/config_chip.h
+++ b/chip/mec1322/config_chip.h
@@ -108,6 +108,6 @@
 #define CONFIG_SWITCH
 
 #define GPIO_PIN(index) (index / 10), (1 << (index % 10))
-#define GPIO_PIN_MASK(pin, mask) (pin), (mask)
+#define GPIO_PIN_MASK(p, m) .port = (p), .mask = (m)
 
 #endif  /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/npcx/config_chip.h b/chip/npcx/config_chip.h
index 1311edca4f..9dac257850 100644
--- a/chip/npcx/config_chip.h
+++ b/chip/npcx/config_chip.h
@@ -71,6 +71,6 @@
 #define CONFIG_CHIP_PRE_INIT
 
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 #endif  /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/chip/nrf51/config_chip.h b/chip/nrf51/config_chip.h
index f14f292f77..374101d1bb 100644
--- a/chip/nrf51/config_chip.h
+++ b/chip/nrf51/config_chip.h
@@ -58,7 +58,7 @@
 #define CONFIG_UART_TX_BUF_SIZE 1024
 
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 #endif /* __CROS_EC_CONFIG_CHIP_H */
 
diff --git a/chip/stm32/config_chip.h b/chip/stm32/config_chip.h
index 4a2f686e6b..5fc0f47681 100644
--- a/chip/stm32/config_chip.h
+++ b/chip/stm32/config_chip.h
@@ -138,7 +138,7 @@
 
 #define GPIO_NAME_BY_PIN(port, index) #port#index
 #define GPIO_PIN(port, index) GPIO_##port, (1 << index)
-#define GPIO_PIN_MASK(port, mask) GPIO_##port, (mask)
+#define GPIO_PIN_MASK(p, m) .port = GPIO_##p, .mask = (m)
 
 /* Prescaler values for PLL. Currently used only by STM32L476. */
 #define STM32_PLLM	0
diff --git a/common/gpio.c b/common/gpio.c
index 0fa949dedb..60d4973d61 100644
--- a/common/gpio.c
+++ b/common/gpio.c
@@ -13,31 +13,32 @@
 
 /* GPIO alternate function structure */
 struct gpio_alt_func {
+	/* Module ID (as uint8_t, since enum would be 32-bit) */
+	uint8_t module_id;
+
+	/* Alternate function number */
+	uint8_t func;
+
 	/* Port base address */
 	uint32_t port;
 
 	/* Bitmask on that port (multiple bits allowed) */
 	uint32_t mask;
 
-	/* Alternate function number */
-	uint8_t func;
-
-	/* Module ID (as uint8_t, since enum would be 32-bit) */
-	uint8_t module_id;
-
 	/* Flags (GPIO_*; see above). */
-	uint16_t flags;
+	uint32_t flags;
 };
 
 /*
  * Construct the gpio_alt_funcs array.  This array is used by gpio_config_module
  * to enable and disable GPIO alternate functions on a module by module basis.
  */
-#define ALTERNATE(pinmask, function, module, flags)	\
-	{GPIO_##pinmask, function, module, flags},
+#define ALTERNATE(pinmask, function, module, flagz)                            \
+	{GPIO_##pinmask, .func = (function), .module_id = (module),            \
+	 .flags = (flagz)},
 
 static const struct gpio_alt_func gpio_alt_funcs[] = {
-	#include "gpio.wrap"
+#include "gpio.wrap"
 };
 
 /*
@@ -47,9 +48,7 @@ static const struct gpio_alt_func gpio_alt_funcs[] = {
  */
 #define GPIO_CONFIG_ALL_PORTS 0xFFFFFFFF
 
-static int gpio_config_pins(enum module_id id,
-			    uint32_t port,
-			    uint32_t pin_mask,
+static int gpio_config_pins(enum module_id id, uint32_t port, uint32_t pin_mask,
 			    int enable)
 {
 	const struct gpio_alt_func *af;
@@ -57,10 +56,9 @@ static int gpio_config_pins(enum module_id id,
 
 	/* Find pins and set to alternate functions */
 	for (af = gpio_alt_funcs;
-	     af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs);
-	     af++) {
+	     af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs); af++) {
 		if (af->module_id != id)
-			continue;  /* Pins for some other module */
+			continue; /* Pins for some other module */
 
 		/* Check to see if the requested port matches. */
 		if ((port != GPIO_CONFIG_ALL_PORTS) && (port != af->port))
@@ -73,13 +71,11 @@ static int gpio_config_pins(enum module_id id,
 		if ((af->mask & pin_mask) == pin_mask) {
 			if (!(af->flags & GPIO_DEFAULT))
 				gpio_set_flags_by_mask(
-					af->port,
-					(af->mask & pin_mask),
+					af->port, (af->mask & pin_mask),
 					enable ? af->flags : GPIO_INPUT);
-			gpio_set_alternate_function(
-				af->port,
-				(af->mask & pin_mask),
-				enable ? af->func : -1);
+			gpio_set_alternate_function(af->port,
+						    (af->mask & pin_mask),
+						    enable ? af->func : -1);
 			rv = EC_SUCCESS;
 			/* We're done here if we were just setting one port. */
 			if (port != GPIO_CONFIG_ALL_PORTS)
@@ -101,10 +97,8 @@ int gpio_config_module(enum module_id id, int enable)
 
 int gpio_config_pin(enum module_id id, enum gpio_signal signal, int enable)
 {
-	return gpio_config_pins(id,
-				gpio_list[signal].port,
-				gpio_list[signal].mask,
-				enable);
+	return gpio_config_pins(id, gpio_list[signal].port,
+				gpio_list[signal].mask, enable);
 }
 
 void gpio_set_flags(enum gpio_signal signal, int flags)
@@ -189,10 +183,9 @@ int gpio_power_down_module(enum module_id id)
 
 	/* Find pins and power down */
 	for (af = gpio_alt_funcs;
-	     af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs);
-	     af++) {
+	     af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs); af++) {
 		if (af->module_id != id)
-			continue;  /* Pins for some other module */
+			continue; /* Pins for some other module */
 
 		gpio_set_flags_by_mask(af->port, af->mask, GPIO_POWER_DOWN);
 		rv = EC_SUCCESS;