From patchwork Mon Aug 6 04:39:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangbo Lu X-Patchwork-Id: 953695 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41kQ4H6xYSz9s0n for ; Mon, 6 Aug 2018 14:42:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726901AbeHFGtB (ORCPT ); Mon, 6 Aug 2018 02:49:01 -0400 Received: from inva020.nxp.com ([92.121.34.13]:41672 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726449AbeHFGtB (ORCPT ); Mon, 6 Aug 2018 02:49:01 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 1D8921A00A7; Mon, 6 Aug 2018 06:41:46 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 8266C1A00DB; Mon, 6 Aug 2018 06:41:43 +0200 (CEST) Received: from titan.ap.freescale.net (TITAN.ap.freescale.net [10.192.208.233]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id D6F4140283; Mon, 6 Aug 2018 12:41:39 +0800 (SGT) From: Yangbo Lu To: netdev@vger.kernel.org, Richard Cochran , "David S . Miller" Cc: linux-kernel@vger.kernel.org, Yangbo Lu Subject: [PATCH] ptp_qoriq: use div_u64/div_u64_rem for 64-bit division Date: Mon, 6 Aug 2018 12:39:11 +0800 Message-Id: <20180806043911.15437-1-yangbo.lu@nxp.com> X-Mailer: git-send-email 2.14.1 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is a fix-up patch for below build issue with multi_v7_defconfig. drivers/ptp/ptp_qoriq.o: In function `qoriq_ptp_probe': ptp_qoriq.c:(.text+0xd0c): undefined reference to `__aeabi_uldivmod' Fixes: 91305f281262 ("ptp_qoriq: support automatic configuration for ptp timer") Signed-off-by: Yangbo Lu --- drivers/ptp/ptp_qoriq.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c index 095c185..fdd49c2 100644 --- a/drivers/ptp/ptp_qoriq.c +++ b/drivers/ptp/ptp_qoriq.c @@ -373,6 +373,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp, u64 freq_comp; u64 max_adj; u32 nominal_freq; + u32 remainder = 0; u32 clk_src = 0; qoriq_ptp->cksel = DEFAULT_CKSEL; @@ -400,7 +401,8 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp, * freq_ratio = reference_clock_freq / nominal_freq */ freq_comp = ((u64)1 << 32) * nominal_freq; - if (do_div(freq_comp, clk_src)) + freq_comp = div_u64_rem(freq_comp, clk_src, &remainder); + if (remainder) freq_comp++; qoriq_ptp->tmr_add = freq_comp; @@ -411,7 +413,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp, * freq_ratio = reference_clock_freq / nominal_freq */ max_adj = 1000000000ULL * (clk_src - nominal_freq); - max_adj = max_adj / nominal_freq - 1; + max_adj = div_u64(max_adj, nominal_freq) - 1; qoriq_ptp->caps.max_adj = max_adj; return 0;