From patchwork Wed Nov 29 11:29:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Buddhabhatti, Jay" X-Patchwork-Id: 13472696 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 47F77C4167B for ; Wed, 29 Nov 2023 11:30:23 +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=lRxvLFvqSN+oX8 hycpxw2HqOAeA70aofogRrVnVUgRrRYPMABHoYhv5Y0gSIt7rc7MIoivgJVyfD0JEmOwN7r1pDtcs P6k/2m9ZdE3zp+lWn9rf89SUX5Dw+7tTKUJ4lXbTNX7JY/g9V1B9QQnW1djtNinhXfCeEPeq48KSn f3rVnic79ljmSs5Wq8N3mn4I6zjV8DBYnzBBoYDtOwJ8X9DJMlh3uauHD309xig+EekFkLhQI7Egl l38QsFOdApnLdNbZuNNVL0wfKwWqzcUiVcm7ad9IfycIG/HdgduLGiX97O6CPJi7oeVJki7MZDEe8 pCfgjs04MeQFI4oUzcyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8IlT-0087YD-1u; Wed, 29 Nov 2023 11:29:59 +0000 Received: from mail-bn8nam11on20601.outbound.protection.outlook.com ([2a01:111:f400:7eae::601] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8Il8-0087V5-2u for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:29:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gzz/Q23GlPN1Qk46nyTgRkmgLQevUBkEduJAovBfqUm9UHtyL2XDFngqwNLV6j3eciRh9aCrwVGy9sXTxwgKkEUiZ5/5E4ZcuUeiPwEVmlPZ2INesk1vOzTR9m93qJHohKKPv39jfijS7ScBXgoPz7XeCHIWmv8N5y/BSjPIcLGWmDhaYl0aMwGLLBZW+4jiFlAteiDmpJX+Gp5abVIQN8BibklmKigdWkbpXjgIG6hV7A8hIHvQWwFuss3dwxkAn2pbyVr6XVB9bv5jEtwtYLjS9r2W25lxNPsIuk5L2TA0T0nOlIPSHSXQQUUC0L0MRgFYNG7GVC9FwALikuxc9Q== 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=oNvyxSYhWMMTWUgWnMc3uQCRa+44vva3X3jYoxSUFoPknBykc/DVjpfbtovnF1jaqvakIPOwdjha7oymTRpas4FXqDtxNQ/eMRnZHaM3bij5ttTjnP6WfGQuH0s6XysmbrxBlWxBvmVfpFw3aaRgZ5mBRHYzKTgP+AwRY8rXpvwmWU3+yee0Avq4cpn6OZeaEIIeT/J2ko/q39A3kbHHxcSFZPN/cBNcXemSHE9Nx+NztWWN9wtA1+zXCUj/8OoYbCCAmXKv9CERdL6VvjIq/qFUJJ1OmhOX2rWEPXgIQFiGGqPVvnBpNs2XVtQK/zaKubjXq40oItysOpiygsRQUA== 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=M/qlEzecSe1jV5jQPl5TLsIQMmvJ3hpOI2A41cISufdlwdNDESanNsDu9fJnUTDeP/Bbz2VJESMc/vGUuz28WBVJ3p51J8mmv7NpLrSynyKef6ob2F//QI56x8euWD1dtECxM3Ode5vIFoKIpkn5S1eMiTn5B56uD2j3wP3NmGM= Received: from BL0PR02CA0132.namprd02.prod.outlook.com (2603:10b6:208:35::37) by PH0PR12MB8008.namprd12.prod.outlook.com (2603:10b6:510:26f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Wed, 29 Nov 2023 11:29:35 +0000 Received: from BL02EPF0001A108.namprd05.prod.outlook.com (2603:10b6:208:35:cafe::90) by BL0PR02CA0132.outlook.office365.com (2603:10b6:208:35::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.22 via Frontend Transport; Wed, 29 Nov 2023 11:29:35 +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 BL02EPF0001A108.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 11:29:35 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.34; Wed, 29 Nov 2023 05:29:34 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 29 Nov 2023 03:29:34 -0800 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 05:29:33 -0600 From: Jay Buddhabhatti To: , , , CC: , , , Jay Buddhabhatti Subject: [PATCH RESEND v2 1/2] drivers: clk: zynqmp: calculate closest mux rate Date: Wed, 29 Nov 2023 03:29:15 -0800 Message-ID: <20231129112916.23125-2-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231129112916.23125-1-jay.buddhabhatti@amd.com> References: <20231129112916.23125-1-jay.buddhabhatti@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A108:EE_|PH0PR12MB8008:EE_ X-MS-Office365-Filtering-Correlation-Id: 075c65b6-6cbf-486d-2730-08dbf0ce7702 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SSIGPEHTgTOicO0Nu5z7PiMnieHpy6ngIQfarbpBMqlTAtllLEfyHqUD9NU+Q8l7aTWKVp5YQfzs5OWsOQrLXHh1BGb8rlnARwRlRjjSoeCZDkrRfcFJ7UxBEBSV9kxKy1eDtp8vmlD7zxxDtX+NUuyZ6ink1n/zeOAQsHlR/7BraItwjv39hvAfJhXhSfYYCfuQeluz5ESMlYN6awkNUC0kr7gBZzr0kZWOXbIdAHYahBzqRyC3+MTtApYG51Tml04r9QNPQkBdq+MTEhR/wlrwAnJNNJSsimwI4h/LIaaYirWg4s/LwuMrxhHPacJU9Wjv6Y+rzubB0NCU06+5tNtS23w8UmMb8ktRrzGz64al+PT1pmqVQ/LSkRExnA4hRA+lqntwPpLPajnF39ZVltdhc0kDJ5gayQZqjpgnem5sec9nIVK++g90ufZsa1OtSLLKT1gGZblslnjaq7Yx7E8/WtgMN/Dn6nETF/h7a6z8GG7KCVQxIZu8bQHzES4sFBoeKranD9ca9muCEg89Vgspwh/ANCRXC6gSkgvXVFjrnhNbqVGgxNs3UdhlcxcwnX9u51hJK3nv4Djpj5XrHf+hfXsgU5glCaqUDz8y14XqC5IpUprV3dYSVkKTKys06r8MzhJqHZ+pdBh7w/fYF/FzrpisiJWQ+Dc8N82FNmPz4RCFl/Mly2xSLrqEqTUx+VOxww+AJcibtE63eHJcXjeQvLRrNv2YlYbgZ6y32kTcvnVBPLQXNR2sAe5//JQHo2Y9k3psp7d88nSz1U6/Mw== 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)(376002)(396003)(136003)(39860400002)(346002)(230922051799003)(186009)(64100799003)(451199024)(1800799012)(82310400011)(40470700004)(36840700001)(46966006)(40460700003)(81166007)(356005)(82740400003)(336012)(478600001)(4326008)(8676002)(2616005)(36756003)(8936002)(86362001)(110136005)(316002)(54906003)(70206006)(41300700001)(1076003)(26005)(70586007)(47076005)(426003)(83380400001)(6666004)(36860700001)(44832011)(2906002)(5660300002)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 11:29:35.3147 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 075c65b6-6cbf-486d-2730-08dbf0ce7702 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: BL02EPF0001A108.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8008 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231129_032938_944686_8A1DF216 X-CRM114-Status: GOOD ( 14.25 ) 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 Wed Nov 29 11:29:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Buddhabhatti, Jay" X-Patchwork-Id: 13472697 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 9E813C07E97 for ; Wed, 29 Nov 2023 11:30:23 +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=2Nsvbsm+gHN2um IbbCCUpBm11rcDlwMguvUqFdAERUvSRz3OzVRi6qqUPWuK2U6OnL0AUU003hixGU1B70BZFRm7RdU LBCs44FDZi451RheNq4Lk2KivqGheYIP7dOEAbUwLftxg2nVezshRatGkP3txYhgDaPWeLyHuo7HG yAdV+YwReUcIcTlF7YSxeeMfbFq32TVWZga4IEk02LpdEeKjg7qmiFL0uHpiX8QAC5KSGnAPvbi5N HzglsDH1wqIAZvsXj/4CSI+Rc6N8KfTzTdcEIocMG1HOIKfpU6Qrj0zcZbZfXFQoaEmgCnxowznC1 TVQtQ0eNP5fZTVcLpo+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8IlU-0087YJ-0Q; Wed, 29 Nov 2023 11:30:00 +0000 Received: from mail-co1nam11on20628.outbound.protection.outlook.com ([2a01:111:f400:7eab::628] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8IlB-0087Vi-0m for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:29:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nTrCGRKBSHgk1+XJP2snEUQtsB00Xuc16Nmb3q8nW3yonyKhI8bbLseQhX8abzFW9KgL1jsg3RyP/LbsMtt/x3NDiZsaLbMNaTplped0bKohR6AGQSn0SyMvu4DzvtE+n+4IumZkaGbXKUuEmpFBCfD6q9V1hjuV7vN3SZxESXNBw5d4ToXp+0wBzlKWAH37qxZru0bB9YURY43DeuyFP5aOhzYtCk8FKMe/QFLmp+UseoIW3PY/ij4js9+QLoagajL9ZrDeSwbx72l8qKTwX4lw8hT34V2WLOCToBMJ72NnwOe1+pDD7eLDUI8it2BR9vMWknDd7bj+9gmWkfzrQw== 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=LiMeIydAZWjMOYRQMnRLvB/I2FBIXY/V9PuhIY0IAKeMUnN+hFDCwKhMXxJ2/sghT+V8riofWykHz0scejf3SvOMcG14seQusPe4dfuAktJJr7RcsEu/jNA49C1NhcPCTvpdmmvB7bnUr2b2BD1YMvMjryC0Spaf4wJzz+g42FyQKNRn/p9850lDalpg/Il35OqC8hGuOrY2yRYgrTcKbBTYjMGjseCIcJcyJsXrHWnPP1c241AeTRDqZBcuYZR1rdUq7ptl5P50WpFxygZWdsVu519b6y/M+UBjJ6vymF4EWNGVT9jQ+Rk06unAkE4BxZG07lE48PiW5VUoMeTbog== 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=jgpDcQUeq52oriP3W9SW2Zx1lh8CZZhgXoPmicA1b5ZKmvuuf9h9q5U+a46H6ldTL/z0q6nKsT3sYYl1s9MO3KbaHRQniIebaIYOzwvyc4h66Jgb8RBRNv0YeV2fS/464Z4noTJ06PfI7pRQ9M3nHs9i4DZFT4qnvxXkg5jnqQg= Received: from BLAPR05CA0021.namprd05.prod.outlook.com (2603:10b6:208:36e::17) by MN0PR12MB6127.namprd12.prod.outlook.com (2603:10b6:208:3c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.22; Wed, 29 Nov 2023 11:29:36 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:208:36e:cafe::69) by BLAPR05CA0021.outlook.office365.com (2603:10b6:208:36e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.8 via Frontend Transport; Wed, 29 Nov 2023 11:29:36 +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 BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Wed, 29 Nov 2023 11:29:35 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.34; Wed, 29 Nov 2023 05:29:35 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Wed, 29 Nov 2023 03:29:35 -0800 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Wed, 29 Nov 2023 05:29:34 -0600 From: Jay Buddhabhatti To: , , , CC: , , , Jay Buddhabhatti Subject: [PATCH RESEND v2 2/2] drivers: clk: zynqmp: update divider round rate logic Date: Wed, 29 Nov 2023 03:29:16 -0800 Message-ID: <20231129112916.23125-3-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231129112916.23125-1-jay.buddhabhatti@amd.com> References: <20231129112916.23125-1-jay.buddhabhatti@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FD:EE_|MN0PR12MB6127:EE_ X-MS-Office365-Filtering-Correlation-Id: a921c8ee-9181-4c7f-70bf-08dbf0ce774d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WdGbi4LrfsobwDAL0yOjjRnfnsZBMNVRbWv5BXI2Q7CnZ/8Ua6mky705RfWsgGAVZdzWuhZdNX0B4/oaeWsOTam8B9qLPzsjJQpovxqAm2aU6ckP0N+Z6oRl8+E89LA9Uc0C1rSqY6CsGWcP9tRnjVMwefeSxeLuGJAOcLAyOVKaSEMrANQZyN4UD/pBPlSiktChUir4YqN4PqfjW/0NFXv7GPhMuJFrrfHpFKbDENkoTTr/seSbHIdr0Oq83ZtDWZopEPuZoz3jyjg6AqHO0i/sCAWv6HlyjwcBbaMEpY/KiQfQWB0HI4wSe8SGpMivvIrAk6f0oj7/sEGudOAnQjnhCxUi+OjPYzWwj1jRAyIuXwiRI1ehvIuz5+c3J8WCgxwrLSLKCL6U2zR/Ukc+YZITkss25Pw6XBHEUqv7QL3OCCLo6JBox3xhR6Gl4rsQvr4sApv3/sqUe8aws3osEqWEW1oAsa/VSO6Z+RPYv0KIhfd3n9tf4SgOUOPNxbmmX5rOqXg3NhloRLuxlQJ17Yw5h6bFWkVxiqK/54wegIV7Sa8HmAFW0Q/BSXKgn9U7fAWlFiCJX6erguqyDvMAHn1Lf3Gmn1Ed0XFafqDj8+38X45WydUIVH5OjN46U45m0GmDvra6PaxIlphJ5eU2SroDHsSrHO1zVbiAUstJ5DWQJx+YFmzHAh78ho2d1WL8TUAgMGv3v1JrT9diKfrhjIZXV93dG/ausLKIDDRLSW5EUyHI9CgqgD5/p2TASCsvIkh34E2CIO8d/d2rJ8O5zA== 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)(376002)(346002)(136003)(396003)(39860400002)(230922051799003)(82310400011)(186009)(1800799012)(64100799003)(451199024)(46966006)(40470700004)(36840700001)(47076005)(356005)(41300700001)(44832011)(2616005)(86362001)(1076003)(8676002)(6666004)(8936002)(5660300002)(4326008)(40480700001)(2906002)(26005)(110136005)(81166007)(478600001)(316002)(70206006)(70586007)(40460700003)(426003)(54906003)(336012)(36860700001)(83380400001)(36756003)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2023 11:29:35.8237 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a921c8ee-9181-4c7f-70bf-08dbf0ce774d 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: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6127 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231129_032941_278676_4D839431 X-CRM114-Status: GOOD ( 13.14 ) 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; }