Skip to contentSkip to conversation

PM: wakeup: Add routine to help fetch wakeup source object.

PATCH Superseded Ran Wang 3 participants 7 messages May 20, 2019 – Jun 19, 2019

Subsystems (6)

v4 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Ran Wang

author
#0 lore raw

PATCH v4 1/3 PM: wakeup: Add routine to help fetch wakeup source object.

Some user might want to go through all registered wakeup sources and doing things accordingly. For example, SoC PM driver might need to do HW programming to prevent powering down specific IP which wakeup source depending on. And is user's responsibility to identify if this wakeup source he is interested in.

---
Change in v4:
- None.

Change in v3:
- Adjust indentation of *attached_dev;.

Change in v2:
- None.

 drivers/base/power/wakeup.c |   18 ++++++++++++++++++
 include/linux/pm_wakeup.h   |    3 +++
 2 files changed, 21 insertions(+), 0 deletions(-)
drivers/base/power/wakeup.c +18 -0
index 5b2b6a0..6904485 100644
@@ -14,6 +14,7 @@
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/of_device.h>
 #include <linux/pm_wakeirq.h>
 #include <trace/events/power.h>
 
@@ -226,6 +227,22 @@ void wakeup_source_unregister(struct wakeup_source *ws)
 	}
 }
 EXPORT_SYMBOL_GPL(wakeup_source_unregister);
+/**
+ * wakeup_source_get_next - Get next wakeup source from the list
+ * @ws: Previous wakeup source object, null means caller want first one.
+ */
+struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws)
+{
+	struct list_head *ws_head = &wakeup_sources;
+
+	if (ws)
+		return list_next_or_null_rcu(ws_head, &ws->entry,
+				struct wakeup_source, entry);
+	else
+		return list_entry_rcu(ws_head->next,
+				struct wakeup_source, entry);
+}
+EXPORT_SYMBOL_GPL(wakeup_source_get_next);
 
 /**
  * device_wakeup_attach - Attach a wakeup source object to a device object.
@@ -242,6 +259,7 @@ static int device_wakeup_attach(struct device *dev, struct wakeup_source *ws)
 		return -EEXIST;
 	}
 	dev->power.wakeup = ws;
+	ws->attached_dev = dev;
 	if (dev->power.wakeirq)
 		device_wakeup_attach_irq(dev, dev->power.wakeirq);
 	spin_unlock_irq(&dev->power.lock);
include/linux/pm_wakeup.h +3 -0
index 0ff134d..913b2fb 100644
@@ -50,6 +50,7 @@
  * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
  * @has_timeout: The wakeup source has been activated with a timeout.
+ * @attached_dev: The device it attached to
  */
 struct wakeup_source {
 	const char 		*name;
@@ -70,6 +71,7 @@ struct wakeup_source {
 	unsigned long		wakeup_count;
 	bool			active:1;
 	bool			autosleep_enabled:1;
+	struct device		*attached_dev;
 };
 
 #ifdef CONFIG_PM_SLEEP
@@ -101,6 +103,7 @@ static inline void device_set_wakeup_path(struct device *dev)
 extern void wakeup_source_remove(struct wakeup_source *ws);
 extern struct wakeup_source *wakeup_source_register(const char *name);
 extern void wakeup_source_unregister(struct wakeup_source *ws);
+extern struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws);
 extern int device_wakeup_enable(struct device *dev);
 extern int device_wakeup_disable(struct device *dev);
 extern void device_set_wakeup_capable(struct device *dev, bool capable);
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH v4 2/3 Documentation: dt: binding: fsl: Add 'little-endian' and update Chassis define

By default, QorIQ SoC's RCPM register block is Big Endian. But there are some exceptions, such as LS1088A and LS2088A, are Little Endian. So add this optional property to help identify them.

Actually LS2021A and other Layerscapes won't totally follow Chassis 2.1, so separate them from powerpc SoC.

---
Change in v4:
- Adjust indectation of 'ls1021a, ls1012a, ls1043a, ls1046a'.

Change in v3:
- None.

Change in v2:
- None.

 Documentation/devicetree/bindings/soc/fsl/rcpm.txt |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/soc/fsl/rcpm.txt +7 -1
index e284e4e..058154c 100644
@@ -20,6 +20,7 @@ Required properites:
 	* "fsl,qoriq-rcpm-1.0": for chassis 1.0 rcpm
 	* "fsl,qoriq-rcpm-2.0": for chassis 2.0 rcpm
 	* "fsl,qoriq-rcpm-2.1": for chassis 2.1 rcpm
