dmaengine: qcom_hidma: add support for bugfixed HW
Subsystems (8)
v5 cover dmaengine: qcom_hidma: add support for bugfixed HW
Introduce new ACPI and OF device ids for thw HW along with the helper functions.
Changes from v4:
* rework the device_get_match_data() to use fwnode callbacks
* change calling parameter of acpi_get_match_data() to struct acpi_device()
Sinan Kaya (7):
Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW ACPI / bus: Introduce acpi_get_match_data() function device property: Introduce a common API to fetch device match data
OF: properties: Implement get_match_data() callback
ACPI: properties: Implement get_match_data() callback
dmaengine: qcom_hidma: Add support for the new revision
dmaengine: qcom_hidma: Add identity register support
.../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 +-- drivers/acpi/bus.c | 13 +++++++ drivers/acpi/property.c | 12 +++++++ drivers/base/property.c | 7 ++++ drivers/dma/qcom/hidma.c | 41 ++++++++++------------ drivers/of/property.c | 17 +++++++++ include/linux/acpi.h | 8 +++++ include/linux/fwnode.h | 4 +++ include/linux/property.h | 2 ++ 9 files changed, 84 insertions(+), 24 deletions(-)
Signature · 1 line
1.9.1
PATCH v5 1/7 Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW
A new version of the HIDMA IP has been released with bug fixes. Bumping the hardware version to differentiate from others.
--- Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +2 -2
@@ -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
Signature · 1 line
1.9.1
PATCH v5 2/7 ACPI / bus: Introduce acpi_get_match_data() function
In reply to Sinan KayaOF has of_device_get_match_data() function to extract driver specific data structure. Add a similar function for ACPI.
--- drivers/acpi/bus.c | 13 +++++++++++++ include/linux/acpi.h | 8 ++++++++ 2 files changed, 21 insertions(+)
drivers/acpi/bus.c +13 -0
@@ -785,6 +785,19 @@ 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 (struct acpi_device *device, +const struct acpi_device_id *ids) +{ +const struct acpi_device_id *match; + + match =__acpi_match_device (device, ids,NULL ); +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) {
include/linux/acpi.h +8 -0
@@ -584,6 +584,8 @@ 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 (struct acpi_device *device, +const struct acpi_device_id *ids);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 +757,12 @@ static inline const struct acpi_device_id *acpi_match_device(return NULL ; } +static inline void *acpi_get_match_data (struct acpi_device *device, +const struct acpi_device_id *ids) +{ +return NULL ; +} +static inline bool acpi_driver_match_device (struct device *dev,const struct device_driver *drv) {
Signature · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 3/7 device property: Introduce a common API to fetch device match data
In reply to Sinan KayaThere 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.
--- drivers/base/property.c | 7 +++++++ include/linux/fwnode.h | 4 ++++ include/linux/property.h | 2 ++ 3 files changed, 13 insertions(+)
drivers/base/property.c +7 -0
@@ -1335,3 +1335,10 @@ 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) +{ +return fwnode_call_ptr_op (dev_fwnode (dev), get_match_data, + dev->driver); +} +EXPORT_SYMBOL_GPL (device_get_match_data);
include/linux/fwnode.h +4 -0
@@ -15,6 +15,7 @@#include <linux/types.h> struct fwnode_operations ; +struct device_driver ;struct fwnode_handle {struct fwnode_handle *secondary;
@@ -66,6 +67,7 @@ struct fwnode_reference_args {* endpoint node. * @graph_get_port_parent: Return the parent node of a port node. * @graph_parse_endpoint: Parse endpoint for port and endpoint id. +* @get_match_data: Return the driver match data. */ struct fwnode_operations {void (*get)(struct fwnode_handle *fwnode);
@@ -101,6 +103,8 @@ struct fwnode_operations { (*graph_get_port_parent)(struct fwnode_handle *fwnode);int (*graph_parse_endpoint)(const struct fwnode_handle *fwnode,struct fwnode_endpoint *endpoint); +void *(*get_match_data)(const struct fwnode_handle *fwnode, +const struct device_driver *drv); };#define fwnode_has_op (fwnode, op) \
include/linux/property.h +2 -0
@@ -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);
Signature · 1 line
1.9.1
PATCH v5 4/7 OF: properties: Implement get_match_data() callback
In reply to Sinan KayaNow that we have a get_match_data() callback as part of the firmware node, implement the OF specific piece for it.
--- drivers/of/property.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/of/property.c +17 -0
@@ -981,6 +981,22 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,return 0 ; } +void *of_fwnode_get_match_data (const struct fwnode_handle *fwnode, +const struct device_driver *drv) +{ +const struct device_node *node =to_of_node (fwnode); +const struct of_device_id *match; + +if (!node) +return NULL ; + + match =of_match_node (drv->of_match_table, node); +if (!match) +return NULL ; + +return (void *)match->data; +} +const struct fwnode_operations of_fwnode_ops = { .get = of_fwnode_get, .put = of_fwnode_put,
@@ -996,5 +1012,6 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, .graph_get_remote_endpoint = of_fwnode_graph_get_remote_endpoint, .graph_get_port_parent = of_fwnode_graph_get_port_parent, .graph_parse_endpoint = of_fwnode_graph_parse_endpoint, + .get_match_data = of_fwnode_get_match_data, };EXPORT_SYMBOL_GPL (of_fwnode_ops);
Signature · 1 line
1.9.1
PATCH v5 5/7 ACPI: properties: Implement get_match_data() callback
In reply to Sinan KayaNow that we have a get_match_data() callback as part of the firmware node, implement the ACPI specific piece for it.
--- drivers/acpi/property.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/acpi/property.c +12 -0
@@ -1271,6 +1271,17 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,return 0 ; } +static void *acpi_fwnode_get_match_data (const struct fwnode_handle *fwnode, +const struct device_driver *drv) +{ +struct acpi_device *adev =to_acpi_device_node (fwnode); + +if (!adev) +return NULL ; + +return acpi_get_match_data (adev, drv->acpi_match_table); +} +#define DECLARE_ACPI_FWNODE_OPS (ops) \ const struct fwnode_operations ops = { \ .device_is_available = acpi_fwnode_device_is_available, \
@@ -1289,6 +1300,7 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, acpi_fwnode_graph_get_remote_endpoint, \ .graph_get_port_parent = acpi_fwnode_get_parent, \ .graph_parse_endpoint = acpi_fwnode_graph_parse_endpoint, \ + .get_match_data = acpi_fwnode_get_match_data, \ }; \EXPORT_SYMBOL_GPL (ops)
Signature · 1 line
1.9.1
PATCH v5 6/7 dmaengine: qcom_hidma: Add support for the new revision
In reply to Sinan KayaAdd support for probing the newer HW and also organize MSI capable hardware into an array for maintenance reasons.
--- drivers/dma/qcom/hidma.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-)
drivers/dma/qcom/hidma.c +13 -21
@@ -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);
Signature · 1 line
1.9.1
PATCH v5 7/7 dmaengine: qcom_hidma: Add identity register support
In reply to Sinan KayaThe location for destination event channel register has been relocated from offset 0x28 to 0x40. Update the code accordingly.
--- drivers/dma/qcom/hidma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/dma/qcom/hidma.c +8 -3
@@ -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);
Signature · 1 line
1.9.1
Re: [PATCH V5 4/7] OF: properties: Implement get_match_data() callback
In reply to Sinan KayaQuoted 14 lines · Sinan Kaya
Now that we have a
get_match_data()callback as part of the firmware node, implement the OF specific piece for it.Signed-off-by Sinan Kaya <[email protected]>--- drivers/of/property.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/of/property.c +0
-0@@ -981,6 +981,22 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,return 0 ;
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 991
Quoted 10 lines
drivers/of/property.c +8
-0} +void *of_fwnode_get_match_data (const struct fwnode_handle *fwnode, +const struct device_driver *drv) +{ +const struct device_node *node =to_of_node (fwnode); +const struct of_device_id *match; + +if (!node) +return NULL ;
of_match_node checks this.
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 997
Quoted 6 lines
drivers/of/property.c +6
-0+ + match =of_match_node (drv->of_match_table, node); +if (!match) +return NULL ; + +return (void *)match->data;
Don't need a cast here.
of_device_get_match_data() already does most of this, but getting a device ptr from fwnode_handle may not be possible?
Rob
Re: [PATCH V5 4/7] OF: properties: Implement get_match_data() callback
Quoted 9 lines · Rob Herring
Quoted 8 lines · Sinan Kaya
Now that we have a
get_match_data()callback as part of the firmware node, implement the OF specific piece for it.Signed-off-by Sinan Kaya <[email protected]>--- drivers/of/property.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
..
Quoted 11 lines
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 991
Quoted 9 lines
drivers/of/property.c +8
-0+void *of_fwnode_get_match_data (const struct fwnode_handle *fwnode, +const struct device_driver *drv) +{ +const struct device_node *node =to_of_node (fwnode); +const struct of_device_id *match; + +if (!node) +return NULL ;
of_match_nodechecks this.
I see a check for the matches argument but not for the node argument. Am I missing something?
Quoted 9 lines
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 997
Quoted 7 lines
drivers/of/property.c +6
-0+ + match =of_match_node (drv->of_match_table, node); +if (!match) +return NULL ; + +return (void *)match->data;Don't need a cast here.
I can fix this.
Quoted 3 lines
of_device_get_match_data()already does most of this, but getting a device ptr fromfwnode_handlemay not be possible?
I couldn't figure out how to do that. Do you have a suggestion? I have been looking for examples with no luck.
Quoted 3 lines
Rob
Signature · 3 lines
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.
Rafael J. Wysocki
maintainerRe: [PATCH V5 2/7] ACPI / bus: Introduce acpi_get_match_data() function
In reply to Sinan KayaQuoted 4 lines · Sinan Kaya
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 <[email protected]>
Haven't I ACKed this already?
Anyway, please resend the whole series with a CC to linux-acpi.
Thanks,
Rafael
Re: [PATCH V5 2/7] ACPI / bus: Introduce acpi_get_match_data() function
Quoted 9 lines · Rafael J. Wysocki
Quoted 4 lines · Sinan Kaya
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 <[email protected]>Haven't I ACKed this already?
Anyway, please resend the whole series with a CC to linux-acpi.
Yeah, you acked the previous one. Then, I changed the calling parameter from struct device to struct acpi_device and removed your ACK.
Signature · 3 lines
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.
Re: [PATCH V5 1/7] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW
In reply to Sinan KayaQuoted 13 lines · Sinan Kaya
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 <[email protected]>--- Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +0
-0
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt When the OS is not in control of the management interface (i.e. it's a guest), · line 51
Quoted 7 lines
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +2
-2@@ -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.
Hopefully 1.2 corresponds to some actual version numbering and not just something you made up. I'd really rather have SoC based compatible strings unless you have dozens of SoCs for each version. I'll probably just say the same thing again when 1.3 or 2.0 gets added...
Quoted 6 lines
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +0
-0- reg: Addresses for the transfer and event channel - interrupts: Should contain the event interrupt - desc-count: Number of asynchronous requests this channel can handleSignature · 1 line
1.9.1
Rob Herring
maintainerRe: [PATCH V5 4/7] OF: properties: Implement get_match_data() callback
In reply to Sinan KayaQuoted 24 lines · Sinan Kaya
Quoted 9 lines · Rob Herring
Quoted 8 lines · Sinan Kaya
Now that we have a
get_match_data()callback as part of the firmware node, implement the OF specific piece for it.Signed-off-by Sinan Kaya <[email protected]>--- drivers/of/property.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)..
Quoted 11 lines
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 991
Quoted 9 lines
drivers/of/property.c +8
-0+void *of_fwnode_get_match_data (const struct fwnode_handle *fwnode, +const struct device_driver *drv) +{ +const struct device_node *node =to_of_node (fwnode); +const struct of_device_id *match; + +if (!node) +return NULL ;
of_match_nodechecks this.
Quoted 2 lines
I see a check for the matches argument but not for the node argument. Am I missing something?
Ah yes, you are right.
Quoted 11 lines
Quoted 10 lines
drivers/of/property.c static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, · line 997
Quoted 8 lines
drivers/of/property.c +6
-0+ + match =of_match_node (drv->of_match_table, node); +if (!match) +return NULL ; + +return (void *)match->data;Don't need a cast here.
Quoted 8 lines
I can fix this.
Quoted 3 lines
of_device_get_match_data()already does most of this, but getting a device ptr fromfwnode_handlemay not be possible?I couldn't figure out how to do that. Do you have a suggestion? I have been looking for examples with no luck.
Change the property API to pass struct device instead. That's maybe not worth it.
Rob
Re: [PATCH V5 1/7] Documentation: DT: qcom_hidma: Bump HW revision for the bugfixed HW
In reply to Rob HerringQuoted 5 lines · Rob Herring
Hopefully 1.2 corresponds to some actual version numbering and not just something you made up. I'd really rather have SoC based compatible strings unless you have dozens of SoCs for each version. I'll probably just say the same thing again when 1.3 or 2.0 gets added...
No, these are coming from the HW. They are user visible.
[ 107.167207] hidma-mgmt QCOM8060:00: HW rev: 1.2 @ 0x0000ffff8b800000 with 6 physical channels
Quoted 1 line
Reviewed-by Rob Herring <[email protected]>
Thanks
Signature · 3 lines
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.