| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Apr 2020 15:34:09 +0200
From: Akira Shimahara <akira215corp@...il.com>
To: greg@...ah.com
Cc: zbr@...emap.net, linux-kernel@...r.kernel.org,
Akira Shimahara <akira215corp@...il.com>
Subject: [PATCH v3 4/5] w1_therm: alarms support by adding sysfs entry. Updating doc
Patch for enhacement of w1_therm module. Adding device alarms settings
by a dedicated sysfs entry alarms (RW) : read or write TH and TL in the
device RAM. Checking devices in alarm state could be performed using
the master search command.
Updating doc in Documentation/ABI/testing/sysfs-driver-w1_therm
accordingly.
Signed-off-by: Akira Shimahara <akira215corp@...il.com>
---
.../ABI/testing/sysfs-driver-w1_therm | 15 ++
drivers/w1/slaves/w1_therm.c | 129 ++++++++++++++++++
drivers/w1/slaves/w1_therm.h | 12 ++
3 files changed, 156 insertions(+)
diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
index 279e13d..39488a4 100644
--- a/Documentation/ABI/testing/sysfs-driver-w1_therm
+++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
@@ -1,3 +1,18 @@
+What: /sys/bus/w1/devices/.../alarms
+Date: Apr 2020
+Contact: Akira Shimahara <akira215corp@...il.com>
+Description:
+ (RW) read or write TH and TL (Temperature High an Low) alarms.
+ Values shall be space separated and in the device range
+ (typical -55 degC to 125 degC). Values are integer as they
+ are store in a 8bit register in the device.
+ Lowest value is automatically put to TL.
+ Once set, alarms could be search at master level, refer to
+ Documentation/w1/w1_generic.rst for detailed information
+Users: any user space application which wants to communicate with
+ w1_term device
+
+
What: /sys/bus/w1/devices/.../eeprom
Date: Apr 2020
Contact: Akira Shimahara <akira215corp@...il.com>
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
index 3ddf2b1..db75048 100644
--- a/drivers/w1/slaves/w1_therm.c
+++ b/drivers/w1/slaves/w1_therm.c
@@ -68,6 +68,12 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0);
* (device do that automatically on power-up)
*
*
+ * alarms (RW) : read TH and TL (Temperature High an Low) alarms
+ * Values shall be space separated and in the device range
+ * (typically -55° to 125°)
+ * Values are integer are they are store in a 8bit field in the device
+ * Lowest value is automatically put to TL
+ *
*/
/*
@@ -81,6 +87,7 @@ static struct attribute *w1_therm_attrs[] = {
&dev_attr_ext_power.attr,
&dev_attr_resolution.attr,
&dev_attr_eeprom.attr,
+ &dev_attr_alarms.attr,
NULL,
};
@@ -89,6 +96,7 @@ static struct attribute *w1_ds18s20_attrs[] = {
&dev_attr_temperature.attr,
&dev_attr_ext_power.attr,
&dev_attr_eeprom.attr,
+ &dev_attr_alarms.attr,
NULL,
};
@@ -99,6 +107,7 @@ static struct attribute *w1_ds28ea00_attrs[] = {
&dev_attr_ext_power.attr,
&dev_attr_resolution.attr,
&dev_attr_eeprom.attr,
+ &dev_attr_alarms.attr,
NULL,
};
@@ -207,6 +216,7 @@ static struct w1_family w1_therm_family_DS1825 = {
};
/*----------------------Device capability description-----------------------*/
+
static struct w1_therm_family_converter w1_therm_families[] = {
{
.f = &w1_therm_family_DS18S20,
@@ -1009,6 +1019,125 @@ static ssize_t eeprom_store(struct device *device,
return size;
}
+static ssize_t alarms_show(struct device *device,
+ struct device_attribute *attr, char *buf)
+{
+ struct w1_slave *sl = dev_to_w1_slave(device);
+ int ret = -ENODEV;
+ s8 th = 0, tl = 0;
+ struct therm_info scratchpad;
+
+ ret = read_scratchpad(sl, &scratchpad);
+
+ if (!ret) {
+ th = scratchpad.rom[2]; // TH is byte 2
+ tl = scratchpad.rom[3]; // TL is byte 3
+ } else {
+ dev_info(device,
+ "%s: error reading alarms register %d\n",
+ __func__, ret);
+ }
+
+ return sprintf(buf, "%hd %hd\n", tl, th);
+}
+
+static ssize_t alarms_store(struct device *device,
+ struct device_attribute *attr, const char *buf, size_t size)
+{
+ struct w1_slave *sl = dev_to_w1_slave(device);
+ struct therm_info info;
+ u8 new_config_register[3]; /* array of data to be written */
+ int temp, ret = -EINVAL;
+ char *token = NULL;
+ s8 tl, th, tt; /* 1 byte per value + temp ring order */
+ char *p_args = kmalloc(size, GFP_KERNEL);
+
+ /* Safe string copys as buf is const */
+ if (!p_args) {
+ dev_warn(device,
+ "%s: error unable to allocate memory %d\n",
+ __func__, -ENOMEM);
+ return size;
+ }
+ strcpy(p_args, buf);
+
+ /* Split string using space char */
+ token = strsep(&p_args, " ");
+
+ if (!token) {
+ dev_info(device,
+ "%s: error parsing args %d\n", __func__, -EINVAL);
+ goto free_m;
+ }
+
+ /* Convert 1st entry to int */
+ ret = kstrtoint (token, 10, &temp);
+ if (ret) {
+ dev_info(device,
+ "%s: error parsing args %d\n", __func__, ret);
+ goto free_m;
+ }
+
+ tl = int_to_short(temp);
+
+ /* Split string using space char */
+ token = strsep(&p_args, " ");
+ if (!token) {
+ dev_info(device,
+ "%s: error parsing args %d\n", __func__, -EINVAL);
+ goto free_m;
+ }
+ /* Convert 2nd entry to int */
+ ret = kstrtoint (token, 10, &temp);
+ if (ret) {
+ dev_info(device,
+ "%s: error parsing args %d\n", __func__, ret);
+ goto free_m;
+ }
+
+ /* Prepare to cast to short by eliminating out of range values */
+ th = int_to_short(temp);
+
+ /* Reorder if required th and tl */
+ if (tl > th) {
+ tt = tl; tl = th; th = tt;
+ }
+
+ /* Read the scratchpad to change only the required bits
+ * (th : byte 2 - tl: byte 3)
+ */
+ ret = read_scratchpad(sl, &info);
+ if (!ret) {
+ new_config_register[0] = th; // Byte 2
+ new_config_register[1] = tl; // Byte 3
+ new_config_register[2] = info.rom[4];// Byte 4
+ } else {
+ dev_info(device,
+ "%s: error reading from the slave device %d\n",
+ __func__, ret);
+ goto free_m;
+ }
+
+ /* Write data in the device RAM */
+ if (!SLAVE_SPECIFIC_FUNC(sl)) {
+ dev_info(device,
+ "%s: Device not supported by the driver %d\n",
+ __func__, -ENODEV);
+ goto free_m;
+ }
+
+ ret = SLAVE_SPECIFIC_FUNC(sl)->write_data(sl, new_config_register);
+ if (ret)
+ dev_info(device,
+ "%s: error writing to the slave device %d\n",
+ __func__, ret);
+
+free_m:
+ /* free allocated memory */
+ kfree(p_args);
+
+ return size;
+}
#if IS_REACHABLE(CONFIG_HWMON)
static int w1_read_temp(struct device *device, u32 attr, int channel,
long *val)
diff --git a/drivers/w1/slaves/w1_therm.h b/drivers/w1/slaves/w1_therm.h
index 487156f..4f2dcf0 100644
--- a/drivers/w1/slaves/w1_therm.h
+++ b/drivers/w1/slaves/w1_therm.h
@@ -287,6 +287,17 @@ static ssize_t resolution_store(struct device *device,
static ssize_t eeprom_store(struct device *device,
struct device_attribute *attr, const char *buf, size_t size);
+/** @brief A callback function to set the alarms level
+ * @param device represents the master device
+ */
+static ssize_t alarms_store(struct device *device,
+ struct device_attribute *attr, const char *buf, size_t size);
+
+/** @brief A callback function to get the alarms level
+ * @return Low and High alarm, separate by one space
+ */
+static ssize_t alarms_show(struct device *device,
+ struct device_attribute *attr, char *buf);
/*-----------------------------Attributes declarations----------------------*/
static DEVICE_ATTR_RW(w1_slave);
@@ -295,6 +306,7 @@ static DEVICE_ATTR_RO(temperature);
static DEVICE_ATTR_RO(ext_power);
static DEVICE_ATTR_RW(resolution);
static DEVICE_ATTR_WO(eeprom);
+static DEVICE_ATTR_RW(alarms);
/*--------------------------Interface Functions-----------------------------*/
--
2.25.4
Powered by blists - more mailing lists