From patchwork Thu Nov 9 12:05:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Buddhabhatti, Jay" X-Patchwork-Id: 13451013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2039CC4167B for ; Thu, 9 Nov 2023 12:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E2XaI2ILjQV7ApsVapivlt6ifc7kNuaewgFj/5sC6PI=; b=b7etvheU7RAE7W emi7g9Zs/rnvHQnL/QmeakvBzlI+/1yMhRy/vfr9+xxLbBGgb112qBvXv1tlE7Ha+AS81ui52jfy7 CDTOGw1k6T9zrosoa5Es4y3+L0RT7hxuvcze9fB+dxUA697rfiu7UnXeJclP/3ofKrOZS8+tHrekv FR4zioWMTinBjTgs/l5IRCTJns6C3GXGTBS/GZpx9/j1os0N7cZvYXEVin5sWTDmRkUjA+JU0ei32 C42zyhXz/oUaQvJRAdmsFmWkuR0YhUUkyHvm6p4eMgzpz8Hzwia6Nzb5SnlxLn8N8gSgniquJmcOv o7omHUOaPZrotcW1U4iA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r13oi-006Hry-30; Thu, 09 Nov 2023 12:07:24 +0000 Received: from mail-dm6nam12on20615.outbound.protection.outlook.com ([2a01:111:f400:fe59::615] helo=NAM12-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r13oe-006Hq6-2p for linux-arm-kernel@lists.infradead.org; Thu, 09 Nov 2023 12:07:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VWfEEotU5lNQZ/KrWfi9PPkcvnXqGzvJI4cvVTdxBqIUz9eYJA7KsGTyhkKb9hcupUHJ+3jhharec6q3fS6nUfSf/4FcJ/TlMVD5N8TIR3vW5Qa/OzN0orSU/VrQ36HWn7CDn4Tql+6LENjZTli8kkEfBBz3lszGrRyPapMeMnCnsAlTmDT4jO1FK6W7WXXSveS4gmyQVC4X6bBT9swttYfZylypmuHhJKiS07kCLFb/Df/PVgQD2IYDLzassiM9Bp9FrR8LJ5h/AQceUf08Y3HjvIcl0Rl5P2pGD1hMqcff4SR0lpyGcfMnP+LtFB19OUZdcS9PiQtaOzzqoa0C3g== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f0si0XF/0Y7YucdFXCNg3Xr799yC2PhchuwuP9wxUP8=; b=jZdYUpR4T2vGiLFRdE1HSmw9KIlnSF/3zm96AM2DN0xMC9DbNlJMbIGp2tBtDBDuVQN3c4SFNESDTvrY731RizMvPIV8li5na9IAGrug26Htod3soyOMTWUZz71slDewpfzcXlXM8dmaqP9cZbeOePzPGgcfFkOIfh4Yrvr+OPaHiP6FXf93biKSx64XegNUVCKxzkQZW/fnzDLa63hnYQoI6Dc3aMuxNdDL2vUtf7W/AaMakaFweUfg1Gz9ViQ3wLSrqXbx/+oAWJCWst4vctNoLVWfXXhNNJeo73/hgINWSyugvB7McYCphCUBjHl8NmLdB1VjA/aOPDAheLsY7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=baylibre.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f0si0XF/0Y7YucdFXCNg3Xr799yC2PhchuwuP9wxUP8=; b=psrVNNaZKn7n+mWXdbo1J74c+yq665drNXIHVk7WUec9IKkLnOem9UUIerSY5+vN1hM8YF4dySbtnff+nZ7iGP3q+MLej6J4lx/r7PMSqGSQCxHsIaRJPFhFI9gmqW525SRxnZ2sEN0gQdoB5H3v+LZdmJXtyCidjBkNtg7bFDo= Received: from DS7PR03CA0191.namprd03.prod.outlook.com (2603:10b6:5:3b6::16) by BY5PR12MB4035.namprd12.prod.outlook.com (2603:10b6:a03:206::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.29; Thu, 9 Nov 2023 12:07:11 +0000 Received: from DS1PEPF00017096.namprd05.prod.outlook.com (2603:10b6:5:3b6:cafe::a4) by DS7PR03CA0191.outlook.office365.com (2603:10b6:5:3b6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.19 via Frontend Transport; Thu, 9 Nov 2023 12:07:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF00017096.mail.protection.outlook.com (10.167.18.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6977.16 via Frontend Transport; Thu, 9 Nov 2023 12:07:11 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Thu, 9 Nov 2023 06:07:08 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Thu, 9 Nov 2023 06:07:07 -0600 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.32 via Frontend Transport; Thu, 9 Nov 2023 06:07:07 -0600 From: Jay Buddhabhatti To: , , , , CC: , , , Jay Buddhabhatti Subject: [PATCH RESEND v2 1/2] drivers: clk: zynqmp: calculate closest mux rate Date: Thu, 9 Nov 2023 04:05:55 -0800 Message-ID: <20231109120556.29348-2-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231109120556.29348-1-jay.buddhabhatti@amd.com> References: <20231109120556.29348-1-jay.buddhabhatti@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017096:EE_|BY5PR12MB4035:EE_ X-MS-Office365-Filtering-Correlation-Id: 7461615a-baa5-4fba-5095-08dbe11c67a4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dTkoG8BGzWeEilOOXj9BIouGV3/ZRmJYJXsdqP7vJWzKPkF+ugfI9Igz1W09CpqaOQwkXSAjEZC4WtmPcAynQnq2EYmgkzQoJQ+lQfZoSFDlfodj9E+5UAAeLEpfiP3eSo8X5x+vYUhDYwsRPFvXqDoya1qMCcBi/SQmj1pjn3zCU3jRRupz4yBg8GvJM8JzZEgbjqEv/wtYXsVEmDJvdz0brlekYKsfFteOGWuSywPr4HwGcS/tfvM3U3/GlDFQAlR97jNW+fSPsqtZWPAImd7pg+sv5fkgH1C1+ejp/dBuCExDAUW15AQO5lP23UTsCVl3DrTxVwMMHbMfEHz34c/jyxAE4I6KjLuDiXnAMCHDPdftqD89XDr9sbUqMY+hnk6UAfaVhwAZIWIv4uiUQddIwBtHiNbMf1LQzjg12sy7N1LamjWhS1HyRNUqWaH9lqpyePHgz/HdtL2lZPpwy+/HlMzKkPoci9rvbEOp/Aoxo7MCmuqeBB0oqBxK3BaA3vDJupWsf+2dmUOTSjlgPvgodP/0Uv8HjUrEtk3VtJj7zj4cbu1nRmA6jt0zEHtpdbt9qttR2PWIEbO8QSYDvM43qvwHRoTvIfBe3f357Z0mC70KEjpHkmRZKY/Oi89ugnNtHEQI7ELhJiCuRsyhZiX947oPRkdrSrVs3hPPxWlHUzdScvue203g9hZNFTqhA8DqteeYYTEcdNv98C+YXISV+YjPgZrc5fWuz3O0pUjOXdw5VIxVQYI4AedgqPGih+let8eVhkZPi89rxwKZNQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(396003)(136003)(346002)(39860400002)(376002)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(82310400011)(36840700001)(40470700004)(46966006)(40460700003)(36756003)(40480700001)(6666004)(41300700001)(5660300002)(44832011)(4326008)(8676002)(8936002)(36860700001)(70586007)(2906002)(2616005)(426003)(316002)(54906003)(83380400001)(26005)(70206006)(110136005)(1076003)(478600001)(47076005)(86362001)(336012)(356005)(81166007)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2023 12:07:11.6431 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7461615a-baa5-4fba-5095-08dbe11c67a4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017096.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4035 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231109_040720_915427_502B5456 X-CRM114-Status: GOOD ( 13.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently zynqmp clock driver is not calculating closest mux rate and because of that Linux is not setting proper frequency for CPU and not able to set given frequency for dynamic frequency scaling. E.g., In current logic initial acpu clock parent and frequency as below apll1 0 0 0 2199999978 0 0 50000 Y acpu0_mux 0 0 0 2199999978 0 0 50000 Y acpu0_idiv1 0 0 0 2199999978 0 0 50000 Y acpu0 0 0 0 2199999978 0 0 50000 Y After changing acpu frequency to 549999994 Hz using CPU freq scaling its selecting incorrect parent which is not closest frequency. rpll_to_xpd 0 0 0 1599999984 0 0 50000 Y acpu0_mux 0 0 0 1599999984 0 0 50000 Y acpu0_div1 0 0 0 533333328 0 0 50000 Y acpu0 0 0 0 533333328 0 0 50000 Y Parent should remain same since 549999994 = 2199999978 / 4. So use __clk_mux_determine_rate_closest() generic function to calculate closest rate for mux clock. After this change its selecting correct parent and correct clock rate. apll1 0 0 0 2199999978 0 0 50000 Y acpu0_mux 0 0 0 2199999978 0 0 50000 Y acpu0_div1 0 0 0 549999995 0 0 50000 Y acpu0 0 0 0 549999995 0 0 50000 Y Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver") Signed-off-by: Jay Buddhabhatti --- drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c index 60359333f26d..9b5d3050b742 100644 --- a/drivers/clk/zynqmp/clk-mux-zynqmp.c +++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c @@ -89,7 +89,7 @@ static int zynqmp_clk_mux_set_parent(struct clk_hw *hw, u8 index) static const struct clk_ops zynqmp_clk_mux_ops = { .get_parent = zynqmp_clk_mux_get_parent, .set_parent = zynqmp_clk_mux_set_parent, - .determine_rate = __clk_mux_determine_rate, + .determine_rate = __clk_mux_determine_rate_closest, }; static const struct clk_ops zynqmp_clk_mux_ro_ops = { From patchwork Thu Nov 9 12:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Buddhabhatti, Jay" X-Patchwork-Id: 13451012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 89E41C4332F for ; Thu, 9 Nov 2023 12:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dnlqPqyXCZbp14c24Gnz3LgoOTpxlbijey8KNcRFtfs=; b=gZhaIAAw3HG02B aUj41zwRhaL9fRdQ13c56f2oyFR9BfpblSW91P45LvbcEWqs4Yk26793MaMCsL/STJsasjHup2aqJ SKMxEfehrQW4v1rubOtpC1PLUjLOOJgKHiGcSlBZnqMp3s7MezgCBKKr30r7B1UsxZvSzFQF8YMI9 6q7QCN796uNWdvevv14DRg2pde9maRntWU2I1ZaSIBqQsJxNXfIqdqyMFDr+TSkwOlRVHdLdfoRBZ EDqNwSV+JerxyYsDXnK7wNL4TVOAgmEvfM442gyuR4zU5VtH1vshDmi670rIXT6IIb5X+fZr7nnoZ 5G+9wuXCk2YFGU1BADlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r13og-006HrE-13; Thu, 09 Nov 2023 12:07:22 +0000 Received: from mail-mw2nam04on2061b.outbound.protection.outlook.com ([2a01:111:f400:7e8c::61b] helo=NAM04-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r13oc-006Hpp-2P for linux-arm-kernel@lists.infradead.org; Thu, 09 Nov 2023 12:07:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g4zOFQdK3jeTf4gyxnBrzZEhUrbQL3Omu0tfb2bo8zU5wiukGdx5Ql63m702z7gFa/l1P8+xuZzvyCDWmkG15A3BSF0y0XZT2qHoVzzDI+Y0me0uZfy7dfTUjlrgbhbep0EKraWj0nJ9rGtMhz1v0C30WNJ6YjqJqwpF8d3V5v2rvOfOiZDk/A8KD8LDrCHZNoY4D78617eiOq3qoqbREtiVc/hkqHnpjwAOXxulMznTt0PDj+zTMEsDvmUmkBZzO9Rb/sBLO9gc040PZDLq3ASLfyK4+p++cjC/wINEaPhTe1H7O5/ISgZDWACHwaplafXSNCsFJuB/0Kswti+WbA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zlRqJg2qMSFYAUx4SKubFDFhDCiP2ETTgr8I2+g+9bI=; b=NLJ7+06Vfr1Y0WGbVcCfUTvZnYN2zgDHjqnOU4FJKliAKxaETXc3Eth1B9EduDPjzHwBIx5GVWbVc2MXxakXwSKGkgQmzC/bAsLaKYrGZAt//3RIw8JDH+QIYl7PhpMM63MKMl78Py3NWNaVFkXHeJVKGTGN0m5WKC8Q/5gmW3lShfr1g6J4XP1rYsp3SNzpADQ3hz0YpGmNFyq437FfllJ73ir6ZRfyHL8uKLR2Eo1bldVTWmyPPC1bmoprPPizDyBM1Szw6gMs05+gGazsBsYrL9Dp0a1RdFl3A1uFgaBHYnyjoVqI1pi6CfTY/QsjRoRcyrR/PwEF2ik9CS25Zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=baylibre.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zlRqJg2qMSFYAUx4SKubFDFhDCiP2ETTgr8I2+g+9bI=; b=yHuJv4Y/y0003V+itlbvU8afYHXrjvS2Fj/BEil6T5LuzwD4Y/rE/lWZOrtWJlc6+rX5h5oSuMDq+zlmQkPmVWluQPBPJblNVgsKFpb91iLEyXNtQIV0cvAo3GgueszyFB1mA8P703aDvVCVYUE4agir7kKO7tso/cWZxs99sQ0= Received: from DS7PR03CA0302.namprd03.prod.outlook.com (2603:10b6:8:2b::11) by DM3PR12MB9286.namprd12.prod.outlook.com (2603:10b6:8:1ae::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.19; Thu, 9 Nov 2023 12:07:11 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:8:2b:cafe::4a) by DS7PR03CA0302.outlook.office365.com (2603:10b6:8:2b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.18 via Frontend Transport; Thu, 9 Nov 2023 12:07:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6977.16 via Frontend Transport; Thu, 9 Nov 2023 12:07:10 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Thu, 9 Nov 2023 06:07:09 -0600 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.32 via Frontend Transport; Thu, 9 Nov 2023 06:07:08 -0600 From: Jay Buddhabhatti To: , , , , CC: , , , Jay Buddhabhatti Subject: [PATCH RESEND v2 2/2] drivers: clk: zynqmp: update divider round rate logic Date: Thu, 9 Nov 2023 04:05:56 -0800 Message-ID: <20231109120556.29348-3-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231109120556.29348-1-jay.buddhabhatti@amd.com> References: <20231109120556.29348-1-jay.buddhabhatti@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3F:EE_|DM3PR12MB9286:EE_ X-MS-Office365-Filtering-Correlation-Id: c4ca8644-89fa-4c82-7ac0-08dbe11c672e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gAsjE944wgYw0LT9wLbLX8XoMFjutCYk0HRuFMbsHz+eLKSRMOGFtD6y80xueUkiKn5WZsJlIep8m/8Z5wTrS9u1Sf9U4Gd0P1cRrHP8LiZIegtRlCw423fqFAuKG5i6UBGmfnhcrzI3BXBUuXdNuWLipT99TcJd/gDRZ0ZLpEOXjx3qkPUeXcRZiL4pq4t9LZP4H2PiWGjAbDcLmY1F9QeRKrFO/+gwHRHMnIbzKkNEF65aYA96lfrmwMGaDNF+cjmf4V8mxl0iUpIp/m1jZxt2fjVuSnPyWydilRPFqCUm2NSNk2aHRdDJenzaricOByXo+FyRinhpYclTtjUy/SzZP3ZfNFmNAtGv9r1yytoB5hAvk4swsZvwmWQlcU6BaYC4ATpV6rKW1WTo6+dg3mOC5kHJqW4hYhTcRoOY06LlELsx1qK2/h/YzXMlYmntLotd+iRCOLNEgkIWEE7J/fAMVZEDOYVmQncxr20cpPKjKlrnpYhKpeNjEiGvTeb3ybphoPYjnE/qeQID+XM5HofQmE5X1LaFQ4k0ClAGTnXZlsC2DpXhA0KarQH+KIuLX0VJFlyRjqV51Qk+SE1KoXh5JnBROlkj8M2Xr2kHv2ajE3B0DJOhdhbO/6nIdSjhKAJH8aoRJlGgbzuoa3jqBYm/UUnPR+WCshWYk2gQAcxRSKkpVDA4ESD5YUdQDkT5wc0tiJlUgqJfllAqslUny+wIsWkSdTpntc2mhBl1aG3m0O9F+lGb/j309/H8q6XH1B/D2+Bq3HynFW8qQTrV2g== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(82310400011)(36840700001)(46966006)(40470700004)(8936002)(8676002)(4326008)(41300700001)(5660300002)(82740400003)(44832011)(40460700003)(81166007)(356005)(2906002)(36756003)(86362001)(26005)(6666004)(47076005)(36860700001)(478600001)(1076003)(2616005)(83380400001)(54906003)(426003)(336012)(110136005)(40480700001)(70586007)(70206006)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2023 12:07:10.7459 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c4ca8644-89fa-4c82-7ac0-08dbe11c672e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9286 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231109_040718_796203_332643CD X-CRM114-Status: GOOD ( 12.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently zynqmp divider round rate is considering single parent and calculating rate and parent rate accordingly. But if divider clock flag is set to SET_RATE_PARENT then its not trying to traverse through all parent rate and not selecting best parent rate from that. So use common divider_round_rate() which is traversing through all clock parents and its rate and calculating proper parent rate. Fixes: 3fde0e16d016 ("drivers: clk: Add ZynqMP clock driver") Signed-off-by: Jay Buddhabhatti --- drivers/clk/zynqmp/divider.c | 66 +++--------------------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/drivers/clk/zynqmp/divider.c b/drivers/clk/zynqmp/divider.c index 33a3b2a22659..5a00487ae408 100644 --- a/drivers/clk/zynqmp/divider.c +++ b/drivers/clk/zynqmp/divider.c @@ -110,52 +110,6 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw, return DIV_ROUND_UP_ULL(parent_rate, value); } -static void zynqmp_get_divider2_val(struct clk_hw *hw, - unsigned long rate, - struct zynqmp_clk_divider *divider, - u32 *bestdiv) -{ - int div1; - int div2; - long error = LONG_MAX; - unsigned long div1_prate; - struct clk_hw *div1_parent_hw; - struct zynqmp_clk_divider *pdivider; - struct clk_hw *div2_parent_hw = clk_hw_get_parent(hw); - - if (!div2_parent_hw) - return; - - 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 = ((div1_prate / div1) / div2) - rate; - - if (abs(new_error) < abs(error)) { - *bestdiv = div2; - error = new_error; - } - if (divider->flags & CLK_DIVIDER_POWER_OF_TWO) - div2 = div2 << 1; - else - div2++; - } - if (pdivider->flags & CLK_DIVIDER_POWER_OF_TWO) - div1 = div1 << 1; - else - div1++; - } -} - /** * zynqmp_clk_divider_round_rate() - Round rate of divider clock * @hw: handle between common and hardware-specific interfaces @@ -174,6 +128,7 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw, u32 div_type = divider->div_type; u32 bestdiv; int ret; + u8 width; /* if read only, just return current value */ if (divider->flags & CLK_DIVIDER_READ_ONLY) { @@ -193,23 +148,12 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw, return DIV_ROUND_UP_ULL((u64)*prate, bestdiv); } - bestdiv = zynqmp_divider_get_val(*prate, rate, divider->flags); - - /* - * In case of two divisors, compute best divider values and return - * divider2 value based on compute value. div1 will be automatically - * set to optimum based on required total divider value. - */ - if (div_type == TYPE_DIV2 && - (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) { - zynqmp_get_divider2_val(hw, rate, divider, &bestdiv); - } + width = fls(divider->max_div); - if ((clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) && divider->is_frac) - bestdiv = rate % *prate ? 1 : bestdiv; + rate = divider_round_rate(hw, rate, prate, NULL, width, divider->flags); - bestdiv = min_t(u32, bestdiv, divider->max_div); - *prate = rate * bestdiv; + if (divider->is_frac && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) && (rate % *prate)) + *prate = rate; return rate; }