Linux-ACPI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources
@ 2019-05-28 14:28 Charles Keepax
  2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
                   ` (5 more replies)
  0 siblings, 6 replies; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:28 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

Remove the static from i2c_dev_irq_from _resources so that other parts
of the core code can use this helper function.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

No changes since v2.

Thanks,
Charles

 drivers/i2c/i2c-core-base.c | 4 ++--
 drivers/i2c/i2c-core.h      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index d389d4fb0623a..84bf11b25a120 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -687,8 +687,8 @@ static void i2c_dev_set_name(struct i2c_adapter *adap,
 		     i2c_encode_flags_to_addr(client));
 }
 
-static int i2c_dev_irq_from_resources(const struct resource *resources,
-				      unsigned int num_resources)
+int i2c_dev_irq_from_resources(const struct resource *resources,
+			       unsigned int num_resources)
 {
 	struct irq_data *irqd;
 	int i;
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index c88cfef813431..8f3a08dc73a25 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -28,6 +28,8 @@ extern struct list_head	__i2c_board_list;
 extern int		__i2c_first_dynamic_bus_num;
 
 int i2c_check_7bit_addr_validity_strict(unsigned short addr);
+int i2c_dev_irq_from_resources(const struct resource *resources,
+			       unsigned int num_resources);
 
 /*
  * We only allow atomic transfers for very late communication, e.g. to send
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
@ 2019-05-28 14:28 ` Charles Keepax
  2019-05-29  7:35   ` Mika Westerberg
  2019-06-04 17:00   ` Andy Shevchenko
  2019-05-28 14:28 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
                   ` (4 subsequent siblings)
  5 siblings, 2 replies; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:28 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

Use the available IRQ helper functions, most of the functions have
additional helpful side affects like configuring the trigger type of the
IRQ.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

Changes since v2:
 - Don't consider zero to be a valid IRQ number

Thanks,
Charles

 drivers/i2c/i2c-core-acpi.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 2728006920888..bc82b44f85860 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -137,14 +137,25 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
 	return 0;
 }
 
+static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
+{
+	int *irq = data;
+	struct resource r;
+
+	if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r))
+		*irq = i2c_dev_irq_from_resources(&r, 1);
+
+	return 1; /* No need to add resource to the list */
+}
+
 static int i2c_acpi_get_info(struct acpi_device *adev,
 			     struct i2c_board_info *info,
 			     struct i2c_adapter *adapter,
 			     acpi_handle *adapter_handle)
 {
 	struct list_head resource_list;
-	struct resource_entry *entry;
 	struct i2c_acpi_lookup lookup;
+	int irq = -ENOENT;
 	int ret;
 
 	memset(&lookup, 0, sizeof(lookup));
@@ -176,16 +187,13 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
 
 	/* Then fill IRQ number if any */
 	INIT_LIST_HEAD(&resource_list);
-	ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
+	ret = acpi_dev_get_resources(adev, &resource_list,
+				     i2c_acpi_add_resource, &irq);
 	if (ret < 0)
 		return -EINVAL;
 
-	resource_list_for_each_entry(entry, &resource_list) {
-		if (resource_type(entry->res) == IORESOURCE_IRQ) {
-			info->irq = entry->res->start;
-			break;
-		}
-	}
+	if (irq > 0)
+		info->irq = irq;
 
 	acpi_dev_free_resource_list(&resource_list);
 
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
  2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
@ 2019-05-28 14:28 ` Charles Keepax
  2019-05-29  7:36   ` Mika Westerberg
  2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:28 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

In preparation for future refactoring factor out the fetch of the IRQ
into its own helper function.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

Changes since v2:
 - Don't consider zero to be a valid IRQ number

Thanks,
Charles

 drivers/i2c/i2c-core-acpi.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index bc82b44f85860..c107f260e252f 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -148,14 +148,30 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
 	return 1; /* No need to add resource to the list */
 }
 
+static int i2c_acpi_get_irq(struct acpi_device *adev)
+{
+	struct list_head resource_list;
+	int irq = -ENOENT;
+	int ret;
+
+	INIT_LIST_HEAD(&resource_list);
+
+	ret = acpi_dev_get_resources(adev, &resource_list,
+				     i2c_acpi_add_resource, &irq);
+	if (ret < 0)
+		return -EINVAL;
+
+	acpi_dev_free_resource_list(&resource_list);
+
+	return irq;
+}
+
 static int i2c_acpi_get_info(struct acpi_device *adev,
 			     struct i2c_board_info *info,
 			     struct i2c_adapter *adapter,
 			     acpi_handle *adapter_handle)
 {
-	struct list_head resource_list;
 	struct i2c_acpi_lookup lookup;
-	int irq = -ENOENT;
 	int ret;
 
 	memset(&lookup, 0, sizeof(lookup));
@@ -186,16 +202,9 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
 		*adapter_handle = lookup.adapter_handle;
 
 	/* Then fill IRQ number if any */
-	INIT_LIST_HEAD(&resource_list);
-	ret = acpi_dev_get_resources(adev, &resource_list,
-				     i2c_acpi_add_resource, &irq);
-	if (ret < 0)
-		return -EINVAL;
-
-	if (irq > 0)
-		info->irq = irq;
-
-	acpi_dev_free_resource_list(&resource_list);
+	ret = i2c_acpi_get_irq(adev);
+	if (ret > 0)
+		info->irq = ret;
 
 	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
 			  sizeof(info->type));
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
  2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
  2019-05-28 14:28 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
@ 2019-05-28 14:28 ` Charles Keepax
  2019-05-29  7:43   ` Mika Westerberg
  2019-06-04 17:04   ` Andy Shevchenko
  2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:28 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

