* [PATCH V4 1/5] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW
[not found] <1512096776-22883-1-git-send-email-okaya@codeaurora.org>
@ 2017-12-01 2:52 ` Sinan Kaya
2017-12-01 2:52 ` [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function Sinan Kaya
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 2:52 UTC (permalink / raw)
To: linux-pci, timur
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Vinod Koul,
Rob Herring, Mark Rutland,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list
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 [flat|nested] 8+ messages in thread* [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function
[not found] <1512096776-22883-1-git-send-email-okaya@codeaurora.org>
2017-12-01 2:52 ` [PATCH V4 1/5] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW Sinan Kaya
@ 2017-12-01 2:52 ` Sinan Kaya
2017-12-01 13:52 ` Rafael J. Wysocki
2017-12-01 2:52 ` [PATCH V4 3/5] device property: Introduce a common API to fetch device match data Sinan Kaya
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 2:52 UTC (permalink / raw)
To: linux-pci, timur
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Rafael J. Wysocki,
Len Brown, open list:ACPI, open list
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..b271eb1 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_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_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..a927260 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_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_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 [flat|nested] 8+ messages in thread* Re: [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function
2017-12-01 2:52 ` [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function Sinan Kaya
@ 2017-12-01 13:52 ` Rafael J. Wysocki
0 siblings, 0 replies; 8+ messages in thread
From: Rafael J. Wysocki @ 2017-12-01 13:52 UTC (permalink / raw)
To: Sinan Kaya
Cc: linux-pci, timur, linux-arm-msm, linux-arm-kernel, Len Brown,
open list:ACPI, open list
On Friday, December 1, 2017 3:52:53 AM CET 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>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 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..b271eb1 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_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_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..a927260 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_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_get_match_data(const struct device *dev)
> +{
> + return NULL;
> +}
> +
> static inline bool acpi_driver_match_device(struct device *dev,
> const struct device_driver *drv)
> {
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V4 3/5] device property: Introduce a common API to fetch device match data
[not found] <1512096776-22883-1-git-send-email-okaya@codeaurora.org>
2017-12-01 2:52 ` [PATCH V4 1/5] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW Sinan Kaya
2017-12-01 2:52 ` [PATCH V4 2/5] ACPI / bus: Introduce acpi_get_match_data() function Sinan Kaya
@ 2017-12-01 2:52 ` Sinan Kaya
2017-12-01 9:13 ` Sakari Ailus
2017-12-01 2:52 ` [PATCH V4 4/5] dmaengine: qcom_hidma: Add support for the new revision Sinan Kaya
2017-12-01 2:52 ` [PATCH V4 5/5] dmaengine: qcom_hidma: Add identity register support Sinan Kaya
4 siblings, 1 reply; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 2:52 UTC (permalink / raw)
To: linux-pci, timur
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Greg Kroah-Hartman,
Rafael J. Wysocki, Mika Westerberg, Sakari Ailus,
Dmitry Torokhov, Rob Herring, Kieran Bingham, open list
There is an OF/ACPI function to obtain the driver data. We want to hide
OF/ACPI details from the device drivers and abstract following the device
family of functions.
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
---
drivers/base/property.c | 14 ++++++++++++++
include/linux/property.h | 2 ++
2 files changed, 16 insertions(+)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 7ed99c1..6adec89 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/of_device.h>
#include <linux/of_graph.h>
#include <linux/property.h>
#include <linux/etherdevice.h>
@@ -1335,3 +1336,16 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
return fwnode_call_int_op(fwnode, graph_parse_endpoint, endpoint);
}
EXPORT_SYMBOL(fwnode_graph_parse_endpoint);
+
+void *device_get_match_data(struct device *dev)
+{
+ void *ret;
+
+ if (IS_ENABLED(CONFIG_OF) && dev->of_node)
+ ret = (void *)of_device_get_match_data(dev);
+ else
+ ret = acpi_get_match_data(dev);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(device_get_match_data);
diff --git a/include/linux/property.h b/include/linux/property.h
index 6bebee1..01fa55b 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -275,6 +275,8 @@ int device_add_properties(struct device *dev,
enum dev_dma_attr device_get_dma_attr(struct device *dev);
+void *device_get_match_data(struct device *dev);
+
int device_get_phy_mode(struct device *dev);
void *device_get_mac_address(struct device *dev, char *addr, int alen);
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH V4 3/5] device property: Introduce a common API to fetch device match data
2017-12-01 2:52 ` [PATCH V4 3/5] device property: Introduce a common API to fetch device match data Sinan Kaya
@ 2017-12-01 9:13 ` Sakari Ailus
2017-12-01 15:51 ` Sinan Kaya
0 siblings, 1 reply; 8+ messages in thread
From: Sakari Ailus @ 2017-12-01 9:13 UTC (permalink / raw)
To: Sinan Kaya
Cc: linux-pci, timur, linux-arm-msm, linux-arm-kernel,
Greg Kroah-Hartman, Rafael J. Wysocki, Mika Westerberg,
Dmitry Torokhov, Rob Herring, Kieran Bingham, open list
Hi Sinan,
Thanks for the patch.
On Thu, Nov 30, 2017 at 09:52:54PM -0500, Sinan Kaya wrote:
> There is an OF/ACPI function to obtain the driver data. We want to hide
> OF/ACPI details from the device drivers and abstract following the device
> family of functions.
>
> Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
> ---
> drivers/base/property.c | 14 ++++++++++++++
> include/linux/property.h | 2 ++
> 2 files changed, 16 insertions(+)
>
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index 7ed99c1..6adec89 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -15,6 +15,7 @@
> #include <linux/kernel.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/of_device.h>
> #include <linux/of_graph.h>
> #include <linux/property.h>
> #include <linux/etherdevice.h>
> @@ -1335,3 +1336,16 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,
> return fwnode_call_int_op(fwnode, graph_parse_endpoint, endpoint);
> }
> EXPORT_SYMBOL(fwnode_graph_parse_endpoint);
> +
> +void *device_get_match_data(struct device *dev)
> +{
> + void *ret;
> +
> + if (IS_ENABLED(CONFIG_OF) && dev->of_node)
Most of the dev->of_node checks have been removed from property.c and
replaced by calls to the firmware specific fwnode operations. What remains
should probably be moved there, too (apart from dev_fwnode).
How about adding a new op for this one to struct fwnode_operations in
include/linux/fwnode.h?
> + ret = (void *)of_device_get_match_data(dev);
> + else
> + ret = acpi_get_match_data(dev);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(device_get_match_data);
> diff --git a/include/linux/property.h b/include/linux/property.h
> index 6bebee1..01fa55b 100644
> --- a/include/linux/property.h
> +++ b/include/linux/property.h
> @@ -275,6 +275,8 @@ int device_add_properties(struct device *dev,
>
> enum dev_dma_attr device_get_dma_attr(struct device *dev);
>
> +void *device_get_match_data(struct device *dev);
> +
> int device_get_phy_mode(struct device *dev);
>
> void *device_get_mac_address(struct device *dev, char *addr, int alen);
--
Kind regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH V4 3/5] device property: Introduce a common API to fetch device match data
2017-12-01 9:13 ` Sakari Ailus
@ 2017-12-01 15:51 ` Sinan Kaya
0 siblings, 0 replies; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 15:51 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-pci, timur, linux-arm-msm, linux-arm-kernel,
Greg Kroah-Hartman, Rafael J. Wysocki, Mika Westerberg,
Dmitry Torokhov, Rob Herring, Kieran Bingham, open list
On 12/1/2017 4:13 AM, Sakari Ailus wrote:
> Most of the dev->of_node checks have been removed from property.c and
> replaced by calls to the firmware specific fwnode operations. What remains
> should probably be moved there, too (apart from dev_fwnode).
>
> How about adding a new op for this one to struct fwnode_operations in
> include/linux/fwnode.h?
Sure, let me look. I was following the get_dma function. Bad example I guess.
--
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] 8+ messages in thread
* [PATCH V4 4/5] dmaengine: qcom_hidma: Add support for the new revision
[not found] <1512096776-22883-1-git-send-email-okaya@codeaurora.org>
` (2 preceding siblings ...)
2017-12-01 2:52 ` [PATCH V4 3/5] device property: Introduce a common API to fetch device match data Sinan Kaya
@ 2017-12-01 2:52 ` Sinan Kaya
2017-12-01 2:52 ` [PATCH V4 5/5] dmaengine: qcom_hidma: Add identity register support Sinan Kaya
4 siblings, 0 replies; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 2:52 UTC (permalink / raw)
To: linux-pci, timur
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Andy Gross,
David Brown, Dan Williams, Vinod Koul,
open list:ARM/QUALCOMM SUPPORT,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list
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 | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/drivers/dma/qcom/hidma.c b/drivers/dma/qcom/hidma.c
index e366985..c146c6d 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,12 @@ 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;
-
- if (!adev || acpi_disabled) {
- ret = device_property_read_string(dev, "compatible",
- &of_compat);
- if (ret)
- return false;
+ enum hidma_cap cap;
- ret = strcmp(of_compat, "qcom,hidma-1.1");
- } else {
-#ifdef CONFIG_ACPI
- ret = strcmp(acpi_device_hid(adev), "QCOM8062");
-#endif
- }
- return ret == 0;
+ cap = (enum hidma_cap) device_get_match_data(dev);
+ return cap ? ((cap & test_cap) > 0) : 0;
}
static int hidma_probe(struct platform_device *pdev)
@@ -834,8 +825,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 +943,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 +952,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 [flat|nested] 8+ messages in thread* [PATCH V4 5/5] dmaengine: qcom_hidma: Add identity register support
[not found] <1512096776-22883-1-git-send-email-okaya@codeaurora.org>
` (3 preceding siblings ...)
2017-12-01 2:52 ` [PATCH V4 4/5] dmaengine: qcom_hidma: Add support for the new revision Sinan Kaya
@ 2017-12-01 2:52 ` Sinan Kaya
4 siblings, 0 replies; 8+ messages in thread
From: Sinan Kaya @ 2017-12-01 2:52 UTC (permalink / raw)
To: linux-pci, timur
Cc: linux-arm-msm, linux-arm-kernel, Sinan Kaya, Andy Gross,
David Brown, Dan Williams, Vinod Koul,
open list:ARM/QUALCOMM SUPPORT,
open list:DMA GENERIC OFFLOAD ENGINE SUBSYSTEM, open list
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 c146c6d..963cc52 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 */
@@ -838,7 +839,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));
@@ -944,7 +948,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);
@@ -953,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", .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 [flat|nested] 8+ messages in thread