* [PATCH v11 1/5] dt-bindings: pci: qcom: Document PCIe bindings for SC7280
2021-10-05 18:42 [PATCH v11 0/5] Add DT bindings and DT nodes for PCIe and PHY in SC7280 Prasad Malisetty
@ 2021-10-05 18:42 ` Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 2/5] arm64: dts: qcom: sc7280: Add PCIe and PHY related nodes Prasad Malisetty
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-05 18:42 UTC (permalink / raw)
To: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci,
Prasad Malisetty
Document the PCIe DT bindings for SC7280 SoC.The PCIe IP is similar
to the one used on SM8250. Add the compatible for SC7280.
Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
---
Documentation/devicetree/bindings/pci/qcom,pcie.txt | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
index 3f64687..ff423cd 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
@@ -12,6 +12,7 @@
- "qcom,pcie-ipq4019" for ipq4019
- "qcom,pcie-ipq8074" for ipq8074
- "qcom,pcie-qcs404" for qcs404
+ - "qcom,pcie-sc7280" for sc7280
- "qcom,pcie-sdm845" for sdm845
- "qcom,pcie-sm8250" for sm8250
- "qcom,pcie-ipq6018" for ipq6018
@@ -144,6 +145,22 @@
- "slave_bus" AXI Slave clock
- clock-names:
+ Usage: required for sc7280
+ Value type: <stringlist>
+ Definition: Should contain the following entries
+ - "aux" Auxiliary clock
+ - "cfg" Configuration clock
+ - "bus_master" Master AXI clock
+ - "bus_slave" Slave AXI clock
+ - "slave_q2a" Slave Q2A clock
+ - "tbu" PCIe TBU clock
+ - "ddrss_sf_tbu" PCIe SF TBU clock
+ - "pipe" PIPE clock
+ - "pipe_mux" PIPE MUX
+ - "phy_pipe" PIPE output clock
+ - "ref" REFERENCE clock
+
+- clock-names:
Usage: required for sdm845
Value type: <stringlist>
Definition: Should contain the following entries
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v11 2/5] arm64: dts: qcom: sc7280: Add PCIe and PHY related nodes
2021-10-05 18:42 [PATCH v11 0/5] Add DT bindings and DT nodes for PCIe and PHY in SC7280 Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 1/5] dt-bindings: pci: qcom: Document PCIe bindings for SC7280 Prasad Malisetty
@ 2021-10-05 18:42 ` Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add PCIe nodes for IDP board Prasad Malisetty
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-05 18:42 UTC (permalink / raw)
To: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci,
Prasad Malisetty
Add PCIe controller and PHY nodes for sc7280 SOC.
Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
---
arch/arm64/boot/dts/qcom/sc7280.dtsi | 117 +++++++++++++++++++++++++++++++++++
1 file changed, 117 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 39635da..72c06c1 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -1563,6 +1563,117 @@
qcom,bcm-voters = <&apps_bcm_voter>;
};
+ pcie1: pci@1c08000 {
+ compatible = "qcom,pcie-sc7280";
+ reg = <0 0x01c08000 0 0x3000>,
+ <0 0x40000000 0 0xf1d>,
+ <0 0x40000f20 0 0xa8>,
+ <0 0x40001000 0 0x1000>,
+ <0 0x40100000 0 0x100000>;
+
+ reg-names = "parf", "dbi", "elbi", "atu", "config";
+ device_type = "pci";
+ linux,pci-domain = <1>;
+ bus-range = <0x00 0xff>;
+ num-lanes = <2>;
+
+ #address-cells = <3>;
+ #size-cells = <2>;
+
+ ranges = <0x01000000 0x0 0x40200000 0x0 0x40200000 0x0 0x100000>,
+ <0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
+
+ interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "msi";
+ #interrupt-cells = <1>;
+ interrupt-map-mask = <0 0 0 0x7>;
+ interrupt-map = <0 0 0 1 &intc 0 434 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 2 &intc 0 435 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 3 &intc 0 438 IRQ_TYPE_LEVEL_HIGH>,
+ <0 0 0 4 &intc 0 439 IRQ_TYPE_LEVEL_HIGH>;
+
+ clocks = <&gcc GCC_PCIE_1_PIPE_CLK>,
+ <&gcc GCC_PCIE_1_PIPE_CLK_SRC>,
+ <&pcie1_lane 0>,
+ <&rpmhcc RPMH_CXO_CLK>,
+ <&gcc GCC_PCIE_1_AUX_CLK>,
+ <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
+ <&gcc GCC_PCIE_1_MSTR_AXI_CLK>,
+ <&gcc GCC_PCIE_1_SLV_AXI_CLK>,
+ <&gcc GCC_PCIE_1_SLV_Q2A_AXI_CLK>,
+ <&gcc GCC_AGGRE_NOC_PCIE_TBU_CLK>,
+ <&gcc GCC_DDRSS_PCIE_SF_CLK>;
+
+ clock-names = "pipe",
+ "pipe_mux",
+ "phy_pipe",
+ "ref",
+ "aux",
+ "cfg",
+ "bus_master",
+ "bus_slave",
+ "slave_q2a",
+ "tbu",
+ "ddrss_sf_tbu";
+
+ assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>;
+ assigned-clock-rates = <19200000>;
+
+ resets = <&gcc GCC_PCIE_1_BCR>;
+ reset-names = "pci";
+
+ power-domains = <&gcc GCC_PCIE_1_GDSC>;
+
+ phys = <&pcie1_lane>;
+ phy-names = "pciephy";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie1_clkreq_n>;
+
+ iommus = <&apps_smmu 0x1c80 0x1>;
+
+ iommu-map = <0x0 &apps_smmu 0x1c80 0x1>,
+ <0x100 &apps_smmu 0x1c81 0x1>;
+
+ status = "disabled";
+ };
+
+ pcie1_phy: phy@1c0e000 {
+ compatible = "qcom,sm8250-qmp-gen3x2-pcie-phy";
+ reg = <0 0x01c0e000 0 0x1c0>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+ clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
+ <&gcc GCC_PCIE_1_CFG_AHB_CLK>,
+ <&gcc GCC_PCIE_CLKREF_EN>,
+ <&gcc GCC_PCIE1_PHY_RCHNG_CLK>;
+ clock-names = "aux", "cfg_ahb", "ref", "refgen";
+
+ resets = <&gcc GCC_PCIE_1_PHY_BCR>;
+ reset-names = "phy";
+
+ assigned-clocks = <&gcc GCC_PCIE1_PHY_RCHNG_CLK>;
+ assigned-clock-rates = <100000000>;
+
+ status = "disabled";
+
+ pcie1_lane: lanes@1c0e200 {
+ reg = <0 0x01c0e200 0 0x170>,
+ <0 0x01c0e400 0 0x200>,
+ <0 0x01c0ea00 0 0x1f0>,
+ <0 0x01c0e600 0 0x170>,
+ <0 0x01c0e800 0 0x200>,
+ <0 0x01c0ee00 0 0xf4>;
+ clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
+ clock-names = "pipe0";
+
+ #phy-cells = <0>;
+ #clock-cells = <1>;
+ clock-output-names = "pcie_1_pipe_clk";
+ };
+ };
+
ipa: ipa@1e40000 {
compatible = "qcom,sc7280-ipa";
@@ -2676,6 +2787,12 @@
gpio-ranges = <&tlmm 0 0 175>;
wakeup-parent = <&pdc>;
+ pcie1_clkreq_n: pcie1-clkreq-n {
+ pins = "gpio79";
+ function = "pcie1_clkreqn";
+ bias-pull-up;
+ };
+
qspi_clk: qspi-clk {
pins = "gpio14";
function = "qspi_clk";
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add PCIe nodes for IDP board
2021-10-05 18:42 [PATCH v11 0/5] Add DT bindings and DT nodes for PCIe and PHY in SC7280 Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 1/5] dt-bindings: pci: qcom: Document PCIe bindings for SC7280 Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 2/5] arm64: dts: qcom: sc7280: Add PCIe and PHY related nodes Prasad Malisetty
@ 2021-10-05 18:42 ` Prasad Malisetty
2021-10-05 18:50 ` Stephen Boyd
2021-10-05 18:42 ` [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops Prasad Malisetty
2021-10-05 18:42 ` [PATCH v11 5/5] PCI: qcom: Switch pcie_1_pipe_clk_src after PHY init in SC7280 Prasad Malisetty
4 siblings, 1 reply; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-05 18:42 UTC (permalink / raw)
To: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci,
Prasad Malisetty
Enable PCIe controller and PHY for sc7280 IDP board.
Add specific NVMe GPIO entries for SKU1 and SKU2 support.
Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
---
arch/arm64/boot/dts/qcom/sc7280-idp.dts | 8 +++++
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 50 ++++++++++++++++++++++++++++++++
arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 8 +++++
3 files changed, 66 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 64fc22a..e6b9f57 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -61,6 +61,14 @@
modem-init;
};
+&nvme_pwren {
+ pins = "gpio19";
+};
+
+&nvme_3v3_regulator {
+ gpio = <&tlmm 19 GPIO_ACTIVE_HIGH>;
+};
+
&pmk8350_vadc {
pmr735a_die_temp {
reg = <PMR735A_ADC7_DIE_TEMP>;
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 272d5ca..d623d71 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -31,6 +31,18 @@
linux,can-disable;
};
};
+
+ nvme_3v3_regulator: nvme-3v3-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "VLDO_3V3";
+
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ enable-active-high;
+ pinctrl-names = "default";
+ pinctrl-0 = <&nvme_pwren>;
+ };
};
/*
@@ -272,6 +284,23 @@
modem-init;
};
+&pcie1 {
+ status = "okay";
+ perst-gpio = <&tlmm 2 GPIO_ACTIVE_LOW>;
+
+ vddpe-3v3-supply = <&nvme_3v3_regulator>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie1_reset_n>, <&pcie1_wake_n>;
+};
+
+&pcie1_phy {
+ status = "okay";
+
+ vdda-phy-supply = <&vreg_l10c_0p8>;
+ vdda-pll-supply = <&vreg_l6b_1p2>;
+};
+
&pmk8350_vadc {
pmk8350_die_temp {
reg = <PMK8350_ADC7_DIE_TEMP>;
@@ -462,6 +491,27 @@
};
&tlmm {
+ nvme_pwren: nvme-pwren {
+ function = "gpio";
+ };
+
+ pcie1_reset_n: pcie1-reset-n {
+ pins = "gpio2";
+ function = "gpio";
+
+ drive-strength = <16>;
+ output-low;
+ bias-disable;
+ };
+
+ pcie1_wake_n: pcie1-wake-n {
+ pins = "gpio3";
+ function = "gpio";
+
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+
qup_uart7_sleep_cts: qup-uart7-sleep-cts {
pins = "gpio28";
function = "gpio";
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
index 1fc2add..3ae9969 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts
@@ -21,3 +21,11 @@
stdout-path = "serial0:115200n8";
};
};
+
+&nvme_pwren {
+ pins = "gpio51";
+};
+
+&nvme_3v3_regulator {
+ gpio = <&tlmm 51 GPIO_ACTIVE_HIGH>;
+};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add PCIe nodes for IDP board
2021-10-05 18:42 ` [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add PCIe nodes for IDP board Prasad Malisetty
@ 2021-10-05 18:50 ` Stephen Boyd
0 siblings, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2021-10-05 18:50 UTC (permalink / raw)
To: Prasad Malisetty, agross, bhelgaas, bjorn.andersson,
lorenzo.pieralisi, robh+dt, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci
Quoting Prasad Malisetty (2021-10-05 11:42:37)
> Enable PCIe controller and PHY for sc7280 IDP board.
> Add specific NVMe GPIO entries for SKU1 and SKU2 support.
>
> Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops
2021-10-05 18:42 [PATCH v11 0/5] Add DT bindings and DT nodes for PCIe and PHY in SC7280 Prasad Malisetty
` (2 preceding siblings ...)
2021-10-05 18:42 ` [PATCH v11 3/5] arm64: dts: qcom: sc7280: Add PCIe nodes for IDP board Prasad Malisetty
@ 2021-10-05 18:42 ` Prasad Malisetty
2021-10-05 18:51 ` Stephen Boyd
2021-10-05 19:21 ` Bjorn Helgaas
2021-10-05 18:42 ` [PATCH v11 5/5] PCI: qcom: Switch pcie_1_pipe_clk_src after PHY init in SC7280 Prasad Malisetty
4 siblings, 2 replies; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-05 18:42 UTC (permalink / raw)
To: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci,
Prasad Malisetty
Add pipe_clk_need_muxing flag in match data and configure
If the platform needs to switch pipe_clk_src.
Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
---
drivers/pci/controller/dwc/pcie-qcom.c | 70 ++++++++++++++++++++++++++++------
1 file changed, 59 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 8a7a300..1d7a9cb 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -189,6 +189,11 @@ struct qcom_pcie_ops {
int (*config_sid)(struct qcom_pcie *pcie);
};
+struct qcom_pcie_cfg {
+ const struct qcom_pcie_ops *ops;
+ unsigned int pipe_clk_need_muxing:1;
+};
+
struct qcom_pcie {
struct dw_pcie *pci;
void __iomem *parf; /* DT parf */
@@ -197,6 +202,7 @@ struct qcom_pcie {
struct phy *phy;
struct gpio_desc *reset;
const struct qcom_pcie_ops *ops;
+ unsigned int pipe_clk_need_muxing:1;
};
#define to_qcom_pcie(x) dev_get_drvdata((x)->dev)
@@ -1456,6 +1462,39 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
.config_sid = qcom_pcie_config_sid_sm8250,
};
+static const struct qcom_pcie_cfg apq8084_cfg = {
+ .ops = &ops_1_0_0,
+};
+
+static const struct qcom_pcie_cfg ipq8064_cfg = {
+ .ops = &ops_2_1_0,
+};
+
+static const struct qcom_pcie_cfg msm8996_cfg = {
+ .ops = &ops_2_3_2,
+};
+
+static const struct qcom_pcie_cfg ipq8074_cfg = {
+ .ops = &ops_2_3_3,
+};
+
+static const struct qcom_pcie_cfg ipq4019_cfg = {
+ .ops = &ops_2_4_0,
+};
+
+static const struct qcom_pcie_cfg sdm845_cfg = {
+ .ops = &ops_2_7_0,
+};
+
+static const struct qcom_pcie_cfg sm8250_cfg = {
+ .ops = &ops_1_9_0,
+};
+
+static const struct qcom_pcie_cfg sc7280_cfg = {
+ .ops = &ops_1_9_0,
+ .pipe_clk_need_muxing = true,
+};
+
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = qcom_pcie_link_up,
.start_link = qcom_pcie_start_link,
@@ -1467,6 +1506,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
struct pcie_port *pp;
struct dw_pcie *pci;
struct qcom_pcie *pcie;
+ const struct qcom_pcie_cfg *pcie_cfg;
int ret;
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
@@ -1488,7 +1528,14 @@ static int qcom_pcie_probe(struct platform_device *pdev)
pcie->pci = pci;
- pcie->ops = of_device_get_match_data(dev);
+ pcie_cfg = of_device_get_match_data(dev);
+ if (!pcie_cfg || !pcie_cfg->ops) {
+ dev_err(dev, "Invalid platform data\n");
+ return NULL;
+ }
+
+ pcie->ops = pcie_cfg->ops;
+ pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
if (IS_ERR(pcie->reset)) {
@@ -1545,16 +1592,17 @@ static int qcom_pcie_probe(struct platform_device *pdev)
}
static const struct of_device_id qcom_pcie_match[] = {
- { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 },
- { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 },
- { .compatible = "qcom,pcie-ipq8064-v2", .data = &ops_2_1_0 },
- { .compatible = "qcom,pcie-apq8064", .data = &ops_2_1_0 },
- { .compatible = "qcom,pcie-msm8996", .data = &ops_2_3_2 },
- { .compatible = "qcom,pcie-ipq8074", .data = &ops_2_3_3 },
- { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 },
- { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
- { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
- { .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
+ { .compatible = "qcom,pcie-apq8084", .data = &apq8084_cfg },
+ { .compatible = "qcom,pcie-ipq8064", .data = &ipq8064_cfg },
+ { .compatible = "qcom,pcie-ipq8064-v2", .data = &ipq8064_cfg },
+ { .compatible = "qcom,pcie-apq8064", .data = &ipq8064_cfg },
+ { .compatible = "qcom,pcie-msm8996", .data = &msm8996_cfg },
+ { .compatible = "qcom,pcie-ipq8074", .data = &ipq8074_cfg },
+ { .compatible = "qcom,pcie-ipq4019", .data = &ipq4019_cfg },
+ { .compatible = "qcom,pcie-qcs404", .data = &ipq4019_cfg },
+ { .compatible = "qcom,pcie-sdm845", .data = &sdm845_cfg },
+ { .compatible = "qcom,pcie-sm8250", .data = &sm8250_cfg },
+ { .compatible = "qcom,pcie-sc7280", .data = &sc7280_cfg },
{ }
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops
2021-10-05 18:42 ` [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops Prasad Malisetty
@ 2021-10-05 18:51 ` Stephen Boyd
2021-10-05 19:21 ` Bjorn Helgaas
1 sibling, 0 replies; 10+ messages in thread
From: Stephen Boyd @ 2021-10-05 18:51 UTC (permalink / raw)
To: Prasad Malisetty, agross, bhelgaas, bjorn.andersson,
lorenzo.pieralisi, robh+dt, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci
Quoting Prasad Malisetty (2021-10-05 11:42:38)
> Add pipe_clk_need_muxing flag in match data and configure
> If the platform needs to switch pipe_clk_src.
>
> Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
> ---
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops
2021-10-05 18:42 ` [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops Prasad Malisetty
2021-10-05 18:51 ` Stephen Boyd
@ 2021-10-05 19:21 ` Bjorn Helgaas
2021-10-07 17:25 ` Prasad Malisetty
1 sibling, 1 reply; 10+ messages in thread
From: Bjorn Helgaas @ 2021-10-05 19:21 UTC (permalink / raw)
To: Prasad Malisetty
Cc: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov, devicetree, linux-arm-msm,
linux-usb, linux-kernel, dianders, mka, vbadigan, sallenki,
manivannan.sadhasivam, linux-pci
On Wed, Oct 06, 2021 at 12:12:38AM +0530, Prasad Malisetty wrote:
> Add pipe_clk_need_muxing flag in match data and configure
> If the platform needs to switch pipe_clk_src.
>
> Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
> ---
> drivers/pci/controller/dwc/pcie-qcom.c | 70 ++++++++++++++++++++++++++++------
> 1 file changed, 59 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
> index 8a7a300..1d7a9cb 100644
> --- a/drivers/pci/controller/dwc/pcie-qcom.c
> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
> @@ -189,6 +189,11 @@ struct qcom_pcie_ops {
> int (*config_sid)(struct qcom_pcie *pcie);
> };
>
> +struct qcom_pcie_cfg {
> + const struct qcom_pcie_ops *ops;
> + unsigned int pipe_clk_need_muxing:1;
> +};
Thanks for splitting this up; it's 90% of the way there.
It would be better if this patch added only the definition and use of
qcom_pcie_cfg:
+struct qcom_pcie_cfg {
+ const struct qcom_pcie_ops *ops;
+};
and then the subsequent patch added the clock muxing stuff:
struct qcom_pcie_cfg {
+ unsigned int pipe_clk_need_muxing:1;
struct qcom_pcie {
+ unsigned int pipe_clk_need_muxing:1;
static const struct qcom_pcie_cfg sc7280_cfg = {
+ .pipe_clk_need_muxing = true,
static int qcom_pcie_probe(struct platform_device *pdev)
+ pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
That way everything related to pipe_clk_need_muxing would be in a
single patch.
> struct qcom_pcie {
> struct dw_pcie *pci;
> void __iomem *parf; /* DT parf */
> @@ -197,6 +202,7 @@ struct qcom_pcie {
> struct phy *phy;
> struct gpio_desc *reset;
> const struct qcom_pcie_ops *ops;
> + unsigned int pipe_clk_need_muxing:1;
> };
>
> #define to_qcom_pcie(x) dev_get_drvdata((x)->dev)
> @@ -1456,6 +1462,39 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
> .config_sid = qcom_pcie_config_sid_sm8250,
> };
>
> +static const struct qcom_pcie_cfg apq8084_cfg = {
> + .ops = &ops_1_0_0,
> +};
> +
> +static const struct qcom_pcie_cfg ipq8064_cfg = {
> + .ops = &ops_2_1_0,
> +};
> +
> +static const struct qcom_pcie_cfg msm8996_cfg = {
> + .ops = &ops_2_3_2,
> +};
> +
> +static const struct qcom_pcie_cfg ipq8074_cfg = {
> + .ops = &ops_2_3_3,
> +};
> +
> +static const struct qcom_pcie_cfg ipq4019_cfg = {
> + .ops = &ops_2_4_0,
> +};
> +
> +static const struct qcom_pcie_cfg sdm845_cfg = {
> + .ops = &ops_2_7_0,
> +};
> +
> +static const struct qcom_pcie_cfg sm8250_cfg = {
> + .ops = &ops_1_9_0,
> +};
> +
> +static const struct qcom_pcie_cfg sc7280_cfg = {
> + .ops = &ops_1_9_0,
> + .pipe_clk_need_muxing = true,
> +};
> +
> static const struct dw_pcie_ops dw_pcie_ops = {
> .link_up = qcom_pcie_link_up,
> .start_link = qcom_pcie_start_link,
> @@ -1467,6 +1506,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> struct pcie_port *pp;
> struct dw_pcie *pci;
> struct qcom_pcie *pcie;
> + const struct qcom_pcie_cfg *pcie_cfg;
> int ret;
>
> pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
> @@ -1488,7 +1528,14 @@ static int qcom_pcie_probe(struct platform_device *pdev)
>
> pcie->pci = pci;
>
> - pcie->ops = of_device_get_match_data(dev);
> + pcie_cfg = of_device_get_match_data(dev);
> + if (!pcie_cfg || !pcie_cfg->ops) {
> + dev_err(dev, "Invalid platform data\n");
> + return NULL;
> + }
> +
> + pcie->ops = pcie_cfg->ops;
> + pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
>
> pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
> if (IS_ERR(pcie->reset)) {
> @@ -1545,16 +1592,17 @@ static int qcom_pcie_probe(struct platform_device *pdev)
> }
>
> static const struct of_device_id qcom_pcie_match[] = {
> - { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 },
> - { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 },
> - { .compatible = "qcom,pcie-ipq8064-v2", .data = &ops_2_1_0 },
> - { .compatible = "qcom,pcie-apq8064", .data = &ops_2_1_0 },
> - { .compatible = "qcom,pcie-msm8996", .data = &ops_2_3_2 },
> - { .compatible = "qcom,pcie-ipq8074", .data = &ops_2_3_3 },
> - { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 },
> - { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
> - { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
> - { .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
> + { .compatible = "qcom,pcie-apq8084", .data = &apq8084_cfg },
> + { .compatible = "qcom,pcie-ipq8064", .data = &ipq8064_cfg },
> + { .compatible = "qcom,pcie-ipq8064-v2", .data = &ipq8064_cfg },
> + { .compatible = "qcom,pcie-apq8064", .data = &ipq8064_cfg },
> + { .compatible = "qcom,pcie-msm8996", .data = &msm8996_cfg },
> + { .compatible = "qcom,pcie-ipq8074", .data = &ipq8074_cfg },
> + { .compatible = "qcom,pcie-ipq4019", .data = &ipq4019_cfg },
> + { .compatible = "qcom,pcie-qcs404", .data = &ipq4019_cfg },
> + { .compatible = "qcom,pcie-sdm845", .data = &sdm845_cfg },
> + { .compatible = "qcom,pcie-sm8250", .data = &sm8250_cfg },
> + { .compatible = "qcom,pcie-sc7280", .data = &sc7280_cfg },
> { }
> };
>
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops
2021-10-05 19:21 ` Bjorn Helgaas
@ 2021-10-07 17:25 ` Prasad Malisetty
0 siblings, 0 replies; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-07 17:25 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov, devicetree, linux-arm-msm,
linux-usb, linux-kernel, dianders, mka, vbadigan, sallenki,
manivannan.sadhasivam, linux-pci
On 2021-10-06 00:51, Bjorn Helgaas wrote:
> On Wed, Oct 06, 2021 at 12:12:38AM +0530, Prasad Malisetty wrote:
>> Add pipe_clk_need_muxing flag in match data and configure
>> If the platform needs to switch pipe_clk_src.
>>
>> Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
>> ---
>> drivers/pci/controller/dwc/pcie-qcom.c | 70
>> ++++++++++++++++++++++++++++------
>> 1 file changed, 59 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/pci/controller/dwc/pcie-qcom.c
>> b/drivers/pci/controller/dwc/pcie-qcom.c
>> index 8a7a300..1d7a9cb 100644
>> --- a/drivers/pci/controller/dwc/pcie-qcom.c
>> +++ b/drivers/pci/controller/dwc/pcie-qcom.c
>> @@ -189,6 +189,11 @@ struct qcom_pcie_ops {
>> int (*config_sid)(struct qcom_pcie *pcie);
>> };
>>
>> +struct qcom_pcie_cfg {
>> + const struct qcom_pcie_ops *ops;
>> + unsigned int pipe_clk_need_muxing:1;
>> +};
>
> Thanks for splitting this up; it's 90% of the way there.
>
> It would be better if this patch added only the definition and use of
> qcom_pcie_cfg:
>
> +struct qcom_pcie_cfg {
> + const struct qcom_pcie_ops *ops;
> +};
>
> and then the subsequent patch added the clock muxing stuff:
>
> struct qcom_pcie_cfg {
> + unsigned int pipe_clk_need_muxing:1;
>
> struct qcom_pcie {
> + unsigned int pipe_clk_need_muxing:1;
>
> static const struct qcom_pcie_cfg sc7280_cfg = {
> + .pipe_clk_need_muxing = true,
>
> static int qcom_pcie_probe(struct platform_device *pdev)
> + pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
>
> That way everything related to pipe_clk_need_muxing would be in a
> single patch.
>
>> struct qcom_pcie {
>> struct dw_pcie *pci;
>> void __iomem *parf; /* DT parf */
>> @@ -197,6 +202,7 @@ struct qcom_pcie {
>> struct phy *phy;
>> struct gpio_desc *reset;
>> const struct qcom_pcie_ops *ops;
>> + unsigned int pipe_clk_need_muxing:1;
>> };
>>
>> #define to_qcom_pcie(x) dev_get_drvdata((x)->dev)
>> @@ -1456,6 +1462,39 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
>> .config_sid = qcom_pcie_config_sid_sm8250,
>> };
>>
Thanks Bjorn, Agree on it. I will incorporate the changes in next patch
version.
-Prasad
>> +static const struct qcom_pcie_cfg apq8084_cfg = {
>> + .ops = &ops_1_0_0,
>> +};
>> +
>> +static const struct qcom_pcie_cfg ipq8064_cfg = {
>> + .ops = &ops_2_1_0,
>> +};
>> +
>> +static const struct qcom_pcie_cfg msm8996_cfg = {
>> + .ops = &ops_2_3_2,
>> +};
>> +
>> +static const struct qcom_pcie_cfg ipq8074_cfg = {
>> + .ops = &ops_2_3_3,
>> +};
>> +
>> +static const struct qcom_pcie_cfg ipq4019_cfg = {
>> + .ops = &ops_2_4_0,
>> +};
>> +
>> +static const struct qcom_pcie_cfg sdm845_cfg = {
>> + .ops = &ops_2_7_0,
>> +};
>> +
>> +static const struct qcom_pcie_cfg sm8250_cfg = {
>> + .ops = &ops_1_9_0,
>> +};
>> +
>> +static const struct qcom_pcie_cfg sc7280_cfg = {
>> + .ops = &ops_1_9_0,
>> + .pipe_clk_need_muxing = true,
>> +};
>> +
>> static const struct dw_pcie_ops dw_pcie_ops = {
>> .link_up = qcom_pcie_link_up,
>> .start_link = qcom_pcie_start_link,
>> @@ -1467,6 +1506,7 @@ static int qcom_pcie_probe(struct
>> platform_device *pdev)
>> struct pcie_port *pp;
>> struct dw_pcie *pci;
>> struct qcom_pcie *pcie;
>> + const struct qcom_pcie_cfg *pcie_cfg;
>> int ret;
>>
>> pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
>> @@ -1488,7 +1528,14 @@ static int qcom_pcie_probe(struct
>> platform_device *pdev)
>>
>> pcie->pci = pci;
>>
>> - pcie->ops = of_device_get_match_data(dev);
>> + pcie_cfg = of_device_get_match_data(dev);
>> + if (!pcie_cfg || !pcie_cfg->ops) {
>> + dev_err(dev, "Invalid platform data\n");
>> + return NULL;
>> + }
>> +
>> + pcie->ops = pcie_cfg->ops;
>> + pcie->pipe_clk_need_muxing = pcie_cfg->pipe_clk_need_muxing;
>>
>> pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_HIGH);
>> if (IS_ERR(pcie->reset)) {
>> @@ -1545,16 +1592,17 @@ static int qcom_pcie_probe(struct
>> platform_device *pdev)
>> }
>>
>> static const struct of_device_id qcom_pcie_match[] = {
>> - { .compatible = "qcom,pcie-apq8084", .data = &ops_1_0_0 },
>> - { .compatible = "qcom,pcie-ipq8064", .data = &ops_2_1_0 },
>> - { .compatible = "qcom,pcie-ipq8064-v2", .data = &ops_2_1_0 },
>> - { .compatible = "qcom,pcie-apq8064", .data = &ops_2_1_0 },
>> - { .compatible = "qcom,pcie-msm8996", .data = &ops_2_3_2 },
>> - { .compatible = "qcom,pcie-ipq8074", .data = &ops_2_3_3 },
>> - { .compatible = "qcom,pcie-ipq4019", .data = &ops_2_4_0 },
>> - { .compatible = "qcom,pcie-qcs404", .data = &ops_2_4_0 },
>> - { .compatible = "qcom,pcie-sdm845", .data = &ops_2_7_0 },
>> - { .compatible = "qcom,pcie-sm8250", .data = &ops_1_9_0 },
>> + { .compatible = "qcom,pcie-apq8084", .data = &apq8084_cfg },
>> + { .compatible = "qcom,pcie-ipq8064", .data = &ipq8064_cfg },
>> + { .compatible = "qcom,pcie-ipq8064-v2", .data = &ipq8064_cfg },
>> + { .compatible = "qcom,pcie-apq8064", .data = &ipq8064_cfg },
>> + { .compatible = "qcom,pcie-msm8996", .data = &msm8996_cfg },
>> + { .compatible = "qcom,pcie-ipq8074", .data = &ipq8074_cfg },
>> + { .compatible = "qcom,pcie-ipq4019", .data = &ipq4019_cfg },
>> + { .compatible = "qcom,pcie-qcs404", .data = &ipq4019_cfg },
>> + { .compatible = "qcom,pcie-sdm845", .data = &sdm845_cfg },
>> + { .compatible = "qcom,pcie-sm8250", .data = &sm8250_cfg },
>> + { .compatible = "qcom,pcie-sc7280", .data = &sc7280_cfg },
>> { }
>> };
>>
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
>> Forum,
>> a Linux Foundation Collaborative Project
>>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v11 5/5] PCI: qcom: Switch pcie_1_pipe_clk_src after PHY init in SC7280
2021-10-05 18:42 [PATCH v11 0/5] Add DT bindings and DT nodes for PCIe and PHY in SC7280 Prasad Malisetty
` (3 preceding siblings ...)
2021-10-05 18:42 ` [PATCH v11 4/5] PCI: qcom: Add a flag in match data along with ops Prasad Malisetty
@ 2021-10-05 18:42 ` Prasad Malisetty
4 siblings, 0 replies; 10+ messages in thread
From: Prasad Malisetty @ 2021-10-05 18:42 UTC (permalink / raw)
To: agross, bjorn.andersson, bhelgaas, robh+dt, swboyd,
lorenzo.pieralisi, svarbanov
Cc: devicetree, linux-arm-msm, linux-usb, linux-kernel, dianders,
mka, vbadigan, sallenki, manivannan.sadhasivam, linux-pci,
Prasad Malisetty
On the SC7280, the clock source for gcc_pcie_1_pipe_clk_src
must be the TCXO while gdsc is enabled. After PHY init successful
clock source should switch to pipe clock for gcc_pcie_1_pipe_clk_src.
Signed-off-by: Prasad Malisetty <pmaliset@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
---
drivers/pci/controller/dwc/pcie-qcom.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 1d7a9cb..ded70e6 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -166,6 +166,9 @@ struct qcom_pcie_resources_2_7_0 {
struct regulator_bulk_data supplies[2];
struct reset_control *pci_reset;
struct clk *pipe_clk;
+ struct clk *pipe_clk_src;
+ struct clk *phy_pipe_clk;
+ struct clk *ref_clk_src;
};
union qcom_pcie_resources {
@@ -1173,6 +1176,20 @@ static int qcom_pcie_get_resources_2_7_0(struct qcom_pcie *pcie)
if (ret < 0)
return ret;
+ if (pcie->pipe_clk_need_muxing) {
+ res->pipe_clk_src = devm_clk_get(dev, "pipe_mux");
+ if (IS_ERR(res->pipe_clk_src))
+ return PTR_ERR(res->pipe_clk_src);
+
+ res->phy_pipe_clk = devm_clk_get(dev, "phy_pipe");
+ if (IS_ERR(res->phy_pipe_clk))
+ return PTR_ERR(res->phy_pipe_clk);
+
+ res->ref_clk_src = devm_clk_get(dev, "ref");
+ if (IS_ERR(res->ref_clk_src))
+ return PTR_ERR(res->ref_clk_src);
+ }
+
res->pipe_clk = devm_clk_get(dev, "pipe");
return PTR_ERR_OR_ZERO(res->pipe_clk);
}
@@ -1191,6 +1208,10 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie)
return ret;
}
+ /* Set TCXO as clock source for pcie_pipe_clk_src */
+ if (pcie->pipe_clk_need_muxing)
+ clk_set_parent(res->pipe_clk_src, res->ref_clk_src);
+
ret = clk_bulk_prepare_enable(res->num_clks, res->clks);
if (ret < 0)
goto err_disable_regulators;
@@ -1262,6 +1283,10 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
{
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
+ /* Set pipe clock as clock source for pcie_pipe_clk_src */
+ if (pcie->pipe_clk_need_muxing)
+ clk_set_parent(res->pipe_clk_src, res->phy_pipe_clk);
+
return clk_prepare_enable(res->pipe_clk);
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 10+ messages in thread