| 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: <20250521090552.3173-8-markus.burri@mt.com>
Date: Wed, 21 May 2025 11:05:52 +0200
From: Markus Burri <markus.burri@...com>
To: linux-kernel@...r.kernel.org
Cc: Markus Burri <markus.burri@...com>,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Manuel Traut <manuel.traut@...com>,
Marek Vasut <marex@...x.de>,
linux-rtc@...r.kernel.org,
devicetree@...r.kernel.org,
Markus Burri <markus.burri@....ch>
Subject: [PATCH v4 7/7] rtc-rv8803: make tamper function configurable via dt
The settings are depending on hardware connected to the input pin.
Make this settings configurable in the device-tree:
- for the input pins: input resistor, trigger edge, de-jitter filter
- for the buffer: overwrite or inhibit mode for the FIFO
Signed-off-by: Markus Burri <markus.burri@...com>
---
drivers/rtc/rtc-rv8803.c | 95 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 92 insertions(+), 3 deletions(-)
diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index 39d5881ba261..e3a4e9eaccb1 100644
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -114,6 +114,11 @@ enum evin_trigger {
both_edges = 0b10,
};
+enum evin_buffer_mode {
+ inhibit = 0,
+ overwrite = 1,
+};
+
struct cfg_val_txt {
char *txt;
u8 val;
@@ -164,6 +169,16 @@ static const u8 evin_flt_regs[] = {
RX8901_EVIN3_FLT
};
+struct tamper_cfg {
+ struct {
+ u8 enable;
+ u8 pull_resistor;
+ u8 trigger;
+ u8 filter;
+ } evin[NO_OF_EVIN];
+ u8 buffer_mode;
+};
+
struct rv8803_data {
struct i2c_client *client;
struct rtc_device *rtc;
@@ -171,6 +186,7 @@ struct rv8803_data {
u8 ctrl;
u8 backup;
u8 alarm_invalid:1;
+ struct tamper_cfg tamper_cfg;
enum rv8803_type type;
};
@@ -769,7 +785,10 @@ static int rv8803_ts_enable(struct rv8803_data *rv8803, u8 enable)
/* 3. set EVENTx pull-up edge trigger and noise filter */
for (i = 0; i < NO_OF_EVIN; ++i) {
- ret = rv8803_ts_event_write_evin(i, rv8803, pull_up_1M, falling_edge, 0);
+ ret = rv8803_ts_event_write_evin(i, rv8803,
+ rv8803->tamper_cfg.evin[i].pull_resistor,
+ rv8803->tamper_cfg.evin[i].trigger,
+ rv8803->tamper_cfg.evin[i].filter);
if (ret < 0)
return ret;
}
@@ -787,10 +806,11 @@ static int rv8803_ts_enable(struct rv8803_data *rv8803, u8 enable)
}
/*
- * 5. set BUF1 inhibit and interrupt every 1 event
+ * 5. set BUF1 inhibit/overwrite mode and interrupt every 1 event
* NOTE: BUF2-3 are not used in FIFO-mode
*/
- ret = rv8803_write_reg(client, RX8901_BUF1_CFG1, 0x01);
+ reg_mask = 0x01 | FIELD_PREP(BIT(6), rv8803->tamper_cfg.buffer_mode);
+ ret = rv8803_write_reg(client, RX8901_BUF1_CFG1, reg_mask);
if (ret < 0)
return ret;
@@ -1125,6 +1145,71 @@ static int rx8900_trickle_charger_init(struct rv8803_data *rv8803)
flags);
}
+static int rx8900_tamper_init(struct rv8803_data *rv8803)
+{
+ int i;
+ int err;
+ u8 flags;
+ struct device_node *of_tamper;
+ struct i2c_client *client = rv8803->client;
+ struct tamper_cfg *tamper_cfg = &rv8803->tamper_cfg;
+
+ rv8803->tamper_cfg.buffer_mode = inhibit;
+ for (i = 0; i < NO_OF_EVIN; ++i) {
+ tamper_cfg->evin[i].enable = true;
+ tamper_cfg->evin[i].pull_resistor = pull_up_1M;
+ tamper_cfg->evin[i].trigger = falling_edge;
+ tamper_cfg->evin[i].filter = 0;
+ }
+
+ of_tamper = of_get_child_by_name(client->dev.of_node, "tamper");
+ if (of_tamper) {
+ if (of_property_read_bool(of_tamper, "buffer-overwrite"))
+ tamper_cfg->buffer_mode = overwrite;
+
+ for (i = 0; i < NO_OF_EVIN; ++i) {
+ char of_evin_name[10];
+ u32 evin_val[3];
+
+ snprintf(of_evin_name, sizeof(of_evin_name), "evin-%d", i + 1);
+ if (!of_property_read_u32_array(of_tamper, of_evin_name, evin_val,
+ ARRAY_SIZE(evin_val))) {
+ tamper_cfg->evin[i].enable = true;
+ tamper_cfg->evin[i].pull_resistor = evin_val[0];
+ tamper_cfg->evin[i].trigger = evin_val[1];
+ tamper_cfg->evin[i].filter = evin_val[2];
+ } else {
+ tamper_cfg->evin[i].enable = false;
+ }
+ }
+ of_node_put(of_tamper);
+ }
+
+ scoped_guard(mutex, &rv8803->flags_lock) {
+ err = rv8803_read_reg(client, RX8901_BUF1_CFG1);
+ if (err < 0)
+ return err;
+ flags = (err & ~BIT(6)) | FIELD_PREP(BIT(6), tamper_cfg->buffer_mode);
+ err = rv8803_write_reg(client, RX8901_BUF1_CFG1, flags);
+ if (err < 0)
+ return err;
+ }
+
+ for (i = 0; i < NO_OF_EVIN; ++i) {
+ err = rv8803_ts_event_write_evin(i, rv8803,
+ tamper_cfg->evin[i].pull_resistor,
+ tamper_cfg->evin[i].trigger,
+ tamper_cfg->evin[i].filter);
+ if (err)
+ return err;
+ }
+
+ if (of_tamper)
+ rv8803_ts_enable(rv8803, true);
+
+ return 0;
+}
+
/* configure registers with values different than the Power-On reset defaults */
static int rv8803_regs_configure(struct rv8803_data *rv8803)
{
@@ -1266,6 +1351,10 @@ static int rv8803_probe(struct i2c_client *client)
return err;
if (rv8803->type == rx_8901) {
+ err = rx8900_tamper_init(rv8803);
+ if (err)
+ return err;
+
err = rtc_add_group(rv8803->rtc, &rv8803_rtc_sysfs_event_files);
if (err)
return err;
--
2.39.5
Powered by blists - more mailing lists