* [PATCH V3 1/4] Documentation: DT: qcom_hidma: bump HW revision for the bugfixed HW
@ 2017-11-10 2:32 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: dmaengine, timur
Cc: linux-arm-msm, linux-arm-kernel, robin.murphy, Sinan Kaya, linux-kernel
A new version of the HIDMA IP has been released with bug fixes. Bumping the
hardware version to differentiate from others.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
index 55492c2..5d93d6d 100644
--- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
+++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
@@ -47,8 +47,8 @@ When the OS is not in control of the management interface (i.e. it's a guest),
the channel nodes appear on their own, not under a management node.
Required properties:
-- compatible: must contain "qcom,hidma-1.0" for initial HW or "qcom,hidma-1.1"
-for MSI capable HW.
+- compatible: must contain "qcom,hidma-1.0" for initial HW or
+ "qcom,hidma-1.1"/"qcom,hidma-1.2" for MSI capable HW.
- reg: Addresses for the transfer and event channel
- interrupts: Should contain the event interrupt
- desc-count: Number of asynchronous requests this channel can handle
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 1/4] Documentation: DT: qcom_hidma: bump HW revision for the bugfixed HW
@ 2017-11-10 2:32 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: linux-arm-kernel
A new version of the HIDMA IP has been released with bug fixes. Bumping the
hardware version to differentiate from others.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
index 55492c2..5d93d6d 100644
--- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
+++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
@@ -47,8 +47,8 @@ When the OS is not in control of the management interface (i.e. it's a guest),
the channel nodes appear on their own, not under a management node.
Required properties:
-- compatible: must contain "qcom,hidma-1.0" for initial HW or "qcom,hidma-1.1"
-for MSI capable HW.
+- compatible: must contain "qcom,hidma-1.0" for initial HW or
+ "qcom,hidma-1.1"/"qcom,hidma-1.2" for MSI capable HW.
- reg: Addresses for the transfer and event channel
- interrupts: Should contain the event interrupt
- desc-count: Number of asynchronous requests this channel can handle
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
2017-11-10 2:32 ` Sinan Kaya
@ 2017-11-10 2:32 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: dmaengine, timur
Cc: linux-arm-msm, linux-arm-kernel, robin.murphy, Sinan Kaya, linux-kernel
OF has of_device_get_match_data() function to extract driver specific data
structure. Add a similar function for ACPI.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/acpi/bus.c | 12 ++++++++++++
include/linux/acpi.h | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 4d0979e..da29c10 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
}
EXPORT_SYMBOL_GPL(acpi_match_device);
+void *acpi_device_get_match_data(const struct device *dev)
+{
+ const struct acpi_device_id *match;
+
+ match = acpi_match_device(dev->driver->acpi_match_table, dev);
+ if (!match)
+ return NULL;
+
+ return (void *)match->driver_data;
+}
+EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
+
int acpi_match_device_ids(struct acpi_device *device,
const struct acpi_device_id *ids)
{
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 502af53..62c85a5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
const struct device *dev);
+void *acpi_device_get_match_data(const struct device *dev);
extern bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv);
int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
@@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device(
return NULL;
}
+static inline void *acpi_device_get_match_data(const struct device *dev)
+{
+ return NULL;
+}
+
static inline bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv)
{
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
@ 2017-11-10 2:32 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: linux-arm-kernel
OF has of_device_get_match_data() function to extract driver specific data
structure. Add a similar function for ACPI.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/acpi/bus.c | 12 ++++++++++++
include/linux/acpi.h | 6 ++++++
2 files changed, 18 insertions(+)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 4d0979e..da29c10 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
}
EXPORT_SYMBOL_GPL(acpi_match_device);
+void *acpi_device_get_match_data(const struct device *dev)
+{
+ const struct acpi_device_id *match;
+
+ match = acpi_match_device(dev->driver->acpi_match_table, dev);
+ if (!match)
+ return NULL;
+
+ return (void *)match->driver_data;
+}
+EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
+
int acpi_match_device_ids(struct acpi_device *device,
const struct acpi_device_id *ids)
{
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 502af53..62c85a5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
const struct device *dev);
+void *acpi_device_get_match_data(const struct device *dev);
extern bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv);
int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
@@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device(
return NULL;
}
+static inline void *acpi_device_get_match_data(const struct device *dev)
+{
+ return NULL;
+}
+
static inline bool acpi_driver_match_device(struct device *dev,
const struct device_driver *drv)
{
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
2017-11-10 2:32 ` Sinan Kaya
@ 2017-11-10 2:32 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: dmaengine, timur
Cc: linux-arm-msm, linux-arm-kernel, robin.murphy, Sinan Kaya, linux-kernel
Add support for probing the newer HW and also organize MSI capable hardware
into an array for maintenance reasons.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma.c | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index e366985..d9d8071 100644
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -50,6 +50,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/of_dma.h>
+#include <linux/of_device.h>
#include <linux/property.h>
#include <linux/delay.h>
#include <linux/acpi.h>
@@ -104,6 +105,9 @@ static void hidma_free(struct hidma_dev *dmadev)
module_param(nr_desc_prm, uint, 0644);
MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)");
+enum hidma_cap {
+ HIDMA_MSI_CAP = 1,
+};
/* process completed descriptors */
static void hidma_process_completed(struct hidma_chan *mchan)
@@ -736,25 +740,17 @@ static int hidma_request_msi(struct hidma_dev *dmadev,
#endif
}
-static bool hidma_msi_capable(struct device *dev)
+static bool hidma_test_capability(struct device *dev, enum hidma_cap test_cap)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
- const char *of_compat;
- int ret = -EINVAL;
+ enum hidma_cap cap;
- if (!adev || acpi_disabled) {
- ret = device_property_read_string(dev, "compatible",
- &of_compat);
- if (ret)
- return false;
+ if (!adev || acpi_disabled)
+ cap = (enum hidma_cap) of_device_get_match_data(dev);
+ else
+ cap = (enum hidma_cap) acpi_device_get_match_data(dev);
- ret = strcmp(of_compat, "qcom,hidma-1.1");
- } else {
-#ifdef CONFIG_ACPI
- ret = strcmp(acpi_device_hid(adev), "QCOM8062");
-#endif
- }
- return ret == 0;
+ return cap ? ((cap & test_cap) > 0) : 0;
}
static int hidma_probe(struct platform_device *pdev)
@@ -834,8 +830,7 @@ static int hidma_probe(struct platform_device *pdev)
* Determine the MSI capability of the platform. Old HW doesn't
* support MSI.
*/
- msi = hidma_msi_capable(&pdev->dev);
-
+ msi = hidma_test_capability(&pdev->dev, HIDMA_MSI_CAP);
device_property_read_u32(&pdev->dev, "desc-count",
&dmadev->nr_descriptors);
@@ -953,7 +948,8 @@ static int hidma_remove(struct platform_device *pdev)
#if IS_ENABLED(CONFIG_ACPI)
static const struct acpi_device_id hidma_acpi_ids[] = {
{"QCOM8061"},
- {"QCOM8062"},
+ {"QCOM8062", HIDMA_MSI_CAP},
+ {"QCOM8063", HIDMA_MSI_CAP},
{},
};
MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids);
@@ -961,7 +957,8 @@ static int hidma_remove(struct platform_device *pdev)
static const struct of_device_id hidma_match[] = {
{.compatible = "qcom,hidma-1.0",},
- {.compatible = "qcom,hidma-1.1",},
+ {.compatible = "qcom,hidma-1.1", .data = (void *)(HIDMA_MSI_CAP),},
+ {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),},
{},
};
MODULE_DEVICE_TABLE(of, hidma_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
@ 2017-11-10 2:32 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: linux-arm-kernel
Add support for probing the newer HW and also organize MSI capable hardware
into an array for maintenance reasons.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma.c | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index e366985..d9d8071 100644
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -50,6 +50,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/of_dma.h>
+#include <linux/of_device.h>
#include <linux/property.h>
#include <linux/delay.h>
#include <linux/acpi.h>
@@ -104,6 +105,9 @@ static void hidma_free(struct hidma_dev *dmadev)
module_param(nr_desc_prm, uint, 0644);
MODULE_PARM_DESC(nr_desc_prm, "number of descriptors (default: 0)");
+enum hidma_cap {
+ HIDMA_MSI_CAP = 1,
+};
/* process completed descriptors */
static void hidma_process_completed(struct hidma_chan *mchan)
@@ -736,25 +740,17 @@ static int hidma_request_msi(struct hidma_dev *dmadev,
#endif
}
-static bool hidma_msi_capable(struct device *dev)
+static bool hidma_test_capability(struct device *dev, enum hidma_cap test_cap)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
- const char *of_compat;
- int ret = -EINVAL;
+ enum hidma_cap cap;
- if (!adev || acpi_disabled) {
- ret = device_property_read_string(dev, "compatible",
- &of_compat);
- if (ret)
- return false;
+ if (!adev || acpi_disabled)
+ cap = (enum hidma_cap) of_device_get_match_data(dev);
+ else
+ cap = (enum hidma_cap) acpi_device_get_match_data(dev);
- ret = strcmp(of_compat, "qcom,hidma-1.1");
- } else {
-#ifdef CONFIG_ACPI
- ret = strcmp(acpi_device_hid(adev), "QCOM8062");
-#endif
- }
- return ret == 0;
+ return cap ? ((cap & test_cap) > 0) : 0;
}
static int hidma_probe(struct platform_device *pdev)
@@ -834,8 +830,7 @@ static int hidma_probe(struct platform_device *pdev)
* Determine the MSI capability of the platform. Old HW doesn't
* support MSI.
*/
- msi = hidma_msi_capable(&pdev->dev);
-
+ msi = hidma_test_capability(&pdev->dev, HIDMA_MSI_CAP);
device_property_read_u32(&pdev->dev, "desc-count",
&dmadev->nr_descriptors);
@@ -953,7 +948,8 @@ static int hidma_remove(struct platform_device *pdev)
#if IS_ENABLED(CONFIG_ACPI)
static const struct acpi_device_id hidma_acpi_ids[] = {
{"QCOM8061"},
- {"QCOM8062"},
+ {"QCOM8062", HIDMA_MSI_CAP},
+ {"QCOM8063", HIDMA_MSI_CAP},
{},
};
MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids);
@@ -961,7 +957,8 @@ static int hidma_remove(struct platform_device *pdev)
static const struct of_device_id hidma_match[] = {
{.compatible = "qcom,hidma-1.0",},
- {.compatible = "qcom,hidma-1.1",},
+ {.compatible = "qcom,hidma-1.1", .data = (void *)(HIDMA_MSI_CAP),},
+ {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),},
{},
};
MODULE_DEVICE_TABLE(of, hidma_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 4/4] dmaengine: qcom_hidma: add identity register support
2017-11-10 2:32 ` Sinan Kaya
@ 2017-11-10 2:32 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: dmaengine, timur
Cc: linux-arm-msm, linux-arm-kernel, robin.murphy, Sinan Kaya, linux-kernel
The location for destination event channel register has been relocated from
offset 0x28 to 0x40. Update the code accordingly.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index d9d8071..a3a6032 100644
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -107,6 +107,7 @@ static void hidma_free(struct hidma_dev *dmadev)
enum hidma_cap {
HIDMA_MSI_CAP = 1,
+ HIDMA_IDENTITY_CAP,
};
/* process completed descriptors */
@@ -843,7 +844,10 @@ static int hidma_probe(struct platform_device *pdev)
if (!dmadev->nr_descriptors)
dmadev->nr_descriptors = HIDMA_NR_DEFAULT_DESC;
- dmadev->chidx = readl(dmadev->dev_trca + 0x28);
+ if (hidma_test_capability(&pdev->dev, HIDMA_IDENTITY_CAP))
+ dmadev->chidx = readl(dmadev->dev_trca + 0x40);
+ else
+ dmadev->chidx = readl(dmadev->dev_trca + 0x28);
/* Set DMA mask to 64 bits. */
rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
@@ -949,7 +953,7 @@ static int hidma_remove(struct platform_device *pdev)
static const struct acpi_device_id hidma_acpi_ids[] = {
{"QCOM8061"},
{"QCOM8062", HIDMA_MSI_CAP},
- {"QCOM8063", HIDMA_MSI_CAP},
+ {"QCOM8063", (HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP)},
{},
};
MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids);
@@ -958,7 +962,8 @@ static int hidma_remove(struct platform_device *pdev)
static const struct of_device_id hidma_match[] = {
{.compatible = "qcom,hidma-1.0",},
{.compatible = "qcom,hidma-1.1", .data = (void *)(HIDMA_MSI_CAP),},
- {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),},
+ {.compatible = "qcom,hidma-1.2",
+ .data = (void *)(HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP),},
{},
};
MODULE_DEVICE_TABLE(of, hidma_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH V3 4/4] dmaengine: qcom_hidma: add identity register support
@ 2017-11-10 2:32 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:32 UTC (permalink / raw)
To: linux-arm-kernel
The location for destination event channel register has been relocated from
offset 0x28 to 0x40. Update the code accordingly.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/dma/qcom/hidma.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index d9d8071..a3a6032 100644
--- a/drivers/dma/qcom/hidma.c
+++ b/drivers/dma/qcom/hidma.c
@@ -107,6 +107,7 @@ static void hidma_free(struct hidma_dev *dmadev)
enum hidma_cap {
HIDMA_MSI_CAP = 1,
+ HIDMA_IDENTITY_CAP,
};
/* process completed descriptors */
@@ -843,7 +844,10 @@ static int hidma_probe(struct platform_device *pdev)
if (!dmadev->nr_descriptors)
dmadev->nr_descriptors = HIDMA_NR_DEFAULT_DESC;
- dmadev->chidx = readl(dmadev->dev_trca + 0x28);
+ if (hidma_test_capability(&pdev->dev, HIDMA_IDENTITY_CAP))
+ dmadev->chidx = readl(dmadev->dev_trca + 0x40);
+ else
+ dmadev->chidx = readl(dmadev->dev_trca + 0x28);
/* Set DMA mask to 64 bits. */
rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
@@ -949,7 +953,7 @@ static int hidma_remove(struct platform_device *pdev)
static const struct acpi_device_id hidma_acpi_ids[] = {
{"QCOM8061"},
{"QCOM8062", HIDMA_MSI_CAP},
- {"QCOM8063", HIDMA_MSI_CAP},
+ {"QCOM8063", (HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP)},
{},
};
MODULE_DEVICE_TABLE(acpi, hidma_acpi_ids);
@@ -958,7 +962,8 @@ static int hidma_remove(struct platform_device *pdev)
static const struct of_device_id hidma_match[] = {
{.compatible = "qcom,hidma-1.0",},
{.compatible = "qcom,hidma-1.1", .data = (void *)(HIDMA_MSI_CAP),},
- {.compatible = "qcom,hidma-1.2", .data = (void *)(HIDMA_MSI_CAP),},
+ {.compatible = "qcom,hidma-1.2",
+ .data = (void *)(HIDMA_MSI_CAP | HIDMA_IDENTITY_CAP),},
{},
};
MODULE_DEVICE_TABLE(of, hidma_match);
--
1.9.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
2017-11-10 2:32 ` Sinan Kaya
@ 2017-11-10 2:35 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:35 UTC (permalink / raw)
To: dmaengine, timur
Cc: linux-arm-msm, linux-arm-kernel, robin.murphy, linux-kernel,
linux-acpi, Rafael J. Wysocki
+linux-acpi@vger.kernel.org, +Rafael
On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> OF has of_device_get_match_data() function to extract driver specific data
> structure. Add a similar function for ACPI.
>
> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> ---
> drivers/acpi/bus.c | 12 ++++++++++++
> include/linux/acpi.h | 6 ++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 4d0979e..da29c10 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> }
> EXPORT_SYMBOL_GPL(acpi_match_device);
>
> +void *acpi_device_get_match_data(const struct device *dev)
> +{
> + const struct acpi_device_id *match;
> +
> + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> + if (!match)
> + return NULL;
> +
> + return (void *)match->driver_data;
> +}
> +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
> +
> int acpi_match_device_ids(struct acpi_device *device,
> const struct acpi_device_id *ids)
> {
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 502af53..62c85a5 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
> const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> const struct device *dev);
>
> +void *acpi_device_get_match_data(const struct device *dev);
> extern bool acpi_driver_match_device(struct device *dev,
> const struct device_driver *drv);
> int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
> @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device(
> return NULL;
> }
>
> +static inline void *acpi_device_get_match_data(const struct device *dev)
> +{
> + return NULL;
> +}
> +
> static inline bool acpi_driver_match_device(struct device *dev,
> const struct device_driver *drv)
> {
>
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
@ 2017-11-10 2:35 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-10 2:35 UTC (permalink / raw)
To: linux-arm-kernel
+linux-acpi at vger.kernel.org, +Rafael
On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> OF has of_device_get_match_data() function to extract driver specific data
> structure. Add a similar function for ACPI.
>
> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> ---
> drivers/acpi/bus.c | 12 ++++++++++++
> include/linux/acpi.h | 6 ++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 4d0979e..da29c10 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> }
> EXPORT_SYMBOL_GPL(acpi_match_device);
>
> +void *acpi_device_get_match_data(const struct device *dev)
> +{
> + const struct acpi_device_id *match;
> +
> + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> + if (!match)
> + return NULL;
> +
> + return (void *)match->driver_data;
> +}
> +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
> +
> int acpi_match_device_ids(struct acpi_device *device,
> const struct acpi_device_id *ids)
> {
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 502af53..62c85a5 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),
> const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> const struct device *dev);
>
> +void *acpi_device_get_match_data(const struct device *dev);
> extern bool acpi_driver_match_device(struct device *dev,
> const struct device_driver *drv);
> int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
> @@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device(
> return NULL;
> }
>
> +static inline void *acpi_device_get_match_data(const struct device *dev)
> +{
> + return NULL;
> +}
> +
> static inline bool acpi_driver_match_device(struct device *dev,
> const struct device_driver *drv)
> {
>
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
2017-11-10 2:35 ` Sinan Kaya
@ 2017-11-12 0:14 ` Rafael J. Wysocki
-1 siblings, 0 replies; 20+ messages in thread
From: Rafael J. Wysocki @ 2017-11-12 0:14 UTC (permalink / raw)
To: Sinan Kaya
Cc: dmaengine, timur, linux-arm-msm, linux-arm-kernel, robin.murphy,
linux-kernel, linux-acpi
On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> +linux-acpi@vger.kernel.org, +Rafael
Thanks!
> On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > OF has of_device_get_match_data() function to extract driver specific data
> > structure. Add a similar function for ACPI.
> >
> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > ---
> > drivers/acpi/bus.c | 12 ++++++++++++
> > include/linux/acpi.h | 6 ++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > index 4d0979e..da29c10 100644
> > --- a/drivers/acpi/bus.c
> > +++ b/drivers/acpi/bus.c
> > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> > }
> > EXPORT_SYMBOL_GPL(acpi_match_device);
> >
> > +void *acpi_device_get_match_data(const struct device *dev)
> > +{
> > + const struct acpi_device_id *match;
> > +
> > + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > + if (!match)
> > + return NULL;
> > +
> > + return (void *)match->driver_data;
> > +}
> > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
While I understand that the name follows the OF convention, I have some
doubts on whether it is the best one.
Apart from this the change is fine by me.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
@ 2017-11-12 0:14 ` Rafael J. Wysocki
0 siblings, 0 replies; 20+ messages in thread
From: Rafael J. Wysocki @ 2017-11-12 0:14 UTC (permalink / raw)
To: linux-arm-kernel
On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> +linux-acpi at vger.kernel.org, +Rafael
Thanks!
> On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > OF has of_device_get_match_data() function to extract driver specific data
> > structure. Add a similar function for ACPI.
> >
> > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > ---
> > drivers/acpi/bus.c | 12 ++++++++++++
> > include/linux/acpi.h | 6 ++++++
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > index 4d0979e..da29c10 100644
> > --- a/drivers/acpi/bus.c
> > +++ b/drivers/acpi/bus.c
> > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> > }
> > EXPORT_SYMBOL_GPL(acpi_match_device);
> >
> > +void *acpi_device_get_match_data(const struct device *dev)
> > +{
> > + const struct acpi_device_id *match;
> > +
> > + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > + if (!match)
> > + return NULL;
> > +
> > + return (void *)match->driver_data;
> > +}
> > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
While I understand that the name follows the OF convention, I have some
doubts on whether it is the best one.
Apart from this the change is fine by me.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
2017-11-12 0:14 ` Rafael J. Wysocki
@ 2017-11-29 13:55 ` Vinod Koul
-1 siblings, 0 replies; 20+ messages in thread
From: Vinod Koul @ 2017-11-29 13:55 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Sinan Kaya, dmaengine, timur, linux-arm-msm, linux-arm-kernel,
robin.murphy, linux-kernel, linux-acpi
On Sun, Nov 12, 2017 at 01:14:12AM +0100, Rafael J. Wysocki wrote:
> On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> > +linux-acpi@vger.kernel.org, +Rafael
>
> Thanks!
>
> > On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > > OF has of_device_get_match_data() function to extract driver specific data
> > > structure. Add a similar function for ACPI.
> > >
> > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > > ---
> > > drivers/acpi/bus.c | 12 ++++++++++++
> > > include/linux/acpi.h | 6 ++++++
> > > 2 files changed, 18 insertions(+)
> > >
> > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > > index 4d0979e..da29c10 100644
> > > --- a/drivers/acpi/bus.c
> > > +++ b/drivers/acpi/bus.c
> > > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> > > }
> > > EXPORT_SYMBOL_GPL(acpi_match_device);
> > >
> > > +void *acpi_device_get_match_data(const struct device *dev)
> > > +{
> > > + const struct acpi_device_id *match;
> > > +
> > > + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > > + if (!match)
> > > + return NULL;
> > > +
> > > + return (void *)match->driver_data;
> > > +}
> > > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
>
> While I understand that the name follows the OF convention, I have some
> doubts on whether it is the best one.
Perhpas acpi_get_match_data() ?
--
~Vinod
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
@ 2017-11-29 13:55 ` Vinod Koul
0 siblings, 0 replies; 20+ messages in thread
From: Vinod Koul @ 2017-11-29 13:55 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Nov 12, 2017 at 01:14:12AM +0100, Rafael J. Wysocki wrote:
> On Friday, November 10, 2017 3:35:41 AM CET Sinan Kaya wrote:
> > +linux-acpi at vger.kernel.org, +Rafael
>
> Thanks!
>
> > On 11/9/2017 9:32 PM, Sinan Kaya wrote:
> > > OF has of_device_get_match_data() function to extract driver specific data
> > > structure. Add a similar function for ACPI.
> > >
> > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> > > ---
> > > drivers/acpi/bus.c | 12 ++++++++++++
> > > include/linux/acpi.h | 6 ++++++
> > > 2 files changed, 18 insertions(+)
> > >
> > > diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> > > index 4d0979e..da29c10 100644
> > > --- a/drivers/acpi/bus.c
> > > +++ b/drivers/acpi/bus.c
> > > @@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,
> > > }
> > > EXPORT_SYMBOL_GPL(acpi_match_device);
> > >
> > > +void *acpi_device_get_match_data(const struct device *dev)
> > > +{
> > > + const struct acpi_device_id *match;
> > > +
> > > + match = acpi_match_device(dev->driver->acpi_match_table, dev);
> > > + if (!match)
> > > + return NULL;
> > > +
> > > + return (void *)match->driver_data;
> > > +}
> > > +EXPORT_SYMBOL_GPL(acpi_device_get_match_data);
>
> While I understand that the name follows the OF convention, I have some
> doubts on whether it is the best one.
Perhpas acpi_get_match_data() ?
--
~Vinod
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
2017-11-10 2:32 ` Sinan Kaya
@ 2017-11-29 13:58 ` Vinod Koul
-1 siblings, 0 replies; 20+ messages in thread
From: Vinod Koul @ 2017-11-29 13:58 UTC (permalink / raw)
To: Sinan Kaya
Cc: dmaengine, timur, linux-arm-msm, linux-arm-kernel, robin.murphy,
linux-kernel
On Thu, Nov 09, 2017 at 09:32:54PM -0500, Sinan Kaya wrote:
> -static bool hidma_msi_capable(struct device *dev)
> +static bool hidma_test_capability(struct device *dev, enum hidma_cap test_cap)
> {
> struct acpi_device *adev = ACPI_COMPANION(dev);
> - const char *of_compat;
> - int ret = -EINVAL;
> + enum hidma_cap cap;
>
> - if (!adev || acpi_disabled) {
> - ret = device_property_read_string(dev, "compatible",
> - &of_compat);
> - if (ret)
> - return false;
> + if (!adev || acpi_disabled)
> + cap = (enum hidma_cap) of_device_get_match_data(dev);
> + else
> + cap = (enum hidma_cap) acpi_device_get_match_data(dev);
should this not reside in core? How about a device_get_match_data() which
returns the data for folks based on node being acpi/of
--
~Vinod
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
@ 2017-11-29 13:58 ` Vinod Koul
0 siblings, 0 replies; 20+ messages in thread
From: Vinod Koul @ 2017-11-29 13:58 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 09, 2017 at 09:32:54PM -0500, Sinan Kaya wrote:
> -static bool hidma_msi_capable(struct device *dev)
> +static bool hidma_test_capability(struct device *dev, enum hidma_cap test_cap)
> {
> struct acpi_device *adev = ACPI_COMPANION(dev);
> - const char *of_compat;
> - int ret = -EINVAL;
> + enum hidma_cap cap;
>
> - if (!adev || acpi_disabled) {
> - ret = device_property_read_string(dev, "compatible",
> - &of_compat);
> - if (ret)
> - return false;
> + if (!adev || acpi_disabled)
> + cap = (enum hidma_cap) of_device_get_match_data(dev);
> + else
> + cap = (enum hidma_cap) acpi_device_get_match_data(dev);
should this not reside in core? How about a device_get_match_data() which
returns the data for folks based on node being acpi/of
--
~Vinod
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
2017-11-29 13:55 ` Vinod Koul
@ 2017-11-29 20:49 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-29 20:49 UTC (permalink / raw)
To: Vinod Koul, Rafael J. Wysocki
Cc: dmaengine, timur, linux-arm-msm, linux-arm-kernel, robin.murphy,
linux-kernel, linux-acpi
On 11/29/2017 8:55 AM, Vinod Koul wrote:
>> While I understand that the name follows the OF convention, I have some
>> doubts on whether it is the best one.
> Perhpas acpi_get_match_data() ?
Will change as recommended unless Rafael has a better idea.
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
@ 2017-11-29 20:49 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-29 20:49 UTC (permalink / raw)
To: linux-arm-kernel
On 11/29/2017 8:55 AM, Vinod Koul wrote:
>> While I understand that the name follows the OF convention, I have some
>> doubts on whether it is the best one.
> Perhpas acpi_get_match_data() ?
Will change as recommended unless Rafael has a better idea.
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
2017-11-29 13:58 ` Vinod Koul
@ 2017-11-29 22:14 ` Sinan Kaya
-1 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-29 22:14 UTC (permalink / raw)
To: Vinod Koul
Cc: dmaengine, timur, linux-arm-msm, linux-arm-kernel, robin.murphy,
linux-kernel, linux-acpi
+linux-acpi
On 11/29/2017 8:58 AM, Vinod Koul wrote:
>> + cap = (enum hidma_cap) acpi_device_get_match_data(dev);
> should this not reside in core? How about a device_get_match_data() which
> returns the data for folks based on node being acpi/of
Sure,
I'm preparing a device function to read this as you suggested.
Sinan
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
@ 2017-11-29 22:14 ` Sinan Kaya
0 siblings, 0 replies; 20+ messages in thread
From: Sinan Kaya @ 2017-11-29 22:14 UTC (permalink / raw)
To: linux-arm-kernel
+linux-acpi
On 11/29/2017 8:58 AM, Vinod Koul wrote:
>> + cap = (enum hidma_cap) acpi_device_get_match_data(dev);
> should this not reside in core? How about a device_get_match_data() which
> returns the data for folks based on node being acpi/of
Sure,
I'm preparing a device function to read this as you suggested.
Sinan
--
Sinan Kaya
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2017-11-29 22:14 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-10 2:32 [PATCH V3 1/4] Documentation: DT: qcom_hidma: bump HW revision for the bugfixed HW Sinan Kaya
2017-11-10 2:32 ` Sinan Kaya
2017-11-10 2:32 ` [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function Sinan Kaya
2017-11-10 2:32 ` Sinan Kaya
2017-11-10 2:35 ` Sinan Kaya
2017-11-10 2:35 ` Sinan Kaya
2017-11-12 0:14 ` Rafael J. Wysocki
2017-11-12 0:14 ` Rafael J. Wysocki
2017-11-29 13:55 ` Vinod Koul
2017-11-29 13:55 ` Vinod Koul
2017-11-29 20:49 ` Sinan Kaya
2017-11-29 20:49 ` Sinan Kaya
2017-11-10 2:32 ` [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision Sinan Kaya
2017-11-10 2:32 ` Sinan Kaya
2017-11-29 13:58 ` Vinod Koul
2017-11-29 13:58 ` Vinod Koul
2017-11-29 22:14 ` Sinan Kaya
2017-11-29 22:14 ` Sinan Kaya
2017-11-10 2:32 ` [PATCH V3 4/4] dmaengine: qcom_hidma: add identity register support Sinan Kaya
2017-11-10 2:32 ` Sinan Kaya
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.