mfd: altera-sysmgr: Fix physical address storing more
PATCH 1/1 mfd: altera-sysmgr: Fix physical address storing more
From: Arnd Bergmann <[email protected]>
A recent fix improved the way the resource gets passed to the low-level accessors, but left one warning that appears in configurations with a resource_size_t that is wider than a pointer:
In file included from drivers/mfd/altera-sysmgr.c:19:drivers/mfd/altera-sysmgr.c: In function 'sysmgr_probe':drivers/mfd/altera-sysmgr.c:148:40: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
148 | regmap = devm_regmap_init(dev, NULL, (void *)res->start,
| ^include/linux/regmap.h:646:6: note: in definition of macro '__regmap_lockdep_wrapper'
646 | fn(__VA_ARGS__, &_key, \
| ^~~~~~~~~~~
drivers/mfd/altera-sysmgr.c:148:12: note: in expansion of macro 'devm_regmap_init'
148 | regmap = devm_regmap_init(dev, NULL, (void *)res->start,
| ^~~~~~~~~~~~~~~~I had tried a different approach that would store the address in the private data as a phys_addr_t, but the easiest solution now seems to be to add a double cast to shut up the warning.
As the address is passed to an inline assembly, it is guaranteed to not be wider than a register anyway.
--- drivers/mfd/altera-sysmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/altera-sysmgr.c +2 -1
@@ -145,7 +145,8 @@ static int sysmgr_probe(struct platform_device *pdev) sysmgr_config.reg_write = s10_protected_reg_write;/* Need physical address for SMCC call */ - regmap =devm_regmap_init (dev,NULL , (void *)res->start, + regmap =devm_regmap_init (dev,NULL , + (void *)(uintptr_t )res->start, &sysmgr_config); }else { base =devm_ioremap (dev, res->start,resource_size (res));
Signature · 1 line
2.27.0
Lee Jones
AppliedQuoted 23 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
A recent fix improved the way the resource gets passed to the low-level accessors, but left one warning that appears in configurations with a
resource_size_tthat is wider than a pointer:In file included from
drivers/mfd/altera-sysmgr.c:19:drivers/mfd/altera-sysmgr.c: In function 'sysmgr_probe':drivers/mfd/altera-sysmgr.c:148:40: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
148 | regmap = devm_regmap_init(dev, NULL, (void *)res->start,
| ^include/linux/regmap.h:646:6: note: in definition of macro '__regmap_lockdep_wrapper'646 | fn(__VA_ARGS__, &_key, \ | ^~~~~~~~~~~ drivers/mfd/altera-sysmgr.c:148:12: note: in expansion of macro 'devm_regmap_init' 148 | regmap = devm_regmap_init(dev, NULL, (void *)res->start, | ^~~~~~~~~~~~~~~~I had tried a different approach that would store the address in the private data as a
phys_addr_t, but the easiest solution now seems to be to add a double cast to shut up the warning.
Quoted 8 lines
As the address is passed to an inline assembly, it is guaranteed to not be wider than a register anyway.
Fixes d9ca7801b6e5 ("mfd: altera-sysmgr: Fix physical address storing hacks")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/mfd/altera-sysmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog