From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0188C282C0 for ; Wed, 23 Jan 2019 09:39:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8938121019 for ; Wed, 23 Jan 2019 09:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727245AbfAWJjc (ORCPT ); Wed, 23 Jan 2019 04:39:32 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:33631 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726207AbfAWJjc (ORCPT ); Wed, 23 Jan 2019 04:39:32 -0500 Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtp (Exim 4.89) (envelope-from ) id 1gmF0M-0000Ze-Ku; Wed, 23 Jan 2019 10:39:30 +0100 Message-ID: <1548236366.3904.1.camel@pengutronix.de> Subject: Re: [PATCH reset-next 2/2] reset: brcmstb: Fix 32-bit build with 64-bit resource_size_t From: Philipp Zabel To: Florian Fainelli , linux-kernel@vger.kernel.org Cc: 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 Date: Wed, 23 Jan 2019 10:39:26 +0100 In-Reply-To: <20190123003345.13750-3-f.fainelli@gmail.com> References: <20190123003345.13750-1-f.fainelli@gmail.com> <20190123003345.13750-3-f.fainelli@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Florian, On Tue, 2019-01-22 at 16:33 -0800, Florian Fainelli wrote: > 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)) { Typo. > 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; This should be DIV_ROUND_DOWN_ULL. regards Philipp