+	* "fsl,qoriq-rcpm-2.1+": for chassis 2.1+ rcpm
 
 All references to "1.0" and "2.0" refer to the QorIQ chassis version to
 which the chip complies.
@@ -27,7 +28,12 @@ Chassis Version		Example Chips
 ---------------		-------------------------------
 1.0				p4080, p5020, p5040, p2041, p3041
 2.0				t4240, b4860, b4420
-2.1				t1040, ls1021
+2.1				t1040,
+2.1+				ls1021a, ls1012a, ls1043a, ls1046a
+
+Optional properties:
+ - little-endian : RCPM register block is Little Endian. Without it RCPM
+   will be Big Endian (default case).
 
 Example:
 The RCPM node for T4240:
Signature · 1 line
1.7.1
maintainer Reviewed-by on v4 2/3
#2 lore raw

Re: [PATCH v4 2/3] Documentation: dt: binding: fsl: Add 'little-endian' and update Chassis define

Quoted 12 lines · Ran Wang

By default, QorIQ SoC's RCPM register block is Big Endian. But there are some exceptions, such as LS1088A and LS2088A, are Little Endian. So add this optional property to help identify them.

Actually LS2021A and other Layerscapes won't totally follow Chassis 2.1, so separate them from powerpc SoC.

---
Change in v4:
- Adjust indectation of 'ls1021a, ls1012a, ls1043a, ls1046a'.

Quoted 9 lines

Change in v3:
- None.

Change in v2:
- None.

 Documentation/devicetree/bindings/soc/fsl/rcpm.txt |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
author
#3 lore raw

PATCH v4 3/3 soc: fsl: add RCPM driver

In reply to Ran Wang

The NXP's QorIQ Processors based on ARM Core have RCPM module (Run Control and Power Management), which performs all device-level tasks associated with power management such as wakeup source control.

This driver depends on PM wakeup source framework which help to collect wake information.

---
Change in v4:
- Remove extra ',' in author line of rcpm.c
- Update usage of wakeup_source_get_next() to be less confusing to the reader, code logic remain the same.

Change in v3:
- Some whitespace ajdustment.

Change in v2:
- Rebase Kconfig and Makefile update to latest mainline.

 drivers/soc/fsl/Kconfig  |    8 +++
 drivers/soc/fsl/Makefile |    1 +
 drivers/soc/fsl/rcpm.c   |  122 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+), 0 deletions(-)
 create mode 100644 drivers/soc/fsl/rcpm.c
drivers/soc/fsl/Kconfig +8 -0
index 61f8e14..8e84e40 100644
@@ -29,4 +29,12 @@ config FSL_MC_DPIO
 	  other DPAA2 objects. This driver does not expose the DPIO
 	  objects individually, but groups them under a service layer
 	  API.
+
+config FSL_RCPM
+	bool "Freescale RCPM support"
+	depends on PM_SLEEP
+	help
+	  The NXP's QorIQ Processors based on ARM Core have RCPM module
+	  (Run Control and Power Management), which performs all device-level
+	  tasks associated with power management, such as wakeup source control.
 endmenu
drivers/soc/fsl/Makefile +1 -0
index 803ef1b..c1be6ee 100644
@@ -7,3 +7,4 @@ obj-$(CONFIG_QUICC_ENGINE)		+= qe/
 obj-$(CONFIG_CPM)			+= qe/
 obj-$(CONFIG_FSL_GUTS)			+= guts.o
 obj-$(CONFIG_FSL_MC_DPIO) 		+= dpio/
+obj-$(CONFIG_FSL_RCPM)		+= rcpm.o
drivers/soc/fsl/rcpm.c new file +122 -0

122 lines not on this page · raw message

Signature · 1 line
1.7.1
author
#4 lore raw
In reply to Ran Wang

Hi Sirs,
Could anyone please comment this patch set or tell me if I have missed
maintainer in mail list? I'd like to let review process move forward.
Thank you.

Regards,
Ran

Quoted 98 lines · On Monday, May 20, 2019 17:53 Ran Wang wrote:

Some user might want to go through all registered wakeup sources and doing things accordingly. For example, SoC PM driver might need to do HW programming to prevent powering down specific IP which wakeup source depending on. And is user's responsibility to identify if this wakeup source he is interested in.

---
Change in v4:
- None.

Change in v3:
- Adjust indentation of *attached_dev;.

