From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Laight Subject: RE: [PATCH reset-next 2/2] reset: brcmstb: Fix 32-bit build with 64-bit resource_size_t Date: Wed, 23 Jan 2019 14:23:24 +0000 Message-ID: <43155ea7637e45d6aad04f5747cbb6bb@AcuMS.aculab.com> References: <20190123003345.13750-1-f.fainelli@gmail.com> <20190123003345.13750-3-f.fainelli@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <20190123003345.13750-3-f.fainelli@gmail.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: 'Florian Fainelli' , "linux-kernel@vger.kernel.org" Cc: Philipp Zabel , Rob Herring , Mark Rutland , Brian Norris , Gregory Fong , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , "moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE" , "rdunlap@infradead.org" , "linux-next@vger.kernel.org" , "sfr@canb.auug.org.au" , "paul.gortmaker@windriver.com" List-Id: devicetree@vger.kernel.org From: Florian Fainelli > Sent: 23 January 2019 00:34 > > 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 > Fixes: c196cdc7659d ("reset: Add Broadcom STB SW_INIT reset controller driver") > Signed-off-by: Florian Fainelli > --- > 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 */ Isn't it enough to assign resource_size(res) to an 'unsigned int' ? The value is never actually going to be over 4G. David - Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)