Skip to content

Commit a1afa3e

Browse files
Russ Weightsmb49
authored andcommitted
regmap: spi-avmm: Fix regmap_bus max_raw_write
BugLink: https://bugs.launchpad.net/bugs/2032683 [ Upstream commit c8e7968 ] The max_raw_write member of the regmap_spi_avmm_bus structure is defined as: .max_raw_write = SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT SPI_AVMM_VAL_SIZE == 4 and MAX_WRITE_CNT == 1 so this results in a maximum write transfer size of 4 bytes which provides only enough space to transfer the address of the target register. It provides no space for the value to be transferred. This bug became an issue (divide-by-zero in _regmap_raw_write()) after the following was accepted into mainline: commit 3981514 ("regmap: Account for register length when chunking") Change max_raw_write to include space (4 additional bytes) for both the register address and value: .max_raw_write = SPI_AVMM_REG_SIZE + SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT Fixes: 7f9fb67 ("regmap: add Intel SPI Slave to AVMM Bus Bridge support") Reviewed-by: Matthew Gerlach <matthew.gerlach@linux.intel.com> Signed-off-by: Russ Weight <russell.h.weight@intel.com> Link: https://lore.kernel.org/r/20230620202824.380313-1-russell.h.weight@intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 3aa169e commit a1afa3e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/regmap/regmap-spi-avmm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static const struct regmap_bus regmap_spi_avmm_bus = {
666666
.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,
667667
.val_format_endian_default = REGMAP_ENDIAN_NATIVE,
668668
.max_raw_read = SPI_AVMM_VAL_SIZE * MAX_READ_CNT,
669-
.max_raw_write = SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT,
669+
.max_raw_write = SPI_AVMM_REG_SIZE + SPI_AVMM_VAL_SIZE * MAX_WRITE_CNT,
670670
.free_context = spi_avmm_bridge_ctx_free,
671671
};
672672

0 commit comments

Comments
 (0)