iio: adc: add Versal SysMon driver
Subsystems (3)
Salih Erim
maintainerv12 cover iio: adc: add Versal SysMon driver
This series adds a new IIO driver for the AMD/Xilinx Versal System Monitor (SysMon), providing on-chip voltage and temperature monitoring.
The Versal SysMon measures up to 160 supply voltages and reads up to 64 temperature satellites distributed across the SoC. The hardware also provides aggregated device temperature registers: the current max and min across all active satellites, and peak/trough values recorded since last hardware reset. The device can be accessed via memory-mapped I/O or via an I2C interface.
The driver is split into a bus-agnostic core module using the regmap API, an MMIO platform driver, and an I2C driver. This allows the same IIO logic to be shared across different bus transports.
Note: Sai Krishna Potthuri is added as co-maintainer and will be actively taking over the upstream maintenance of this driver going forward. Please direct any future review feedback to him.
Previous submissions:
v11: https://lore.kernel.org/all/[email protected]/
v10: https://lore.kernel.org/all/[email protected]/
v9: https://lore.kernel.org/all/[email protected]/
v8: https://lore.kernel.org/all/[email protected]/
v7: https://lore.kernel.org/all/[email protected]/
v6: https://lore.kernel.org/all/[email protected]/
v5: https://lore.kernel.org/all/[email protected]/
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Changes in v12:
- Add Sai Krishna Potthuri as co-maintainer in MAINTAINERS
Changes in v11:
- Add input validation for threshold event writes and clamp computed lower threshold to Q8.7 range (Jonathan, Sashiko)
- Add oversampling info_mask to static temp channels (Jonathan)
Changes in v10:
- Address Andy v9 nit-picks: limits.h for IWYU, variable declaration grouping in P2 (Andy)
Changes in v9:
- Address Andy v8 review items: symbol namespace, function signature joins, minmax.h, variable naming consistency, num_static move to P2 (Andy)
Changes in v8:
- Address Andy v7 review items: MILLIDEGREE_PER_DEGREE, overflow.h, devm_versal_sysmon_core_probe rename, volatile register comment, regmap_test_bits, unsigned int for osr_write, ~0 instead of ~0U (Andy)
- Fix devm teardown race in interrupt cleanup (Sashiko)
Changes in v7:
- Move TEMP event onto channel 0; drop OT as separate IIO channel; use single temp_channels array with runtime event attachment (Jonathan)
- Return administrative state from temp_mask in read_event_config instead of transient hardware IMR (Jonathan, Sashiko)
- Add devm cleanup to mask HW interrupts on driver unbind (Sashiko)
- Add documentation comment for static aggregate temp channels (Jonathan)
- Split sysmon_osr_write into per-type helpers (Jonathan)
Changes in v6:
- Address all Andy v5 review items: switch(chan->type) in event functions, reversed xmas tree ordering, macro brace placement, scoped_guard in unmask worker, combined regmap error checks, join single-line constructs, IWYU header fixes (Andy)
- Fix fwnode_irq_get() to propagate only -EPROBE_DEFER; treating all negatives as fatal broke probe on I2C nodes without interrupts property
Changes in v5:
- Core: add err.h include (IWYU) (Andy)
- Core: drop (int) cast on MILLI in scale assignment (Andy)
- Core: sign_extend32() instead of (s16) cast (Andy)
- Core: remove unneeded parentheses in voltage address calculation (Andy)
- Core: drop NULL checks before fwnode_get_child_node_count
(NULL-aware) (Andy)
- Core: nested size_add() for overflow-safe allocation (Andy)
- Core: if (ret) instead of if (ret < 0) for fwnode property reads (Andy)
- Core: remove outer parentheses in satellite address calculation (Andy)
- Core: loop index declared in for() scope (Andy)
- MMIO: add err.h, types.h includes (IWYU) (Andy)
- Header: remove unused types.h include and struct iio_dev forward declaration at P2 stage (Andy)
- I2C: add err.h, mod_devicetable.h includes (IWYU) (Andy)
- Events: clamp() instead of clamp_t() (Andy)
- Events: regmap_assign_bits() instead of separate set/clear (Andy)
- Events: remove unneeded parentheses (2 places) (Andy)
- Events: for_each_set_bit on single line (Andy)
- Events: regmap_clear_bits() instead of regmap_update_bits() (Andy)
- Events: simplify unmask XOR to ~status & masked_temp (Andy)
- Events: add comment explaining unmask &= ~temp_mask logic (Andy)
- Events: split container_of across two lines (Andy)
- Events: move ISR write after !isr check (Andy)
- Events: unsigned int for init_hysteresis address param (Andy)
- Events: add comment explaining error check policy in worker/IRQ (Andy)
- Events: nested size_add() for overflow-safe allocation (Andy)
- Events: propagate negative from fwnode_irq_get() for EPROBE_DEFER (Andy)
- Events: pass irq instead of has_irq to sysmon_parse_fw (Andy)
- Oversampling: remove unneeded parentheses (Andy)
- Oversampling: use struct regmap *map local variable (Andy)
- Oversampling: switch instead of redundant if/if on channel_type (Andy)
- Oversampling: add CONFIG register readback fence after oversampling update to prevent NoC bus hang from posted writes (found during hardware stress testing)
Changes in v4:
- Core: temperature channels use RAW + SCALE (IIO_VAL_FRACTIONAL, 1000/128) instead of PROCESSED; voltage channels use PROCESSED only, drop RAW; drop scan_type from all channel macros (Jonathan)
- Core: move __free(fwnode_handle) declarations down to just above use; devm_regmap_init() on one line; lock comment describes RMW sequences and cached state (Jonathan)
- Events: merge event channels into static temp array -- two arrays (with/without events) selected by has_irq; event-only channels have no info_mask (Jonathan)
- Events: blank lines, fit under 80 chars, default returns error, return early in each case, guard(spinlock) in IRQ handler (Jonathan)
- Events: take irq_lock in write_event_config for temp_mask updates (Sashiko)
- I2C: replace enum with defines, use unaligned accessors for data and register offset packing, named initializer in i2c_device_id (Jonathan)
- I2C: drop bitfield.h, add unaligned.h
- Oversampling: return directly, remove else after early returns, rename mask defines, blank lines (Jonathan)
- Oversampling: move oversampling read inside guard(mutex) scope
- Fix v2 lore link in cover letter
Changes in v3:
- DT binding: single compatible, voltage-channels rename, single quotes, drop label/bipolar/xlnx,aie-temp (Krzysztof)
- Core: IWYU throughout, __free(fwnode_handle), sign_extend32(), size_add(), dev_err_probe(), s16 param, remove (int) casts, drop SYSMON_MILLI in favor of (int)MILLI, rename _ext to _name in SYSMON_CHAN_TEMP macro (Andy, Jonathan)
- Core: fwnode_irq_get() moved to core_probe, remove sysmon->dev/ indio_dev/irq from struct, describe protected data in lock comment, add RAW+PROCESSED comment (Jonathan)
- I2C: IWYU, remove wrapper struct, explicit enum values, sizeof() for buffers, = { } initializers, adapt to core_probe interface change (Andy, Krzysztof)
- Events: IWYU, FIELD_GET/FIELD_PREP, regmap_set/clear_bits, clamp_t, !!, IRQ_RETVAL(), devm_delayed_work_autocancel, loop var scope, error checks, remove redundant else, logical param splits, spinlock safety comment (Andy)
- Events: hysteresis rework -- store as millicelsius, hardcode ALARM_CONFIG to hysteresis mode, compute lower threshold from (upper - hysteresis), remove falling threshold for temperature, single event spec per channel with IIO_EV_DIR_RISING, push IIO_EV_DIR_RISING for temp and IIO_EV_DIR_EITHER for voltage (Jonathan)
Tested on VCK190 (single SLR, MMIO path, 7 supplies, 10 temperature satellites). I2C compile-tested.
A follow-up series will add thermal zone integration, secure firmware access, and I2C remote monitoring.
Salih Erim (5):
dt-bindings: iio: adc: add xlnx,versal-sysmon binding
iio: adc: add Versal SysMon driver
iio: adc: versal-sysmon: add I2C driver
iio: adc: versal-sysmon: add threshold event support
iio: adc: versal-sysmon: add oversampling support
.../bindings/iio/adc/xlnx,versal-sysmon.yaml | 154 +++ MAINTAINERS | 8 + drivers/iio/adc/Kconfig | 33 + drivers/iio/adc/Makefile | 3 + drivers/iio/adc/versal-sysmon-core.c | 1052 +++++++++++++++++ drivers/iio/adc/versal-sysmon-i2c.c | 134 +++ drivers/iio/adc/versal-sysmon.c | 92 ++ drivers/iio/adc/versal-sysmon.h | 120 ++ 8 files changed, 1596 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml create mode 100644 drivers/iio/adc/versal-sysmon-core.c create mode 100644 drivers/iio/adc/versal-sysmon-i2c.c create mode 100644 drivers/iio/adc/versal-sysmon.c create mode 100644 drivers/iio/adc/versal-sysmon.h
Signature · 1 line
2.48.1
Salih Erim
maintainerPATCH v12 1/5 dt-bindings: iio: adc: add xlnx,versal-sysmon binding
Add devicetree binding for the AMD/Xilinx Versal System Monitor (SysMon).
The Versal SysMon is the successor to the Zynq UltraScale+ AMS block, providing on-chip voltage and temperature monitoring. The hardware supports up to 160 supply voltage measurement points and up to 64 temperature satellites distributed across the SoC, with configurable threshold alarms and oversampling. The device can be accessed via memory-mapped I/O or via an I2C interface.
Supply and temperature channels are described as child nodes under container nodes, referencing the standard adc.yaml binding for channel properties.
---
Changes in v12:
- No code changes
Changes in v11:
- No code changes
Changes in v10:
- No code changes
Changes in v9:
- No code changes
Changes in v8:
- No code changes
Changes in v7:
- No code changes
Changes in v6:
- No code changes
Changes in v5:
- No code changes
Changes in v4:
- Add Reviewed-by tag from Krzysztof Kozlowski
Changes in v3:
- Use single compatible (xlnx,versal-sysmon only), remove xlnx,versal-sysmon-i2c (Krzysztof)
- Rename supply-channels container to voltage-channels (Krzysztof)
- Use single quotes in patternProperties regex (Krzysztof)
- Drop label description from channel properties (Krzysztof)
- Drop bipolar from channel properties (Krzysztof)
- Remove xlnx,aie-temp property from binding and example (Krzysztof)
Changes in v2:
- Restructured to container nodes (supply-channels, temperature-channels) with channel@N children referencing adc.yaml
- Added xlnx,versal-sysmon-i2c compatible
- Descriptions rewritten to describe hardware only
- Example simplified to #address-cells = <1>
- Interrupt example uses GIC_SPI/IRQ_TYPE_LEVEL_HIGH constants
- Commit description explains hardware context instead of schema layout
- reg required for both MMIO and I2C, interrupts optional
- Hex unit-addresses (channel@a not channel@10) per DTSpec
- patternProperties regex updated to accept hex digits [0-9a-f]
- Example trimmed to minimal variants (one basic + one bipolar supply, one AIE temperature channel)
.../bindings/iio/adc/xlnx,versal-sysmon.yaml | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml
Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml new file +154 -0
@@ -0,0 +1,154 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (C) 2022 - 2026, Advanced Micro Devices, Inc. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/xlnx,versal-sysmon.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AMD/Xilinx Versal System Monitor + +maintainers: + - Salih Erim <[email protected]> + +description: + The AMD/Xilinx Versal System Monitor (SysMon) is the successor to the + Zynq UltraScale+ AMS block. It provides on-chip voltage and temperature + monitoring with up to 160 voltage measurement points and up to + 64 temperature satellites distributed across the SoC. The hardware + supports configurable threshold alarms and oversampling. The device + can be accessed via memory-mapped I/O or via an I2C interface. + +properties: + compatible: + const: xlnx,versal-sysmon + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + '#io-channel-cells': + const: 1 + + voltage-channels: + type: object + description: + Container for voltage measurement channels. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + patternProperties: + '^channel@([0-9a-f]|[1-9][0-9a-f])$': + $ref: adc.yaml + + description: + Measures a voltage rail. The register index and rail + name are assigned by the hardware design tool (Vivado). + + properties: + reg: + minimum: 0 + maximum: 159 + description: + Voltage measurement register index assigned by the hardware + design tool. + + required: + - reg + - label + + unevaluatedProperties: false + + required: + - '#address-cells' + - '#size-cells' + + additionalProperties: false + + temperature-channels: + type: object + description: + Container for temperature satellite measurement channels. + + properties: + '#address-cells': + const: 1 + + '#size-cells': + const: 0 + + patternProperties: + '^channel@([1-9a-f]|[1-3][0-9a-f]|40)$': + $ref: adc.yaml + + description: + Reads a temperature satellite sensor. Each satellite monitors + a specific region of the SoC die. + + properties: + reg: + minimum: 1 + maximum: 64 + description: + Temperature satellite number (1-based hardware index). + + required: + - reg + - label + + unevaluatedProperties: false + + required: + - '#address-cells' + - '#size-cells' + + additionalProperties: false + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + sysmon@f1270000 { + compatible = "xlnx,versal-sysmon"; + reg = <0xf1270000 0x4000>; + interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; + #io-channel-cells = <1>; + + voltage-channels { + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + label = "vccaux"; + }; + + channel@3 { + reg = <3>; + label = "vcc_ram"; + bipolar; + }; + }; + + temperature-channels { + #address-cells = <1>; + #size-cells = <0>; + + channel@a { + reg = <10>; + label = "aie-temp-ch1"; + }; + }; + };
Signature · 1 line
2.48.1
Salih Erim
maintainerPATCH v12 2/5 iio: adc: add Versal SysMon driver
In reply to Salih ErimAdd the core driver and MMIO platform driver for the AMD/Xilinx Versal System Monitor (SysMon) block.
The SysMon block resides in the platform management controller (PMC) and provides on-chip voltage and temperature monitoring through a 10-bit, 200 kSPS ADC. It can monitor up to 160 voltage channels and 64 temperature satellites distributed across the SoC, with a consistent sample rate of 8 kSPS per channel regardless of how many channels are enabled.
The hardware also provides four aggregate temperature registers that are always present regardless of the device tree configuration: the current max and min across all active satellites, and the peak and trough values recorded since the last hardware reset.
The driver is split into two compilation units:
- versal-sysmon-core: Channel parsing, IIO registration, read_raw
- versal-sysmon: MMIO platform driver with custom regmap accessors
Voltage results are stored in a 19-bit modified floating-point format and converted to millivolts. Temperature results are stored in Q8.7 signed fixed-point Celsius format and converted to millicelsius.
The MMIO regmap backend uses a custom reg_write accessor that automatically unlocks the NPI (NoC programming interface) lock register before each write, as required by the hardware. The regmap is configured with fast_io since the underlying MMIO accessors are safe to call from atomic context.
---
Changes in v12:
- Add Sai Krishna Potthuri as co-maintainer in MAINTAINERS
Changes in v11:
- No code changes
Changes in v10:
- Restructure variable declarations in sysmon_parse_fw:
group num_* and idx_* on separate lines (Andy)
Changes in v9:
- Add Reviewed-by tag from Andy Shevchenko
- Use EXPORT_SYMBOL_NS_GPL with "VERSAL_SYSMON" namespace, add MODULE_IMPORT_NS to MMIO driver (Andy)
- Join sysmon_mmio_reg_read and sysmon_mmio_reg_write signatures to single lines (Andy)
- Introduce num_static variable in sysmon_parse_fw to reduce churn in P4 (Andy)
Changes in v8:
- Use MILLIDEGREE_PER_DEGREE instead of MILLI for temperature scale (Andy)
- Add overflow.h include for size_add() (Andy)
- Rename sysmon_core_probe to devm_versal_sysmon_core_probe (Andy)
Changes in v7:
- Add documentation comment explaining the four static aggregate temperature registers (Jonathan)
Changes in v6:
- Macro brace on separate line for SYSMON_CHAN_TEMP (Andy)
- Remove unneeded = 0 init on num_supply, num_temp (Andy)
- Use temporary variable for channel count allocation (Andy)
- Initialize idx directly after memcpy (Andy)
- Join info_mask_separate on one line (Andy)
- Join info_mask_shared_by_type on one line (Andy)
- Join devm_kcalloc on one line (Andy)
- Reversed xmas tree ordering in sysmon_parse_fw
Changes in v5:
- Add err.h include to core (IWYU) (Andy)
- Drop (int) cast on MILLI in scale assignment (Andy)
- sign_extend32() instead of (s16) cast for temperature raw (Andy)
- Remove unneeded parentheses in voltage address calculation (Andy)
- Drop NULL checks before fwnode_get_child_node_count (Andy)
- Nested size_add() for overflow-safe allocation (Andy)
- if (ret) instead of if (ret < 0) for fwnode property reads (Andy)
- Remove outer parentheses in satellite address calculation (Andy)
- Loop index declared in for() scope (Andy)
- MMIO: add err.h, types.h includes (IWYU) (Andy)
- Header: remove unused types.h include and struct iio_dev forward declaration (Andy)
Changes in v4:
- Temperature: RAW + SCALE (IIO_VAL_FRACTIONAL, 1000/128) instead of PROCESSED (Jonathan)
- Voltage: PROCESSED only, drop RAW (Jonathan)
- Drop scan_type from all channel macros (Jonathan)
- Move __free(fwnode_handle) declarations down to just above use (Jonathan)
- devm_regmap_init() on one line (Jonathan)
- Lock comment: describe RMW sequences and cached state (Jonathan)
- Remove sysmon_q8p7_to_millicelsius() from this patch; the function is now introduced in P4 where it is first used
Changes in v3:
- IWYU: add array_size.h, string.h, types.h to core; audit and fix header and MMIO driver includes (Andy)
- Rename _ext to _name in SYSMON_CHAN_TEMP macro parameter (Andy, Jonathan)
- Use .info_mask_separate = BIT() style in SYSMON_CHAN_TEMP (Andy)
- Use s16 parameter in sysmon_q8p7_to_millicelsius (Andy)
- Use sign_extend32() in sysmon_supply_rawtoprocessed (Andy)
- Split sysmon_read_raw parameters logically across lines (Andy)
- Remove redundant (int) casts on regval (Andy)
- Split num_supply/num_temp initialization (Andy)
- Use __free(fwnode_handle) cleanup, remove goto err_put (Andy)
- Use size_add() for overflow-safe allocation (Andy)
- Use dev_err_probe() in sysmon_parse_fw error paths (Jonathan)
- Move fwnode_irq_get() to core_probe, remove irq parameter from bus driver interfaces (Jonathan)
- Use (int)MILLI at call sites, drop SYSMON_MILLI define (Andy, Jonathan)
- Remove sysmon->dev, sysmon->indio_dev, sysmon->irq from struct; pass as local variables or use regmap_get_device() (Jonathan)
- Use struct device *dev local in sysmon_platform_probe (Andy)
- Describe protected data in lock comment (Jonathan)
- Add comment explaining RAW+PROCESSED co-exposure (Jonathan)
Changes in v2:
- Split into core (versal-sysmon-core.c) + MMIO platform driver (versal-sysmon.c) + shared header (versal-sysmon.h)
- Uses regmap API instead of direct readl/writel
- MMIO regmap uses custom callbacks with NPI unlock in write path
- Reverse Christmas Tree variable ordering throughout
- Header include order fixed
- MAINTAINERS entry folded in with wildcard F: pattern
- Kconfig: hidden VERSAL_SYSMON_CORE + VERSAL_SYSMON selects it
- Kconfig/Makefile: alphabetical ordering (VERSAL before VF610)
- Bounds validation on DT reg values
- Named constants replace magic numbers (SYSMON_REG_STRIDE, SYSMON_SUPPLY_MANTISSA_BITS, SYSMON_MILLI)
- kernel-doc for exported sysmon_core_probe() and sysmon_parse_fw()
- Supply voltage conversion uses proper two's complement sign extension (s16 cast) matching the hardware specification
- Register offsets sorted by address in header
- Each patch introduces only the defines, fields, and includes it uses (no dead code in any commit)
- Removed unused linux/limits.h and linux/units.h includes
- Renamed iio_dev_info to sysmon_iio_info
- regmap_write return values checked in probe init path
MAINTAINERS | 8 + drivers/iio/adc/Kconfig | 20 ++ drivers/iio/adc/Makefile | 2 + drivers/iio/adc/versal-sysmon-core.c | 292 +++++++++++++++++++++++++++ drivers/iio/adc/versal-sysmon.c | 92 +++++++++ drivers/iio/adc/versal-sysmon.h | 67 ++++++ 6 files changed, 481 insertions(+) create mode 100644 drivers/iio/adc/versal-sysmon-core.c create mode 100644 drivers/iio/adc/versal-sysmon.c create mode 100644 drivers/iio/adc/versal-sysmon.h
MAINTAINERS +8 -0
@@ -29216,6 +29216,14 @@ F: Documentation/devicetree/bindings/memory-controllers/xlnx,versal-net-ddrmc5.y F: drivers/edac/versalnet_edac.c F: include/linux/cdx/edac_cdx_pcol.h +XILINX VERSAL SYSMON DRIVER +M: Salih Erim <[email protected]> +M: Sai Krishna Potthuri <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml +F: drivers/iio/adc/versal-sysmon* + XILINX WATCHDOG DRIVER M: Srinivas Neeli <[email protected]> R: Shubhrajyoti Datta <[email protected]>
drivers/iio/adc/Kconfig +20 -0
@@ -1943,6 +1943,26 @@ config TWL6030_GPADC This driver can also be built as a module. If so, the module will be called twl6030-gpadc. +config VERSAL_SYSMON_CORE + tristate + select REGMAP + +config VERSAL_SYSMON + tristate "AMD Versal SysMon driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + select VERSAL_SYSMON_CORE + help + Say yes here to have support for the AMD/Xilinx Versal System + Monitor (SysMon). This driver provides voltage and temperature + monitoring through the IIO subsystem. + + The SysMon measures up to 160 supply voltages and reads up to + 64 temperature satellites distributed across the SoC. + + To compile this driver as a module, choose M here: the module + will be called versal-sysmon. + config VF610_ADC tristate "Freescale vf610 ADC driver" depends on HAS_IOMEM
drivers/iio/adc/Makefile +2 -0
@@ -167,6 +167,8 @@ obj-$(CONFIG_TI_TLC4541) += ti-tlc4541.o obj-$(CONFIG_TI_TSC2046) += ti-tsc2046.o obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o +obj-$(CONFIG_VERSAL_SYSMON_CORE) += versal-sysmon-core.o +obj-$(CONFIG_VERSAL_SYSMON) += versal-sysmon.o obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o
drivers/iio/adc/versal-sysmon-core.c new file +292 -0
292 lines not on this page · raw message
drivers/iio/adc/versal-sysmon.c new file +92 -0
92 lines not on this page · raw message
drivers/iio/adc/versal-sysmon.h new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
2.48.1
Salih Erim
maintainerPATCH v12 3/5 iio: adc: versal-sysmon: add I2C driver
In reply to Salih ErimAdd an I2C transport driver for the Versal SysMon block. The SysMon provides an I2C slave interface that allows an external master to read voltage and temperature measurements through the same register map used by the MMIO path.
The I2C command frame is an 8-byte structure containing a 4-byte data payload, a 2-byte register offset, and a 1-byte instruction field. Read operations send the frame with a read instruction, then receive a 4-byte response containing the register value.
Events are not supported on the I2C path because there is no interrupt line and the I2C regmap backend cannot be called from atomic context.
---
Changes in v12:
- No code changes
Changes in v11:
- No code changes
Changes in v10:
- No code changes
Changes in v9:
- Add Reviewed-by tag from Andy Shevchenko
- Add MODULE_IMPORT_NS("VERSAL_SYSMON") (Andy, from P2 namespace)
Changes in v8:
- Add volatile register comment for regmap cache (Andy)
- Update devm_versal_sysmon_core_probe call site (Andy, from P2 rename)
Changes in v7:
- No code changes
Changes in v6:
- Add types.h include (IWYU) (Andy)
- Add local struct device *dev, join devm_regmap_init on one line (Andy)
Changes in v5:
- Add err.h, mod_devicetable.h includes (IWYU) (Andy)
Changes in v4:
- Replace enum with defines for I2C frame offsets (Jonathan)
- Use get_unaligned_le32() for read data reassembly (Jonathan)
- Use put_unaligned_le32/le16() for write data and register offset packing (Jonathan)
- Named initializer in i2c_device_id (Jonathan)
- Drop bitfield.h, add unaligned.h (FIELD_GET/FIELD_PREP replaced by unaligned accessors)
Changes in v3:
- IWYU: fix includes (Andy)
- Enum: assign all values explicitly for HW-mapped fields (Andy)
- Remove sysmon_i2c wrapper struct, pass i2c_client directly
(Andy)
- Use sizeof() for I2C buffer lengths instead of defines (Andy)
- Use = { } instead of = { 0 } for initializers (Andy)
- Use single compatible xlnx,versal-sysmon (Krzysztof)
- Adapt to core_probe interface change: irq moved to core, remove irq parameter from bus driver (Jonathan)
Changes in v2:
- New patch (I2C was deferred to Series B in v1)
- Uses regmap API with custom I2C read/write callbacks
- Shares core module with MMIO driver via sysmon_core_probe()
- No event support (I2C has no interrupt line)
- Separate VERSAL_SYSMON_I2C Kconfig symbol
- Reverse Christmas Tree variable ordering in read/write functions
drivers/iio/adc/Kconfig | 13 +++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/versal-sysmon-i2c.c | 134 ++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 drivers/iio/adc/versal-sysmon-i2c.c
drivers/iio/adc/Kconfig +13 -0
@@ -1963,6 +1963,19 @@ config VERSAL_SYSMON To compile this driver as a module, choose M here: the module will be called versal-sysmon. +config VERSAL_SYSMON_I2C + tristate "AMD Versal SysMon I2C driver" + depends on I2C + select VERSAL_SYSMON_CORE + help + Say yes here to have support for the AMD/Xilinx Versal System + Monitor (SysMon) via I2C interface. This driver enables voltage + and temperature monitoring when the Versal chip has SysMon + configured with I2C access. + + To compile this driver as a module, choose M here: the module + will be called versal-sysmon-i2c. + config VF610_ADC tristate "Freescale vf610 ADC driver" depends on HAS_IOMEM
drivers/iio/adc/Makefile +1 -0
@@ -169,6 +169,7 @@ obj-$(CONFIG_TWL4030_MADC) += twl4030-madc.o obj-$(CONFIG_TWL6030_GPADC) += twl6030-gpadc.o obj-$(CONFIG_VERSAL_SYSMON_CORE) += versal-sysmon-core.o obj-$(CONFIG_VERSAL_SYSMON) += versal-sysmon.o +obj-$(CONFIG_VERSAL_SYSMON_I2C) += versal-sysmon-i2c.o obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o
drivers/iio/adc/versal-sysmon-i2c.c new file +134 -0
134 lines not on this page · raw message
Signature · 1 line
2.48.1
[email protected]
AI reviewRe: [PATCH v12 3/5] iio: adc: versal-sysmon: add I2C driver
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Non-atomic I2C read sequence allows bus interleaving, potentially corrupting hardware state or…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Non-atomic I2C read sequence allows bus interleaving, potentially corrupting hardware state or readings. --
commit 9ab4d88815ee621205c4b3e8a0bb6032534c3baa
Author: Salih Erim <[email protected]>
iio: adc: versal-sysmon: add I2C driver
Add an I2C transport driver for the Versal SysMon block. The SysMon provides an I2C slave interface that allows an external master to read voltage and temperature measurements through the same register map used by the MMIO path.
Quoted 5 lines
drivers/iio/adc/versal-sysmon-i2c.c new file +0
-0
[ ... ]
Quoted 8 lines
drivers/iio/adc/versal-sysmon-i2c.c new file +8
-0+static int sysmon_i2c_reg_read (void *context,unsigned int reg, +unsigned int *val) +{ +struct i2c_client *client = context; +u8 write_buf[8 ] = { }; +u8 read_buf[4 ]; +int ret; +
drivers/iio/adc/versal-sysmon-i2c.c line 50
Quoted 10 lines
drivers/iio/adc/versal-sysmon-i2c.c new file +10
-0+put_unaligned_le16 (reg >>2 , &write_buf[SYSMON_I2C_REG_OFS ]); + write_buf[SYSMON_I2C_INSTR_OFS ] =SYSMON_I2C_INSTR_READ ; + + ret =i2c_master_send (client, write_buf,sizeof (write_buf)); +if (ret <0 ) +return ret; +if (ret !=sizeof (write_buf)) +return -EIO ; + + ret =i2c_master_recv (client, read_buf,sizeof (read_buf));
[Severity: Medium]
Does this split I2C read sequence allow bus interleaving?
Calling i2c_master_send() followed by i2c_master_recv() releases the I2C adapter lock and generates a STOP condition on the bus between the two calls.
If another I2C transaction is scheduled during this window (for example, from userspace via /dev/i2c-* or from another driver sharing the bus), it could interleave with this read sequence.
This breaks the atomicity of the command/response pair, potentially returning corrupted data or breaking the hardware's state machine.
Could a single i2c_transfer() call with two messages be used here to generate a Repeated START, or i2c_lock_bus() be used if a STOP condition is strictly required by the hardware?
Quoted 9 lines
drivers/iio/adc/versal-sysmon-i2c.c new file +9
-0+if (ret <0 ) +return ret; +if (ret !=sizeof (read_buf)) +return -EIO ; + + *val =get_unaligned_le32 (read_buf); + +return 0 ; +}
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Salih Erim
maintainerPATCH v12 4/5 iio: adc: versal-sysmon: add threshold event support
In reply to Salih ErimAdd threshold event support for temperature and supply voltage channels.
Temperature events:
- Rising threshold with configurable value on the device temperature channel (current max across all satellites)
- Per-channel hysteresis as a millicelsius value
- Event direction is IIO_EV_DIR_RISING (hysteresis mode)
Supply voltage events:
- Rising/falling threshold per supply channel
- Per-channel alarm enable via alarm configuration registers
The hardware supports both window and hysteresis alarm modes for temperature. This driver uses hysteresis mode, where the upper threshold triggers the alarm and the lower threshold clears it (re-arm point). The hardware has a single ISR bit per temperature channel with no indication of which threshold was crossed, so hysteresis mode is the natural fit. The lower threshold register is computed internally as (upper - hysteresis).
Hysteresis is stored in the driver as a millicelsius value, initialized from the hardware registers at probe. Writing the rising threshold or hysteresis recomputes the lower register. ALARM_CONFIG is hard-coded to hysteresis mode during init.
The hardware also provides a separate over-temperature (OT) threshold, but it is not exposed through IIO as it serves as a hardware safety mechanism for platform shutdown. OT will be exposed through the thermal framework in a follow-up series.
The interrupt handler masks active threshold interrupts (which are level-sensitive) and schedules a delayed worker to poll for condition clear before unmasking. When no hardware IRQ is available, event specs are not attached and interrupt init is skipped, since the I2C regmap backend cannot be called from atomic context.
When disabling a supply channel alarm, the group interrupt remains active if any other channel in the same alarm group still has an alarm enabled.
A devm cleanup action masks all interrupts on driver unbind to prevent unhandled interrupt storms after the IRQ handler is freed.
---
Changes in v12:
- No code changes
Changes in v11:
- Add bounds check for temperature threshold writes; return -EINVAL if out of Q8.7 range (Jonathan)
- Add bounds check for supply voltage threshold writes to prevent integer overflow (Jonathan)
- Clamp computed lower threshold to Q8.7 range in sysmon_update_temp_lower (found during audit)
- Add comment explaining that threshold register upper bits (FMT/MODE) are ignored on write (Jonathan)
Changes in v10:
- Add Reviewed-by tag from Andy Shevchenko
- Add limits.h include for U16_MAX, S16_MIN, S16_MAX (Andy)
Changes in v9:
- Add minmax.h include for clamp() (Andy)
- Join sysmon_supply_thresh_offset to one line, change address parameter to unsigned long for consistency (Andy)
- Combine mask declaration with initialization in sysmon_read_event_config (Andy)
- Rename ier to mask in sysmon_write_event_config for consistency with sysmon_read_event_config (Andy)
- Remove blank line in sysmon_update_temp_lower between semantically coupled lines (Andy)
- Rename unmask to ier (u32) in sysmon_unmask_temp (Andy)
- Variable name and type consistency audit across all event functions (Andy)
Changes in v8:
- Use MILLIDEGREE_PER_DEGREE in q8p7 conversion functions (Andy)
- Use regmap_test_bits() in sysmon_read_alarm_config (Andy)
- Join sysmon_parse_fw signature onto one line (Andy)
- Fix devm teardown race: replace devm_delayed_work_autocancel with INIT_DELAYED_WORK; fold cancel_delayed_work_sync into sysmon_disable_interrupts to prevent the worker from re-enabling interrupts after the IRQ handler is freed (Sashiko)
- Drop devm-helpers.h include (no longer needed)
Changes in v7:
- Move TEMP threshold event onto channel 0; drop OT as separate IIO channel -- OT is a hardware safety mechanism better suited for the thermal framework follow-up (Jonathan)
- Use single temp_channels array; attach event spec to channel 0 at runtime when IRQ is available, matching the pattern used for supply channels (Jonathan)
- Remove sysmon_temp_thresh_offset; use SYSMON_TEMP_TH_UP and SYSMON_TEMP_TH_LOW defines directly at call sites
- Return administrative state from temp_mask in read_event_config instead of transient hardware IMR (Jonathan, Sashiko)
- Add devm_add_action_or_reset to mask all HW interrupts on driver unbind (Sashiko)
- Remove SYSMON_CHAN_TEMP_EVENT macro, SYSMON_ADDR_TEMP_EVENT, SYSMON_ADDR_OT_EVENT, SYSMON_BIT_OT, SYSMON_OT_HYST_MASK, OT_TH_LOW/UP registers, ot_hysteresis from struct
- Simplify sysmon_get_event_mask, sysmon_update_temp_lower, sysmon_init_hysteresis -- all now operate on single TEMP channel only
Changes in v6:
- Remove types.h from header (not needed at any stage) (Andy)
- Macro brace on separate line for SYSMON_CHAN_TEMP_EVENT (Andy)
- switch(chan->type) in all event functions instead of cascading if statements (Andy)
- switch(info) in read/write_event_value for nested dispatch (Andy)
- Reversed xmas tree in sysmon_update_temp_lower and sysmon_init_hysteresis (Andy)
- scoped_guard(spinlock_irq) with error check in sysmon_unmask_worker (Andy)
- Combined regmap_read error check with || in sysmon_iio_irq (Andy)
- Join devm_request_irq on one line (Andy)
- Fix fwnode_irq_get() to propagate only -EPROBE_DEFER; treating all negatives as fatal broke probe on I2C nodes without interrupts property
Changes in v5:
- clamp() instead of clamp_t() (Andy)
- regmap_assign_bits() instead of separate set/clear (Andy)
- Remove unneeded parentheses (2 places) (Andy)
- for_each_set_bit on single line (Andy)
- regmap_clear_bits() instead of regmap_update_bits() (Andy)
- Simplify unmask XOR to ~status & masked_temp (Andy)
- Add comment explaining unmask &= ~temp_mask logic (Andy)
- Split container_of across two lines (Andy)
- Move ISR write after !isr check to avoid writing 0 (Andy)
- unsigned int for init_hysteresis address param (Andy)
- Add comment explaining error check policy in worker/IRQ (Andy)
- Nested size_add() for overflow-safe allocation (Andy)
- Propagate negative from fwnode_irq_get() for EPROBE_DEFER (Andy)
- Pass irq instead of has_irq to sysmon_parse_fw (Andy)
Changes in v4:
- Merge event channels into static temp array; two arrays (with/without events) selected by has_irq (Jonathan)
- Event-only channels have no info_mask; their addresses are logical identifiers, not readable registers
- Drop RAW for voltage events, keep PROCESSED only (Jonathan)
- Drop scan_type from event channel macro (Jonathan)
- Blank lines between call+error-check blocks (Jonathan)
- Fit under 80 chars on one line where possible (Jonathan)
- default case returns -EINVAL instead of break (Jonathan)
- sysmon_handle_event: return early in each case (Jonathan)
- guard(spinlock) in sysmon_iio_irq, return IRQ_NONE/IRQ_HANDLED directly (Jonathan)
- Take irq_lock in write_event_config for temp_mask updates to synchronize with unmask worker (Sashiko)
Changes in v3:
- IWYU: add new includes, group iio headers with blank line (Andy)
- Reduce casts in millicelsius_to_q8p7, consistent style with q8p7_to_millicelsius (Andy)
- Use clamp_t with typed constants, remove tmp & U16_MAX (Andy)
- Use !! to return 0/1 from read_alarm_config (Andy)
- Use regmap_set_bits/clear_bits in write_alarm_config (Andy)
- Add comment explaining spinlock is safe (I2C never reaches event code path) (Andy)
- Add comment explaining IMR negation logic (Andy)
- Split read_event_value/write_event_value parameters logically across lines (Andy)
- Move mask/shift after regmap_read error check (Andy)
- Remove redundant else in read_event_value and write_event_value (Andy)
- Use named constant for hysteresis bit, if-else not ternary
(Andy)
- Loop variable declared in for() scope (Andy)
- Add error checks in sysmon_handle_event (Andy)
- Use IRQ_RETVAL() macro (Andy)
- Use devm_delayed_work_autocancel instead of manual INIT + devm_add_action (Andy)
- Use FIELD_GET/FIELD_PREP for hysteresis register bits (Jonathan)
- Split OT vs TEMP handling with FIELD_GET (Jonathan)
- Rework hysteresis: store as millicelsius value, hardcode ALARM_CONFIG to hysteresis mode, compute lower threshold from (upper - hysteresis), initialize from HW at probe (Jonathan)
- Remove falling threshold for temperature; single event spec per channel with IIO_EV_DIR_RISING (Jonathan)
- Push IIO_EV_DIR_RISING events for temperature, IIO_EV_DIR_EITHER for voltage (Jonathan)
Changes in v2:
- Reverse Christmas Tree variable ordering in all functions
- Named constants for hysteresis bits: SYSMON_OT_HYST_BIT,
SYSMON_TEMP_HYST_BIT instead of magic 0x1/0x2
- SYSMON_ALARM_BITS_PER_REG replaces magic number 32
- SYSMON_ALARM_OFFSET() helper macro deduplicates alarm register
offset computation
- BIT() macro for shift expressions in conversion functions
- Hysteresis input validated to single-bit range (0 or 1)
- Event channels only created when irq > 0 (I2C safety)
- Group alarm interrupt stays active while any channel in the
group has an alarm enabled
- write_event_value returns -EINVAL for unhandled types
- IRQ_NONE returned for spurious interrupts
- Q8.7 write path uses multiplication instead of left-shift
to avoid undefined behavior with negative temperatures
- (u16) mask prevents garbage in reserved register bits
- regmap_write return values checked for IER/IDR writes
- devm cleanup ordering: cancel_work before request_irq
drivers/iio/adc/versal-sysmon-core.c | 613 ++++++++++++++++++++++++++-
drivers/iio/adc/versal-sysmon.h | 36 ++
2 files changed, 645 insertions(+), 4 deletions(-)drivers/iio/adc/versal-sysmon-core.c +609 -4
@@ -12,6 +12,9 @@#include <linux/cleanup.h> #include <linux/device.h> #include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/limits.h> +#include <linux/minmax.h> #include <linux/module.h> #include <linux/overflow.h> #include <linux/property.h>
@@ -20,10 +23,18 @@#include <linux/sysfs.h> #include <linux/units.h> +#include <linux/iio/events.h> #include <linux/iio/iio.h> #include "versal-sysmon.h" +/* TEMP hysteresis mode bit in SYSMON_TEMP_EV_CFG */ +#define SYSMON_TEMP_HYST_MASK BIT(1) + +/* Compute alarm register offset from a channel address */ +#define SYSMON_ALARM_OFFSET (addr) \ + (SYSMON_ALARM_REG + ((addr) / SYSMON_ALARM_BITS_PER_REG) * SYSMON_REG_STRIDE) +#define SYSMON_CHAN_TEMP (_chan, _address, _name) \ { \ .type = IIO_TEMP, \
@@ -35,6 +46,45 @@ .datasheet_name = _name, \ } +enum sysmon_alarm_bit { +SYSMON_BIT_ALARM0 =0 , +SYSMON_BIT_ALARM1 =1 , +SYSMON_BIT_ALARM2 =2 , +SYSMON_BIT_ALARM3 =3 , +SYSMON_BIT_ALARM4 =4 , +SYSMON_BIT_TEMP =9 , +}; + +/* Temperature event specification: rising threshold + hysteresis only */ +static const struct iio_event_spec sysmon_temp_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ) | +BIT (IIO_EV_INFO_VALUE ) | +BIT (IIO_EV_INFO_HYSTERESIS ), + }, +}; + +/* Supply event specifications */ +static const struct iio_event_spec sysmon_supply_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_FALLING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_EITHER , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ), + }, +}; +/* * Static temperature channels (always present). *
@@ -52,6 +102,16 @@ static const struct iio_chan_spec temp_channels[] = { SYSMON_CHAN_TEMP(3, SYSMON_TEMP_MIN_MIN, "min_min"), }; +static void sysmon_q8p7_to_millicelsius (s16 raw_data,int *val) +{ + *val = (raw_data *MILLIDEGREE_PER_DEGREE ) >>SYSMON_FRACTIONAL_SHIFT ; +} + +static void sysmon_millicelsius_to_q8p7 (u32 *raw_data,int val) +{ + *raw_data = (val <<SYSMON_FRACTIONAL_SHIFT ) /MILLIDEGREE_PER_DEGREE ; +} +static void sysmon_supply_rawtoprocessed (int raw_data,int *val) {int mantissa, format, exponent;
@@ -69,6 +129,33 @@ static void sysmon_supply_rawtoprocessed(int raw_data, int *val) *val = (mantissa * (int )MILLI ) >> exponent; } +static void sysmon_supply_processedtoraw (int val,u32 reg_val,u32 *raw_data) +{ +int exponent =FIELD_GET (SYSMON_MODE_MASK , reg_val); +int format =FIELD_GET (SYSMON_FMT_MASK , reg_val); +int scale, tmp; + + scale =BIT (SYSMON_SUPPLY_MANTISSA_BITS - exponent); + tmp = (val * scale) / (int )MILLI ; + +if (format) + tmp =clamp (tmp,S16_MIN ,S16_MAX ); +else + tmp =clamp (tmp,0 ,U16_MAX ); + + *raw_data = (u16 )tmp; +} + +static int sysmon_supply_thresh_offset (unsigned long address,enum iio_event_direction dir) +{ +if (dir ==IIO_EV_DIR_RISING ) +return (address *SYSMON_REG_STRIDE ) +SYSMON_SUPPLY_TH_UP ; +if (dir ==IIO_EV_DIR_FALLING ) +return (address *SYSMON_REG_STRIDE ) +SYSMON_SUPPLY_TH_LOW ; + +return -EINVAL ; +} +static int sysmon_read_raw (struct iio_dev *indio_dev,struct iio_chan_spec const *chan,int *val,int *val2,long mask)
@@ -115,6 +202,269 @@ static int sysmon_read_raw(struct iio_dev *indio_dev, } } +static u32 sysmon_get_event_mask (const struct iio_chan_spec *chan) +{ +if (chan->type ==IIO_TEMP ) +return BIT (SYSMON_BIT_TEMP ); + +return BIT (chan->address /SYSMON_ALARM_BITS_PER_REG ); +} + +static int sysmon_read_alarm_config (struct sysmon *sysmon, +unsigned long address) +{ +u32 shift = address %SYSMON_ALARM_BITS_PER_REG ; +u32 offset =SYSMON_ALARM_OFFSET (address); + +return regmap_test_bits (sysmon->regmap, offset,BIT (shift)); +} + +static int sysmon_write_alarm_config (struct sysmon *sysmon, +unsigned long address,bool enable) +{ +u32 shift = address %SYSMON_ALARM_BITS_PER_REG ; +u32 offset =SYSMON_ALARM_OFFSET (address); + +return regmap_assign_bits (sysmon->regmap, offset,BIT (shift), enable); +} + +static int sysmon_read_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir) +{ +struct sysmon *sysmon =iio_priv (indio_dev); +u32 mask =sysmon_get_event_mask (chan); +unsigned int imr; +int config_value; +int ret; + + ret =regmap_read (sysmon->regmap,SYSMON_IMR , &imr); +if (ret) +return ret; + +/* IMR bits are 1=masked, invert to get 1=enabled */ + imr = ~imr; + +switch (chan->type) { +case IIO_VOLTAGE : + config_value =sysmon_read_alarm_config (sysmon, chan->address); +if (config_value <0 ) +return config_value; +return config_value && (imr & mask); + +case IIO_TEMP : +/* +* Return the administrative state, not the hardware IMR. +* The IRQ handler temporarily masks the interrupt during +* the polling window; reading IMR would show it as disabled. +* temp_mask bit is set when administratively disabled. +*/ +return !(sysmon->temp_mask & mask); + +default : +return -EINVAL ; + } +} + +static int sysmon_write_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +bool state) +{ +u32 offset =SYSMON_ALARM_OFFSET (chan->address); +struct sysmon *sysmon =iio_priv (indio_dev); +u32 mask =sysmon_get_event_mask (chan); +unsigned int alarm_config; +int ret; + +guard (mutex)(&sysmon->lock); + +switch (chan->type) { +case IIO_VOLTAGE : + ret =sysmon_write_alarm_config (sysmon, chan->address, state); +if (ret) +return ret; + + ret =regmap_read (sysmon->regmap, offset, &alarm_config); +if (ret) +return ret; + +if (alarm_config) +return regmap_write (sysmon->regmap,SYSMON_IER , mask); + +return regmap_write (sysmon->regmap,SYSMON_IDR , mask); + +case IIO_TEMP : +if (state) { + ret =regmap_write (sysmon->regmap,SYSMON_IER , mask); +if (ret) +return ret; + +scoped_guard (spinlock_irq, &sysmon->irq_lock) + sysmon->temp_mask &= ~mask; + }else { + ret =regmap_write (sysmon->regmap,SYSMON_IDR , mask); +if (ret) +return ret; + +scoped_guard (spinlock_irq, &sysmon->irq_lock) + sysmon->temp_mask |= mask; + } +return 0 ; + +default : +return -EINVAL ; + } +} + +/* +* Recompute the lower threshold register from upper threshold and +* cached hysteresis. Called when either upper threshold or hysteresis +* is written. +*/ +static int sysmon_update_temp_lower (struct sysmon *sysmon) +{ +unsigned int upper_reg; +int upper_mc, lower_mc; +u32 raw_val; +int ret; + + ret =regmap_read (sysmon->regmap,SYSMON_TEMP_TH_UP , &upper_reg); +if (ret) +return ret; + +sysmon_q8p7_to_millicelsius (upper_reg, &upper_mc); + lower_mc =clamp (upper_mc - sysmon->temp_hysteresis,-256000 ,255992 ); +sysmon_millicelsius_to_q8p7 (&raw_val, lower_mc); + +return regmap_write (sysmon->regmap,SYSMON_TEMP_TH_LOW , raw_val); +} + +static int sysmon_read_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int *val,int *val2) +{ +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned int reg_val; +int offset; +int ret; + +guard (mutex)(&sysmon->lock); + +switch (chan->type) { +case IIO_TEMP : +switch (info) { +case IIO_EV_INFO_VALUE : + ret =regmap_read (sysmon->regmap,SYSMON_TEMP_TH_UP , ®_val); +if (ret) +return ret; + +sysmon_q8p7_to_millicelsius (reg_val, val); + +return IIO_VAL_INT ; + +case IIO_EV_INFO_HYSTERESIS : + *val = sysmon->temp_hysteresis; +return IIO_VAL_INT ; + +default : +return -EINVAL ; + } + +case IIO_VOLTAGE : + offset =sysmon_supply_thresh_offset (chan->address, dir); +if (offset <0 ) +return offset; + + ret =regmap_read (sysmon->regmap, offset, ®_val); +if (ret) +return ret; + +sysmon_supply_rawtoprocessed (reg_val, val); + +return IIO_VAL_INT ; + +default : +return -EINVAL ; + } +} + +static int sysmon_write_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int val,int val2) +{ +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned int reg_val; +u32 raw_val; +int offset; +int ret; + +guard (mutex)(&sysmon->lock); + +switch (chan->type) { +case IIO_TEMP : +switch (info) { +case IIO_EV_INFO_VALUE : +/* Q8.7 signed range: -256000 to +255992 mC */ +if (val <-256000 || val >255992 ) +return -EINVAL ; + +sysmon_millicelsius_to_q8p7 (&raw_val, val); + + ret =regmap_write (sysmon->regmap,SYSMON_TEMP_TH_UP , raw_val); +if (ret) +return ret; + +/* Recompute lower = upper - hysteresis */ +return sysmon_update_temp_lower (sysmon); + +case IIO_EV_INFO_HYSTERESIS : +if (val <0 ) +return -EINVAL ; + + sysmon->temp_hysteresis = val; + +return sysmon_update_temp_lower (sysmon); + +default : +return -EINVAL ; + } + +case IIO_VOLTAGE : + offset =sysmon_supply_thresh_offset (chan->address, dir); +if (offset <0 ) +return offset; + + ret =regmap_read (sysmon->regmap, offset, ®_val); +if (ret) +return ret; + +/* Clamp to prevent overflow in processedtoraw conversion */ +if (val <-32768 || val >32767 ) +return -EINVAL ; + +sysmon_supply_processedtoraw (val, reg_val, &raw_val); + +/* +* The hardware threshold register returns FMT and MODE +* bits in the upper 16 bits on read, but only the lower +* 16-bit mantissa is used on write. +*/ +return regmap_write (sysmon->regmap, offset, raw_val); + +default : +return -EINVAL ; + } +} +static int sysmon_read_label (struct iio_dev *indio_dev,struct iio_chan_spec const *chan,char *label)
@@ -128,20 +478,242 @@ static int sysmon_read_label(struct iio_dev *indio_dev,static const struct iio_info sysmon_iio_info = { .read_raw = sysmon_read_raw, .read_label = sysmon_read_label, + .read_event_config = sysmon_read_event_config, + .write_event_config = sysmon_write_event_config, + .read_event_value = sysmon_read_event_value, + .write_event_value = sysmon_write_event_value, }; +static void sysmon_push_event (struct iio_dev *indio_dev,u32 address) +{ +const struct iio_chan_spec *chan; +enum iio_event_direction dir; + +for (unsigned int i =0 ; i < indio_dev->num_channels; i++) { +if (indio_dev->channels[i].address != address) +continue ; + + chan = &indio_dev->channels[i]; +/* Temp uses hysteresis mode (rising only), voltage uses window */ + dir = (chan->type ==IIO_TEMP ) ?IIO_EV_DIR_RISING : +IIO_EV_DIR_EITHER ; +iio_push_event (indio_dev, +IIO_UNMOD_EVENT_CODE (chan->type, + chan->channel, +IIO_EV_TYPE_THRESH , + dir), +iio_get_time_ns (indio_dev)); + } +} + +static int sysmon_handle_event (struct iio_dev *indio_dev,u32 event) +{ +u32 alarm_flag_offset =SYSMON_ALARM_FLAG + event *SYSMON_REG_STRIDE ; +u32 alarm_reg_offset =SYSMON_ALARM_REG + event *SYSMON_REG_STRIDE ; +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned long alarm_flag_reg; +unsigned int reg_val; +u32 address, bit; +int ret; + +switch (event) { +case SYSMON_BIT_TEMP : +sysmon_push_event (indio_dev,SYSMON_TEMP_MAX ); + + ret =regmap_write (sysmon->regmap,SYSMON_IDR ,BIT (SYSMON_BIT_TEMP )); +if (ret) +return ret; + + sysmon->masked_temp |=BIT (SYSMON_BIT_TEMP ); +return 0 ; + +case SYSMON_BIT_ALARM0 : +case SYSMON_BIT_ALARM1 : +case SYSMON_BIT_ALARM2 : +case SYSMON_BIT_ALARM3 : +case SYSMON_BIT_ALARM4 : + ret =regmap_read (sysmon->regmap, alarm_flag_offset, ®_val); +if (ret) +return ret; + + alarm_flag_reg = reg_val; + +for_each_set_bit (bit, &alarm_flag_reg,SYSMON_ALARM_BITS_PER_REG ) { + address = bit +SYSMON_ALARM_BITS_PER_REG * event; +sysmon_push_event (indio_dev, address); + ret =regmap_clear_bits (sysmon->regmap, alarm_reg_offset,BIT (bit)); +if (ret) +return ret; + } + +return regmap_write (sysmon->regmap, alarm_flag_offset, alarm_flag_reg); + +default : +return -EINVAL ; + } +} + +static void sysmon_handle_events (struct iio_dev *indio_dev, +unsigned long events) +{ +unsigned int bit; + +for_each_set_bit (bit, &events,SYSMON_NO_OF_EVENTS ) +sysmon_handle_event (indio_dev, bit); +} + +static void sysmon_unmask_temp (struct sysmon *sysmon,unsigned int isr) +{ +unsigned int status; +u32 ier; + + status = isr &SYSMON_TEMP_INTR_MASK ; + + ier = ~status & sysmon->masked_temp; + sysmon->masked_temp &= status; + +/* Only unmask if not administratively disabled by userspace */ + ier &= ~sysmon->temp_mask; + +regmap_write (sysmon->regmap,SYSMON_IER , ier); +} + +/* +* Versal threshold interrupts are level-sensitive. Active threshold +* interrupts are masked in the handler and polled via delayed work +* until the condition clears, then unmasked. +*/ +static void sysmon_unmask_worker (struct work_struct *work) +{ +struct sysmon *sysmon = + container_of(work, struct sysmon, sysmon_unmask_work.work); +unsigned int isr; + +/* +* If the ISR read fails, skip processing to avoid acting +* on undefined data. +*/ + scoped_guard(spinlock_irq, &sysmon->irq_lock) { +if (regmap_read (sysmon->regmap,SYSMON_ISR , &isr)) +break ; +regmap_write (sysmon->regmap,SYSMON_ISR , isr); +sysmon_unmask_temp (sysmon, isr); + } + +if (sysmon->masked_temp) +schedule_delayed_work (&sysmon->sysmon_unmask_work, +msecs_to_jiffies (SYSMON_UNMASK_WORK_DELAY_MS )); +else +regmap_write (sysmon->regmap,SYSMON_STATUS_RESET ,1 ); +} + +static irqreturn_t sysmon_iio_irq (int irq,void *data) +{ +struct iio_dev *indio_dev = data; +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned int isr, imr; + +guard (spinlock)(&sysmon->irq_lock); + +if (regmap_read (sysmon->regmap,SYSMON_ISR , &isr) || +regmap_read (sysmon->regmap,SYSMON_IMR , &imr)) +return IRQ_NONE ; + + isr &= ~imr; +if (!isr) +return IRQ_NONE ; + +regmap_write (sysmon->regmap,SYSMON_ISR , isr); + +sysmon_handle_events (indio_dev, isr); +schedule_delayed_work (&sysmon->sysmon_unmask_work, +msecs_to_jiffies (SYSMON_UNMASK_WORK_DELAY_MS )); + +return IRQ_HANDLED ; +} + +static void sysmon_disable_interrupts (void *data) +{ +struct sysmon *sysmon = data; + +regmap_write (sysmon->regmap,SYSMON_IDR ,SYSMON_INTR_ALL_MASK ); + +scoped_guard (spinlock_irq, &sysmon->irq_lock) + sysmon->masked_temp = 0; + +cancel_delayed_work_sync (&sysmon->sysmon_unmask_work); +} + +static int sysmon_init_interrupt (struct sysmon *sysmon, +struct device *dev, +struct iio_dev *indio_dev, +int irq) +{ +unsigned int imr; +int ret; + +/* Events not supported without IRQ (e.g. I2C path) */ +if (!irq) +return 0 ; + +INIT_DELAYED_WORK (&sysmon->sysmon_unmask_work, sysmon_unmask_worker); + + ret =regmap_read (sysmon->regmap,SYSMON_IMR , &imr); +if (ret) +return ret; + sysmon->temp_mask = imr &SYSMON_TEMP_INTR_MASK ; + + ret =devm_request_irq (dev, irq, sysmon_iio_irq,0 ,"sysmon-irq" , indio_dev); +if (ret) +return ret; + +return devm_add_action_or_reset (dev, sysmon_disable_interrupts, sysmon); +} + +/* +* Initialize the cached hysteresis for a temperature channel from the +* current hardware threshold registers: hysteresis = upper - lower. +*/ +static int sysmon_init_hysteresis (struct sysmon *sysmon,int *hysteresis) +{ +unsigned int upper_reg, lower_reg; +int upper_mc, lower_mc; +int ret; + + ret =regmap_read (sysmon->regmap,SYSMON_TEMP_TH_UP , &upper_reg); +if (ret) +return ret; + + ret =regmap_read (sysmon->regmap,SYSMON_TEMP_TH_LOW , &lower_reg); +if (ret) +return ret; + +sysmon_q8p7_to_millicelsius (upper_reg, &upper_mc); +sysmon_q8p7_to_millicelsius (lower_reg, &lower_mc); + *hysteresis = upper_mc - lower_mc; + +return 0 ; +} +/** * sysmon_parse_fw() - Parse firmware nodes and configure IIO channels. * @indio_dev: IIO device instance * @dev: Parent device +* @irq: IRQ number (positive enables event channels, 0 disables) * * Reads voltage-channels and temperature-channels container nodes from * firmware and builds the IIO channel array. Static temperature channels -* are prepended, followed by supply and satellite channels from DT. +* and event channels are prepended, followed by supply and satellite +* channels from DT. +* +* Event channels and per-channel event specs are only added when the +* device has an IRQ. I2C devices have no interrupt line, and the I2C +* regmap cannot be called from atomic context, so events are not +* supported on that path. * * Return: 0 on success, negative errno on failure. */ -static int sysmon_parse_fw (struct iio_dev *indio_dev,struct device *dev) +static int sysmon_parse_fw (struct iio_dev *indio_dev,struct device *dev,int irq) {unsigned int num_chan, num_static, num_supply, num_temp;unsigned int idx, temp_chan_idx, volt_chan_idx;
@@ -164,8 +736,14 @@ static int sysmon_parse_fw(struct iio_dev *indio_dev, struct device *dev)if (!sysmon_channels)return -ENOMEM ; -/* Static temperature channels first */ memcpy (sysmon_channels, temp_channels,sizeof (temp_channels)); + +/* Attach event spec to channel 0 when IRQ is available */ +if (irq >0 ) { + sysmon_channels[0 ].event_spec = sysmon_temp_events; + sysmon_channels[0 ].num_event_specs =ARRAY_SIZE (sysmon_temp_events); + } + idx = num_static;/* Supply channels from DT */
@@ -190,6 +768,10 @@ static int sysmon_parse_fw(struct iio_dev *indio_dev, struct device *dev) .indexed = 1, .address = reg, .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), + .event_spec = irq > 0 ? + sysmon_supply_events : NULL, + .num_event_specs = irq > 0 ? + ARRAY_SIZE(sysmon_supply_events) : 0, .datasheet_name = label, }; }
@@ -255,6 +837,7 @@ int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap) {struct iio_dev *indio_dev;struct sysmon *sysmon; +int irq;int ret; indio_dev =devm_iio_device_alloc (dev,sizeof (*sysmon));
@@ -267,6 +850,7 @@ int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap) ret =devm_mutex_init (dev, &sysmon->lock);if (ret)return ret; +spin_lock_init (&sysmon->irq_lock);/* Disable all interrupts and clear pending status */ ret =regmap_write (sysmon->regmap,SYSMON_IDR ,SYSMON_INTR_ALL_MASK );
@@ -276,13 +860,34 @@ int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap)if (ret)return ret; + irq =fwnode_irq_get (dev_fwnode (dev),0 ); +if (irq == -EPROBE_DEFER ) +return dev_err_probe (dev, irq,"failed to get IRQ\n" ); + indio_dev->name ="versal-sysmon" ; indio_dev->modes =INDIO_DIRECT_MODE ; - ret =sysmon_parse_fw (indio_dev, dev); + ret =sysmon_parse_fw (indio_dev, dev, irq);if (ret)return ret; +if (irq >0 ) { +/* Set hysteresis mode for temperature threshold */ + ret =regmap_set_bits (sysmon->regmap,SYSMON_TEMP_EV_CFG , +SYSMON_TEMP_HYST_MASK ); +if (ret) +return ret; + +/* Initialize cached hysteresis from hardware registers */ + ret =sysmon_init_hysteresis (sysmon, &sysmon->temp_hysteresis); +if (ret) +return ret; + + ret =sysmon_init_interrupt (sysmon, dev, indio_dev, irq); +if (ret) +return ret; + } +return devm_iio_device_register (dev, indio_dev); }EXPORT_SYMBOL_NS_GPL (devm_versal_sysmon_core_probe,"VERSAL_SYSMON" );
drivers/iio/adc/versal-sysmon.h +36 -0
@@ -11,6 +11,8 @@#include <linux/bits.h> #include <linux/mutex.h> +#include <linux/spinlock_types.h> +#include <linux/workqueue.h> struct device ;struct regmap ;
@@ -18,12 +20,22 @@ struct regmap;/* Register offsets (sorted by address) */ #define SYSMON_NPI_LOCK 0x000C#define SYSMON_ISR 0x0044 +#define SYSMON_IMR 0x0048 +#define SYSMON_IER 0x004C#define SYSMON_IDR 0x0050#define SYSMON_TEMP_MAX 0x1030#define SYSMON_TEMP_MIN 0x1034#define SYSMON_SUPPLY_BASE 0x1040 +#define SYSMON_ALARM_FLAG 0x1018 +#define SYSMON_ALARM_REG 0x1940 +#define SYSMON_TEMP_TH_LOW 0x1970 +#define SYSMON_TEMP_TH_UP 0x1974 +#define SYSMON_SUPPLY_TH_LOW 0x1980 +#define SYSMON_SUPPLY_TH_UP 0x1C80 +#define SYSMON_TEMP_EV_CFG 0x1F84#define SYSMON_TEMP_MIN_MIN 0x1F8C#define SYSMON_TEMP_MAX_MAX 0x1F90 +#define SYSMON_STATUS_RESET 0x1F94#define SYSMON_TEMP_SAT_BASE 0x1FAC#define SYSMON_MAX_REG 0x24C0
@@ -35,8 +47,12 @@ struct regmap;#define SYSMON_SUPPLY_IDX_MAX 159#define SYSMON_TEMP_SAT_MAX 64 +#define SYSMON_NO_OF_EVENTS 32#define SYSMON_INTR_ALL_MASK GENMASK(31, 0) +/* ISR/IMR temperature alarm mask (bit 9) */ +#define SYSMON_TEMP_INTR_MASK BIT(9) +/* Supply voltage conversion register fields */ #define SYSMON_MANTISSA_MASK GENMASK(15, 0)#define SYSMON_FMT_MASK BIT(16)
@@ -46,11 +62,21 @@ struct regmap;#define SYSMON_FRACTIONAL_SHIFT 7U#define SYSMON_SUPPLY_MANTISSA_BITS 16 +/* Bits per alarm register */ +#define SYSMON_ALARM_BITS_PER_REG 32 + +#define SYSMON_UNMASK_WORK_DELAY_MS 500 +/** * struct sysmon - Driver data for Versal SysMon * @regmap: register map for hardware access * @lock: protects read-modify-write sequences on threshold registers * and cached state that spans multiple regmap calls +* @irq_lock: protects interrupt mask register updates (MMIO path only) +* @masked_temp: currently masked temperature alarm bits +* @temp_mask: temperature interrupt configuration mask +* @temp_hysteresis: cached DEVICE_TEMP hysteresis in millicelsius +* @sysmon_unmask_work: re-enables events after alarm condition clears */ struct sysmon {struct regmap *regmap;
@@ -60,6 +86,16 @@ struct sysmon {* that spans multiple regmap calls. */ struct mutex lock; +/* +* Protects interrupt mask register updates. Only used on the +* MMIO path (fast_io regmap); I2C has no IRQ and never reaches +* the event code that takes this lock. +*/ +spinlock_t irq_lock; +unsigned int masked_temp; +unsigned int temp_mask; +int temp_hysteresis; +struct delayed_work sysmon_unmask_work; };int devm_versal_sysmon_core_probe (struct device *dev,struct regmap *regmap);
Signature · 1 line
2.48.1
[email protected]
AI reviewRe: [PATCH v12 4/5] iio: adc: versal-sysmon: add threshold event support
Thank you for your contribution! Sashiko AI review found 7 potential issue(s) to consider: - [High] Supply voltage threshold events permanently disable themselves in hardware upon triggering.…
Thank you for your contribution! Sashiko AI review found 7 potential issue(s) to consider:
- [High] Supply voltage threshold events permanently disable themselves in hardware upon triggering.
- [High] Unmask worker silently drops voltage alarms.
- [High] Use-After-Free due to delayed work scheduling after cancellation during unbind.
- [High] Race condition in interrupt configuration re-enables masked alarms.
- [High] Hard IRQ handler triggers sleep-in-atomic panic on I2C devices.
- [Medium] Data corruption when setting negative temperature thresholds.
- [Medium] Integer underflow in lower threshold calculation breaks hardware alarms. --
commit 5011ca744b3ab433f6a307686494ec49213c41b4
Author: Salih Erim <[email protected]>
iio: adc: versal-sysmon: add threshold event support
Add threshold event support for temperature and supply voltage channels, introducing hysteresis mode for temperature and window mode for supply alarms.
Quoted 4 lines
drivers/iio/adc/versal-sysmon-core.c +0
-0
[ ... ]
drivers/iio/adc/versal-sysmon-core.c static const struct iio_chan_spec temp_channels[] = { · line 113
Quoted 13 lines
drivers/iio/adc/versal-sysmon-core.c +9
-0@@ -52,6 +102,16 @@ static const struct iio_chan_spec temp_channels[] = { SYSMON_CHAN_TEMP(3, SYSMON_TEMP_MIN_MIN, "min_min"), }; +static void sysmon_q8p7_to_millicelsius (s16 raw_data,int *val) +{ + *val = (raw_data *MILLIDEGREE_PER_DEGREE ) >>SYSMON_FRACTIONAL_SHIFT ; +} + +static void sysmon_millicelsius_to_q8p7 (u32 *raw_data,int val) +{ + *raw_data = (val <<SYSMON_FRACTIONAL_SHIFT ) /MILLIDEGREE_PER_DEGREE ; +}
[Severity: Medium]
When a negative threshold (e.g., -256000 mC) is converted to Q8.7 format in sysmon_millicelsius_to_q8p7(), will it produce a negative 32-bit integer due to sign extension?
If this negative value is subsequently written directly to the 32-bit hardware registers without masking, could it overwrite the upper 16 bits with 1s and corrupt the hardware register state?
[ ... ]
Quoted 6 lines
drivers/iio/adc/versal-sysmon-core.c +6
-0+static int sysmon_write_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +bool state) +{
[ ... ]
Quoted 7 lines
drivers/iio/adc/versal-sysmon-core.c +7
-0+case IIO_TEMP : +if (state) { + ret =regmap_write (sysmon->regmap,SYSMON_IER , mask); +if (ret) +return ret; + +scoped_guard (spinlock_irq, &sysmon->irq_lock)
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_raw(struct iio_dev *indio_dev, · line 315
Quoted 10 lines
drivers/iio/adc/versal-sysmon-core.c +10
-0+ sysmon->temp_mask &= ~mask; + }else { + ret =regmap_write (sysmon->regmap,SYSMON_IDR , mask); +if (ret) +return ret; + +scoped_guard (spinlock_irq, &sysmon->irq_lock) + sysmon->temp_mask |= mask; + } +return 0 ;
[Severity: High]
Because the hardware interrupt is disabled via SYSMON_IDR outside the sysmon->irq_lock, can a race condition occur with the unmask worker?
If the worker runs concurrently, holds the lock, and calculates the enable mask using the old state, might it write to SYSMON_IER and override this disable command, resulting in unexpected interrupts?
[ ... ]
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_raw(struct iio_dev *indio_dev, · line 339
Quoted 13 lines
drivers/iio/adc/versal-sysmon-core.c +13
-0+static int sysmon_update_temp_lower (struct sysmon *sysmon) +{ +unsigned int upper_reg; +int upper_mc, lower_mc; +u32 raw_val; +int ret; + + ret =regmap_read (sysmon->regmap,SYSMON_TEMP_TH_UP , &upper_reg); +if (ret) +return ret; + +sysmon_q8p7_to_millicelsius (upper_reg, &upper_mc); + lower_mc =clamp (upper_mc - sysmon->temp_hysteresis,-256000 ,255992 );
[Severity: Medium]
Since sysmon->temp_hysteresis can accept any positive value up to INT_MAX, will subtracting a large hysteresis from a negative upper threshold mathematically underflow a 32-bit signed integer?
If an underflow occurs here, wrapping to a positive value, will clamp() then incorrectly set the lower re-arm threshold higher than the upper threshold and break the hardware alarm logic?
Quoted 4 lines
drivers/iio/adc/versal-sysmon-core.c +4
-0+sysmon_millicelsius_to_q8p7 (&raw_val, lower_mc); + +return regmap_write (sysmon->regmap,SYSMON_TEMP_TH_LOW , raw_val); +}
[ ... ]
Quoted 7 lines
drivers/iio/adc/versal-sysmon-core.c +7
-0+static int sysmon_write_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info, +int val,int val2) +{
[ ... ]
Quoted 23 lines
drivers/iio/adc/versal-sysmon-core.c +23
-0+case IIO_TEMP : +switch (info) { +case IIO_EV_INFO_VALUE : +/* Q8.7 signed range: -256000 to +255992 mC */ +if (val <-256000 || val >255992 ) +return -EINVAL ; + +sysmon_millicelsius_to_q8p7 (&raw_val, val); + + ret =regmap_write (sysmon->regmap,SYSMON_TEMP_TH_UP , raw_val); +if (ret) +return ret; + +/* Recompute lower = upper - hysteresis */ +return sysmon_update_temp_lower (sysmon); + +case IIO_EV_INFO_HYSTERESIS : +if (val <0 ) +return -EINVAL ; + + sysmon->temp_hysteresis = val; + +return sysmon_update_temp_lower (sysmon);
[ ... ]
Quoted 2 lines
drivers/iio/adc/versal-sysmon-core.c +2
-0+static int sysmon_handle_event (struct iio_dev *indio_dev,u32 event) +{
[ ... ]
Quoted 5 lines
drivers/iio/adc/versal-sysmon-core.c +5
-0+case SYSMON_BIT_ALARM0 : +case SYSMON_BIT_ALARM1 : +case SYSMON_BIT_ALARM2 : +case SYSMON_BIT_ALARM3 : +case SYSMON_BIT_ALARM4 :
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_label(struct iio_dev *indio_dev, · line 544
Quoted 10 lines
drivers/iio/adc/versal-sysmon-core.c +10
-0+ ret =regmap_read (sysmon->regmap, alarm_flag_offset, ®_val); +if (ret) +return ret; + + alarm_flag_reg = reg_val; + +for_each_set_bit (bit, &alarm_flag_reg,SYSMON_ALARM_BITS_PER_REG ) { + address = bit +SYSMON_ALARM_BITS_PER_REG * event; +sysmon_push_event (indio_dev, address); + ret =regmap_clear_bits (sysmon->regmap, alarm_reg_offset,BIT (bit));
[Severity: High]
The IRQ handler clears the administrative alarm configuration bit in hardware when a voltage alarm triggers. Does the driver ever re-arm supply alarms like it does for temperature alarms in the delayed worker?
If not, will a single threshold event permanently disable the supply alarm in hardware?
Quoted 5 lines
drivers/iio/adc/versal-sysmon-core.c +5
-0+if (ret) +return ret; + } + +return regmap_write (sysmon->regmap, alarm_flag_offset, alarm_flag_reg);
[ ... ]
Quoted 6 lines
drivers/iio/adc/versal-sysmon-core.c +6
-0+static void sysmon_unmask_worker (struct work_struct *work) +{ +struct sysmon *sysmon = + container_of(work, struct sysmon, sysmon_unmask_work.work); +unsigned int isr; +
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_label(struct iio_dev *indio_dev, · line 601
Quoted 10 lines
drivers/iio/adc/versal-sysmon-core.c +10
-0+/* +* If the ISR read fails, skip processing to avoid acting +* on undefined data. +*/ + scoped_guard(spinlock_irq, &sysmon->irq_lock) { +if (regmap_read (sysmon->regmap,SYSMON_ISR , &isr)) +break ; +regmap_write (sysmon->regmap,SYSMON_ISR , isr); +sysmon_unmask_temp (sysmon, isr); + }
[Severity: High]
Since SYSMON_ISR is a write-1-to-clear register, does writing the entire ISR back clear all pending interrupts, including any newly asserted voltage alarms?
Because the worker only calls sysmon_unmask_temp() and ignores the voltage alarm bits, will this silently drop any voltage alarms that fired during the worker's execution?
Quoted 9 lines
drivers/iio/adc/versal-sysmon-core.c +9
-0+ +if (sysmon->masked_temp) +schedule_delayed_work (&sysmon->sysmon_unmask_work, +msecs_to_jiffies (SYSMON_UNMASK_WORK_DELAY_MS )); +else +regmap_write (sysmon->regmap,SYSMON_STATUS_RESET ,1 ); +} + +static irqreturn_t sysmon_iio_irq (int irq,void *data)
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_label(struct iio_dev *indio_dev, · line 620
Quoted 10 lines
drivers/iio/adc/versal-sysmon-core.c +10
-0+{ +struct iio_dev *indio_dev = data; +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned int isr, imr; + +guard (spinlock)(&sysmon->irq_lock); + +if (regmap_read (sysmon->regmap,SYSMON_ISR , &isr) || +regmap_read (sysmon->regmap,SYSMON_IMR , &imr)) +return IRQ_NONE ;
[Severity: High]
If the device is instantiated on an I2C bus and the device tree provides an interrupts property, will this hardirq handler trigger a scheduling while atomic panic?
The handler acquires a spinlock and calls regmap_read(), which would sleep when using the I2C bus's mutex-based locking. Should the driver verify if the regmap is suitable for atomic context before requesting the IRQ?
[ ... ]
Quoted 17 lines
drivers/iio/adc/versal-sysmon-core.c +17
-0+static void sysmon_disable_interrupts (void *data) +{ +struct sysmon *sysmon = data; + +regmap_write (sysmon->regmap,SYSMON_IDR ,SYSMON_INTR_ALL_MASK ); + +scoped_guard (spinlock_irq, &sysmon->irq_lock) + sysmon->masked_temp = 0; + +cancel_delayed_work_sync (&sysmon->sysmon_unmask_work); +} + +static int sysmon_init_interrupt (struct sysmon *sysmon, +struct device *dev, +struct iio_dev *indio_dev, +int irq) +{
[ ... ]
drivers/iio/adc/versal-sysmon-core.c static int sysmon_read_label(struct iio_dev *indio_dev, · line 671
Quoted 6 lines
drivers/iio/adc/versal-sysmon-core.c +6
-0+ ret =devm_request_irq (dev, irq, sysmon_iio_irq,0 ,"sysmon-irq" , indio_dev); +if (ret) +return ret; + +return devm_add_action_or_reset (dev, sysmon_disable_interrupts, sysmon); +}
[Severity: High]
During unbind, sysmon_disable_interrupts() cancels the delayed work before the IRQ handler is freed. If an interrupt fires after cancel_delayed_work_sync() returns, will the still-active sysmon_iio_irq() handler reschedule the delayed work?
Could this cause a use-after-free when the sysmon structure is freed shortly after, allowing the delayed work to execute 500ms later on freed memory?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Salih Erim
maintainerPATCH v12 5/5 iio: adc: versal-sysmon: add oversampling support
In reply to Salih ErimAdd support for reading and writing the oversampling ratio through the IIO oversampling_ratio attribute. The hardware supports averaging 2, 4, 8, or 16 samples, plus a ratio of 1 (no averaging).
Temperature and supply channels share oversampling configuration at the type level (all temperature channels share one ratio, all supply channels share another), exposed through info_mask_shared_by_type.
The hardware encoding uses sample_count / 2 in a 4-bit field within the CONFIG register. Per-channel averaging enable registers must also be updated to activate or deactivate averaging.
---
Changes in v12:
- No code changes
Changes in v11:
- Add oversampling info_mask bits to static SYSMON_CHAN_TEMP macro (Jonathan)
Changes in v10:
- No code changes
Changes in v9:
- Add Reviewed-by tag from Andy Shevchenko
- No code changes
Changes in v8:
- Use unsigned int for val parameter and hw_val in both osr_write helpers (Andy)
- Use ~0 instead of ~0U for avg enable bitmask (Andy)
Changes in v7:
- Split sysmon_osr_write into sysmon_osr_write_temp and sysmon_osr_write_supply; caller dispatches with if/else on chan->type (Jonathan)
- Restore HW encoding comment in both helpers; fix cross-reference in sysmon_osr_write_supply
Changes in v6:
- Fix FIELD_PREP indentation in sysmon_osr_write (Andy)
- unsigned int for loop index in sysmon_write_raw (Andy)
Changes in v5:
- Remove unneeded parentheses in i * SYSMON_REG_STRIDE (Andy)
- Use struct regmap *map local variable in sysmon_set_avg_enable (Andy)
- switch instead of redundant if/if on channel_type (Andy)
- Add CONFIG register readback fence after oversampling update to prevent NoC bus hang from posted writes (found during hardware stress testing)
Changes in v4:
- Return directly from sysmon_set_avg_enable calls, remove else after early returns, drop unreachable return 0 (Jonathan)
- Rename mask defines to SYSMON_CONFIG_SUPPLY_OSR and SYSMON_CONFIG_TEMP_SAT_OSR (Jonathan)
- Drop "bits X:Y" from GENMASK comments (Jonathan)
- Blank lines after if (ret) return ret blocks (Jonathan)
- Move oversampling read inside guard(mutex) scope
Changes in v3:
- No changes
Changes in v2:
- EN_AVG per-channel bitmask registers written with all-ones instead of boolean 1 when oversampling is enabled
- EN_AVG write errors propagated to userspace
- Oversampling limited to satellite temp and supply channels; static temp channels do not participate
- Oversampling exposes actual sample counts (1,2,4,8,16) to userspace with internal HW register translation
- write_raw_get_fmt returns IIO_VAL_INT for oversampling ratio
- HW encoding documented (sample_count/2, not log2)
- oversampling_avail is const int[] (type match fix)
drivers/iio/adc/versal-sysmon-core.c | 159 ++++++++++++++++++++++++++- drivers/iio/adc/versal-sysmon.h | 17 +++ 2 files changed, 174 insertions(+), 2 deletions(-)
drivers/iio/adc/versal-sysmon-core.c +157 -2
@@ -28,6 +28,12 @@#include "versal-sysmon.h" +/* +* Oversampling ratio values exposed to userspace via IIO. +* Actual number of samples averaged: 1=none, 2=2x, 4=4x, 8=8x, 16=16x. +*/ +static const int sysmon_oversampling_avail[] = {1 ,2 ,4 ,8 ,16 }; +/* TEMP hysteresis mode bit in SYSMON_TEMP_EV_CFG */ #define SYSMON_TEMP_HYST_MASK BIT(1)
@@ -42,7 +48,11 @@ .address = _address, \ .channel = _chan, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_type = \ +BIT (IIO_CHAN_INFO_SCALE ) | \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ + .info_mask_shared_by_type_available = \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ .datasheet_name = _name, \ }
@@ -166,6 +176,12 @@ static int sysmon_read_raw(struct iio_dev *indio_dev,guard (mutex)(&sysmon->lock); +if (mask ==IIO_CHAN_INFO_OVERSAMPLING_RATIO ) { + *val = (chan->type ==IIO_TEMP ) ? sysmon->temp_oversampling : + sysmon->supply_oversampling; +return IIO_VAL_INT ; + } +switch (chan->type) {case IIO_TEMP :if (mask ==IIO_CHAN_INFO_SCALE ) {
@@ -465,6 +481,132 @@ static int sysmon_write_event_value(struct iio_dev *indio_dev, } } +static int sysmon_set_avg_enable (struct sysmon *sysmon, +u32 base,u32 count,u32 val) +{ +struct regmap *map = sysmon->regmap; +int ret; + +for (unsigned int i =0 ; i < count; i++) { + ret =regmap_write (map, base + i *SYSMON_REG_STRIDE , val); +if (ret) +return ret; + } + +return 0 ; +} + +static int sysmon_osr_write_temp (struct sysmon *sysmon,unsigned int val) +{ +/* +* HW register encoding is sample_count / 2: +* 0=none, 1=2x, 2=4x, 4=8x, 8=16x (not log2-based). +*/ +unsigned int hw_val = val >>1 ; +unsigned int readback; +int ret; + + ret =regmap_update_bits (sysmon->regmap,SYSMON_CONFIG , +SYSMON_CONFIG_TEMP_SAT_OSR , +FIELD_PREP (SYSMON_CONFIG_TEMP_SAT_OSR , hw_val)); +if (ret) +return ret; + +/* +* Readback fence: the SysMon CONFIG register resides in the +* PMC domain behind the NoC. A posted write may not reach the +* hardware before the next MMIO access. Reading the register +* back forces the interconnect to complete the write, preventing +* a bus hang on the subsequent access. +*/ +regmap_read (sysmon->regmap,SYSMON_CONFIG , &readback); + +return sysmon_set_avg_enable (sysmon,SYSMON_TEMP_EN_AVG_BASE , +SYSMON_TEMP_EN_AVG_COUNT , + hw_val ? ~0 :0 ); +} + +static int sysmon_osr_write_supply (struct sysmon *sysmon,unsigned int val) +{ +/* HW encoding: sample_count / 2 (see sysmon_osr_write_temp) */ +unsigned int hw_val = val >>1 ; +unsigned int readback; +int ret; + + ret =regmap_update_bits (sysmon->regmap,SYSMON_CONFIG , +SYSMON_CONFIG_SUPPLY_OSR , +FIELD_PREP (SYSMON_CONFIG_SUPPLY_OSR , hw_val)); +if (ret) +return ret; + +/* Readback fence -- see sysmon_osr_write_temp for details */ +regmap_read (sysmon->regmap,SYSMON_CONFIG , &readback); + +return sysmon_set_avg_enable (sysmon,SYSMON_SUPPLY_EN_AVG_BASE , +SYSMON_SUPPLY_EN_AVG_COUNT , + hw_val ? ~0 :0 ); +} + +static int sysmon_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct sysmon *sysmon =iio_priv (indio_dev); +unsigned int i; +int ret; + +if (mask !=IIO_CHAN_INFO_OVERSAMPLING_RATIO ) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (sysmon_oversampling_avail); i++) { +if (val == sysmon_oversampling_avail[i]) +break ; + } +if (i ==ARRAY_SIZE (sysmon_oversampling_avail)) +return -EINVAL ; + +guard (mutex)(&sysmon->lock); + +if (chan->type ==IIO_TEMP ) { + ret =sysmon_osr_write_temp (sysmon, val); +if (ret) +return ret; + sysmon->temp_oversampling = val; + }else { + ret =sysmon_osr_write_supply (sysmon, val); +if (ret) +return ret; + sysmon->supply_oversampling = val; + } + +return 0 ; +} + +static int sysmon_write_raw_get_fmt (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +long mask) +{ +if (mask ==IIO_CHAN_INFO_OVERSAMPLING_RATIO ) +return IIO_VAL_INT ; + +return -EINVAL ; +} + +static int sysmon_read_avail (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +const int **vals,int *type, +int *length,long mask) +{ +if (mask !=IIO_CHAN_INFO_OVERSAMPLING_RATIO ) +return -EINVAL ; + + *vals = sysmon_oversampling_avail; + *type =IIO_VAL_INT ; + *length =ARRAY_SIZE (sysmon_oversampling_avail); + +return IIO_AVAIL_LIST ; +} +static int sysmon_read_label (struct iio_dev *indio_dev,struct iio_chan_spec const *chan,char *label)
@@ -477,6 +619,9 @@ static int sysmon_read_label(struct iio_dev *indio_dev,static const struct iio_info sysmon_iio_info = { .read_raw = sysmon_read_raw, + .write_raw = sysmon_write_raw, + .write_raw_get_fmt = sysmon_write_raw_get_fmt, + .read_avail = sysmon_read_avail, .read_label = sysmon_read_label, .read_event_config = sysmon_read_event_config, .write_event_config = sysmon_write_event_config,
@@ -768,6 +913,10 @@ static int sysmon_parse_fw(struct iio_dev *indio_dev, struct device *dev, int ir .indexed = 1, .address = reg, .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), + .info_mask_shared_by_type = + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_type_available = + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), .event_spec = irq >0 ? sysmon_supply_events : NULL, .num_event_specs = irq > 0 ?
@@ -799,7 +948,11 @@ static int sysmon_parse_fw(struct iio_dev *indio_dev, struct device *dev, int ir .address = SYSMON_TEMP_SAT_BASE + (reg - 1) * SYSMON_REG_STRIDE, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_type = +BIT (IIO_CHAN_INFO_SCALE ) | + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), + .info_mask_shared_by_type_available = + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), .datasheet_name = label, }; }
@@ -846,6 +999,8 @@ int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap) sysmon =iio_priv (indio_dev); sysmon->regmap = regmap; + sysmon->temp_oversampling =1 ; + sysmon->supply_oversampling =1 ; ret =devm_mutex_init (dev, &sysmon->lock);if (ret)
drivers/iio/adc/versal-sysmon.h +17 -0
@@ -23,11 +23,13 @@ struct regmap;#define SYSMON_IMR 0x0048#define SYSMON_IER 0x004C#define SYSMON_IDR 0x0050 +#define SYSMON_CONFIG 0x0100#define SYSMON_TEMP_MAX 0x1030#define SYSMON_TEMP_MIN 0x1034#define SYSMON_SUPPLY_BASE 0x1040#define SYSMON_ALARM_FLAG 0x1018#define SYSMON_ALARM_REG 0x1940 +#define SYSMON_SUPPLY_EN_AVG_BASE 0x1958#define SYSMON_TEMP_TH_LOW 0x1970#define SYSMON_TEMP_TH_UP 0x1974#define SYSMON_SUPPLY_TH_LOW 0x1980
@@ -37,6 +39,7 @@ struct regmap;#define SYSMON_TEMP_MAX_MAX 0x1F90#define SYSMON_STATUS_RESET 0x1F94#define SYSMON_TEMP_SAT_BASE 0x1FAC +#define SYSMON_TEMP_EN_AVG_BASE 0x24B4#define SYSMON_MAX_REG 0x24C0/* NPI unlock value written to SYSMON_NPI_LOCK */
@@ -53,6 +56,16 @@ struct regmap;/* ISR/IMR temperature alarm mask (bit 9) */ #define SYSMON_TEMP_INTR_MASK BIT(9) +/* SYSMON_CONFIG: supply oversampling ratio */ +#define SYSMON_CONFIG_SUPPLY_OSR GENMASK(17, 14) + +/* SYSMON_CONFIG: temperature satellite oversampling ratio */ +#define SYSMON_CONFIG_TEMP_SAT_OSR GENMASK(27, 24) + +/* Per-channel averaging enable register counts */ +#define SYSMON_SUPPLY_EN_AVG_COUNT 5 +#define SYSMON_TEMP_EN_AVG_COUNT 2 +/* Supply voltage conversion register fields */ #define SYSMON_MANTISSA_MASK GENMASK(15, 0)#define SYSMON_FMT_MASK BIT(16)
@@ -77,6 +90,8 @@ struct regmap;* @temp_mask: temperature interrupt configuration mask * @temp_hysteresis: cached DEVICE_TEMP hysteresis in millicelsius * @sysmon_unmask_work: re-enables events after alarm condition clears +* @temp_oversampling: current temp oversampling ratio +* @supply_oversampling: current supply oversampling ratio */ struct sysmon {struct regmap *regmap;
@@ -96,6 +111,8 @@ struct sysmon {unsigned int temp_mask;int temp_hysteresis;struct delayed_work sysmon_unmask_work; +unsigned int temp_oversampling; +unsigned int supply_oversampling; };int devm_versal_sysmon_core_probe (struct device *dev,struct regmap *regmap);
Signature · 1 line
2.48.1
[email protected]
AI reviewRe: [PATCH v12 5/5] iio: adc: versal-sysmon: add oversampling support
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Software cache for oversampling ratios is initialized to 1 without synchronizing with actual…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Software cache for oversampling ratios is initialized to 1 without synchronizing with actual hardware state. --
commit 943b70956fe7374b433e643428ed243156f1fcae
Author: Salih Erim <[email protected]>
iio: adc: versal-sysmon: add oversampling support
This commit adds support for reading and writing the oversampling ratio through the IIO oversampling_ratio attribute. It exposes shared oversampling configuration at the channel type level for temperature and supply channels.
Quoted 4 lines
drivers/iio/adc/versal-sysmon-core.c +0
-0
[ ... ]
drivers/iio/adc/versal-sysmon-core.c int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap) · line 1003
Quoted 6 lines
drivers/iio/adc/versal-sysmon-core.c +2
-0@@ -846,6 +999,8 @@ int devm_versal_sysmon_core_probe(struct device *dev, struct regmap *regmap) sysmon =iio_priv (indio_dev); sysmon->regmap = regmap; + sysmon->temp_oversampling =1 ; + sysmon->supply_oversampling =1 ;
[Severity: Medium]
Can the software cache become out of sync with the actual hardware state here?
If the platform firmware previously configured the SysMon IP to perform oversampling, hardcoding these values to 1 without reading the current hardware configuration might result in the IIO sysfs oversampling_ratio attribute reporting an incorrect value to userspace.
Should the driver read the hardware configuration (via SYSMON_CONFIG) to initialize these fields, or explicitly reset the hardware ratio to 1 during probe?
Quoted 3 lines
drivers/iio/adc/versal-sysmon-core.c +0
-0ret =devm_mutex_init (dev, &sysmon->lock);if (ret)
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Jonathan Cameron
maintainerQuoted 10 lines · On Wed, 24 Jun 2026 15:37:17 +0100 Salih Erim <[email protected]> wrote:
This series adds a new IIO driver for the AMD/Xilinx Versal System Monitor (SysMon), providing on-chip voltage and temperature monitoring.
The Versal SysMon measures up to 160 supply voltages and reads up to 64 temperature satellites distributed across the SoC. The hardware also provides aggregated device temperature registers: the current max and min across all active satellites, and peak/trough values recorded since last hardware reset. The device can be accessed via memory-mapped I/O or via an I2C interface.
Quoted 7 lines
The driver is split into a bus-agnostic core module using the regmap API, an MMIO platform driver, and an I2C driver. This allows the same IIO logic to be shared across different bus transports.
Note: Sai Krishna Potthuri is added as co-maintainer and will be actively taking over the upstream maintenance of this driver going forward. Please direct any future review feedback to him.
Series applied to the testing branch of iio.git.
Thanks,
Jonathan