Documentation: DT: qcom_hidma: bump HW revision for the bugfixed HW
Subsystems (5)
PATCH v3 1/4 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 v3 2/4 ACPI / bus: introduce acpi_device_get_match_data() function
OF has of_device_get_match_data() function to extract driver specific data structure. Add a similar function for ACPI.
--- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+)
drivers/acpi/bus.c +12 -0
@@ -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) {
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_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) {
Signature · 1 line
1.9.1
Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
[email protected], +Rafael
Quoted 57 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]>--- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+)drivers/acpi/bus.c +12
-0@@ -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) {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_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) {
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 V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
Quoted 1 line · CET Sinan Kaya
+linux-acpi at vger.kernel.org, +Rafael
Thanks!
Quoted 18 lines · Sinan Kaya
Quoted 17 lines
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]>--- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+)drivers/acpi/bus.c +0
-0@@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, }EXPORT_SYMBOL_GPL (acpi_match_device);
Quoted 11 lines
drivers/acpi/bus.c const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, · line 798
Quoted 11 lines
drivers/acpi/bus.c +11
-0+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
Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
Quoted 23 lines · Rafael J. Wysocki
Quoted 1 line · CET Sinan Kaya
[email protected], +Rafael
Thanks!
Quoted 18 lines · Sinan Kaya
Quoted 17 lines
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]>--- drivers/acpi/bus.c | 12 ++++++++++++ include/linux/acpi.h | 6 ++++++ 2 files changed, 18 insertions(+)drivers/acpi/bus.c +0
-0@@ -785,6 +785,18 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, }EXPORT_SYMBOL_GPL (acpi_match_device);
Quoted 14 lines
Quoted 11 lines
drivers/acpi/bus.c const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, · line 798
Quoted 11 lines
drivers/acpi/bus.c +11
-0+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() ?
Signature · 1 line
~Vinod
Re: [PATCH V3 2/4] ACPI / bus: introduce acpi_device_get_match_data() function
Quoted 3 lines · Vinod Koul
Quoted 2 lines
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.
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.
PATCH v3 3/4 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 | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-)
drivers/dma/qcom/hidma.c +16 -19
@@ -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);
Signature · 1 line
1.9.1
Re: [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
Quoted 7 lines · Sinan Kaya
drivers/dma/qcom/hidma.c +2
-3-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;
drivers/dma/qcom/hidma.c static int hidma_request_msi(struct hidma_dev *dmadev, · line 751
Quoted 10 lines
drivers/dma/qcom/hidma.c +4
-5-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
Signature · 1 line
~Vinod
Re: [PATCH V3 3/4] dmaengine: qcom_hidma: add support for the new revision
+linux-acpi
Quoted 3 lines · Vinod Koul
drivers/dma/qcom/hidma.c static int hidma_request_msi(struct hidma_dev *dmadev, · line 751
Quoted 1 line
drivers/dma/qcom/hidma.c +1
-0+ 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
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.
PATCH v3 4/4 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 */
@@ -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);
Signature · 1 line
1.9.1