From patchwork Thu Aug 31 09:29:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9931643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D62326022E for ; Thu, 31 Aug 2017 09:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC123288CE for ; Thu, 31 Aug 2017 09:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE51E288D0; Thu, 31 Aug 2017 09:30:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 569D5288CE for ; Thu, 31 Aug 2017 09:30:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=RIa491w4D2s7y8ATpYWRNGZhUCf1zFsy7RJpPWpwmVs=; b=oBMZKNegqMmf+smh1bA62mGETs LkXPQFmQJtWrYac8QAg9fEC2FW77rGeMSD7m0Ge4xfMRSCes/iaQLMlADd2DAwN2BWCck+25JPahI ccGH5kcmtmYl8gWXAsc7LRjQYUs/M6knwHryl7K/0HxoiuvFvhgPiXXk+xmar/JDozaWMZqzBBa49 W4fPM477GRPPibsCFU38VAb9NdKrIKYdz9Bm0BrLOCTjKbJ1eRKb22VoDHajhLIwdwre1Swfictqg L6xzIurv57WlwoIlHHUkUrDR5OHK1mwPQp24lXztqP1HwL2IQvR2EtJZwkeAcpyYHGF0gW3nPWboy i8nNWJbg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dnLoC-0001Lt-9r; Thu, 31 Aug 2017 09:30:44 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dnLnt-00084F-1a for linux-amlogic@lists.infradead.org; Thu, 31 Aug 2017 09:30:27 +0000 Received: by mail-wm0-x22c.google.com with SMTP id v2so892989wmf.0 for ; Thu, 31 Aug 2017 02:30:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UsMAAleqj5gLgOMuOWdTQr+fsvj/JHlXcfSONX1Rolc=; b=nFjU4j4XRfJ8XlOd9CPntCNM3uRJPLOjVEZlJYFJYnJ+HqzPSOsRRcg27fQGV4dRQ9 mJJdo6K6xDic4uTFtbKw9UOpWJmoFaCKvyYGHYYFu1v59bRyQQQXfjbozuae/Ljn2Y9z TzD7jc0KPOCnREaGJY4StiB6zN5UZMEmzd4fvYEKSWbuS9L/Kr/clnn5V9o+M2SZVWhg WSfhtpdAJZDvS6bnahYANMatu21PIht0dn+ti+FVStdYnEXBcN9xRZCCquQm0xoXGohq U6NdZTGnjzCNw24dZdn8U/R1mALU9COYisWlpnppDodsJuRMDy9wAwKT8oNvEqUOoyDw 1JCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UsMAAleqj5gLgOMuOWdTQr+fsvj/JHlXcfSONX1Rolc=; b=tknwURVILud9RRTD7Ba0XwLW5Uaotml0/27yEt04/gD0ptSuDy1wEU6bQK8FhV5r9Y gOEay3bvnorwTAYB8GlY7e1/cUv1PxP2N4LJqTeWOSKcKEft/kcV3/Eo2mmmyy0Iz/lW L45lxqVxoDi/m1FmBB3hNYJcvQeiMDrlQ8h/UV105DQ3LHiXqKjt9SD2E9nK4WTC0q4t XV1NPBiu3Ys4T00/GgSQsJJyFnvsjxEVI1a4lwQrrZHTN2nHMB08fXkcZSSRi2dJUwUc sTEyHr+1CsAiS72koOq2Etvryc5vJMIVymJeJtq6rQ5/HJslHXv3YvRhSh9SiBa86ysi ewGg== X-Gm-Message-State: AHYfb5glRPSwbMEXngilk9k3wKM1lBTplgWKBnmccsTdo+SQVAiOQcIJ et2gROhW6b5bI21Z2lc= X-Received: by 10.28.99.7 with SMTP id x7mr106503wmb.30.1504171802801; Thu, 31 Aug 2017 02:30:02 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id g15sm1825622wrb.79.2017.08.31.02.30.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 02:30:02 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson Subject: [PATCH] mmc: meson-gx: fix __ffsdi2 undefined on arm32 Date: Thu, 31 Aug 2017 11:29:58 +0200 Message-Id: <20170831092958.31948-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <201708310823.lfxGt2Kh%fengguang.wu@intel.com> References: <201708310823.lfxGt2Kh%fengguang.wu@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170831_023025_284014_5367DE10 X-CRM114-Status: GOOD ( 12.04 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Hilman , linux-amlogic@lists.infradead.org, linux-mmc@vger.kernel.org, Jerome Brunet MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Using __bf_shf does not compile on arm 32 architecture. This has gone unnoticed till now cause the driver is only used on arm64. In addition, __bf_shf was already used in the driver without any issue. It was used on a constant value, so the call was probably optimized away. Replace __bf_shf by __ffs fixes the problem Signed-off-by: Jerome Brunet --- Hi Ulf, Sorry for not catching this earlier. If you still intend to keep the series applied in next, here is a fixup patch to squash with the offending commit during your rebase. Regards Jerome drivers/mmc/host/meson-gx-mmc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 2fa18faa7f0f..7d7aa2389b7c 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -201,13 +201,13 @@ static int meson_mmc_clk_get_phase(struct clk_hw *hw) u32 val; val = readl(mmc->reg); - p = (val & mmc->phase_mask) >> __bf_shf(mmc->phase_mask); + p = (val & mmc->phase_mask) >> __ffs(mmc->phase_mask); degrees = p * 360 / phase_num; if (mmc->delay_mask) { period_ps = DIV_ROUND_UP((unsigned long)NSEC_PER_SEC * 1000, clk_get_rate(hw->clk)); - d = (val & mmc->delay_mask) >> __bf_shf(mmc->delay_mask); + d = (val & mmc->delay_mask) >> __ffs(mmc->delay_mask); degrees += d * mmc->delay_step_ps * 360 / period_ps; degrees %= 360; } @@ -223,11 +223,11 @@ static void meson_mmc_apply_phase_delay(struct meson_mmc_phase *mmc, val = readl(mmc->reg); val &= ~mmc->phase_mask; - val |= phase << __bf_shf(mmc->phase_mask); + val |= phase << __ffs(mmc->phase_mask); if (mmc->delay_mask) { val &= ~mmc->delay_mask; - val |= delay << __bf_shf(mmc->delay_mask); + val |= delay << __ffs(mmc->delay_mask); } writel(val, mmc->reg); @@ -254,7 +254,7 @@ static int meson_mmc_clk_set_phase(struct clk_hw *hw, int degrees) r = do_div(p, 360 / phase_num); d = DIV_ROUND_CLOSEST(r * period_ps, 360 * mmc->delay_step_ps); - d = min(d, mmc->delay_mask >> __bf_shf(mmc->delay_mask)); + d = min(d, mmc->delay_mask >> __ffs(mmc->delay_mask)); } meson_mmc_apply_phase_delay(mmc, p, d); @@ -518,7 +518,7 @@ static int meson_mmc_clk_init(struct meson_host *host) init.num_parents = MUX_CLK_NUM_PARENTS; mux->reg = host->regs + SD_EMMC_CLOCK; - mux->shift = __bf_shf(CLK_SRC_MASK); + mux->shift = __ffs(CLK_SRC_MASK); mux->mask = CLK_SRC_MASK >> mux->shift; mux->hw.init = &init; @@ -540,7 +540,7 @@ static int meson_mmc_clk_init(struct meson_host *host) init.num_parents = 1; div->reg = host->regs + SD_EMMC_CLOCK; - div->shift = __bf_shf(CLK_DIV_MASK); + div->shift = __ffs(CLK_DIV_MASK); div->width = __builtin_popcountl(CLK_DIV_MASK); div->hw.init = &init; div->flags = (CLK_DIVIDER_ONE_BASED |