From patchwork Sat May 21 00:53:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 12857646 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 529CEC433EF for ; Sat, 21 May 2022 00:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354255AbiEUAxt (ORCPT ); Fri, 20 May 2022 20:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348108AbiEUAxt (ORCPT ); Fri, 20 May 2022 20:53:49 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF49B1AEC4B for ; Fri, 20 May 2022 17:53:47 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id p4so15533860lfg.4 for ; Fri, 20 May 2022 17:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eiE3saeN56PNZ4QQslHGAdxhWgCAIye4cgjJAc2aLT4=; b=THB0qo38VsHybEhBI9MFGMAJMWh+5uBh+zwOEZjlZd5gVdwxKfmSr4mKBVpHS7UGiK OCVPySTS/pA1pdesFGlWrKHiy/uIgSowYGGhHCEKf1spsun6s1E/y7xa5pKV9eAoXmd5 G8of9LVrhc9PJyATghrOagRFLDEazibCdD83J9t5ZS7Z9/NYMfjdz9VtpJKHGTLgi+lO oeCTfW3x2zgFnIwVEpZwNUXzX+nOL8VZqx1cnyfXTIYJymnQtg56AUVIVFNI8+BbLcCc GI34tmakNGCEB5K80nu2njyICs5Ps7SvRwqmIkiTCL/1iaKhN4AMuKBa7yt3rXrya6Zt h5UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eiE3saeN56PNZ4QQslHGAdxhWgCAIye4cgjJAc2aLT4=; b=7dLq6EqkI4Yxa5JPzmKfm5A2FI1a9bjegbPgoGorxqIM+fPilTpO5yN5K52yRGsUQN MVsYC2ovP61LPKSBKfgmIOc29vtBS4gax1WLV1wC8h135n9emcVZibKmgzDChQlTmrD5 GGxhSwrO8UTV+gZU0TzM9tKOI7Gx8kXzzc8q5fDmOdqUxWQP0NAEy7lg9ZuK6Hj+fWLE yNQc1pMgWQDoGKC+l3bBvugjP7lx0alOM1hRoYIiXh9XnUpoGmdcvhkqOeDqXg5UGAii NQmtZTNJFYLorxiQO1sOzwV1+71PoOGlawmYkHIvRJSbPYaWw9w5PO/0wnL6M4q6kpKf HO6w== X-Gm-Message-State: AOAM532+E+EMHr2D9Yd372b/TB3GrhoPDK2d2t3t4BLV2ZJJeitkhloZ 5J61dTp5pxFxCASW4MfArkv4sA== X-Google-Smtp-Source: ABdhPJyplEAAeQMRTXLKq67dSETvc5izogTOWci3idP9MNoEwPSR4lU62Ruf6ElFkJIJEangXItvsw== X-Received: by 2002:a19:c20b:0:b0:477:bec9:4f99 with SMTP id l11-20020a19c20b000000b00477bec94f99mr8750897lfc.274.1653094426188; Fri, 20 May 2022 17:53:46 -0700 (PDT) Received: from eriador.lan ([2001:470:dd84:abc0::8a5]) by smtp.gmail.com with ESMTPSA id u14-20020a056512094e00b0047255d21187sm844559lft.182.2022.05.20.17.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 May 2022 17:53:45 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Stephen Boyd , Michael Turquette , Taniya Das , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas Cc: Johan Hovold , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v7 0/8] PCI: qcom: Rework pipe_clk/pipe_clk_src handling Date: Sat, 21 May 2022 03:53:35 +0300 Message-Id: <20220521005343.1429642-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org PCIe pipe clk (and some other clocks) must be parked to the "safe" source (bi_tcxo) when corresponding GDSC is turned off and on again. Currently this is handcoded in the PCIe driver by reparenting the gcc_pipe_N_clk_src clock. Instead of doing it manually, follow the approach used by clk_rcg2_shared_ops and implement this parking in the enable() and disable() clock operations for respective pipe clocks. Changes since v7: - Brought back the struct clk_regmap_phy_mux (Johan) - Fixed includes (Stephen) Changes since v6: - Switched the ops to use GENMASK/FIELD_GET/FIELD_PUT (Stephen), - As all pipe/symbol clock source clocks have the same register (and parents) layout, hardcode all the values. If the need arises, this can be changed later (Stephen), - Fixed commit messages and comments (suggested by Johan), - Added revert for the clk_regmap_mux_safe that have been already picked up by Bjorn. Changes since v5: - Rename the clock to clk-regmap-phy-mux and the enable/disable values to phy_src_val and ref_src_val respectively (as recommended by Johan). Changes since v4: - Renamed the clock to clk-regmap-pipe-src, - Added mention of PCIe2 PHY to the commit message, - Expanded commit messages to mention additional pipe clock details. Changes since v3: - Replaced the clock multiplexer implementation with branch-like clock. Changes since v2: - Added is_enabled() callback - Added default parent to the pipe clock configuration Changes since v1: - Rebased on top of [1]. - Removed erroneous Fixes tag from the patch 4. Changes since RFC: - Rework clk-regmap-mux fields. Specify safe parent as P_* value rather than specifying the register value directly - Expand commit message to the first patch to specially mention that it is required only on newer generations of Qualcomm chipsets. Dmitry Baryshkov (6): PCI: qcom: Remove unnecessary pipe_clk handling clk: qcom: regmap: add PHY clock source implementation clk: qcom: gcc-sm8450: use new clk_regmap_phy_mux_ops for PCIe pipe clocks clk: qcom: gcc-sc7280: use new clk_regmap_phy_mux_ops for PCIe pipe clocks Revert "clk: qcom: regmap-mux: add pipe clk implementation" PCI: qcom: Drop manual pipe_clk_src handling Dmitry Baryshkov (8): Revert "clk: qcom: gcc-sm8450: use new clk_regmap_mux_safe_ops for PCIe pipe clocks" Revert "clk: qcom: gcc-sc7280: use new clk_regmap_mux_safe_ops for PCIe pipe clocks" Revert "clk: qcom: regmap-mux: add pipe clk implementation" clk: qcom: regmap: add PHY clock source implementation clk: qcom: gcc-sm8450: use new clk_regmap_phy_mux_ops for PCIe pipe clocks clk: qcom: gcc-sc7280: use new clk_regmap_phy_mux_ops for PCIe pipe clocks PCI: qcom: Remove unnecessary pipe_clk handling PCI: qcom: Drop manual pipe_clk_src handling drivers/clk/qcom/Makefile | 1 + drivers/clk/qcom/clk-regmap-mux.c | 78 ------------------------- drivers/clk/qcom/clk-regmap-mux.h | 3 - drivers/clk/qcom/clk-regmap-phy-mux.c | 62 ++++++++++++++++++++ drivers/clk/qcom/clk-regmap-phy-mux.h | 33 +++++++++++ drivers/clk/qcom/gcc-sc7280.c | 49 +++++----------- drivers/clk/qcom/gcc-sm8450.c | 51 +++++----------- drivers/pci/controller/dwc/pcie-qcom.c | 81 +------------------------- 8 files changed, 125 insertions(+), 233 deletions(-) create mode 100644 drivers/clk/qcom/clk-regmap-phy-mux.c create mode 100644 drivers/clk/qcom/clk-regmap-phy-mux.h Reviewed-by: Johan Hovold Tested-by: Reviewed-by: Johan Hovold