From b6d2a7286a25943c8a225833c7b50ec0d033f351 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 23 May 2017 11:53:47 -0700 Subject: [PATCH] UPSTREAM: soc/intel/skylake: Implement GPIO ACPI AML generating functions Implement GPIO ACPI AML generating functions that can be called by coreboot drivers to generate GPIO manipulation code in AML. Following API functions are implemented: 1. acpigen_soc_read_rx_gpio 2. acpigen_soc_get_tx_gpio 3. acpigen_soc_set_tx_gpio 4. acpigen_soc_clear_tx_gpio In addition to the API functions above, helper functions are added to gpio.asl to set/clear/get Tx value of GPIO. BUG=b:62028489 Change-Id: Ie79dcb9c4b57bfe435d173310025577a947509ac Signed-off-by: Patrick Georgi Original-Commit-Id: a6f0b2754b0eea323db60d95fc59e1f08bc060e4 Original-Change-Id: I77e5d0decd8929a922d06b02312378f092551667 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://review.coreboot.org/19828 Original-Reviewed-by: Duncan Laurie Original-Reviewed-by: Aaron Durbin Original-Tested-by: build bot (Jenkins) Reviewed-on: https://chromium-review.googlesource.com/515866 Commit-Ready: Shelley Chen Tested-by: Patrick Georgi Tested-by: Shelley Chen Reviewed-by: Patrick Georgi --- src/soc/intel/skylake/acpi.c | 37 +++++++++++++++++++++++ src/soc/intel/skylake/acpi/gpio.asl | 46 ++++++++++++++++++++++++++++- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 64438bdd80..77fbb48570 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -695,3 +695,40 @@ const char *soc_acpi_name(struct device *dev) return NULL; } + +static int acpigen_soc_gpio_op(const char *op, unsigned int gpio_num) +{ + /* op (gpio_num) */ + acpigen_emit_namestring(op); + acpigen_write_integer(gpio_num); + return 0; +} + +static int acpigen_soc_get_gpio_state(const char *op, unsigned int gpio_num) +{ + /* Store (op (gpio_num), Local0) */ + acpigen_write_store(); + acpigen_soc_gpio_op(op, gpio_num); + acpigen_emit_byte(LOCAL0_OP); + return 0; +} + +int acpigen_soc_read_rx_gpio(unsigned int gpio_num) +{ + return acpigen_soc_get_gpio_state("\\_SB.PCI0.GRXS", gpio_num); +} + +int acpigen_soc_get_tx_gpio(unsigned int gpio_num) +{ + return acpigen_soc_get_gpio_state("\\_SB.PCI0.GTXS", gpio_num); +} + +int acpigen_soc_set_tx_gpio(unsigned int gpio_num) +{ + return acpigen_soc_gpio_op("\\_SB.PCI0.STXS", gpio_num); +} + +int acpigen_soc_clear_tx_gpio(unsigned int gpio_num) +{ + return acpigen_soc_gpio_op("\\_SB.PCI0.CTXS", gpio_num); +} diff --git a/src/soc/intel/skylake/acpi/gpio.asl b/src/soc/intel/skylake/acpi/gpio.asl index 0c5a793dc3..fb220959d5 100644 --- a/src/soc/intel/skylake/acpi/gpio.asl +++ b/src/soc/intel/skylake/acpi/gpio.asl @@ -120,7 +120,7 @@ Method (GADD, 1, NotSerialized) } /* - * Get GPIO Value + * Get GPIO Rx Value * Arg0 - GPIO Number */ Method (GRXS, 1, Serialized) @@ -134,3 +134,47 @@ Method (GRXS, 1, Serialized) Return (Local0) } + +/* + * Get GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (GTXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + And (GPIOTXSTATE_MASK, ShiftRight (VAL0, GPIOTXSTATE_SHIFT), Local0) + + Return (Local0) +} + +/* + * Set GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (STXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + Or (GPIOTXSTATE_MASK, VAL0, VAL0) +} + +/* + * Clear GPIO Tx Value + * Arg0 - GPIO Number + */ +Method (CTXS, 1, Serialized) +{ + OperationRegion (PREG, SystemMemory, GADD (Arg0), 4) + Field (PREG, AnyAcc, NoLock, Preserve) + { + VAL0, 32 + } + And (Not (GPIOTXSTATE_MASK), VAL0, VAL0) +}