Change in v2:
- None.

 drivers/base/power/wakeup.c |   18 ++++++++++++++++++
 include/linux/pm_wakeup.h   |    3 +++
 2 files changed, 21 insertions(+), 0 deletions(-)
drivers/base/power/wakeup.c index renamed from drivers/base/power/wakeup.c +0 -0

5b2b6a0..6904485 100644

drivers/base/power/wakeup.c +17 -0
@@ -14,6 +14,7 @@
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/of_device.h>
 #include <linux/pm_wakeirq.h>
 #include <trace/events/power.h>
 
@@ -226,6 +227,22 @@ void wakeup_source_unregister(struct wakeup_source
 *ws)
 	}
 }
 EXPORT_SYMBOL_GPL(wakeup_source_unregister);
+/**
+ * wakeup_source_get_next - Get next wakeup source from the list
+ * @ws: Previous wakeup source object, null means caller want first one.
+ */
+struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws)
+{
+	struct list_head *ws_head = &wakeup_sources;
+
+	if (ws)
+		return list_next_or_null_rcu(ws_head, &ws->entry,
+				struct wakeup_source, entry);
+	else
+		return list_entry_rcu(ws_head->next,
+				struct wakeup_source, entry);
+}
+EXPORT_SYMBOL_GPL(wakeup_source_get_next);
 
 /**

* device_wakeup_attach - Attach a wakeup source object to a device object.

drivers/base/power/wakeup.c +1 -0
@@ -242,6 +259,7 @@ static int device_wakeup_attach(struct device *dev,
 struct wakeup_source *ws)
 		return -EEXIST;
 	}
 	dev->power.wakeup = ws;
+	ws->attached_dev = dev;
 	if (dev->power.wakeirq)
 		device_wakeup_attach_irq(dev, dev->power.wakeirq);
drivers/base/power/wakeup.c +0 -0
 	spin_unlock_irq(&dev->power.lock);
include/linux/pm_wakeup.h index renamed from include/linux/pm_wakeup.h +0 -0

0ff134d..913b2fb 100644

include/linux/pm_wakeup.h +2 -0
@@ -50,6 +50,7 @@
  * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
  * @has_timeout: The wakeup source has been activated with a timeout.
+ * @attached_dev: The device it attached to
  */
 struct wakeup_source {
 	const char 		*name;
@@ -70,6 +71,7 @@ struct wakeup_source {
 	unsigned long		wakeup_count;
 	bool			active:1;
 	bool			autosleep_enabled:1;
+	struct device		*attached_dev;
 };
 
 #ifdef CONFIG_PM_SLEEP
@@ -101,6 +103,7 @@ static inline void device_set_wakeup_path(struct device
 *dev)  extern void wakeup_source_remove(struct wakeup_source *ws);  extern

struct wakeup_source *wakeup_source_register(const char *name); extern void wakeup_source_unregister(struct wakeup_source *ws);

include/linux/pm_wakeup.h +2 -0
+extern struct wakeup_source *wakeup_source_get_next(struct
+wakeup_source *ws);
 extern int device_wakeup_enable(struct device *dev);  extern int

device_wakeup_disable(struct device *dev); extern void device_set_wakeup_capable(struct device *dev, bool capable); --
1.7.1

#5 lore raw
In reply to Ran Wang
Quoted 5 lines · CEST Ran Wang

Some user might want to go through all registered wakeup sources and doing things accordingly. For example, SoC PM driver might need to do HW programming to prevent powering down specific IP which wakeup source depending on. And is user's responsibility to identify if this wakeup source he is interested in.

I guess the idea here is that you need to walk wakeup devices and you noticed that there was a wakeup source object for each of them and those wakeup source objects were on a list, so you could walk wakeup devices by walking the list of wakeup source objects.

That is fair enough, but the changelog above doesn't even talk about that.

Quoted 37 lines

---
Change in v4:
- None.

Change in v3:
- Adjust indentation of *attached_dev;.

Change in v2:
- None.

 drivers/base/power/wakeup.c |   18 ++++++++++++++++++
 include/linux/pm_wakeup.h   |    3 +++
 2 files changed, 21 insertions(+), 0 deletions(-)
drivers/base/power/wakeup.c +7 -0
index 5b2b6a0..6904485 100644
@@ -14,6 +14,7 @@
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/of_device.h>
 #include <linux/pm_wakeirq.h>
 #include <trace/events/power.h>
 
@@ -226,6 +227,22 @@ void wakeup_source_unregister(struct wakeup_source *ws)
 	}
 }
 EXPORT_SYMBOL_GPL(wakeup_source_unregister);
