gpiolib: acpi: Use con_id in acpi_dev_gpio_irq_get_by()
Subsystems (6)
cover gpiolib: acpi: Use con_id in acpi_dev_gpio_irq_get_by()
Use con_id instead of property in the acpi_dev_gpio_irq_get_by(). It will be aligned with other GPIO library functions.
Assumed to go via my GPIO ACPI library tree follwoed by GPIO subsystem.
Andy Shevchenko (4):
gpiolib: acpi: Extract __acpi_find_gpio() helper
gpiolib: acpi: Simplify error handling in __acpi_find_gpio()
gpiolib: acpi: Move acpi_can_fallback_to_crs() out of
__acpi_find_gpio()
gpiolib: acpi: Pass con_id instead of property into
acpi_dev_gpio_irq_get_by()drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpiolib-acpi.c | 52 +++++++++++-------- .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- include/linux/acpi.h | 8 +-- 5 files changed, 37 insertions(+), 29 deletions(-)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH 1/4 gpiolib: acpi: Extract __acpi_find_gpio() helper
We want to reuse it later on in the code. In particular, it helps to clean up the users of acpi_dev_gpio_irq_wake_get_by().
--- drivers/gpio/gpiolib-acpi.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/gpio/gpiolib-acpi.c +23 -9
@@ -945,14 +945,11 @@ static bool acpi_can_fallback_to_crs(struct acpi_device *adev,return con_id ==NULL ; } -struct gpio_desc *acpi_find_gpio (struct fwnode_handle *fwnode, -const char *con_id, -unsigned int idx, -enum gpiod_flags *dflags, -unsigned long *lookupflags) +static struct gpio_desc * +__acpi_find_gpio (struct fwnode_handle *fwnode,const char *con_id,unsigned int idx, +struct acpi_gpio_info *info) {struct acpi_device *adev =to_acpi_device_node (fwnode); -struct acpi_gpio_info info;struct gpio_desc *desc;char propname[32 ];int i;
@@ -969,10 +966,10 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,if (adev) desc =acpi_get_gpiod_by_index (adev, - propname, idx, &info); + propname, idx, info);else desc =acpi_get_gpiod_from_data (fwnode, - propname, idx, &info); + propname, idx, info);if (PTR_ERR (desc) == -EPROBE_DEFER )return ERR_CAST (desc);
@@ -985,11 +982,28 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,if (!adev || !acpi_can_fallback_to_crs (adev, con_id))return ERR_PTR (-ENOENT ); - desc =acpi_get_gpiod_by_index (adev,NULL , idx, &info); + desc =acpi_get_gpiod_by_index (adev,NULL , idx, info);if (IS_ERR (desc))return desc; } +return desc; +} + +struct gpio_desc *acpi_find_gpio (struct fwnode_handle *fwnode, +const char *con_id, +unsigned int idx, +enum gpiod_flags *dflags, +unsigned long *lookupflags) +{ +struct acpi_device *adev =to_acpi_device_node (fwnode); +struct acpi_gpio_info info; +struct gpio_desc *desc; + + desc =__acpi_find_gpio (fwnode, con_id, idx, &info); +if (IS_ERR (desc)) +return desc; +if (info.gpioint && (*dflags ==GPIOD_OUT_LOW || *dflags ==GPIOD_OUT_HIGH )) {dev_dbg (&adev->dev,"refusing GpioInt() entry when doing GPIOD_OUT_* lookup\n" );
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH 2/4 gpiolib: acpi: Simplify error handling in __acpi_find_gpio()
In reply to Andy ShevchenkoNow that we don't perform anything on the GPIO descriptor, we may simplify the error path in newly introduced helper. Do it so.
--- drivers/gpio/gpiolib-acpi.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/gpio/gpiolib-acpi.c +5 -11
@@ -974,20 +974,14 @@ __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned intreturn ERR_CAST (desc);if (!IS_ERR (desc)) -break ; - } - -/* Then from plain _CRS GPIOs */ -if (IS_ERR (desc)) { -if (!adev || !acpi_can_fallback_to_crs (adev, con_id)) -return ERR_PTR (-ENOENT ); - - desc =acpi_get_gpiod_by_index (adev,NULL , idx, info); -if (IS_ERR (desc))return desc; } -return desc; +/* Then from plain _CRS GPIOs */ +if (!adev || !acpi_can_fallback_to_crs (adev, con_id)) +return ERR_PTR (-ENOENT ); + +return acpi_get_gpiod_by_index (adev,NULL , idx, info); } struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH 3/4 gpiolib: acpi: Move acpi_can_fallback_to_crs() out of __acpi_find_gpio()
In reply to Andy ShevchenkoNew coming user may need to check for _CRS fallback slightly differently. Move the current check out of the helper function to allow that user to use it.
--- drivers/gpio/gpiolib-acpi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpio/gpiolib-acpi.c +4 -3
@@ -947,7 +947,7 @@ static bool acpi_can_fallback_to_crs(struct acpi_device *adev,static struct gpio_desc *__acpi_find_gpio (struct fwnode_handle *fwnode,const char *con_id,unsigned int idx, -struct acpi_gpio_info *info) +bool can_fallback,struct acpi_gpio_info *info) {struct acpi_device *adev =to_acpi_device_node (fwnode);struct gpio_desc *desc;
@@ -978,7 +978,7 @@ __acpi_find_gpio(struct fwnode_handle *fwnode, const char *con_id, unsigned int }/* Then from plain _CRS GPIOs */ -if (!adev || !acpi_can_fallback_to_crs (adev, con_id)) +if (!adev || !can_fallback)return ERR_PTR (-ENOENT );return acpi_get_gpiod_by_index (adev,NULL , idx, info);
@@ -991,10 +991,11 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode, unsigned long *lookupflags) {struct acpi_device *adev =to_acpi_device_node (fwnode); +bool can_fallback =acpi_can_fallback_to_crs (adev, con_id);struct acpi_gpio_info info;struct gpio_desc *desc; - desc =__acpi_find_gpio (fwnode, con_id, idx, &info); + desc =__acpi_find_gpio (fwnode, con_id, idx, can_fallback, &info);if (IS_ERR (desc))return desc;
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
PATCH 4/4 gpiolib: acpi: Pass con_id instead of property into acpi_dev_gpio_irq_get_by()
In reply to Andy ShevchenkoPass the con_id instead of property so that callers won't repeat the GPIO suffixes to try.
--- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpiolib-acpi.c | 11 +++++------ .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- include/linux/acpi.h | 8 ++++---- 5 files changed, 12 insertions(+), 13 deletions(-)
drivers/gpio/gpio-pca953x.c +1 -1
@@ -144,7 +144,7 @@ static int pca953x_acpi_get_irq(struct device *dev)if (ret)dev_warn (dev,"can't add GPIO ACPI mapping\n" ); - ret =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (dev),"irq-gpios" ,0 ); + ret =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (dev),"irq" ,0 );if (ret <0 )return ret;
drivers/gpio/gpiolib-acpi.c +5 -6
@@ -1013,7 +1013,7 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,/** * acpi_dev_gpio_irq_wake_get_by() - Find GpioInt and translate it to Linux IRQ number * @adev: pointer to a ACPI device to get IRQ from -* @name: optional name of GpioInt resource +* @con_id: optional name of GpioInt resource * @index: index of GpioInt resource (starting from %0) * @wake_capable: Set to true if the IRQ is wake capable *
@@ -1024,15 +1024,15 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,* The function is idempotent, though each time it runs it will configure GPIO * pin direction according to the flags in GpioInt resource. * -* The function takes optional @name parameter. If the resource has a property -* name, then only those will be taken into account. +* The function takes optional @con_id parameter. If the resource has +* a @con_id in a property, then only those will be taken into account. * * The GPIO is considered wake capable if the GpioInt resource specifies * SharedAndWake or ExclusiveAndWake. * * Return: Linux IRQ number (> %0) on success, negative errno on failure. */ -int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *name,int index, +int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *con_id,int index,bool *wake_capable) {int idx, i;
@@ -1043,9 +1043,8 @@ int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *name, instruct acpi_gpio_info info;struct gpio_desc *desc; - desc =acpi_get_gpiod_by_index (adev, name, i, &info); -/* Ignore -EPROBE_DEFER, it only matters if idx matches */ + desc =__acpi_find_gpio (acpi_fwnode_handle (adev), con_id, i, true, &info);if (IS_ERR (desc) &&PTR_ERR (desc) != -EPROBE_DEFER )return PTR_ERR (desc);
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +1 -1
@@ -436,7 +436,7 @@ static int mlxbf_gige_probe(struct platform_device *pdev) priv->rx_irq =platform_get_irq (pdev,MLXBF_GIGE_RECEIVE_PKT_INTR_IDX ); priv->llu_plu_irq =platform_get_irq (pdev,MLXBF_GIGE_LLU_PLU_INTR_IDX ); - phy_irq =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (&pdev->dev),"phy-gpios" ,0 ); + phy_irq =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (&pdev->dev),"phy" ,0 );if (phy_irq <0 ) {dev_err (&pdev->dev,"Error getting PHY irq. Use polling instead" ); phy_irq =PHY_POLL ;
drivers/pinctrl/pinctrl-cy8c95x0.c +1 -1
@@ -95,7 +95,7 @@ static int cy8c95x0_acpi_get_irq(struct device *dev)if (ret)dev_warn (dev,"can't add GPIO ACPI mapping\n" ); - ret =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (dev),"irq-gpios" ,0 ); + ret =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (dev),"irq" ,0 );if (ret <0 )return ret;
include/linux/acpi.h +4 -4
@@ -1233,7 +1233,7 @@ bool acpi_gpio_get_irq_resource(struct acpi_resource *ares, struct acpi_resource_gpio **agpio);bool acpi_gpio_get_io_resource (struct acpi_resource *ares,struct acpi_resource_gpio **agpio); -int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *name,int index, +int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *con_id,int index,bool *wake_capable);#else static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares,
@@ -1246,7 +1246,7 @@ static inline bool acpi_gpio_get_io_resource(struct acpi_resource *ares, {return false; } -static inline int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *name, +static inline int acpi_dev_gpio_irq_wake_get_by (struct acpi_device *adev,const char *con_id,int index,bool *wake_capable) {return -ENXIO ;
@@ -1259,10 +1259,10 @@ static inline int acpi_dev_gpio_irq_wake_get(struct acpi_device *adev, int indexreturn acpi_dev_gpio_irq_wake_get_by (adev,NULL , index, wake_capable); } -static inline int acpi_dev_gpio_irq_get_by (struct acpi_device *adev,const char *name, +static inline int acpi_dev_gpio_irq_get_by (struct acpi_device *adev,const char *con_id,int index) { -return acpi_dev_gpio_irq_wake_get_by (adev, name, index,NULL ); +return acpi_dev_gpio_irq_wake_get_by (adev, con_id, index,NULL ); }static inline int acpi_dev_gpio_irq_get (struct acpi_device *adev,int index)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 9 lines · Andy Shevchenko
Use
con_idinstead of property in theacpi_dev_gpio_irq_get_by(). It will be aligned with other GPIO library functions.Assumed to go via my GPIO ACPI library tree follwoed by GPIO subsystem.
Andy Shevchenko (4):
gpiolib: acpi: Extract__acpi_find_gpio()helper
gpiolib: acpi: Simplify error handling in__acpi_find_gpio()
gpiolib: acpi: Moveacpi_can_fallback_to_crs()out of
Quoted 6 lines
__acpi_find_gpio() gpiolib: acpi: Pass con_id instead of property into acpi_dev_gpio_irq_get_by()drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpiolib-acpi.c | 52 +++++++++++--------
For the gpiolib-acpi.c parts,
Quoted 14 lines · Mika Westerberg
Quoted 13 lines · Andy Shevchenko
Use
con_idinstead of property in theacpi_dev_gpio_irq_get_by(). It will be aligned with other GPIO library functions.Assumed to go via my GPIO ACPI library tree follwoed by GPIO subsystem.
Andy Shevchenko (4):
gpiolib: acpi: Extract__acpi_find_gpio()helper
gpiolib: acpi: Simplify error handling in__acpi_find_gpio()
gpiolib: acpi: Moveacpi_can_fallback_to_crs()out of__acpi_find_gpio() gpiolib: acpi: Pass con_id instead of property into acpi_dev_gpio_irq_get_by()
Quoted 6 lines
Quoted 2 lines
drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpio/gpiolib-acpi.c | 52 +++++++++++--------For the
gpiolib-acpi.cparts,Acked-by Mika Westerberg <[email protected]>
Pushed to my review and testing queue, thanks!
Note, I'll will wait for Acks for Mellanox and ACPI code for a while, the series will appear in Linux Next for the testing purposes, but if anybody objects, please let me know.
Signature · 2 lines
With Best Regards, Andy Shevchenko