mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-09-18 23:09:29 +02:00
Aelin Reidel
ff10b6db0a
The Apple SPMI NVMEM driver previously cast regmap_bulk_read/write to
void * when assigning them to nvmem_config's reg_read/reg_write
function pointers.
This cast breaks the expected function signature of nvmem_reg_read_t
and nvmem_reg_write_t. With CFI enabled, indirect calls through
these pointers fail:
CFI failure at nvmem_reg_write+0x194/0x1e4 (target: regmap_bulk_write+0x0/0x2c8; expected type: 0x83a189c3)
...
Call trace:
nvmem_reg_write+0x194/0x1e4 (P)
__nvmem_cell_entry_write+0x298/0x2e8
nvmem_cell_write+0x24/0x34
macsmc_reboot_probe+0x1dc/0x454 [macsmc_reboot]
...
Introduce thin wrapper functions with the correct nvmem function
pointer types to satisfy the CFI checks.
Fixes: fe91c24a55 ("nvmem: Add apple-spmi-nvmem driver")
Signed-off-by: Aelin Reidel <aelin@mainlining.org>
Reported-by: Clayton Craft <craftyguy@postmarketos.org>
Tested-by: Clayton Craft <craftyguy@postmarketos.org>
Reviewed-by: Sven Peter <sven@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Srinivas Kandagatla <srini@kernel.org>
Link: https://patch.msgid.link/20260724223404.629248-2-srini@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
79 lines
1.8 KiB
C
79 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only OR MIT
|
|
/*
|
|
* Apple SPMI NVMEM driver
|
|
*
|
|
* Copyright The Asahi Linux Contributors
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/nvmem-provider.h>
|
|
#include <linux/of.h>
|
|
#include <linux/spmi.h>
|
|
#include <linux/regmap.h>
|
|
|
|
static const struct regmap_config apple_spmi_regmap_config = {
|
|
.reg_bits = 16,
|
|
.val_bits = 8,
|
|
.max_register = 0xffff,
|
|
};
|
|
|
|
static int apple_spmi_nvmem_read(void *priv, unsigned int offset, void *val,
|
|
size_t bytes)
|
|
{
|
|
struct regmap *map = priv;
|
|
|
|
return regmap_bulk_read(map, offset, val, bytes);
|
|
}
|
|
|
|
static int apple_spmi_nvmem_write(void *priv, unsigned int offset, void *val,
|
|
size_t bytes)
|
|
{
|
|
struct regmap *map = priv;
|
|
|
|
return regmap_bulk_write(map, offset, val, bytes);
|
|
}
|
|
|
|
static int apple_spmi_nvmem_probe(struct spmi_device *sdev)
|
|
{
|
|
struct regmap *regmap;
|
|
struct nvmem_config nvmem_cfg = {
|
|
.dev = &sdev->dev,
|
|
.name = "spmi_nvmem",
|
|
.id = NVMEM_DEVID_AUTO,
|
|
.word_size = 1,
|
|
.stride = 1,
|
|
.size = 0xffff,
|
|
.reg_read = apple_spmi_nvmem_read,
|
|
.reg_write = apple_spmi_nvmem_write,
|
|
};
|
|
|
|
regmap = devm_regmap_init_spmi_ext(sdev, &apple_spmi_regmap_config);
|
|
if (IS_ERR(regmap))
|
|
return PTR_ERR(regmap);
|
|
|
|
nvmem_cfg.priv = regmap;
|
|
|
|
return PTR_ERR_OR_ZERO(devm_nvmem_register(&sdev->dev, &nvmem_cfg));
|
|
}
|
|
|
|
static const struct of_device_id apple_spmi_nvmem_id_table[] = {
|
|
{ .compatible = "apple,spmi-nvmem" },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, apple_spmi_nvmem_id_table);
|
|
|
|
static struct spmi_driver apple_spmi_nvmem_driver = {
|
|
.probe = apple_spmi_nvmem_probe,
|
|
.driver = {
|
|
.name = "apple-spmi-nvmem",
|
|
.of_match_table = apple_spmi_nvmem_id_table,
|
|
},
|
|
};
|
|
|
|
module_spmi_driver(apple_spmi_nvmem_driver);
|
|
|
|
MODULE_LICENSE("Dual MIT/GPL");
|
|
MODULE_AUTHOR("Hector Martin <marcan@marcan.st>");
|
|
MODULE_DESCRIPTION("Apple SPMI NVMEM driver");
|