Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89873a71 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Wim Van Sebroeck
Browse files

watchdog: pretimeout: add pretimeout_available_governors attribute 



The change adds an option to a user with CONFIG_WATCHDOG_SYSFS and
CONFIG_WATCHDOG_PRETIMEOUT_GOV enabled to get information about all
registered watchdog pretimeout governors by reading watchdog device
attribute named "pretimeout_available_governors".

Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 53f96cee

drivers/watchdog/watchdog_dev.c

+10 −1
Original line number Diff line number Diff line
@@ -489,6 +489,13 @@ static ssize_t state_show(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR_RO(state);



static ssize_t pretimeout_available_governors_show(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	return watchdog_pretimeout_available_governors_get(buf);

}

static DEVICE_ATTR_RO(pretimeout_available_governors);



static ssize_t pretimeout_governor_show(struct device *dev,

					struct device_attribute *attr,

					char *buf)
@@ -524,7 +531,8 @@ static umode_t wdt_is_visible(struct kobject *kobj, struct attribute *attr, 
	else if (attr == &dev_attr_pretimeout.attr &&

		 !(wdd->info->options & WDIOF_PRETIMEOUT))

		mode = 0;

	else if (attr == &dev_attr_pretimeout_governor.attr &&

	else if ((attr == &dev_attr_pretimeout_governor.attr ||

		  attr == &dev_attr_pretimeout_available_governors.attr) &&

		 (!(wdd->info->options & WDIOF_PRETIMEOUT) ||

		  !IS_ENABLED(CONFIG_WATCHDOG_PRETIMEOUT_GOV)))

		mode = 0;
@@ -541,6 +549,7 @@ static struct attribute *wdt_attrs[] = { 
	&dev_attr_status.attr,

	&dev_attr_nowayout.attr,

	&dev_attr_pretimeout_governor.attr,

	&dev_attr_pretimeout_available_governors.attr,

	NULL,

};

drivers/watchdog/watchdog_pretimeout.c

+15 −0
Original line number Diff line number Diff line
@@ -52,6 +52,21 @@ static struct governor_priv *find_governor_by_name(const char *gov_name) 
	return NULL;

}



int watchdog_pretimeout_available_governors_get(char *buf)

{

	struct governor_priv *priv;

	int count = 0;



	mutex_lock(&governor_lock);



	list_for_each_entry(priv, &governor_list, entry)

		count += sprintf(buf + count, "%s\n", priv->gov->name);



	mutex_unlock(&governor_lock);



	return count;

}



int watchdog_pretimeout_governor_get(struct watchdog_device *wdd, char *buf)

{

	int count = 0;

drivers/watchdog/watchdog_pretimeout.h

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ void watchdog_unregister_governor(struct watchdog_governor *gov); 
/* Interfaces to watchdog_dev.c */

int watchdog_register_pretimeout(struct watchdog_device *wdd);

void watchdog_unregister_pretimeout(struct watchdog_device *wdd);

int watchdog_pretimeout_available_governors_get(char *buf);

int watchdog_pretimeout_governor_get(struct watchdog_device *wdd, char *buf);

int watchdog_pretimeout_governor_set(struct watchdog_device *wdd,

				     const char *buf);
@@ -38,6 +39,11 @@ static inline void watchdog_unregister_pretimeout(struct watchdog_device *wdd) 
{

}



static inline int watchdog_pretimeout_available_governors_get(char *buf)

{

	return -EINVAL;

}



static inline int watchdog_pretimeout_governor_get(struct watchdog_device *wdd,

						   char *buf)

{