+/**
+ * wakeup_source_get_next - Get next wakeup source from the list
+ * @ws: Previous wakeup source object, null means caller want first one.
+ */
+struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws)
+{

drivers/base/power/wakeup.c void wakeup_source_unregister(struct wakeup_source *ws) · line 245

Quoted 10 lines
drivers/base/power/wakeup.c +10 -0
+	struct list_head *ws_head = &wakeup_sources;
+
+	if (ws)
+		return list_next_or_null_rcu(ws_head, &ws->entry,
+				struct wakeup_source, entry);
+	else
+		return list_entry_rcu(ws_head->next,
+				struct wakeup_source, entry);
+}
+EXPORT_SYMBOL_GPL(wakeup_source_get_next);

This needs to be arranged along the lines of wakeup_sources_stats_seq_start/next/stop() because of the SRCU protection of the list.

Quoted 24 lines
drivers/base/power/wakeup.c +1 -0
 /**
  * device_wakeup_attach - Attach a wakeup source object to a device object.
@@ -242,6 +259,7 @@ static int device_wakeup_attach(struct device *dev, struct wakeup_source *ws)
 		return -EEXIST;
 	}
 	dev->power.wakeup = ws;
+	ws->attached_dev = dev;
 	if (dev->power.wakeirq)
 		device_wakeup_attach_irq(dev, dev->power.wakeirq);
 	spin_unlock_irq(&dev->power.lock);
include/linux/pm_wakeup.h +1 -0
index 0ff134d..913b2fb 100644
@@ -50,6 +50,7 @@
  * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
  * @has_timeout: The wakeup source has been activated with a timeout.
+ * @attached_dev: The device it attached to
  */
 struct wakeup_source {
 	const char 		*name;

include/linux/pm_wakeup.h struct wakeup_source { · line 74

Quoted 4 lines
include/linux/pm_wakeup.h +1 -0
@@ -70,6 +71,7 @@ struct wakeup_source {
 	unsigned long		wakeup_count;
 	bool			active:1;
 	bool			autosleep_enabled:1;
+	struct device		*attached_dev;

Please (a) call it just dev and (b) move it up (before wakeirq, say).

Quoted 12 lines
include/linux/pm_wakeup.h +1 -0
 };
 
 #ifdef CONFIG_PM_SLEEP
@@ -101,6 +103,7 @@ static inline void device_set_wakeup_path(struct device *dev)
 extern void wakeup_source_remove(struct wakeup_source *ws);
 extern struct wakeup_source *wakeup_source_register(const char *name);
 extern void wakeup_source_unregister(struct wakeup_source *ws);
+extern struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws);
 extern int device_wakeup_enable(struct device *dev);
 extern int device_wakeup_disable(struct device *dev);
 extern void device_set_wakeup_capable(struct device *dev, bool capable);
author
#6 lore raw

Hi Rafael,

Quoted 8 lines · Rafael J. Wysocki
Quoted 5 lines · CEST Ran Wang

Some user might want to go through all registered wakeup sources and doing things accordingly. For example, SoC PM driver might need to do HW programming to prevent powering down specific IP which wakeup source depending on. And is user's responsibility to identify if this wakeup source he is interested in.

Quoted 6 lines

I guess the idea here is that you need to walk wakeup devices and you noticed that there was a wakeup source object for each of them and those wakeup source objects were on a list, so you could walk wakeup devices by walking the list of wakeup source objects.

That is fair enough, but the changelog above doesn't even talk about that.

How about this:
"Providing a API for helping walk through all registered wakeup devices on the list. It will be useful for SoC PMU driver to know which device will work as a wakeup source then do specific HW programming for them."

Quoted 44 lines

drivers/base/power/wakeup.c void wakeup_source_unregister(struct

Quoted 28 lines

---
Change in v4:
- None.

Change in v3:
- Adjust indentation of *attached_dev;.

Change in v2:
- None.

 drivers/base/power/wakeup.c |   18 ++++++++++++++++++
 include/linux/pm_wakeup.h   |    3 +++
 2 files changed, 21 insertions(+), 0 deletions(-)
drivers/base/power/wakeup.c +1 -0
index 5b2b6a0..6904485 100644
@@ -14,6 +14,7 @@
 #include <linux/suspend.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/of_device.h>
 #include <linux/pm_wakeirq.h>
 #include <trace/events/power.h>
 
@@ -226,6 +227,22 @@ void wakeup_source_unregister(struct

wakeup_source *ws)

Quoted 15 lines
drivers/base/power/wakeup.c +12 -0
 	}
 }
 EXPORT_SYMBOL_GPL(wakeup_source_unregister);
