On 32-bit architectures defining resource_size_t as 64-bit (because of PAE), we can run into a linker failure because of the modulo and the division against resource_size(), replace the two problematic operations with an alignment check on the register resource (instead of modulo), and the division with DIV_ROUND_CLOSEST_ULL().
Reported-by: Randy Dunlap <[email protected]> Fixes: c196cdc7659d ("reset: Add Broadcom STB SW_INIT reset controller driver") Signed-off-by: Florian Fainelli <[email protected]> --- drivers/reset/reset-brcmstb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/reset/reset-brcmstb.c b/drivers/reset/reset-brcmstb.c index 01ab1f71518b..c4cab8b5052d 100644 --- a/drivers/reset/reset-brcmstb.c +++ b/drivers/reset/reset-brcmstb.c @@ -91,7 +91,8 @@ static int brcmstb_reset_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (resource_size(res) % SW_INIT_BANK_SIZE) { + if (!IS_ALIGNED(res->start, SW_INIT_BANK_SIZE) || + !IS_AGLINED(resource_size(res), SW_INIT_BANK_SIZE)) { dev_err(kdev, "incorrect register range\n"); return -EINVAL; } @@ -103,7 +104,8 @@ static int brcmstb_reset_probe(struct platform_device *pdev) dev_set_drvdata(kdev, priv); priv->rcdev.owner = THIS_MODULE; - priv->rcdev.nr_resets = (resource_size(res) / SW_INIT_BANK_SIZE) * 32; + priv->rcdev.nr_resets = DIV_ROUND_CLOSEST_ULL(resource_size(res), + SW_INIT_BANK_SIZE) * 32; priv->rcdev.ops = &brcmstb_reset_ops; priv->rcdev.of_node = kdev->of_node; /* Use defaults: 1 cell and simple xlate function */ -- 2.17.1