Bring the ACPI path in sync with the device tree path and handle all the
IRQ fetching at probe time. This leaves the only IRQ handling at device
registration time being that which is passed directly through the board
info as either a resource or an actual IRQ number.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

Changes since v2:
 - Add kernel doc for i2c_acpi_get_irq

Thanks,
Charles

 drivers/i2c/i2c-core-acpi.c | 16 ++++++++++------
 drivers/i2c/i2c-core-base.c |  5 ++++-
 drivers/i2c/i2c-core.h      |  7 +++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index c107f260e252f..62a938c17cbd2 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -148,8 +148,17 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
 	return 1; /* No need to add resource to the list */
 }
 
-static int i2c_acpi_get_irq(struct acpi_device *adev)
+/**
+ * i2c_acpi_get_irq - get device IRQ number from ACPI
+ * @client: Pointer to the I2C client device
+ *
+ * Find the IRQ number used by a specific client device.
+ *
+ * Return: The IRQ number or an error code.
+ */
+int i2c_acpi_get_irq(struct i2c_client *client)
 {
+	struct acpi_device *adev = ACPI_COMPANION(&client->adapter->dev);
 	struct list_head resource_list;
 	int irq = -ENOENT;
 	int ret;
@@ -201,11 +210,6 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
 	if (adapter_handle)
 		*adapter_handle = lookup.adapter_handle;
 
-	/* Then fill IRQ number if any */
-	ret = i2c_acpi_get_irq(adev);
-	if (ret > 0)
-		info->irq = ret;
-
 	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
 			  sizeof(info->type));
 
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 84bf11b25a120..b6b009bfe842b 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -335,7 +335,10 @@ static int i2c_device_probe(struct device *dev)
 			if (irq == -EINVAL || irq == -ENODATA)
 				irq = of_irq_get(dev->of_node, 0);
 		} else if (ACPI_COMPANION(dev)) {
-			irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
+			irq = i2c_acpi_get_irq(client);
+
+			if (irq == -ENOENT)
+				irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
 		}
 		if (irq == -EPROBE_DEFER)
 			return irq;
diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
index 8f3a08dc73a25..15c1411f35f07 100644
--- a/drivers/i2c/i2c-core.h
+++ b/drivers/i2c/i2c-core.h
@@ -72,6 +72,8 @@ const struct acpi_device_id *
 i2c_acpi_match_device(const struct acpi_device_id *matches,
 		      struct i2c_client *client);
 void i2c_acpi_register_devices(struct i2c_adapter *adap);
+
+int i2c_acpi_get_irq(struct i2c_client *client);
 #else /* CONFIG_ACPI */
 static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
 static inline const struct acpi_device_id *
