nvmem: fixes for 6.15

From: Srinivas Kandagatla <[email protected]>

Hi Greg,

Here are two fixes in nvmem for 6.15, Could you please queue these for next possible rc.

fixes include
- a fix in zynqmp_nvmem provider during cleanup.
- fix a link failure due to newly added crc checking

Thanks,
Srini

Arnd Bergmann (1):
nvmem: rmem: select CONFIG_CRC32

Peter Korsgaard (1):
nvmem: zynqmp_nvmem: unbreak driver after cleanup

 drivers/nvmem/Kconfig        | 1 +
 drivers/nvmem/zynqmp_nvmem.c | 1 +
 2 files changed, 2 insertions(+)

2.43.0

From: Arnd Bergmann <[email protected]>

The newly added crc checking leads to a link failure if CRC32 itself is disabled:

x86_64-linux-ld: vmlinux.o: in function `rmem_eyeq5_checksum':
rmem.c:(.text+0x52341b): undefined reference to `crc32_le_arch'

---
 drivers/nvmem/Kconfig | 1 +
 1 file changed, 1 insertion(+)

index 8671b7c974b9..eceb3cdb421f 100644
@@ -260,6 +260,7 @@ config NVMEM_RCAR_EFUSE
 config NVMEM_RMEM
 	tristate "Reserved Memory Based Driver Support"
 	depends on HAS_IOMEM
+	select CRC32
 	help
 	  This driver maps reserved memory into an nvmem device. It might be
 	  useful to expose information left by firmware in memory.

2.43.0

You forgot to cc: stable :(

From: Peter Korsgaard <[email protected]>

Commit 29be47fcd6a0 ("nvmem: zynqmp_nvmem: zynqmp_nvmem_probe cleanup") changed the driver to expect the device pointer to be passed as the "context", but in nvmem the context parameter comes from nvmem_config.priv which is never set - Leading to null pointer exceptions when the device is accessed.

---
 drivers/nvmem/zynqmp_nvmem.c | 1 +
 1 file changed, 1 insertion(+)

index 8682adaacd69..7da717d6c7fa 100644
@@ -213,6 +213,7 @@ static int zynqmp_nvmem_probe(struct platform_device *pdev)
 	econfig.word_size = 1;
 	econfig.size = ZYNQMP_NVMEM_SIZE;
 	econfig.dev = dev;
+	econfig.priv = dev;
 	econfig.add_legacy_fixed_of_cells = true;
 	econfig.reg_read = zynqmp_nvmem_read;
 	econfig.reg_write = zynqmp_nvmem_write;

2.43.0