From patchwork Sat May 2 04:37:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne X-Patchwork-Id: 11523663 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A13A139A for ; Sat, 2 May 2020 04:38:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 632D920787 for ; Sat, 2 May 2020 04:38:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="fSQNYOxZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="JNbEwey/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 632D920787 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=Xr/Ojv6nbS/ERSXdPNZezUspgL3K8l9E5fFwKYiaqTo=; b=fSQNYOxZER0dDK 2zG2uHcf8+gyEpgPnN7dLPWKNvBLUYdR00Kn3BUP4o5KzwWrEoFQ4d7fX59Slx3ZY4JykH4oUXYEi 0BnY26A4+aHJZznjjJZENwpg1puo20cP9u4eKjMpjlPq3A24SBpno5ReVvbAnm9yfX/Q55adDKw7X W5JNTKHOMByjueAzKjlQ5t69wI9p9a5+CCsbaOl2KaOm+zvLh5pLKsexswFmv7B/5MEl9dJydaqv6 eKj95uHbgQX3vGoErDOEFxAy3MLBUe1rBN+nb5yRXRrDPPU8Dso879CBYZkvvRMfSNlsJH9V8IDJW VzVSWxxnIBYooLdj+YOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUjv0-0001xV-UK; Sat, 02 May 2020 04:38:26 +0000 Received: from mail-eopbgr750042.outbound.protection.outlook.com ([40.107.75.42] helo=NAM02-BL2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUjtx-0000wH-PM for linux-arm-kernel@lists.infradead.org; Sat, 02 May 2020 04:37:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=es4sb/7OtxH3inq8y9bAezto4W/cSs2H4vh8pCcUCXUsJtRzstFVIKZwD3DsVfohFoxwaXsTE612e1KFIOF0Un0MGGtAJk9/9F/qtdwF5eJ2dXfgPJI64mjSWTCsXemMWTuu2Dl8PpFzcCQvtKNxzFlupoTK9UCfa8t2JNJPld5dSWFCizQ5NnOjCwjyVzR6ueSTMumISGDN1YelYMx0x7AZXA22JRodI/ai55Kt/BvhovS9ecr/DkeaFvfivR9adTiHwB2yXafBpPzaM/Pz82Lc+XY0DS8Ld8D+/7i40EFV/2rQ5+ttQmIyE2KweX1c3WR7EM2x0IV2hFe8XF9Dqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OCr9dneKr8K0zpMeL2RfEvUHMH4ZBnuGYw9BtKB3dNo=; b=TbbJiRv7/NJe6g8U1wxAcjsh17v3DUaaLa0AKcnQc+IFbsFmPSKOETzek4Nm/koVI+QuGH1ysMMVgcEiuIme8DE1sTxcJ8iSbltyTA2vadPIVIlFHfo5hvShV8yKqo2n1D5IdCVeIpCEQ7WRMI76GjqL3aV6/Vx7+7e8V0DZNtHyStwrv1n+CyMOsGXSFiGAuuWd5iUWZDHe2+EbOGwywdzqyZY3JZZu77vqM72cKshAmFzKg0Bn4uu20M/yLcTXe/NEHaAqrtjdwnGcQbpbH3KWuNmxNhP5xvvkUoByH9gTNCzleCqTHwvfCfl5Q65hEU2Wnj4p2Q7ncpRyq52pfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.60.83) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=xilinx.com; dmarc=bestguesspass action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OCr9dneKr8K0zpMeL2RfEvUHMH4ZBnuGYw9BtKB3dNo=; b=JNbEwey/J4+wgoxheCo8xwpOzqUFR5r8g0bxDZIgJkwZvRPcLdhG5WbyPlgm8DfMpq53Hp9gh5fZZXGNTA7OMu7qqgJhfAJ/c96ND6hrorcswAdA8307w8S9aYeFnjJW5OPFFh/MqQnKh3AJnVZN9adn/dhrbVjx8r33U0GAbRA= Received: from DM6PR06CA0026.namprd06.prod.outlook.com (2603:10b6:5:120::39) by BL0PR02MB4851.namprd02.prod.outlook.com (2603:10b6:208:5b::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Sat, 2 May 2020 04:37:14 +0000 Received: from CY1NAM02FT053.eop-nam02.prod.protection.outlook.com (2603:10b6:5:120:cafe::b8) by DM6PR06CA0026.outlook.office365.com (2603:10b6:5:120::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Sat, 2 May 2020 04:37:14 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT053.mail.protection.outlook.com (10.152.74.165) with Microsoft SMTP Server id 15.20.2958.27 via Frontend Transport; Sat, 2 May 2020 04:37:13 +0000 Received: from [149.199.38.66] (port=34433 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.90) (envelope-from ) id 1jUjtn-0002fe-61; Fri, 01 May 2020 21:37:11 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1jUjtp-0004eZ-MS; Fri, 01 May 2020 21:37:13 -0700 Received: from xsj-pvapsmtp01 (mail.xilinx.com [149.199.38.66] (may be forged)) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id 0424b5cx002108; Fri, 1 May 2020 21:37:05 -0700 Received: from [172.19.3.8] (helo=xsjamitsuni50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1jUjth-0004de-8R; Fri, 01 May 2020 21:37:05 -0700 From: Amit Sunil Dhamne To: mturquette@baylibre.com, sboyd@kernel.org, michal.simek@xilinx.com, mark.rutland@arm.com, linux-clk@vger.kernel.org Subject: [RESEND PATCH v2 2/4] drivers: clk: zynqmp: Fix divider2 calculation Date: Fri, 1 May 2020 21:37:01 -0700 Message-Id: <1588394223-257635-3-git-send-email-amit.sunil.dhamne@xilinx.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588394223-257635-1-git-send-email-amit.sunil.dhamne@xilinx.com> References: <1588394223-257635-1-git-send-email-amit.sunil.dhamne@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:xsj-pvapsmtpgw01; PTR:unknown-60-83.xilinx.com; CAT:NONE; SFTY:; SFS:(4636009)(136003)(376002)(346002)(396003)(39860400002)(46966005)(54906003)(82310400002)(316002)(356005)(9786002)(478600001)(81166007)(426003)(70206006)(336012)(70586007)(82740400003)(47076004)(7696005)(2906002)(36756003)(6666004)(4326008)(2616005)(8936002)(186003)(26005)(5660300002)(107886003)(8676002)(42866002); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfd6d44c-de79-47cc-c50a-08d7ee527c84 X-MS-TrafficTypeDiagnostic: BL0PR02MB4851: X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 039178EF4A X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u4MtmYydD23J4tuT4C2IE+WteW5bGGqChUpYFQlGc4engh8AqVPEm6T0v56kyzTun4J7oerbQzHdgvTKk7nx2eagmb2b/offG5Ps1vFr5V4OFiygnE6xO3U0/r73xCELQint9iiNaoh6rwHS3nRJr6pKy5jwmIWcY0idQzv9Vzn14M2a7ymDiZ9ggNWmS8shhmRk4mWAXoBrWDfhBaRSHIAT5wP+osjniTZKLH2itMDyPR6F6AmIHHhig8Sqs9rHmyV2hClBikUDdJUKLla5J+BlChQIZ+utiXc66+js6eydVgLDe6E8CdXq4iXtPmXUSyLdCJ47k+ZHHRhvAxSTPZuw4qSmix7id56vVUKQBU6kHxA1sFCmpdrUUxK7xdmq5gvPf7oEjgkqbM50jpM9CxzGmsvWbMl0/PfgRi/xWQMlfMQH+5oNZy3SWaNn5l/uy2aLcjJaxcBk8o68XhtKUJIwuZjL7nm3CrJSUCqPaBQyOGkuZZz6ba6fU2VMhbrIES6p2DVJJ5GRH9tjC3dsGfCZx3mGh9V0fF/nQ0MO0wQ= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2020 04:37:13.9744 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bfd6d44c-de79-47cc-c50a-08d7ee527c84 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR02MB4851 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200501_213721_858737_53A0EA88 X-CRM114-Status: GOOD ( 11.04 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.75.42 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.75.42 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tejas Patel , Amit Sunil Dhamne , linux-kernel@vger.kernel.org, jollys@xilinx.com, rajanv@xilinx.com, Jolly Shah , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Tejas Patel zynqmp_get_divider2_val() calculates, divider value of type DIV2 clock, considering best possible combination of DIV1 and DIV2. To find best possible values of DIV1 and DIV2, DIV1's parent rate should be consider and not DIV2's parent rate since it would rate of div1 clock. Consider a below topology, out_clk->div2_clk->div1_clk->fixed_parent where out_clk = (fixed_parent/div1_clk) / div2_clk, so parent clock of div1_clk (i.e. out_clk) should be divided by div1_clk and div2_clk. Existing code divides parent rate of div2_clk's clock instead of div1_clk's parent rate, which is wrong. Fix the same by considering div1's parent clock rate. Fixes: 4ebd92d2e228 ("clk: zynqmp: Fix divider calculation") Signed-off-by: Tejas Patel Signed-off-by: Jolly Shah Signed-off-by: Amit Sunil Dhamne --- drivers/clk/zynqmp/divider.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c index 5c41ddb..f7b3545 100644 --- a/drivers/clk/zynqmp/divider.c +++ b/drivers/clk/zynqmp/divider.c @@ -111,23 +111,30 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw, static void zynqmp_get_divider2_val(struct clk_hw *hw, unsigned long rate, - unsigned long parent_rate, struct zynqmp_clk_divider *divider, int *bestdiv) { int div1; int div2; long error = LONG_MAX; - struct clk_hw *parent_hw = clk_hw_get_parent(hw); - struct zynqmp_clk_divider *pdivider = to_zynqmp_clk_divider(parent_hw); + unsigned long div1_prate; + struct clk_hw *div1_parent_hw; + struct clk_hw *div2_parent_hw = clk_hw_get_parent(hw); + struct zynqmp_clk_divider *pdivider = + to_zynqmp_clk_divider(div2_parent_hw); if (!pdivider) return; + div1_parent_hw = clk_hw_get_parent(div2_parent_hw); + if (!div1_parent_hw) + return; + + div1_prate = clk_hw_get_rate(div1_parent_hw); *bestdiv = 1; for (div1 = 1; div1 <= pdivider->max_div;) { for (div2 = 1; div2 <= divider->max_div;) { - long new_error = ((parent_rate / div1) / div2) - rate; + long new_error = ((div1_prate / div1) / div2) - rate; if (abs(new_error) < abs(error)) { *bestdiv = div2; @@ -192,7 +199,7 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw, */ if (div_type == TYPE_DIV2 && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) { - zynqmp_get_divider2_val(hw, rate, *prate, divider, &bestdiv); + zynqmp_get_divider2_val(hw, rate, divider, &bestdiv); } if ((clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) && divider->is_frac)