From patchwork Fri Apr 26 06:53:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anson Huang X-Patchwork-Id: 10918405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C78BC14B6 for ; Fri, 26 Apr 2019 06:53:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2C7528B21 for ; Fri, 26 Apr 2019 06:53:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A483628AB0; Fri, 26 Apr 2019 06:53:30 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 326CD28AB0 for ; Fri, 26 Apr 2019 06:53:30 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=/JKAp/bplifUbv2XSjGKaMAXcdHc/eMme2Czm+93S78=; b=aFlvHhrbYhmSoq cXMSfxUaxXi9kMHbxJLakonCFHc7WJjMUvwq6aEKggzxIEB25pNQokMmsA+XxURGwIzYRizqQ6Hec qbHQhBWt+caHHY0BqpXrN6oB65wwup7Jrv/esFDEle/1mqMa9/4KTZLJlzZCan44hdnTUL5WX+ZcY BmH3aQaTl+eypv00kCHmHZeyVwayaN+G0X5lId6RSIPpd7/BUGD4eZcl/ioF4oyRIk5QSsbZ9kTkv j1okLmMt5zfWDCqrk4ZM23LWglhLTqIaK+q4Nqx8axG1PB7R9NOmjt/zDzNMs0g5ffZQCLRd/jl5s LgCzZSjF30N33mJWG4/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJujc-000557-CE; Fri, 26 Apr 2019 06:53:24 +0000 Received: from mail-db5eur03on0623.outbound.protection.outlook.com ([2a01:111:f400:fe0a::623] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJujZ-00052q-3q for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2019 06:53:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+n77c3DJU2ZoX/ufclnCOYwKRdoFJL/XoFWLeD5Udjo=; b=TU+oVrfTQavfYMjAmaIGFM53ZnjIn5qitq8j27S1C5J8+YSDZRjzjrIpRs9JWH0NJ9BEUVbbPoy29tIKebKm6NEJTkk+97dnFfCj+8yW+WfcMmZ89t68QO9bcbg4S4Rm99fmKGqWTME4Cin2KV/pILobnG9yYDD5MfDxmMT8XqA= Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com (52.134.72.18) by DB3PR0402MB3657.eurprd04.prod.outlook.com (52.134.69.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.17; Fri, 26 Apr 2019 06:53:14 +0000 Received: from DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::e8ca:4f6b:e43:c170]) by DB3PR0402MB3916.eurprd04.prod.outlook.com ([fe80::e8ca:4f6b:e43:c170%3]) with mapi id 15.20.1835.010; Fri, 26 Apr 2019 06:53:14 +0000 From: Anson Huang To: "mturquette@baylibre.com" , "sboyd@kernel.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "kernel@pengutronix.de" , "festevam@gmail.com" , Aisheng Dong , "linux-clk@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] clk: imx: correct pfdv2 gate_bit/vld_bit operations Thread-Topic: [PATCH] clk: imx: correct pfdv2 gate_bit/vld_bit operations Thread-Index: AQHU+/y4TYtf1+nKQkWX+VpUdHACww== Date: Fri, 26 Apr 2019 06:53:14 +0000 Message-ID: <1556261303-6360-1-git-send-email-Anson.Huang@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: HK0P153CA0048.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::36) To DB3PR0402MB3916.eurprd04.prod.outlook.com (2603:10a6:8:10::18) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anson.huang@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.66] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e3e5935e-f82b-4bcc-f08c-08d6ca13da86 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4618075)(2017052603328)(7193020); SRVR:DB3PR0402MB3657; x-ms-traffictypediagnostic: DB3PR0402MB3657: x-microsoft-antispam-prvs: x-forefront-prvs: 001968DD50 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(346002)(376002)(396003)(39860400002)(199004)(189003)(486006)(476003)(2616005)(14454004)(50226002)(66066001)(6486002)(6512007)(8936002)(81166006)(81156014)(6436002)(14444005)(256004)(8676002)(25786009)(53936002)(478600001)(2906002)(99286004)(186003)(6506007)(4326008)(386003)(102836004)(3846002)(26005)(5660300002)(52116002)(71200400001)(6116002)(66556008)(66476007)(305945005)(316002)(110136005)(2501003)(68736007)(66946007)(64756008)(66446008)(71190400001)(73956011)(97736004)(2201001)(36756003)(86362001)(7736002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0402MB3657; H:DB3PR0402MB3916.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: WPVUqXUXnhy9Rlnd3F0p/M6MjERjXsVZMQsJ94xcn+m4leJ0hQFW7ftB5XSmYSoJzVS9xRG6TerI2TMkIFZVB3qbOn0akvtUr6PtizZgBCNsXpc1aA1yoqFs/oi9Lk7FuZ10LDnpVhSFY0cWoqNgglwiCSvmFLpZW19hJGDdmAVZvsQTq2oC40UPSEQb1fZbGK2z7TPxAaTaaC5mCe4qorB6pf7ov2xzn4+FN+1RB+wsT9xMsjQrMbqLQ5A3OMWfwwrMCnnYEuJLpkfSE3COx6j3oi907UmTtQ0JveXfb3fxP9+zfrFZXqfxvs91mhDmJQby2tM2ft8fa0xSvTjqWn0u0imu7rq9AT92eVrrk4G84MiXlk4uzJRT1g2shxCgT5eiMO7VvQgg+Pjh4TTYn8j9YbAnaaG7fEpc4SX2b3c= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3e5935e-f82b-4bcc-f08c-08d6ca13da86 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2019 06:53:14.4193 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3657 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190425_235321_166914_F9E260F0 X-CRM114-Status: GOOD ( 14.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dl-linux-imx Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The operations of pfdv2 gate_bit/valid_bit are incorrect, they are defined as u8 for bit offset, but gate_bit is actually assigned as mask which could be 32 bit long and it causes overflow, and vld_bit is assigned as bit offset based on incorrect gate_bit value, it causes incorrect pfd clock gate status in clock tree, this patch fixes the issue by assigning them as correct bit offset. Fixes: 9fcb6be3b6c9 ("clk: imx: add pfdv2 support") Signed-off-by: Anson Huang --- drivers/clk/imx/clk-pfdv2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/imx/clk-pfdv2.c b/drivers/clk/imx/clk-pfdv2.c index 7e9134b..fb567dc 100644 --- a/drivers/clk/imx/clk-pfdv2.c +++ b/drivers/clk/imx/clk-pfdv2.c @@ -43,7 +43,7 @@ static int clk_pfdv2_wait(struct clk_pfdv2 *pfd) { u32 val; - return readl_poll_timeout(pfd->reg, val, val & pfd->vld_bit, + return readl_poll_timeout(pfd->reg, val, val & (1 << pfd->vld_bit), 0, LOCK_TIMEOUT_US); } @@ -55,7 +55,7 @@ static int clk_pfdv2_enable(struct clk_hw *hw) spin_lock_irqsave(&pfd_lock, flags); val = readl_relaxed(pfd->reg); - val &= ~pfd->gate_bit; + val &= ~(1 << pfd->gate_bit); writel_relaxed(val, pfd->reg); spin_unlock_irqrestore(&pfd_lock, flags); @@ -70,7 +70,7 @@ static void clk_pfdv2_disable(struct clk_hw *hw) spin_lock_irqsave(&pfd_lock, flags); val = readl_relaxed(pfd->reg); - val |= pfd->gate_bit; + val |= (1 << pfd->gate_bit); writel_relaxed(val, pfd->reg); spin_unlock_irqrestore(&pfd_lock, flags); } @@ -123,7 +123,7 @@ static int clk_pfdv2_is_enabled(struct clk_hw *hw) { struct clk_pfdv2 *pfd = to_clk_pfdv2(hw); - if (readl_relaxed(pfd->reg) & pfd->gate_bit) + if (readl_relaxed(pfd->reg) & (1 << pfd->gate_bit)) return 0; return 1; @@ -180,7 +180,7 @@ struct clk_hw *imx_clk_pfdv2(const char *name, const char *parent_name, return ERR_PTR(-ENOMEM); pfd->reg = reg; - pfd->gate_bit = 1 << ((idx + 1) * 8 - 1); + pfd->gate_bit = (idx + 1) * 8 - 1; pfd->vld_bit = pfd->gate_bit - 1; pfd->frac_off = idx * 8;