+/**
+ * wakeup_source_get_next - Get next wakeup source from the list
+ * @ws: Previous wakeup source object, null means caller want first one.
+ */
+struct wakeup_source *wakeup_source_get_next(struct wakeup_source
+*ws) {
+	struct list_head *ws_head = &wakeup_sources;
+
+	if (ws)
+		return list_next_or_null_rcu(ws_head, &ws->entry,
+				struct wakeup_source, entry);
+	else
Quoted 8 lines

drivers/base/power/wakeup.c void wakeup_source_unregister(struct wakeup_source *ws) · line 245

Quoted 4 lines
drivers/base/power/wakeup.c +4 -0
+		return list_entry_rcu(ws_head->next,
+				struct wakeup_source, entry);
+}
+EXPORT_SYMBOL_GPL(wakeup_source_get_next);

This needs to be arranged along the lines of
wakeup_sources_stats_seq_start/next/stop()
because of the SRCU protection of the list.

Got it, how about this:
230 /**

 231  * wakeup_source_get_next - Get next wakeup source from the list                 
 232  * @ws: Previous wakeup source object, null means caller want first one.         
 233  */                                                                              
 234 struct wakeup_source *wakeup_source_get_next(struct wakeup_source *ws)           
 235 {                                                                                
 236         struct list_head *ws_head = &wakeup_sources;                             
 237         struct wakeup_source *next_ws = NULL;                                    
 238         int idx;                                                                 

239
240 idx = srcu_read_lock(&wakeup_srcu);
241 if (ws)
242 next_ws = list_next_or_null_rcu(ws_head, &ws->entry,
243 struct wakeup_source, entry);
244 else
245 next_ws = list_entry_rcu(ws_head->next,
246 struct wakeup_source, entry);
247 srcu_read_unlock(&wakeup_srcu, idx);
248
249 return next_ws;
250 }
251 EXPORT_SYMBOL_GPL(wakeup_source_get_next);

Quoted 23 lines

drivers/base/power/wakeup.c static int device_wakeup_attach(struct device *dev,

Quoted 4 lines
drivers/base/power/wakeup.c +0 -0
 /**
  * device_wakeup_attach - Attach a wakeup source object to a device object.
@@ -242,6 +259,7 @@ static int device_wakeup_attach(struct device *dev,

struct wakeup_source *ws)

Quoted 18 lines
drivers/base/power/wakeup.c +1 -0
 		return -EEXIST;
 	}
 	dev->power.wakeup = ws;
+	ws->attached_dev = dev;
 	if (dev->power.wakeirq)
 		device_wakeup_attach_irq(dev, dev->power.wakeirq);
 	spin_unlock_irq(&dev->power.lock);
include/linux/pm_wakeup.h +1 -0
index 0ff134d..913b2fb 100644
@@ -50,6 +50,7 @@
  * @wakeup_count: Number of times the wakeup source might abort suspend.
  * @active: Status of the wakeup source.
  * @has_timeout: The wakeup source has been activated with a timeout.
+ * @attached_dev: The device it attached to
  */
 struct wakeup_source {
Quoted 8 lines

include/linux/pm_wakeup.h struct wakeup_source { · line 74

Quoted 6 lines
include/linux/pm_wakeup.h +1 -0
 	const char 		*name;
@@ -70,6 +71,7 @@ struct wakeup_source {
 	unsigned long		wakeup_count;
 	bool			active:1;
 	bool			autosleep_enabled:1;
+	struct device		*attached_dev;

Please (a) call it just dev and (b) move it up (before wakeirq, say)

Got it, will update in next version.

Thanks & Regards,
Ran

Quoted 18 lines
Quoted 15 lines
include/linux/pm_wakeup.h +0 -0
 };
 
 #ifdef CONFIG_PM_SLEEP
@@ -101,6 +103,7 @@ static inline void device_set_wakeup_path(struct

device *dev) extern void wakeup_source_remove(struct wakeup_source *ws); extern struct wakeup_source *wakeup_source_register(const char *name); extern void wakeup_source_unregister(struct wakeup_source *ws);

include/linux/pm_wakeup.h +2 -0
+extern struct wakeup_source *wakeup_source_get_next(struct
+wakeup_source *ws);
 extern int device_wakeup_enable(struct device *dev);  extern int

device_wakeup_disable(struct device *dev); extern void device_set_wakeup_capable(struct device *dev, bool capable);