mfd: introduce a driver for LPSS devices on SPT
Subsystems (9)
Andy Shevchenko
reviewerv3 cover mfd: introduce a driver for LPSS devices on SPT
The new coming Intel platforms such as Skylake will contain Sunrisepoint PCH.
The driver is based on MFD framework since the main device, i.e. serial bus controller, contains register space for itself, DMA part, and an additional address space (convergence layer).
The public specification of the register map is avaiable in [1].
This is third generation of the patch series to bring support LPSS devices found on Intel Sunrisepoint (Intel Skylake PCH). Previous one can be found here [2].
The series has few logical parts:
- patches 1-3 prepares PM core, ACPI, and driver core (PM) to handle our case
- patches 4-6 introduce unregistering platform devices in MFD in reversed order
- patch 7 implements iDMA 64-bit driver
- patch 8 introduces an MFD driver for LPSS devices
The patch 8 depends on clkdev_create() helper that has been introduced by Russel King in [3].
The driver has been tested with SPI and UART on Intel Skylake PCH.
[1] https://download.01.org/future-platform-configuration-hub/skylake/register-definitions/332219_001_Final.pdf
[2] https://lkml.org/lkml/2015/5/25/298
[3] https://patchwork.linuxtv.org/patch/28464/
Changelog v3:
- rework patch 3 to be used for all kind of devices (address Alan comment)
- iDMA 64-bit driver improvements:
- fix burst-to-register conversion
- remove excessive locking
- do not expose core part to the user (Kconfig)
- address most of Lee's comments
- append ACKs
- rebase on top of v4.1-rc6
Changelog v2:
- new DMA driver to fully support iDMA 64-bit IP
- patch 3 is added to wake up parent devices when ->probe(), ->remove(), or
->shutdown()
- MFD core is unregistering devices in reversed order
- address few Lee's comments on v1
- address Russel's comment, therefore use clkdev_create() helper
- intel-lpss{,-acpi,-pci} are modified regarding to above changes
Andy Shevchenko (5):
klist: implement klist_prev()
driver core: implement device_for_each_child_reverse()
mfd: make mfd_remove_devices() iterate in reverse order
dmaengine: add a driver for Intel integrated DMA 64-bit
mfd: Add support for Intel Sunrisepoint LPSS devices
Heikki Krogerus (1):
Driver core: wakeup the parent device before trying probe
Mika Westerberg (2):
PM / QoS: Make it possible to expose device latency tolerance to
userspace
ACPI / PM: Attach ACPI power domain only once
drivers/acpi/device_pm.c | 8 + drivers/acpi/internal.h | 2 + drivers/acpi/scan.c | 46 ++- drivers/base/core.c | 43 +++ drivers/base/dd.c | 8 + drivers/base/power/power.h | 2 + drivers/base/power/qos.c | 37 +++ drivers/base/power/sysfs.c | 11 + drivers/dma/Kconfig | 5 + drivers/dma/Makefile | 1 + drivers/dma/idma64.c | 724 ++++++++++++++++++++++++++++++++++++++++++ drivers/dma/idma64.h | 232 ++++++++++++++ drivers/mfd/Kconfig | 23 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel-lpss-acpi.c | 84 +++++ drivers/mfd/intel-lpss-pci.c | 113 +++++++ drivers/mfd/intel-lpss.c | 524 ++++++++++++++++++++++++++++++ drivers/mfd/intel-lpss.h | 62 ++++ drivers/mfd/mfd-core.c | 2 +- include/linux/device.h | 2 + include/linux/klist.h | 1 + include/linux/pm_qos.h | 5 + lib/klist.c | 41 +++ 23 files changed, 1962 insertions(+), 17 deletions(-) create mode 100644 drivers/dma/idma64.c create mode 100644 drivers/dma/idma64.h create mode 100644 drivers/mfd/intel-lpss-acpi.c create mode 100644 drivers/mfd/intel-lpss-pci.c create mode 100644 drivers/mfd/intel-lpss.c create mode 100644 drivers/mfd/intel-lpss.h
Signature · 1 line
2.1.4
Andy Shevchenko
reviewerPATCH v3 1/8 PM / QoS: Make it possible to expose device latency tolerance to userspace
From: Mika Westerberg <[email protected]>
Typically when a device is created the bus core it belongs to (for example PCI) does not know if the device supports things like latency tolerance. This is left to the driver that binds to the device in question. However, at that time the device has already been created and there is no way to set its dev->power.set_latency_tolerance anymore.
So follow what has been done for other PM QoS attributes as well and allow drivers to expose and hide latency tolerance from userspace, if the device supports it.
--- drivers/base/power/power.h | 2 ++ drivers/base/power/qos.c | 37 +++++++++++++++++++++++++++++++++++++ drivers/base/power/sysfs.c | 11 +++++++++++ include/linux/pm_qos.h | 5 +++++ 4 files changed, 55 insertions(+)
drivers/base/power/power.h +2 -0
@@ -33,6 +33,8 @@ extern int pm_qos_sysfs_add_resume_latency(struct device *dev);extern void pm_qos_sysfs_remove_resume_latency (struct device *dev);extern int pm_qos_sysfs_add_flags (struct device *dev);extern void pm_qos_sysfs_remove_flags (struct device *dev); +extern int pm_qos_sysfs_add_latency_tolerance (struct device *dev); +extern void pm_qos_sysfs_remove_latency_tolerance (struct device *dev);#else /* CONFIG_PM */
drivers/base/power/qos.c +37 -0
@@ -883,3 +883,40 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)mutex_unlock (&dev_pm_qos_mtx);return ret; } + +/** +* dev_pm_qos_expose_latency_tolerance - Expose latency tolerance to userspace +* @dev: Device whose latency tolerance to expose +*/ +int dev_pm_qos_expose_latency_tolerance (struct device *dev) +{ +int ret; + +if (!dev->power.set_latency_tolerance) +return -EINVAL ; + +mutex_lock (&dev_pm_qos_sysfs_mtx); + ret =pm_qos_sysfs_add_latency_tolerance (dev); +mutex_unlock (&dev_pm_qos_sysfs_mtx); + +return ret; +} +EXPORT_SYMBOL_GPL (dev_pm_qos_expose_latency_tolerance); + +/** +* dev_pm_qos_hide_latency_tolerance - Hide latency tolerance from userspace +* @dev: Device whose latency tolerance to hide +*/ +void dev_pm_qos_hide_latency_tolerance (struct device *dev) +{ +mutex_lock (&dev_pm_qos_sysfs_mtx); +pm_qos_sysfs_remove_latency_tolerance (dev); +mutex_unlock (&dev_pm_qos_sysfs_mtx); + +/* Remove the request from user space now */ +pm_runtime_get_sync (dev); +dev_pm_qos_update_user_latency_tolerance (dev, +PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT ); +pm_runtime_put (dev); +} +EXPORT_SYMBOL_GPL (dev_pm_qos_hide_latency_tolerance);
drivers/base/power/sysfs.c +11 -0
@@ -738,6 +738,17 @@ void pm_qos_sysfs_remove_flags(struct device *dev)sysfs_unmerge_group (&dev->kobj, &pm_qos_flags_attr_group); } +int pm_qos_sysfs_add_latency_tolerance (struct device *dev) +{ +return sysfs_merge_group (&dev->kobj, + &pm_qos_latency_tolerance_attr_group); +} + +void pm_qos_sysfs_remove_latency_tolerance (struct device *dev) +{ +sysfs_unmerge_group (&dev->kobj, &pm_qos_latency_tolerance_attr_group); +} +void rpm_sysfs_remove (struct device *dev) {sysfs_unmerge_group (&dev->kobj, &pm_runtime_attr_group);
include/linux/pm_qos.h +5 -0
@@ -161,6 +161,8 @@ void dev_pm_qos_hide_flags(struct device *dev);int dev_pm_qos_update_flags (struct device *dev,s32 mask,bool set);s32 dev_pm_qos_get_user_latency_tolerance (struct device *dev);int dev_pm_qos_update_user_latency_tolerance (struct device *dev,s32 val); +int dev_pm_qos_expose_latency_tolerance (struct device *dev); +void dev_pm_qos_hide_latency_tolerance (struct device *dev);static inline s32 dev_pm_qos_requested_resume_latency (struct device *dev) {
@@ -229,6 +231,9 @@ static inline s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev) {return PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT ; }static inline int dev_pm_qos_update_user_latency_tolerance (struct device *dev,s32 val) {return 0 ; } +static inline int dev_pm_qos_expose_latency_tolerance (struct device *dev) + {return 0 ; } +static inline void dev_pm_qos_hide_latency_tolerance (struct device *dev) {}static inline s32 dev_pm_qos_requested_resume_latency (struct device *dev) {return 0 ; }static inline s32 dev_pm_qos_requested_flags (struct device *dev) {return 0 ; }
Signature · 1 line
2.1.4
Re: [PATCH v3 1/8] PM / QoS: Make it possible to expose device latency tolerance to userspace
Quoted 8 lines · Andy Shevchenko
From: Mika Westerberg <[email protected]>
Typically when a device is created the bus core it belongs to (for example PCI) does not know if the device supports things like latency tolerance. This is left to the driver that binds to the device in question. However, at that time the device has already been created and there is no way to set its
dev->power.set_latency_toleranceanymore.
Quoted 6 lines
So follow what has been done for other PM QoS attributes as well and allow drivers to expose and hide latency tolerance from userspace, if the device supports it.
Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
Quoted 111 lines
--- drivers/base/power/power.h | 2 ++ drivers/base/power/qos.c | 37 +++++++++++++++++++++++++++++++++++++ drivers/base/power/sysfs.c | 11 +++++++++++ include/linux/pm_qos.h | 5 +++++ 4 files changed, 55 insertions(+)drivers/base/power/power.h +2
-0@@ -33,6 +33,8 @@ extern int pm_qos_sysfs_add_resume_latency(struct device *dev);extern void pm_qos_sysfs_remove_resume_latency (struct device *dev);extern int pm_qos_sysfs_add_flags (struct device *dev);extern void pm_qos_sysfs_remove_flags (struct device *dev); +extern int pm_qos_sysfs_add_latency_tolerance (struct device *dev); +extern void pm_qos_sysfs_remove_latency_tolerance (struct device *dev);#else /* CONFIG_PM */ drivers/base/power/qos.c +37
-0@@ -883,3 +883,40 @@ int dev_pm_qos_update_user_latency_tolerance(struct device *dev, s32 val)mutex_unlock (&dev_pm_qos_mtx);return ret; } + +/** +* dev_pm_qos_expose_latency_tolerance - Expose latency tolerance to userspace +* @dev: Device whose latency tolerance to expose +*/ +int dev_pm_qos_expose_latency_tolerance (struct device *dev) +{ +int ret; + +if (!dev->power.set_latency_tolerance) +return -EINVAL ; + +mutex_lock (&dev_pm_qos_sysfs_mtx); + ret =pm_qos_sysfs_add_latency_tolerance (dev); +mutex_unlock (&dev_pm_qos_sysfs_mtx); + +return ret; +} +EXPORT_SYMBOL_GPL (dev_pm_qos_expose_latency_tolerance); + +/** +* dev_pm_qos_hide_latency_tolerance - Hide latency tolerance from userspace +* @dev: Device whose latency tolerance to hide +*/ +void dev_pm_qos_hide_latency_tolerance (struct device *dev) +{ +mutex_lock (&dev_pm_qos_sysfs_mtx); +pm_qos_sysfs_remove_latency_tolerance (dev); +mutex_unlock (&dev_pm_qos_sysfs_mtx); + +/* Remove the request from user space now */ +pm_runtime_get_sync (dev); +dev_pm_qos_update_user_latency_tolerance (dev, +PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT ); +pm_runtime_put (dev); +} +EXPORT_SYMBOL_GPL (dev_pm_qos_hide_latency_tolerance);drivers/base/power/sysfs.c +11
-0@@ -738,6 +738,17 @@ void pm_qos_sysfs_remove_flags(struct device *dev)sysfs_unmerge_group (&dev->kobj, &pm_qos_flags_attr_group); } +int pm_qos_sysfs_add_latency_tolerance (struct device *dev) +{ +return sysfs_merge_group (&dev->kobj, + &pm_qos_latency_tolerance_attr_group); +} + +void pm_qos_sysfs_remove_latency_tolerance (struct device *dev) +{ +sysfs_unmerge_group (&dev->kobj, &pm_qos_latency_tolerance_attr_group); +} +void rpm_sysfs_remove (struct device *dev) {sysfs_unmerge_group (&dev->kobj, &pm_runtime_attr_group);include/linux/pm_qos.h +5
-0@@ -161,6 +161,8 @@ void dev_pm_qos_hide_flags(struct device *dev);int dev_pm_qos_update_flags (struct device *dev,s32 mask,bool set);s32 dev_pm_qos_get_user_latency_tolerance (struct device *dev);int dev_pm_qos_update_user_latency_tolerance (struct device *dev,s32 val); +int dev_pm_qos_expose_latency_tolerance (struct device *dev); +void dev_pm_qos_hide_latency_tolerance (struct device *dev);static inline s32 dev_pm_qos_requested_resume_latency (struct device *dev) {@@ -229,6 +231,9 @@ static inline s32 dev_pm_qos_get_user_latency_tolerance(struct device *dev) {return PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT ; }static inline int dev_pm_qos_update_user_latency_tolerance (struct device *dev,s32 val) {return 0 ; } +static inline int dev_pm_qos_expose_latency_tolerance (struct device *dev) + {return 0 ; } +static inline void dev_pm_qos_hide_latency_tolerance (struct device *dev) {}static inline s32 dev_pm_qos_requested_resume_latency (struct device *dev) {return 0 ; }static inline s32 dev_pm_qos_requested_flags (struct device *dev) {return 0 ; }
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Andy Shevchenko
reviewerPATCH v3 2/8 ACPI / PM: Attach ACPI power domain only once
In reply to Andy ShevchenkoFrom: Mika Westerberg <[email protected]>
Some devices, like MFD subdevices, share a single ACPI companion device so that they are able to access their resources and children. However, currently all these subdevices are attached to the ACPI power domain and this might cause that the power methods for the companion device get called more than once.
In order to solve this we attach the ACPI power domain only to the first physical device that is bound to the ACPI companion device. In case of MFD devices, this is the parent MFD device itself.
--- drivers/acpi/device_pm.c | 8 ++++++++ drivers/acpi/internal.h | 2 ++ drivers/acpi/scan.c | 46 ++++++++++++++++++++++++++++++---------------- 3 files changed, 40 insertions(+), 16 deletions(-)
drivers/acpi/device_pm.c +8 -0
@@ -1103,6 +1103,14 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)if (dev->pm_domain)return -EEXIST ; +/* +* Only attach the power domain to the first device if the +* companion is shared by multiple. This is to prevent doing power +* management twice. +*/ +if (!acpi_device_is_first_physical_node (adev, dev)) +return -EBUSY ; +acpi_add_pm_notifier (adev, dev, acpi_pm_notify_work_func); dev->pm_domain = &acpi_general_pm_domain;if (power_on) {
drivers/acpi/internal.h +2 -0
@@ -96,6 +96,8 @@ void acpi_device_add_finalize(struct acpi_device *device);void acpi_free_pnp_ids (struct acpi_device_pnp *pnp);bool acpi_device_is_present (struct acpi_device *adev);bool acpi_device_is_battery (struct acpi_device *adev); +bool acpi_device_is_first_physical_node (struct acpi_device *adev, +const struct device *dev);/* -------------------------------------------------------------------------- Power Resource
drivers/acpi/scan.c +30 -16
64 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [PATCH v3 2/8] ACPI / PM: Attach ACPI power domain only once
Quoted 8 lines · Andy Shevchenko
From: Mika Westerberg <[email protected]>
Some devices, like MFD subdevices, share a single ACPI companion device so that they are able to access their resources and children. However, currently all these subdevices are attached to the ACPI power domain and this might cause that the power methods for the companion device get called more than once.
Quoted 6 lines
In order to solve this we attach the ACPI power domain only to the first physical device that is bound to the ACPI companion device. In case of MFD devices, this is the parent MFD device itself.
Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>
Quoted 110 lines
--- drivers/acpi/device_pm.c | 8 ++++++++ drivers/acpi/internal.h | 2 ++ drivers/acpi/scan.c | 46 ++++++++++++++++++++++++++++++---------------- 3 files changed, 40 insertions(+), 16 deletions(-)drivers/acpi/device_pm.c +8
-0@@ -1103,6 +1103,14 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)if (dev->pm_domain)return -EEXIST ; +/* +* Only attach the power domain to the first device if the +* companion is shared by multiple. This is to prevent doing power +* management twice. +*/ +if (!acpi_device_is_first_physical_node (adev, dev)) +return -EBUSY ; +acpi_add_pm_notifier (adev, dev, acpi_pm_notify_work_func); dev->pm_domain = &acpi_general_pm_domain;if (power_on) {drivers/acpi/internal.h +2
-0@@ -96,6 +96,8 @@ void acpi_device_add_finalize(struct acpi_device *device);void acpi_free_pnp_ids (struct acpi_device_pnp *pnp);bool acpi_device_is_present (struct acpi_device *adev);bool acpi_device_is_battery (struct acpi_device *adev); +bool acpi_device_is_first_physical_node (struct acpi_device *adev, +const struct device *dev);/* -------------------------------------------------------------------------- Power Resource drivers/acpi/scan.c +30
-16@@ -223,6 +223,35 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,return len; } +/** +* acpi_device_is_first_physical_node - Is given dev first physical node +* @adev: ACPI companion device +* @dev: Physical device to check +* +* Function checks if given @dev is the first physical devices attached to +* the ACPI companion device. This distinction is needed in some cases +* where the same companion device is shared between many physical devices. +* +* Note that the caller have to provide valid @adev pointer. +*/ +bool acpi_device_is_first_physical_node (struct acpi_device *adev, +const struct device *dev) +{ +bool ret = false; + +mutex_lock (&adev->physical_node_lock); +if (!list_empty (&adev->physical_node_list)) { +const struct acpi_device_physical_node *node; + + node =list_first_entry (&adev->physical_node_list, + struct acpi_device_physical_node, node); + ret = node->dev == dev; + } +mutex_unlock (&adev->physical_node_lock); + +return ret; +} +/* * acpi_companion_match() - Can we match via ACPI companion device * @dev: Device in question @@ -247,7 +276,6 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,static struct acpi_device *acpi_companion_match (const struct device *dev) {struct acpi_device *adev; -struct mutex *physical_node_lock; adev =ACPI_COMPANION (dev);if (!adev)@@ -256,21 +284,7 @@ static struct acpi_device *acpi_companion_match(const struct device *dev)if (list_empty (&adev->pnp.ids))return NULL ; - physical_node_lock = &adev->physical_node_lock; -mutex_lock (physical_node_lock); -if (list_empty (&adev->physical_node_list)) { - adev =NULL ; - }else { -const struct acpi_device_physical_node *node; - - node =list_first_entry (&adev->physical_node_list, - struct acpi_device_physical_node, node); -if (node->dev != dev) - adev =NULL ; - } -mutex_unlock (physical_node_lock); - -return adev; +return acpi_device_is_first_physical_node (adev, dev) ? adev :NULL ; } static int __acpi_device_uevent_modalias(struct acpi_device *adev,
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Andy Shevchenko
reviewerPATCH v3 3/8 Driver core: wakeup the parent device before trying probe
In reply to Andy ShevchenkoFrom: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return 0xffffffff.
To fix the problem, making sure the parent is always awake before attempting driver probe.
--- drivers/base/dd.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/base/dd.c +8 -0
@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe);* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If device has a parent it will be powered on during device's probe(). */ int driver_probe_device (struct device_driver *drv,struct device *dev) {
@@ -410,10 +412,16 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)pr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name); +if (dev->parent) +pm_runtime_get_sync (dev->parent); +pm_runtime_barrier (dev); ret =really_probe (dev, drv);pm_request_idle (dev); +if (dev->parent) +pm_runtime_put_sync (dev->parent); +return ret; }
Signature · 1 line
2.1.4
Re: [PATCH v3 3/8] Driver core: wakeup the parent device before trying probe
Quoted 32 lines · Andy Shevchenko
From: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return
0xffffffff.To fix the problem, making sure the parent is always awake before attempting driver probe.
Signed-off-by Heikki Krogerus <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/dd.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/base/dd.c +2
-0@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe);* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If device has a parent it will be powered on during device's probe(). */ int driver_probe_device (struct device_driver *drv,struct device *dev) {
drivers/base/dd.c int driver_probe_device(struct device_driver *drv, struct device *dev) · line 417
Quoted 6 lines
drivers/base/dd.c +3
-0@@ -410,10 +412,16 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)pr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name); +if (dev->parent) +pm_runtime_get_sync (dev->parent); +
For some bus types that will resume and suspend the parent for many times in a row in device_attach() until an appropriate driver is found. Would it be more efficient to call it once before the bus_for_each_drv() loop in there?
drivers/base/dd.c int driver_probe_device(struct device_driver *drv, struct device *dev) · line 423
Quoted 6 lines
drivers/base/dd.c +2
-0pm_runtime_barrier (dev); ret =really_probe (dev, drv);pm_request_idle (dev); +if (dev->parent) +pm_runtime_put_sync (dev->parent);
Is there anything particularly wrong with calling pm_runtime_put() here instead?
Quoted 5 lines
drivers/base/dd.c +1
-0+return ret; }
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH v3 3/8] Driver core: wakeup the parent device before trying probe
Quoted 36 lines · Rafael J. Wysocki
Quoted 35 lines · Andy Shevchenko
From: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return
0xffffffff.To fix the problem, making sure the parent is always awake before attempting driver probe.
Signed-off-by Heikki Krogerus <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/dd.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/base/dd.c +2
-0@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe);* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If device has a parent it will be powered on during device's probe(). */ int driver_probe_device (struct device_driver *drv,struct device *dev) {@@ -410,10 +412,16 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)pr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name);
Quoted 7 lines
drivers/base/dd.c int driver_probe_device(struct device_driver *drv, struct device *dev) · line 417
Quoted 3 lines
drivers/base/dd.c +3
-0+if (dev->parent) +pm_runtime_get_sync (dev->parent); +For some bus types that will resume and suspend the parent for many times in a row in
device_attach()until an appropriate driver is found. Would it be more efficient to call it once before thebus_for_each_drv()loop in there?
Actually, something like the below should work too (the bumping up of the parent's usage counter before the loop will keep it in the runtime-active state throughout the loop).
--- drivers/base/dd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/base/dd.c +14 -0
@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe)* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If the device has a parent, runtime-resume the parent before driver probing. */ int driver_probe_device (struct device_driver *drv,struct device *dev) {
@@ -410,10 +412,16 @@ int driver_probe_device(struct device_drpr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name); +if (dev->parent) +pm_runtime_get_sync (dev->parent); +pm_runtime_barrier (dev); ret =really_probe (dev, drv);pm_request_idle (dev); +if (dev->parent) +pm_runtime_put (dev->parent); +return ret; }
@@ -459,8 +467,14 @@ int device_attach(struct device *dev) ret =0 ; } }else { +if (dev->parent) +pm_runtime_get_sync (dev->parent); + ret =bus_for_each_drv (dev->bus,NULL , dev, __device_attach);pm_request_idle (dev); + +if (dev->parent) +pm_runtime_put (dev->parent); } out_unlock:device_unlock (dev);
Andy Shevchenko
reviewerRe: [PATCH v3 3/8] Driver core: wakeup the parent device before trying probe
Quoted 45 lines · Rafael J. Wysocki
Quoted 36 lines · Rafael J. Wysocki
Quoted 35 lines · Andy Shevchenko
From: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return
0xffffffff.To fix the problem, making sure the parent is always awake before attempting driver probe.
Signed-off-by Heikki Krogerus <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/dd.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/base/dd.c +2
-0@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe);* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If device has a parent it will be powered on during device's probe(). */ int driver_probe_device (struct device_driver *drv,struct device *dev) {@@ -410,10 +412,16 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)pr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name);Quoted 7 lines
drivers/base/dd.c int driver_probe_device(struct device_dr · line 417
Quoted 3 lines
drivers/base/dd.c +3
-0+if (dev->parent) +pm_runtime_get_sync (dev->parent); +For some bus types that will resume and suspend the parent for many times in a row in
device_attach()until an appropriate driver is found. Would it be more efficient to call it once before thebus_for_each_drv()loop in there?
Quoted 4 lines
Actually, something like the below should work too (the bumping up of the parent's usage counter before the loop will keep it in the runtime-active state throughout the loop).
Thanks for the patch! We are going to test this soon.
By the way, can you give your Ack for patches 1 and 2 if there is no objection?
Quoted 50 lines
--- drivers/base/dd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)Index:
linux-pm/drivers/base/dd.c
===================================================================drivers/base/dd.c +14
-0@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe)* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If the device has a parent, runtime-resume the parent before driver probing. */ int driver_probe_device (struct device_driver *drv,struct device *dev) {@@ -410,10 +412,16 @@ int driver_probe_device(struct device_drpr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name); +if (dev->parent) +pm_runtime_get_sync (dev->parent); +pm_runtime_barrier (dev); ret =really_probe (dev, drv);pm_request_idle (dev); +if (dev->parent) +pm_runtime_put (dev->parent); +return ret; }@@ -459,8 +467,14 @@ int device_attach(struct device *dev) ret =0 ; } }else { +if (dev->parent) +pm_runtime_get_sync (dev->parent); + ret =bus_for_each_drv (dev->bus,NULL , dev, __device_attach);pm_request_idle (dev); + +if (dev->parent) +pm_runtime_put (dev->parent); } out_unlock:device_unlock (dev);
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Re: [PATCH v3 3/8] Driver core: wakeup the parent device before trying probe
Quoted 51 lines · Andy Shevchenko
Quoted 45 lines · Rafael J. Wysocki
Quoted 36 lines · Rafael J. Wysocki
Quoted 35 lines · Andy Shevchenko
From: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return
0xffffffff.To fix the problem, making sure the parent is always awake before attempting driver probe.
Signed-off-by Heikki Krogerus <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/dd.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/base/dd.c +2
-0@@ -399,6 +399,8 @@ EXPORT_SYMBOL_GPL(wait_for_device_probe);* * This function must be called with @dev lock held. When called for a * USB interface, @dev->parent lock must be held as well. +* +* If device has a parent it will be powered on during device's probe(). */ int driver_probe_device (struct device_driver *drv,struct device *dev) {@@ -410,10 +412,16 @@ int driver_probe_device(struct device_driver *drv, struct device *dev)pr_debug ("bus: '%s': %s: matched device %s with driver %s\n" , drv->bus->name, __func__,dev_name (dev), drv->name);Quoted 7 lines
drivers/base/dd.c int driver_probe_device(struct device_dr · line 417
Quoted 3 lines
drivers/base/dd.c +3
-0+if (dev->parent) +pm_runtime_get_sync (dev->parent); +For some bus types that will resume and suspend the parent for many times in a row in
device_attach()until an appropriate driver is found. Would it be more efficient to call it once before thebus_for_each_drv()loop in there?Quoted 4 lines
Actually, something like the below should work too (the bumping up of the parent's usage counter before the loop will keep it in the runtime-active state throughout the loop).
Quoted 4 lines
Thanks for the patch! We are going to test this soon.
By the way, can you give your Ack for patches 1 and 2 if there is no objection?
OK
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Andy Shevchenko
reviewerRe: [PATCH v3 3/8] Driver core: wakeup the parent device before trying probe
In reply to Rafael J. WysockiQuoted 7 lines · Rafael J. Wysocki
Quoted 6 lines · Rafael J. Wysocki
Quoted 5 lines · Andy Shevchenko
From: Heikki Krogerus <[email protected]>
If the parent is still suspended when driver probe is attempted, the result may be failure.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
For example, if the parent is a PCI MFD device that has been suspended when we try to probe our device, any register reads will return
0xffffffff.To fix the problem, making sure the parent is always awake before attempting driver probe.
[]
Quoted 3 lines
Actually, something like the below should work too (the bumping up of the parent's usage counter before the loop will keep it in the runtime-active state throughout the loop).
It works. Thanks for the patch. We incorporate it instead of the previous Heikki's patch into v4.
Signature · 2 lines
Andy Shevchenko <[email protected]> Intel Finland Oy
Andy Shevchenko
reviewerPATCH v3 4/8 klist: implement klist_prev()
In reply to Andy Shevchenkoklist_prev() gets the previous element in the list. It is useful to traverse through the list in reverse order, for example, to provide LIFO (last in first out) variant of access.
--- include/linux/klist.h | 1 + lib/klist.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+)
include/linux/klist.h +1 -0
@@ -63,6 +63,7 @@ extern void klist_iter_init(struct klist *k, struct klist_iter *i);extern void klist_iter_init_node (struct klist *k,struct klist_iter *i,struct klist_node *n);extern void klist_iter_exit (struct klist_iter *i); +extern struct klist_node *klist_prev (struct klist_iter *i);extern struct klist_node *klist_next (struct klist_iter *i);#endif
lib/klist.c +41 -0
47 lines not on this page · raw message
Signature · 1 line
2.1.4
Andy Shevchenko
reviewerPATCH v3 5/8 driver core: implement device_for_each_child_reverse()
In reply to Andy ShevchenkoThe new function device_for_each_child_reverse() is helpful to traverse the registered devices in a reversed order, e.g. in the case when an operation on each device should be done first on the last added device, then on one before last and so on.
--- drivers/base/core.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/device.h | 2 ++ 2 files changed, 45 insertions(+)
drivers/base/core.c +43 -0
@@ -1252,6 +1252,19 @@ void device_unregister(struct device *dev) }EXPORT_SYMBOL_GPL (device_unregister); +static struct device *prev_device (struct klist_iter *i) +{ +struct klist_node *n =klist_prev (i); +struct device *dev =NULL ; +struct device_private *p; + +if (n) { + p =to_device_private_parent (n); + dev = p->device; + } +return dev; +} +static struct device *next_device (struct klist_iter *i) {struct klist_node *n =klist_next (i);
@@ -1342,6 +1355,36 @@ int device_for_each_child(struct device *parent, void *data,EXPORT_SYMBOL_GPL (device_for_each_child);/** +* device_for_each_child_reverse - device child iterator in reversed order. +* @parent: parent struct device. +* @fn: function to be called for each device. +* @data: data for the callback. +* +* Iterate over @parent's child devices, and call @fn for each, +* passing it @data. +* +* We check the return of @fn each time. If it returns anything +* other than 0, we break out and return that value. +*/ +int device_for_each_child_reverse (struct device *parent,void *data, +int (*fn)(struct device *dev,void *data)) +{ +struct klist_iter i; +struct device *child; +int error =0 ; + +if (!parent->p) +return 0 ; + +klist_iter_init (&parent->p->klist_children, &i); +while ((child =prev_device (&i)) && !error) + error =fn (child, data); +klist_iter_exit (&i); +return error; +} +EXPORT_SYMBOL_GPL (device_for_each_child_reverse); + +/** * device_find_child - device iterator for locating a particular device. * @parent: parent struct device * @match: Callback function to check device
include/linux/device.h +2 -0
@@ -928,6 +928,8 @@ extern int __must_check device_add(struct device *dev);extern void device_del (struct device *dev);extern int device_for_each_child (struct device *dev,void *data,int (*fn)(struct device *dev,void *data)); +extern int device_for_each_child_reverse (struct device *dev,void *data, +int (*fn)(struct device *dev,void *data));extern struct device *device_find_child (struct device *dev,void *data,int (*match)(struct device *dev,void *data));extern int device_rename (struct device *dev,const char *new_name);
Signature · 1 line
2.1.4
Andy Shevchenko
reviewerPATCH v3 6/8 mfd: make mfd_remove_devices() iterate in reverse order
In reply to Andy ShevchenkoThe newly introduced device_for_each_child_reverse() would be used when MFD core removes the device.
After this patch applied the devices will be removed in a reversed order. This behaviour is useful when devices have implicit dependency on order, i.e. consider MFD device with serial bus controller, such as SPI, and DMA IP that is attached to serial bus controller: before remove the DMA driver we have to be ensured that no DMA transfers is ongoing and the requested channel are unused.
--- drivers/mfd/mfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/mfd-core.c +1 -1
@@ -300,7 +300,7 @@ void mfd_remove_devices(struct device *parent) {atomic_t *cnts =NULL ; -device_for_each_child (parent, &cnts, mfd_remove_devices_fn); +device_for_each_child_reverse (parent, &cnts, mfd_remove_devices_fn);kfree (cnts); }EXPORT_SYMBOL (mfd_remove_devices);
Signature · 1 line
2.1.4
Andy Shevchenko
reviewerPATCH v3 7/8 dmaengine: add a driver for Intel integrated DMA 64-bit
In reply to Andy ShevchenkoIntel integrated DMA (iDMA) 64-bit is a specific IP that is used as a part of LPSS devices such as HSUART or SPI. The iDMA IP is attached for private usage on each host controller independently.
While it has similarities with Synopsys DesignWare DMA, the following distinctions doesn't allow to use the existing driver:
- 64-bit mode with corresponding changes in Hardware Linked List data structure
- many slight differences in the channel registers
Moreover this driver is based on the DMA virtual channels framework that helps to make the driver cleaner and easy to understand.
--- drivers/dma/Kconfig | 5 + drivers/dma/Makefile | 1 + drivers/dma/idma64.c | 724 +++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/dma/idma64.h | 232 +++++++++++++++++ 4 files changed, 962 insertions(+) create mode 100644 drivers/dma/idma64.c create mode 100644 drivers/dma/idma64.h
drivers/dma/Kconfig +5 -0
@@ -85,6 +85,11 @@ config INTEL_IOP_ADMA help Enable support for the Intel(R) IOP Series RAID engines. +config IDMA64 + tristate "Intel integrated DMA 64-bit support" + select DMA_ENGINE + select DMA_VIRTUAL_CHANNELS + source "drivers/dma/dw/Kconfig" config AT_HDMAC
drivers/dma/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_HSU_DMA) += hsu/ obj-$(CONFIG_MPC512X_DMA) += mpc512x_dma.o obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_MV_XOR) += mv_xor.o +obj-$(CONFIG_IDMA64) += idma64.o obj-$(CONFIG_DW_DMAC_CORE) += dw/ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_AT_XDMAC) += at_xdmac.o
drivers/dma/idma64.c new file +724 -0
724 lines not on this page · raw message
drivers/dma/idma64.h new file +232 -0
232 lines not on this page · raw message
Signature · 1 line
2.1.4
Andy Shevchenko
reviewerPATCH v3 8/8 mfd: Add support for Intel Sunrisepoint LPSS devices
In reply to Andy ShevchenkoThe new coming Intel platforms such as Skylake will contain Sunrisepoint PCH. The main difference to the previous platforms is that the LPSS devices are compound devices where usually main (SPI, HSUART, or I2C) and DMA IPs are present.
This patch brings the driver for such devices found on Sunrisepoint PCH.
--- drivers/mfd/Kconfig | 23 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel-lpss-acpi.c | 84 +++++++ drivers/mfd/intel-lpss-pci.c | 113 +++++++++ drivers/mfd/intel-lpss.c | 524 ++++++++++++++++++++++++++++++++++++++++++ drivers/mfd/intel-lpss.h | 62 +++++ 6 files changed, 809 insertions(+) create mode 100644 drivers/mfd/intel-lpss-acpi.c create mode 100644 drivers/mfd/intel-lpss-pci.c create mode 100644 drivers/mfd/intel-lpss.c create mode 100644 drivers/mfd/intel-lpss.h
drivers/mfd/Kconfig +23 -0
@@ -325,6 +325,29 @@ config INTEL_SOC_PMIC thermal, charger and related power management functions on these systems. +config MFD_INTEL_LPSS + tristate + select COMMON_CLK + select MFD_CORE + +config MFD_INTEL_LPSS_ACPI + tristate "Intel Low Power Subsystem support in ACPI mode" + select MFD_INTEL_LPSS + depends on X86 && ACPI + help + This driver supports Intel Low Power Subsystem (LPSS) devices such as + I2C, SPI and HS-UART starting from Intel Sunrisepoint (Intel Skylake + PCH) in ACPI mode. + +config MFD_INTEL_LPSS_PCI + tristate "Intel Low Power Subsystem support in PCI mode" + select MFD_INTEL_LPSS + depends on X86 && PCI + help + This driver supports Intel Low Power Subsystem (LPSS) devices such as + I2C, SPI and HS-UART starting from Intel Sunrisepoint (Intel Skylake + PCH) in PCI mode. + config MFD_INTEL_MSIC bool "Intel MSIC" depends on INTEL_SCU_IPC
drivers/mfd/Makefile +3 -0
@@ -161,6 +161,9 @@ obj-$(CONFIG_TPS65911_COMPARATOR) += tps65911-comparator.o obj-$(CONFIG_MFD_TPS65090) += tps65090.o obj-$(CONFIG_MFD_AAT2870_CORE) += aat2870-core.o obj-$(CONFIG_MFD_ATMEL_HLCDC) += atmel-hlcdc.o +obj-$(CONFIG_MFD_INTEL_LPSS) += intel-lpss.o +obj-$(CONFIG_MFD_INTEL_LPSS_PCI) += intel-lpss-pci.o +obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o obj-$(CONFIG_MFD_INTEL_MSIC) += intel_msic.o obj-$(CONFIG_MFD_PALMAS) += palmas.o obj-$(CONFIG_MFD_VIPERBOARD) += viperboard.o
drivers/mfd/intel-lpss-acpi.c new file +84 -0
84 lines not on this page · raw message
drivers/mfd/intel-lpss-pci.c new file +113 -0
113 lines not on this page · raw message
drivers/mfd/intel-lpss.c new file +524 -0
524 lines not on this page · raw message
drivers/mfd/intel-lpss.h new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [PATCH v3 8/8] mfd: Add support for Intel Sunrisepoint LPSS devices
Mike,
Can you review the clock implementation please? It looks fragile to me as it relies heavily on device names constructed of MFD cell names and IDA numbers cat'ed together!
Quoted 21 lines
The new coming Intel platforms such as Skylake will contain Sunrisepoint PCH. The main difference to the previous platforms is that the LPSS devices are compound devices where usually main (SPI, HSUART, or I2C) and DMA IPs are present.
This patch brings the driver for such devices found on Sunrisepoint PCH.
Signed-off-by Mika Westerberg <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>--- drivers/mfd/Kconfig | 23 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel-lpss-acpi.c | 84 +++++++ drivers/mfd/intel-lpss-pci.c | 113 +++++++++ drivers/mfd/intel-lpss.c | 524 ++++++++++++++++++++++++++++++++++++++++++ drivers/mfd/intel-lpss.h | 62 +++++ 6 files changed, 809 insertions(+) create mode 100644 drivers/mfd/intel-lpss-acpi.c create mode 100644 drivers/mfd/intel-lpss-pci.c create mode 100644 drivers/mfd/intel-lpss.c create mode 100644 drivers/mfd/intel-lpss.h
[...]
Quoted 308 lines
drivers/mfd/intel-lpss.c new file +240
-0+static void intel_lpss_unregister_clock_tree (struct clk *clk) +{ +struct clk *parent; + +while (clk) { + parent =clk_get_parent (clk); +clk_unregister (clk); + clk = parent; + } +} + +static int intel_lpss_register_clock_divider (struct intel_lpss *lpss, +const char *devname, +struct clk **clk) +{ +char name[32 ]; +struct clk *tmp = *clk; + +snprintf (name,sizeof (name),"%s-enable" , devname); + tmp =clk_register_gate (NULL , name,__clk_get_name (tmp),0 , + lpss->priv,0 ,0 ,NULL ); +if (IS_ERR (tmp)) +return PTR_ERR (tmp); + +snprintf (name,sizeof (name),"%s-div" , devname); + tmp =clk_register_fractional_divider (NULL , name,__clk_get_name (tmp), +0 , lpss->priv,1 ,15 ,16 ,15 ,0 , +NULL ); +if (IS_ERR (tmp)) +return PTR_ERR (tmp); + *clk = tmp; + +snprintf (name,sizeof (name),"%s-update" , devname); + tmp =clk_register_gate (NULL , name,__clk_get_name (tmp), +CLK_SET_RATE_PARENT , lpss->priv,31 ,0 ,NULL ); +if (IS_ERR (tmp)) +return PTR_ERR (tmp); + *clk = tmp; + +return 0 ; +} + +static int intel_lpss_register_clock (struct intel_lpss *lpss) +{ +const struct mfd_cell *cell = lpss->cell; +struct clk *clk; +char devname[24 ]; +int ret; + +if (!lpss->info->clk_rate) +return 0 ; + +/* Root clock */ + clk =clk_register_fixed_rate (NULL ,dev_name (lpss->dev),NULL , +CLK_IS_ROOT , lpss->info->clk_rate); +if (IS_ERR (clk)) +return PTR_ERR (clk); + +snprintf (devname,sizeof (devname),"%s.%d" , cell->name, lpss->devid); + +/* +* Support for clock divider only if it has some preset value. +* Otherwise we assume that the divider is not used. +*/ +if (lpss->type !=LPSS_DEV_I2C ) { + ret =intel_lpss_register_clock_divider (lpss, devname, &clk); +if (ret) + goto err_clk_register; + } + + ret = -ENOMEM ; + +/* Clock for the host controller */ + lpss->clock =clkdev_create (clk, lpss->info->clk_con_id,"%s" , devname); +if (!lpss->clock) + goto err_clk_register; + + lpss->clk = clk; + +return 0 ; + +err_clk_register: +intel_lpss_unregister_clock_tree (clk); + +return ret; +} + +static void intel_lpss_unregister_clock (struct intel_lpss *lpss) +{ +if (IS_ERR_OR_NULL (lpss->clk)) +return ; + +clkdev_drop (lpss->clock); +intel_lpss_unregister_clock_tree (lpss->clk); +} + +int intel_lpss_probe (struct device *dev, +const struct intel_lpss_platform_info *info) +{ +struct intel_lpss *lpss; +int ret; + +if (!info || !info->mem || info->irq <=0 ) +return -EINVAL ; + + lpss =devm_kzalloc (dev,sizeof (*lpss),GFP_KERNEL ); +if (!lpss) +return -ENOMEM ; + + lpss->priv =devm_ioremap (dev, info->mem->start +LPSS_PRIV_OFFSET , +LPSS_PRIV_SIZE ); +if (!lpss->priv) +return -ENOMEM ; + + lpss->info = info; + lpss->dev = dev; + lpss->caps =readl (lpss->priv +LPSS_PRIV_CAPS ); + +dev_set_drvdata (dev, lpss); + + ret =intel_lpss_assign_devs (lpss); +if (ret) +return ret; + +intel_lpss_init_dev (lpss); + + lpss->devid =ida_simple_get (&intel_lpss_devid_ida,0 ,0 ,GFP_KERNEL ); +if (lpss->devid <0 ) +return lpss->devid; + + ret =intel_lpss_register_clock (lpss); +if (ret) + goto err_clk_register; + +intel_lpss_ltr_expose (lpss); + + ret =intel_lpss_debugfs_add (lpss); +if (ret) +dev_warn (dev,"Failed to create debugfs entries\n" ); + +if (intel_lpss_has_idma (lpss)) { +/* +* Ensure the DMA driver is loaded before the host +* controller device appears, so that the host controller +* driver can request its DMA channels as early as +* possible. +* +* If the DMA module is not there that's OK as well. +*/ +intel_lpss_request_dma_module (LPSS_IDMA64_DRIVER_NAME ); + + ret =mfd_add_devices (dev, lpss->devid, &intel_lpss_idma64_cell, +1 , info->mem, info->irq,NULL ); +if (ret) +dev_warn (dev,"Failed to add %s, fallback to PIO\n" , +LPSS_IDMA64_DRIVER_NAME ); + } + + ret =mfd_add_devices (dev, lpss->devid, lpss->cell, +1 , info->mem, info->irq,NULL ); +if (ret) + goto err_remove_ltr; + +return 0 ; + +err_remove_ltr: +intel_lpss_debugfs_remove (lpss); +intel_lpss_ltr_hide (lpss); + +err_clk_register: +ida_simple_remove (&intel_lpss_devid_ida, lpss->devid); + +return ret; +} +EXPORT_SYMBOL_GPL (intel_lpss_probe); + +void intel_lpss_remove (struct device *dev) +{ +struct intel_lpss *lpss =dev_get_drvdata (dev); + +mfd_remove_devices (dev); +intel_lpss_debugfs_remove (lpss); +intel_lpss_ltr_hide (lpss); +intel_lpss_unregister_clock (lpss); +ida_simple_remove (&intel_lpss_devid_ida, lpss->devid); +} +EXPORT_SYMBOL_GPL (intel_lpss_remove); + +static int resume_lpss_device (struct device *dev,void *data) +{ +pm_runtime_resume (dev); +return 0 ; +} + +int intel_lpss_prepare (struct device *dev) +{ +/* +* Resume both child devices before entering system sleep. This +* ensures that they are in proper state before they get suspended. +*/ +device_for_each_child_reverse (dev,NULL , resume_lpss_device); +return 0 ; +} +EXPORT_SYMBOL_GPL (intel_lpss_prepare); + +int intel_lpss_suspend (struct device *dev) +{ +return 0 ; +} +EXPORT_SYMBOL_GPL (intel_lpss_suspend); + +int intel_lpss_resume (struct device *dev) +{ +struct intel_lpss *lpss =dev_get_drvdata (dev); + +intel_lpss_init_dev (lpss); + +return 0 ; +} +EXPORT_SYMBOL_GPL (intel_lpss_resume); + +static int __init intel_lpss_init (void ) +{ + intel_lpss_debugfs =debugfs_create_dir ("intel_lpss" ,NULL ); +return 0 ; +} +module_init (intel_lpss_init); + +static void __exit intel_lpss_exit(void) +{ +debugfs_remove (intel_lpss_debugfs); +} +module_exit (intel_lpss_exit); + +MODULE_AUTHOR ("Andy Shevchenko <[email protected]>" ); +MODULE_AUTHOR ("Mika Westerberg <[email protected]>" ); +MODULE_AUTHOR ("Heikki Krogerus <[email protected]>" ); +MODULE_AUTHOR ("Jarkko Nikula <[email protected]>" ); +MODULE_DESCRIPTION ("Intel LPSS core driver" ); +MODULE_LICENSE ("GPL v2" );drivers/mfd/intel-lpss.h new file +62
-0@@ -0,0 +1,62 @@ +/* +* Intel LPSS core support. +* +* Copyright (C) 2015, Intel Corporation +* +* Authors: Andy Shevchenko <[email protected]> +* Mika Westerberg <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __MFD_INTEL_LPSS_H +#define __MFD_INTEL_LPSS_H + +struct device ; +struct resource ; + +struct intel_lpss_platform_info { +struct resource *mem; +int irq; +unsigned long clk_rate; +const char *clk_con_id; +}; + +int intel_lpss_probe (struct device *dev, +const struct intel_lpss_platform_info *info); +void intel_lpss_remove (struct device *dev); + +#ifdef CONFIG_PM +int intel_lpss_prepare (struct device *dev); +int intel_lpss_suspend (struct device *dev); +int intel_lpss_resume (struct device *dev); + +#ifdef CONFIG_PM_SLEEP +#define INTEL_LPSS_SLEEP_PM_OPS \ + .prepare = intel_lpss_prepare, \ + .suspend = intel_lpss_suspend, \ + .resume = intel_lpss_resume, \ + .freeze = intel_lpss_suspend, \ + .thaw = intel_lpss_resume, \ + .poweroff = intel_lpss_suspend, \ + .restore = intel_lpss_resume, +#endif + +#define INTEL_LPSS_RUNTIME_PM_OPS \ + .runtime_suspend = intel_lpss_suspend, \ + .runtime_resume = intel_lpss_resume, + +#else /* !CONFIG_PM */ +#define INTEL_LPSS_SLEEP_PM_OPS +#define INTEL_LPSS_RUNTIME_PM_OPS +#endif /* CONFIG_PM */ + +#define INTEL_LPSS_PM_OPS (name) \ +const struct dev_pm_ops name = { \ + INTEL_LPSS_SLEEP_PM_OPS \ + INTEL_LPSS_RUNTIME_PM_OPS \ +} + +#endif /* __MFD_INTEL_LPSS_H */
Signature · 8 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html