dmaengine: qcom_hidma: add support for bugfixed HW
Subsystems (8)
v8 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 v7:
* rebase to 4.15-rc1
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 | 18 ++++++++++ drivers/acpi/property.c | 8 +++++ drivers/base/property.c | 7 ++++ drivers/dma/qcom/hidma.c | 41 ++++++++++------------ drivers/of/property.c | 8 +++++ include/linux/acpi.h | 6 ++++ include/linux/fwnode.h | 4 +++ include/linux/property.h | 2 ++ 9 files changed, 74 insertions(+), 24 deletions(-)
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 v8 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
PATCH v8 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 | 18 ++++++++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 24 insertions(+)
drivers/acpi/bus.c +18 -0
@@ -785,6 +785,24 @@ 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; + +if (!dev->driver) +return NULL ; + +if (!dev->driver->acpi_match_table) +return NULL ; + + 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) {
include/linux/acpi.h +6 -0
@@ -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) {
PATCH v8 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
@@ -1340,3 +1340,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), device_get_match_data, + dev); +} +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 ;struct fwnode_handle {struct fwnode_handle *secondary;
@@ -51,6 +52,7 @@ struct fwnode_reference_args {* struct fwnode_operations - Operations for fwnode interface * @get: Get a reference to an fwnode. * @put: Put a reference to an fwnode. +* @device_get_match_data: Return the device driver match data. * @property_present: Return true if a property is present. * @property_read_integer_array: Read an array of integer properties. Return * zero on success, a negative error code
@@ -71,6 +73,8 @@ struct fwnode_operations {struct fwnode_handle *(*get)(struct fwnode_handle *fwnode);void (*put)(struct fwnode_handle *fwnode);bool (*device_is_available)(const struct fwnode_handle *fwnode); +void *(*device_get_match_data)(const struct fwnode_handle *fwnode, +const struct device *dev);bool (*property_present)(const struct fwnode_handle *fwnode,const char *propname); int (*property_read_int_array)(const struct fwnode_handle *fwnode,
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);
PATCH v8 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 | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/of/property.c +8 -0
@@ -981,10 +981,18 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,return 0 ; } +static void * +of_fwnode_device_get_match_data (const struct fwnode_handle *fwnode, +const struct device *dev) +{ +return (void *)of_device_get_match_data (dev); +} +const struct fwnode_operations of_fwnode_ops = { .get = of_fwnode_get, .put = of_fwnode_put, .device_is_available = of_fwnode_device_is_available, + .device_get_match_data = of_fwnode_device_get_match_data, .property_present = of_fwnode_property_present, .property_read_int_array = of_fwnode_property_read_int_array, .property_read_string_array = of_fwnode_property_read_string_array,
PATCH v8 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 | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/acpi/property.c +8 -0
@@ -1271,9 +1271,17 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,return 0 ; } +static void * +acpi_fwnode_device_get_match_data (const struct fwnode_handle *fwnode, +const struct device *dev) +{ +return acpi_get_match_data (dev); +} +#define DECLARE_ACPI_FWNODE_OPS (ops) \ const struct fwnode_operations ops = { \ .device_is_available = acpi_fwnode_device_is_available, \ + .device_get_match_data = acpi_fwnode_device_get_match_data, \ .property_present = acpi_fwnode_property_present, \ .property_read_int_array = \ acpi_fwnode_property_read_int_array, \
PATCH v8 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);
PATCH v8 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);
Vinod Koul
AppliedQuoted 2 lines · Sinan Kaya
Introduce new ACPI and OF device ids for thw HW along with the helper functions.
Applied, thanks
Signature · 1 line
~Vinod