From: Sinan Kaya <okaya@codeaurora.org>
To: Eric Auger <eric.auger@linaro.org>,
dmaengine@vger.kernel.org, marc.zyngier@arm.com,
mark.rutland@arm.com, timur@codeaurora.org,
devicetree@vger.kernel.org, cov@codeaurora.org,
vinod.koul@intel.com, jcm@redhat.com
Cc: shankerd@codeaurora.org, vikrams@codeaurora.org,
agross@codeaurora.org, arnd@arndb.de,
linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH V14 8/9] vfio, platform: add support for ACPI while detecting the reset driver
Date: Fri, 26 Feb 2016 14:21:06 -0500 [thread overview]
Message-ID: <56D0A5A2.6020907@codeaurora.org> (raw)
In-Reply-To: <56D08843.5020306@linaro.org>
>> +#ifdef CONFIG_ACPI
>> +int vfio_platform_probe_acpi(struct vfio_platform_device *vdev,
>> + struct device *dev)
>> +{
>> + struct acpi_device *adev = ACPI_COMPANION(dev);
>> +
>> + if (!adev)
>> + return -EINVAL;
> -ENODEV seems to be commonly used in that case
ok
>> +
>> + vdev->acpihid = acpi_device_hid(adev);
>> + if (!vdev->acpihid) {
> can it return NULL? Seems to return dummy "device" or actual hid
>> + pr_err("VFIO: cannot find ACPI HID for %s\n",
>> + vdev->name);
>> + return -EINVAL;
> -ENODEV too?
sure
>> + }
>> + return 0;
>> +}
>> +#else
>> +int vfio_platform_probe_acpi(struct vfio_platform_device *vdev,
>> + struct device *dev)
>> +{
>> + return -EINVAL;
>> +}
>> +#endif
>> +
>> +int vfio_platform_probe_of(struct vfio_platform_device *vdev,
>> + struct device *dev)
>> +{
>> + int ret;
>> +
>> + ret = device_property_read_string(dev, "compatible",
>> + &vdev->compat);
>> + if (ret) {
>> + pr_err("VFIO: cannot retrieve compat for %s\n",
>> + vdev->name);
>> + return -EINVAL;
> return ret instead.
ok
>> + }
>> + return 0;
>> +}
>> +
>> int vfio_platform_probe_common(struct vfio_platform_device *vdev,
>> struct device *dev)
>> {
>> @@ -550,14 +600,14 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
>> if (!vdev)
>> return -EINVAL;
>>
>> - ret = device_property_read_string(dev, "compatible", &vdev->compat);
>> - if (ret) {
>> - pr_err("VFIO: cannot retrieve compat for %s\n", vdev->name);
>> - return -EINVAL;
>> - }
>> + ret = vfio_platform_probe_acpi(vdev, dev);
>> + if (ret)
>> + ret = vfio_platform_probe_of(vdev, dev);
>>
>> - vdev->device = dev;
>> + if (ret)
>> + return ret;
>>
>> + vdev->device = dev;
>> group = iommu_group_get(dev);
>> if (!group) {
>> pr_err("VFIO: No IOMMU group for device %s\n", vdev->name);
>> @@ -602,13 +652,21 @@ void __vfio_platform_register_reset(struct vfio_platform_reset_node *node)
>> EXPORT_SYMBOL_GPL(__vfio_platform_register_reset);
>>
>> void vfio_platform_unregister_reset(const char *compat,
>> + const char *acpihid,
>> vfio_platform_reset_fn_t fn)
>> {
>> struct vfio_platform_reset_node *iter, *temp;
>>
>> mutex_lock(&driver_lock);
>> list_for_each_entry_safe(iter, temp, &reset_list, link) {
>> - if (!strcmp(iter->compat, compat) && (iter->reset == fn)) {
>> + if (acpihid && iter->acpihid &&
>> + !strcmp(iter->acpihid, acpihid) && (iter->reset == fn)) {
>> + list_del(&iter->link);
>> + break;
>> + }
>> +
>> + if (compat && iter->compat &&
>> + !strcmp(iter->compat, compat) && (iter->reset == fn)) {
>> list_del(&iter->link);
>> break;
>> }
>
> in vfio_platform_get_reset, if the 1st vfio_platform_lookup_reset call
> does not return anything then we currently call
> request_module("vfio-reset:%s", vdev->compat);
>
> you need to handle the case where compat is not set but vdev->acpihid
> is, instead.
>
> currently the module alias is constructed with the compat only
> MODULE_ALIAS("vfio-reset:" compat);
>
> Looks you can define several ones ( for instance in
> drivers/block/xen-blkfront.c).
>
> If I am not wrong this currently would not work with
> vfio-platform-qcomhidma compiled as a module.
>
Good point. I happen to have both defined as the driver support both ACPI
and device-tree. That's why, I have never seen the problem during testing.
>>
>> -#define module_vfio_reset_handler(compat, reset) \
>> -MODULE_ALIAS("vfio-reset:" compat); \
>> -static int __init reset ## _module_init(void) \
>> -{ \
>> - vfio_platform_register_reset(compat, reset); \
>> - return 0; \
>> -}; \
>> -static void __exit reset ## _module_exit(void) \
>> -{ \
>> - vfio_platform_unregister_reset(compat, reset); \
>> -}; \
>> -module_init(reset ## _module_init); \
>> +#define module_vfio_reset_handler(compat, acpihid, reset) \
>> +MODULE_ALIAS("vfio-reset:" compat); \
> Here you need to handle alias for hid case I think
>
I'll add this and test different combinations where compat and acpihid are null.
#define module_vfio_reset_handler(compat, acpihid, reset) \
MODULE_ALIAS("vfio-reset:" compat); \
MODULE_ALIAS("vfio-reset:" acpihid); \
--
Sinan Kaya
Qualcomm Technologies, Inc. on behalf of Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-02-26 19:21 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 4:34 [PATCH V14 0/9] dma: add Qualcomm Technologies HIDMA driver Sinan Kaya
2016-02-05 4:34 ` [PATCH V14 1/9] dma: qcom_bam_dma: move to qcom directory Sinan Kaya
2016-03-11 2:13 ` Vinod Koul
2016-02-05 4:34 ` [PATCH V14 2/9] dma: hidma: Add Device Tree binding Sinan Kaya
2016-03-11 2:16 ` Vinod Koul
2016-02-05 4:34 ` [PATCH V14 3/9] dma: add Qualcomm Technologies HIDMA management driver Sinan Kaya
2016-03-11 2:16 ` Vinod Koul
2016-02-05 4:34 ` [PATCH V14 4/9] dma: add Qualcomm Technologies HIDMA channel driver Sinan Kaya
2016-03-11 2:17 ` Vinod Koul
2016-02-05 4:34 ` [PATCH V14 5/9] dma: qcom_hidma: implement lower level hardware interface Sinan Kaya
2016-03-11 2:06 ` Vinod Koul
2016-03-11 3:08 ` Okaya
2016-03-11 16:02 ` Sinan Kaya
2016-03-11 16:32 ` Vinod Koul
2016-03-11 16:44 ` Sinan Kaya
2016-03-11 19:29 ` Sinan Kaya
2016-03-11 21:59 ` Sinan Kaya
2016-03-13 16:00 ` Vinod Koul
2016-03-14 13:53 ` Sinan Kaya
2016-03-13 15:59 ` Vinod Koul
2016-03-14 13:56 ` Sinan Kaya
2016-02-05 4:34 ` [PATCH V14 6/9] dma: qcom_hidma: add debugfs hooks Sinan Kaya
2016-02-05 4:34 ` [PATCH V14 7/9] dma: qcom_hidma: add support for object hierarchy Sinan Kaya
2016-02-05 4:34 ` [PATCH V14 8/9] vfio, platform: add support for ACPI while detecting the reset driver Sinan Kaya
2016-02-26 16:24 ` Sinan Kaya
2016-02-26 17:15 ` Eric Auger
2016-02-26 19:21 ` Sinan Kaya [this message]
2016-03-02 18:34 ` Sinan Kaya
2016-03-03 23:14 ` Eric Auger
2016-03-04 5:20 ` Sinan Kaya
2016-03-07 4:09 ` Eric Auger
2016-03-07 15:30 ` Sinan Kaya
2016-03-08 4:46 ` Eric Auger
2016-03-08 5:07 ` Sinan Kaya
2016-03-08 15:44 ` Sinan Kaya
2016-02-05 4:34 ` [PATCH V14 9/9] vfio, platform: add QTI HIDMA " Sinan Kaya
2016-02-26 17:52 ` Eric Auger
2016-02-26 19:05 ` Sinan Kaya
2016-02-08 10:14 ` [PATCH V14 0/9] dma: add Qualcomm Technologies HIDMA driver Christoffer Dall
2016-02-08 14:24 ` Sinan Kaya
2016-02-08 17:00 ` Christoffer Dall
2016-02-26 16:21 ` Sinan Kaya
2016-02-26 16:52 ` Timur Tabi
2016-03-02 18:40 ` Sinan Kaya
2016-03-03 3:44 ` Vinod Koul
2016-03-03 15:22 ` Sinan Kaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56D0A5A2.6020907@codeaurora.org \
--to=okaya@codeaurora.org \
--cc=agross@codeaurora.org \
--cc=arnd@arndb.de \
--cc=cov@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=eric.auger@linaro.org \
--cc=jcm@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=shankerd@codeaurora.org \
--cc=timur@codeaurora.org \
--cc=vikrams@codeaurora.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).