@@ -80,6 +82,11 @@ i2c_acpi_match_device(const struct acpi_device_id *matches,
 {
 	return NULL;
 }
+
+static inline int i2c_acpi_get_irq(struct i2c_client *client)
+{
+	return 0;
+}
 #endif /* CONFIG_ACPI */
 extern struct notifier_block i2c_acpi_notifier;
 
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
                   ` (2 preceding siblings ...)
  2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
@ 2019-05-28 14:28 ` Charles Keepax
  2019-05-29  7:43   ` Mika Westerberg
  2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
  2019-05-29  7:34 ` [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Mika Westerberg
  5 siblings, 1 reply; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:28 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

It makes sense to contain all the ACPI IRQ handling in a single helper
function.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

No changes since v2.

Thanks,
Charles

 drivers/i2c/i2c-core-acpi.c | 3 +++
 drivers/i2c/i2c-core-base.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 62a938c17cbd2..42d53fe91c7ed 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -172,6 +172,9 @@ int i2c_acpi_get_irq(struct i2c_client *client)
 
 	acpi_dev_free_resource_list(&resource_list);
 
+	if (irq == -ENOENT)
+		irq = acpi_dev_gpio_irq_get(adev, 0);
+
 	return irq;
 }
 
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index b6b009bfe842b..684ea2665d994 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -336,9 +336,6 @@ static int i2c_device_probe(struct device *dev)
 				irq = of_irq_get(dev->of_node, 0);
 		} else if (ACPI_COMPANION(dev)) {
 			irq = i2c_acpi_get_irq(client);
-
-			if (irq == -ENOENT)
-				irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
 		}
 		if (irq == -EPROBE_DEFER)
 			return irq;
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
                   ` (3 preceding siblings ...)
  2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
@ 2019-05-28 14:29 ` Charles Keepax
  2019-05-29  7:44   ` Mika Westerberg
  2019-05-29  7:34 ` [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Mika Westerberg
  5 siblings, 1 reply; 16+ messages in thread
From: Charles Keepax @ 2019-05-28 14:29 UTC (permalink / raw)
  To: wsa, mika.westerberg
  Cc: jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

Only set init_irq during i2c_device_new and only handle client->irq on
the probe/remove paths.

Suggested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

No changes since v2.

Thanks,
Charles

 drivers/i2c/i2c-core-base.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 684ea2665d994..6d4904cdf58ac 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -322,6 +322,8 @@ static int i2c_device_probe(struct device *dev)
 
 	driver = to_i2c_driver(dev->driver);
 
+	client->irq = client->init_irq;
+
 	if (!client->irq && !driver->disable_i2c_core_irq_mapping) {
 		int irq = -ENOENT;
 
@@ -432,7 +434,7 @@ static int i2c_device_remove(struct device *dev)
 	dev_pm_clear_wake_irq(&client->dev);
 	device_init_wakeup(&client->dev, false);
 
-	client->irq = client->init_irq;
+	client->irq = 0;
 	if (client->flags & I2C_CLIENT_HOST_NOTIFY)
 		pm_runtime_put(&client->adapter->dev);
 
@@ -749,7 +751,6 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf
 	if (!client->init_irq)
 		client->init_irq = i2c_dev_irq_from_resources(info->resources,
 							 info->num_resources);
-	client->irq = client->init_irq;
 
 	strlcpy(client->name, info->type, sizeof(client->name));
 
-- 
2.11.0


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources
  2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
                   ` (4 preceding siblings ...)
  2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
@ 2019-05-29  7:34 ` Mika Westerberg
  5 siblings, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:34 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:55PM +0100, Charles Keepax wrote:
> Remove the static from i2c_dev_irq_from _resources so that other parts
> of the core code can use this helper function.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions
  2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
@ 2019-05-29  7:35   ` Mika Westerberg
  2019-06-04 17:00   ` Andy Shevchenko
  1 sibling, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:35 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:56PM +0100, Charles Keepax wrote:
> Use the available IRQ helper functions, most of the functions have
> additional helpful side affects like configuring the trigger type of the
> IRQ.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI
  2019-05-28 14:28 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
@ 2019-05-29  7:36   ` Mika Westerberg
  0 siblings, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:36 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:57PM +0100, Charles Keepax wrote:
> In preparation for future refactoring factor out the fetch of the IRQ
> into its own helper function.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time
  2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
@ 2019-05-29  7:43   ` Mika Westerberg
  2019-06-04 17:04   ` Andy Shevchenko
  1 sibling, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:43 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:58PM +0100, Charles Keepax wrote:
> Bring the ACPI path in sync with the device tree path and handle all the
> IRQ fetching at probe time. This leaves the only IRQ handling at device
> registration time being that which is passed directly through the board
> info as either a resource or an actual IRQ number.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq
  2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
@ 2019-05-29  7:43   ` Mika Westerberg
  0 siblings, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:43 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:59PM +0100, Charles Keepax wrote:
> It makes sense to contain all the ACPI IRQ handling in a single helper
> function.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq
  2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
@ 2019-05-29  7:44   ` Mika Westerberg
  0 siblings, 0 replies; 16+ messages in thread
From: Mika Westerberg @ 2019-05-29  7:44 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, jarkko.nikula, andriy.shevchenko, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:29:00PM +0100, Charles Keepax wrote:
> Only set init_irq during i2c_device_new and only handle client->irq on
> the probe/remove paths.
> 
> Suggested-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions
  2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
  2019-05-29  7:35   ` Mika Westerberg
@ 2019-06-04 17:00   ` Andy Shevchenko
  2019-06-05  8:26     ` Charles Keepax
  1 sibling, 1 reply; 16+ messages in thread
From: Andy Shevchenko @ 2019-06-04 17:00 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, mika.westerberg, jarkko.nikula, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:56PM +0100, Charles Keepax wrote:
> Use the available IRQ helper functions, most of the functions have
> additional helpful side affects like configuring the trigger type of the
> IRQ.
> 

You do here two things, i.e.
- splitting out helper function
- converting it to use helpers

I would split the patch to do exact these steps separately, e.g.:
- splitting out to a local helper
- replacing open coded stuff with existing helpers


> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> ---
> 
> Changes since v2:
>  - Don't consider zero to be a valid IRQ number
> 
> Thanks,
> Charles
> 
>  drivers/i2c/i2c-core-acpi.c | 24 ++++++++++++++++--------
>  1 file changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
> index 2728006920888..bc82b44f85860 100644
> --- a/drivers/i2c/i2c-core-acpi.c
> +++ b/drivers/i2c/i2c-core-acpi.c
> @@ -137,14 +137,25 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
>  	return 0;
>  }
>  
> +static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
> +{
> +	int *irq = data;
> +	struct resource r;
> +
> +	if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r))
> +		*irq = i2c_dev_irq_from_resources(&r, 1);
> +
> +	return 1; /* No need to add resource to the list */
> +}
> +
>  static int i2c_acpi_get_info(struct acpi_device *adev,
>  			     struct i2c_board_info *info,
>  			     struct i2c_adapter *adapter,
>  			     acpi_handle *adapter_handle)
>  {
>  	struct list_head resource_list;
> -	struct resource_entry *entry;
>  	struct i2c_acpi_lookup lookup;
> +	int irq = -ENOENT;
>  	int ret;
>  
>  	memset(&lookup, 0, sizeof(lookup));
> @@ -176,16 +187,13 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
>  
>  	/* Then fill IRQ number if any */
>  	INIT_LIST_HEAD(&resource_list);
> -	ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
> +	ret = acpi_dev_get_resources(adev, &resource_list,
> +				     i2c_acpi_add_resource, &irq);
>  	if (ret < 0)
>  		return -EINVAL;
>  
> -	resource_list_for_each_entry(entry, &resource_list) {
> -		if (resource_type(entry->res) == IORESOURCE_IRQ) {
> -			info->irq = entry->res->start;
> -			break;
> -		}
> -	}
> +	if (irq > 0)
> +		info->irq = irq;
>  
>  	acpi_dev_free_resource_list(&resource_list);
>  
> -- 
> 2.11.0
> 

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time
  2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
  2019-05-29  7:43   ` Mika Westerberg
@ 2019-06-04 17:04   ` Andy Shevchenko
  2019-06-05  8:22     ` Charles Keepax
  1 sibling, 1 reply; 16+ messages in thread
From: Andy Shevchenko @ 2019-06-04 17:04 UTC (permalink / raw)
  To: Charles Keepax
  Cc: wsa, mika.westerberg, jarkko.nikula, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, May 28, 2019 at 03:28:58PM +0100, Charles Keepax wrote:
> Bring the ACPI path in sync with the device tree path and handle all the
> IRQ fetching at probe time. This leaves the only IRQ handling at device
> registration time being that which is passed directly through the board
> info as either a resource or an actual IRQ number.
> 

It seems my comments weren't addressed by one or another reason.
This one I would rather to split with exporting function as a separate patch.

> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> ---
> 
> Changes since v2:
>  - Add kernel doc for i2c_acpi_get_irq
> 
> Thanks,
> Charles
> 
>  drivers/i2c/i2c-core-acpi.c | 16 ++++++++++------
>  drivers/i2c/i2c-core-base.c |  5 ++++-
>  drivers/i2c/i2c-core.h      |  7 +++++++
>  3 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
> index c107f260e252f..62a938c17cbd2 100644
> --- a/drivers/i2c/i2c-core-acpi.c
> +++ b/drivers/i2c/i2c-core-acpi.c
> @@ -148,8 +148,17 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
>  	return 1; /* No need to add resource to the list */
>  }
>  
> -static int i2c_acpi_get_irq(struct acpi_device *adev)
> +/**
> + * i2c_acpi_get_irq - get device IRQ number from ACPI
> + * @client: Pointer to the I2C client device
> + *
> + * Find the IRQ number used by a specific client device.
> + *
> + * Return: The IRQ number or an error code.
> + */
> +int i2c_acpi_get_irq(struct i2c_client *client)
>  {
> +	struct acpi_device *adev = ACPI_COMPANION(&client->adapter->dev);
>  	struct list_head resource_list;
>  	int irq = -ENOENT;
>  	int ret;
> @@ -201,11 +210,6 @@ static int i2c_acpi_get_info(struct acpi_device *adev,
>  	if (adapter_handle)
>  		*adapter_handle = lookup.adapter_handle;
>  
> -	/* Then fill IRQ number if any */
> -	ret = i2c_acpi_get_irq(adev);
> -	if (ret > 0)
> -		info->irq = ret;
> -
>  	acpi_set_modalias(adev, dev_name(&adev->dev), info->type,
>  			  sizeof(info->type));
>  
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 84bf11b25a120..b6b009bfe842b 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -335,7 +335,10 @@ static int i2c_device_probe(struct device *dev)
>  			if (irq == -EINVAL || irq == -ENODATA)
>  				irq = of_irq_get(dev->of_node, 0);
>  		} else if (ACPI_COMPANION(dev)) {
> -			irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
> +			irq = i2c_acpi_get_irq(client);
> +
> +			if (irq == -ENOENT)
> +				irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0);
>  		}
>  		if (irq == -EPROBE_DEFER)
>  			return irq;
> diff --git a/drivers/i2c/i2c-core.h b/drivers/i2c/i2c-core.h
> index 8f3a08dc73a25..15c1411f35f07 100644
> --- a/drivers/i2c/i2c-core.h
> +++ b/drivers/i2c/i2c-core.h
> @@ -72,6 +72,8 @@ const struct acpi_device_id *
>  i2c_acpi_match_device(const struct acpi_device_id *matches,
>  		      struct i2c_client *client);
>  void i2c_acpi_register_devices(struct i2c_adapter *adap);
> +
> +int i2c_acpi_get_irq(struct i2c_client *client);
>  #else /* CONFIG_ACPI */
>  static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
>  static inline const struct acpi_device_id *
> @@ -80,6 +82,11 @@ i2c_acpi_match_device(const struct acpi_device_id *matches,
>  {
>  	return NULL;
>  }
> +
> +static inline int i2c_acpi_get_irq(struct i2c_client *client)
> +{
> +	return 0;
> +}
>  #endif /* CONFIG_ACPI */
>  extern struct notifier_block i2c_acpi_notifier;
>  
> -- 
> 2.11.0
> 

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time
  2019-06-04 17:04   ` Andy Shevchenko
@ 2019-06-05  8:22     ` Charles Keepax
  0 siblings, 0 replies; 16+ messages in thread
From: Charles Keepax @ 2019-06-05  8:22 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: wsa, mika.westerberg, jarkko.nikula, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, Jun 04, 2019 at 08:04:04PM +0300, Andy Shevchenko wrote:
> On Tue, May 28, 2019 at 03:28:58PM +0100, Charles Keepax wrote:
> > Bring the ACPI path in sync with the device tree path and handle all the
> > IRQ fetching at probe time. This leaves the only IRQ handling at device
> > registration time being that which is passed directly through the board
> > info as either a resource or an actual IRQ number.
> > 
> 
> It seems my comments weren't addressed by one or another reason.
> This one I would rather to split with exporting function as a separate patch.
> 

With the switch to passing in i2c_client it makes for some fairly
awkward gymnastics and "ping pong" programming to do so. I guess
we could leave the function taking in an acpi_device but just
felt like a slightly less user friendly interface. Any thoughts?

Thanks,
Charles

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions
  2019-06-04 17:00   ` Andy Shevchenko
@ 2019-06-05  8:26     ` Charles Keepax
  0 siblings, 0 replies; 16+ messages in thread
From: Charles Keepax @ 2019-06-05  8:26 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: wsa, mika.westerberg, jarkko.nikula, linux-i2c, linux-acpi,
	linux-kernel, benjamin.tissoires, jbroadus, patches

On Tue, Jun 04, 2019 at 08:00:52PM +0300, Andy Shevchenko wrote:
> On Tue, May 28, 2019 at 03:28:56PM +0100, Charles Keepax wrote:
> > Use the available IRQ helper functions, most of the functions have
> > additional helpful side affects like configuring the trigger type of the
> > IRQ.
> > 
> 
> You do here two things, i.e.
> - splitting out helper function
> - converting it to use helpers
> 
> I would split the patch to do exact these steps separately, e.g.:
> - splitting out to a local helper
> - replacing open coded stuff with existing helpers
> 

This can't really be done like this, the helper is called by
acpi_dev_get_resources and I need the acpi_resource from that to
call acpi_dev_resource_interrupt. I guess I could do a separate
patch to start using i2c_dev_irq_from_resource if that would be
preferrable? But I think the rest needs to stay together.

Thanks,
Charles

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, back to index

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-28 14:28 [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Charles Keepax
2019-05-28 14:28 ` [PATCH v3 2/6] i2c: acpi: Use available IRQ helper functions Charles Keepax
2019-05-29  7:35   ` Mika Westerberg
2019-06-04 17:00   ` Andy Shevchenko
2019-06-05  8:26     ` Charles Keepax
2019-05-28 14:28 ` [PATCH v3 3/6] i2c: acpi: Factor out getting the IRQ from ACPI Charles Keepax
2019-05-29  7:36   ` Mika Westerberg
2019-05-28 14:28 ` [PATCH v3 4/6] i2c: core: Move ACPI IRQ handling to probe time Charles Keepax
2019-05-29  7:43   ` Mika Westerberg
2019-06-04 17:04   ` Andy Shevchenko
2019-06-05  8:22     ` Charles Keepax
2019-05-28 14:28 ` [PATCH v3 5/6] i2c: core: Move ACPI gpio IRQ handling into i2c_acpi_get_irq Charles Keepax
2019-05-29  7:43   ` Mika Westerberg
2019-05-28 14:29 ` [PATCH v3 6/6] i2c: core: Tidy up handling of init_irq Charles Keepax
2019-05-29  7:44   ` Mika Westerberg
2019-05-29  7:34 ` [PATCH v3 1/6] i2c: core: Allow whole core to use i2c_dev_irq_from_resources Mika Westerberg

Linux-ACPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-acpi/0 linux-acpi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-acpi linux-acpi/ https://lore.kernel.org/linux-acpi \
		linux-acpi@vger.kernel.org
	public-inbox-index linux-acpi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-acpi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git