| 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
| ||
|
Message-Id: <20250508120900.114348-2-brajeshpatil11@gmail.com>
Date: Thu, 8 May 2025 13:08:59 +0100
From: Brajesh Patil <brajeshpatil11@...il.com>
To: jic23@...nel.org,
lars@...afoo.de
Cc: linux-iio@...r.kernel.org,
linux-kernel@...r.kernel.org,
marcelo.schmitt1@...il.com,
dlechner@...libre.com,
Brajesh Patil <brajeshpatil11@...il.com>
Subject: [PATCH v2 4/5] iio: magnetometer: qmc5883l: add extended sysfs attributes and configuration options
Signed-off-by: Brajesh Patil <brajeshpatil11@...il.com>
---
drivers/iio/magnetometer/qmc5883l.c | 276 +++++++++++++++++++++++++++-
1 file changed, 274 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/magnetometer/qmc5883l.c b/drivers/iio/magnetometer/qmc5883l.c
index 68597cdd0ca8..07c65f193def 100644
--- a/drivers/iio/magnetometer/qmc5883l.c
+++ b/drivers/iio/magnetometer/qmc5883l.c
@@ -54,6 +54,20 @@
#define QMC5883L_OSR_MASK 0xC0
#define QMC5883L_OSR_SHIFT 6
+static const char *const qmc5883l_modes[] = {
+ "standby", "continuous"
+};
+
+static const int qmc5883l_odr_avail[][2] = {
+ {10, 0}, {50, 0}, {100, 0}, {200, 0}
+};
+
+static const char *const qmc5883l_osr_avail[] = {
+ "512", "256", "128", "64"
+};
+
+static const int qmc5883l_scale_avail[] = {2, 8};
+
static const int qmc5883l_odr_map[] = {
[QMC5883L_ODR_10HZ] = 10,
[QMC5883L_ODR_50HZ] = 50,
@@ -82,6 +96,12 @@ struct qmc5883l_data {
static int qmc5883l_init(struct qmc5883l_data *data);
static int qmc5883l_set_mode(struct qmc5883l_data *data, unsigned int mode);
+static ssize_t qmc5883l_show_odr_avail(struct device *dev,
+ struct device_attribute *attr, char *buf);
+static ssize_t qmc5883l_show_scale_avail(struct device *dev,
+ struct device_attribute *attr, char *buf);
+static ssize_t qmc5883l_show_status(struct device *dev,
+ struct device_attribute *attr, char *buf);
static int qmc5883l_buffer_preenable(struct iio_dev *indio_dev)
{
@@ -142,6 +162,102 @@ static const struct regmap_config qmc5883l_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};
+static int qmc5883l_set_osr(struct qmc5883l_data *data, unsigned int osr)
+{
+ int ret;
+
+ mutex_lock(&data->lock);
+ ret = regmap_update_bits(data->regmap, QMC5883L_CONTROL_REG_1,
+ QMC5883L_OSR_MASK, osr << QMC5883L_OSR_SHIFT);
+ mutex_unlock(&data->lock);
+
+ return ret;
+}
+
+static int qmc5883l_get_osr(struct qmc5883l_data *data)
+{
+ unsigned int val;
+ int ret;
+
+ ret = regmap_read(data->regmap, QMC5883L_CONTROL_REG_1, &val);
+ if (ret < 0)
+ return ret;
+
+ return (val & QMC5883L_OSR_MASK) >> QMC5883L_OSR_SHIFT;
+}
+
+static int qmc5883l_get_osr_iio(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan)
+{
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+
+ return qmc5883l_get_osr(data);
+}
+
+static int qmc5883l_set_osr_iio(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan,
+ unsigned int osr)
+{
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+
+ return qmc5883l_set_osr(data, osr);
+}
+
+static s32 qmc5883l_set_rng(struct qmc5883l_data *data, u8 rng)
+{
+ int ret;
+
+ mutex_lock(&data->lock);
+ ret = regmap_update_bits(data->regmap, QMC5883L_CONTROL_REG_1,
+ QMC5883L_RNG_MASK, rng << QMC5883L_RNG_SHIFT);
+ mutex_unlock(&data->lock);
+ return ret;
+}
+
+static s32 qmc5883l_set_odr(struct qmc5883l_data *data, u8 odr)
+{
+ int ret;
+
+ mutex_lock(&data->lock);
+ ret = regmap_update_bits(data->regmap, QMC5883L_CONTROL_REG_1,
+ QMC5883L_ODR_MASK, odr << QMC5883L_ODR_SHIFT);
+ mutex_unlock(&data->lock);
+ return ret;
+}
+
+static int qmc5883l_get_odr(struct qmc5883l_data *data, unsigned int *odr)
+{
+ int ret;
+ unsigned int val;
+
+ ret = regmap_read(data->regmap, QMC5883L_CONTROL_REG_1, &val);
+ if (ret < 0)
+ return ret;
+
+ *odr = (val & QMC5883L_ODR_MASK) >> QMC5883L_ODR_SHIFT;
+ return 0;
+}
+
+static int qmc5883l_get_delay_based_on_odr(struct qmc5883l_data *data)
+{
+ unsigned int odr;
+ int ret;
+
+ ret = qmc5883l_get_odr(data, &odr);
+ if (ret < 0)
+ return ret;
+
+ switch (odr) {
+ case QMC5883L_ODR_10HZ: return 100000;
+ case QMC5883L_ODR_50HZ: return 20000;
+ case QMC5883L_ODR_100HZ: return 10000;
+ case QMC5883L_ODR_200HZ: return 5000;
+ default:
+ dev_err(&data->client->dev, "Invalid ODR value: %u\n", odr);
+ return -EINVAL;
+ }
+}
+
static int qmc5883l_set_mode(struct qmc5883l_data *data, unsigned int mode)
{
int ret;
@@ -154,11 +270,44 @@ static int qmc5883l_set_mode(struct qmc5883l_data *data, unsigned int mode)
return ret;
}
+static int qmc5883l_get_mode(struct qmc5883l_data *data)
+{
+ unsigned int val;
+ int ret;
+
+ ret = regmap_read(data->regmap, QMC5883L_CONTROL_REG_1, &val);
+ if (ret < 0)
+ return ret;
+
+ return (val & QMC5883L_MODE_MASK) >> QMC5883L_MODE_SHIFT;
+}
+
+static int qmc5883l_get_mode_iio(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan)
+{
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+
+ return qmc5883l_get_mode(data);
+}
+
+static int qmc5883l_set_mode_iio(struct iio_dev *indio_dev,
+ const struct iio_chan_spec *chan,
+ unsigned int mode)
+{
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+
+ return qmc5883l_set_mode(data, mode);
+}
+
static int qmc5883l_wait_measurement(struct qmc5883l_data *data)
{
int tries = 150;
unsigned int val;
- int ret;
+ int ret, delay;
+
+ delay = qmc5883l_get_delay_based_on_odr(data);
+ if (delay < 0)
+ return delay;
while (tries-- > 0) {
ret = regmap_read(data->regmap, QMC5883L_STATUS_REG, &val);
@@ -172,7 +321,7 @@ static int qmc5883l_wait_measurement(struct qmc5883l_data *data)
if (val & QMC5883L_DRDY)
return 0;
- usleep_range(5000, 6000);
+ usleep_range(delay, delay + 1000);
}
dev_err(&data->client->dev, "data not ready\n");
@@ -208,6 +357,65 @@ static int qmc5883l_read_measurement(struct qmc5883l_data *data,
return IIO_VAL_INT;
}
+static const struct iio_enum qmc5883l_mode_enum = {
+ .items = qmc5883l_modes,
+ .num_items = ARRAY_SIZE(qmc5883l_modes),
+ .get = qmc5883l_get_mode_iio,
+ .set = qmc5883l_set_mode_iio,
+};
+
+static const struct iio_enum qmc5883l_osr_enum = {
+ .items = qmc5883l_osr_avail,
+ .num_items = ARRAY_SIZE(qmc5883l_osr_avail),
+ .get = qmc5883l_get_osr_iio,
+ .set = qmc5883l_set_osr_iio,
+};
+
+static const struct iio_chan_spec_ext_info qmc5883l_ext_info[] = {
+ IIO_ENUM("mode", IIO_SHARED_BY_TYPE, &qmc5883l_mode_enum),
+ IIO_ENUM_AVAILABLE("mode", IIO_SHARED_BY_TYPE, &qmc5883l_mode_enum),
+ IIO_ENUM("oversampling_ratio", IIO_SHARED_BY_TYPE, &qmc5883l_osr_enum),
+ IIO_ENUM_AVAILABLE("oversampling_ratio", IIO_SHARED_BY_TYPE, &qmc5883l_osr_enum),
+ { }
+};
+
+static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(qmc5883l_show_odr_avail);
+static IIO_DEVICE_ATTR(scale_available, 0444, qmc5883l_show_scale_avail, NULL, 0);
+static IIO_DEVICE_ATTR(data_ready, 0444, qmc5883l_show_status, NULL, 0);
+static IIO_DEVICE_ATTR(overflow, 0444, qmc5883l_show_status, NULL, 0);
+
+static ssize_t qmc5883l_show_odr_avail(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return sprintf(buf, "10 50 100 200\n");
+}
+
+static ssize_t qmc5883l_show_scale_avail(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return sprintf(buf, "2 8\n");
+}
+
+static ssize_t qmc5883l_show_status(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+ unsigned int val;
+ int ret;
+
+ ret = regmap_read(data->regmap, QMC5883L_STATUS_REG, &val);
+ if (ret < 0)
+ return ret;
+
+ if (attr == (struct device_attribute *)&iio_dev_attr_data_ready.dev_attr.attr)
+ return sprintf(buf, "%d\n", !!(val & QMC5883L_DRDY));
+ else if (attr == (struct device_attribute *)&iio_dev_attr_overflow.dev_attr.attr)
+ return sprintf(buf, "%d\n", !!(val & QMC5883L_OVL));
+
+ return -EINVAL;
+}
+
static int qmc5883l_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, int *val, int *val2, long mask)
{
@@ -275,6 +483,54 @@ static int qmc5883l_read_raw(struct iio_dev *indio_dev,
return -EINVAL;
}
+static int qmc5883l_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val, int val2, long mask)
+{
+ struct qmc5883l_data *data = iio_priv(indio_dev);
+ int odr, range;
+
+ switch (mask) {
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ if (val == 10 && val2 == 0)
+ odr = QMC5883L_ODR_10HZ;
+ else if (val == 50 && val2 == 0)
+ odr = QMC5883L_ODR_50HZ;
+ else if (val == 100 && val2 == 0)
+ odr = QMC5883L_ODR_100HZ;
+ else if (val == 200 && val2 == 0)
+ odr = QMC5883L_ODR_200HZ;
+ else
+ return -EINVAL;
+
+ return qmc5883l_set_odr(data, odr);
+ case IIO_CHAN_INFO_SCALE:
+ if (val == 2 && val2 == 0)
+ range = QMC5883L_RNG_2G;
+ else if (val == 8 && val2 == 0)
+ range = QMC5883L_RNG_8G;
+ else
+ return -EINVAL;
+
+ return qmc5883l_set_rng(data, range << QMC5883L_RNG_SHIFT);
+ default:
+ return -EINVAL;
+ }
+}
+
+static int qmc5883l_write_raw_get_fmt(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan, long mask)
+{
+ switch (mask) {
+ case IIO_CHAN_INFO_SAMP_FREQ:
+ return IIO_VAL_INT;
+ case IIO_CHAN_INFO_SCALE:
+ return IIO_VAL_INT_PLUS_NANO;
+ default:
+ return -EINVAL;
+ }
+}
+
static irqreturn_t qmc5883l_trigger_handler(int irq, void *p)
{
struct iio_poll_func *pf = p;
@@ -321,6 +577,7 @@ static irqreturn_t qmc5883l_trigger_handler(int irq, void *p)
.storagebits = 16, \
.endianness = IIO_LE, \
}, \
+ .ext_info = qmc5883l_ext_info, \
}
static const struct iio_chan_spec qmc5883l_channels[] = {
@@ -337,6 +594,18 @@ static const struct iio_chan_spec qmc5883l_channels[] = {
IIO_CHAN_SOFT_TIMESTAMP(3),
};
+static struct attribute *qmc5883l_attributes[] = {
+ &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
+ &iio_dev_attr_scale_available.dev_attr.attr,
+ &iio_dev_attr_data_ready.dev_attr.attr,
+ &iio_dev_attr_overflow.dev_attr.attr,
+ NULL
+};
+
+static const struct attribute_group qmc5883l_attribute_group = {
+ .attrs = qmc5883l_attributes,
+};
+
static int qmc5883l_init(struct qmc5883l_data *data)
{
int ret;
@@ -382,7 +651,10 @@ static int qmc5883l_init(struct qmc5883l_data *data)
}
static const struct iio_info qmc5883l_info = {
+ .attrs = &qmc5883l_attribute_group,
.read_raw = &qmc5883l_read_raw,
+ .write_raw = &qmc5883l_write_raw,
+ .write_raw_get_fmt = &qmc5883l_write_raw_get_fmt,
};
static const unsigned long qmc5883l_scan_masks[] = {0x7, 0};
--
2.39.5
Powered by blists - more mailing lists