Skip to content

Commit 60f0072

Browse files
Mani-SadhasivamLorenzo Pieralisi
authored andcommitted
PCI: qcom: Use DWC helpers for modifying the read-only DBI registers
DWC core already exposes dw_pcie_dbi_ro_wr_{en/dis} helper APIs for enabling and disabling the write access to read only DBI registers. So let's use them instead of doing it manually. Also, the existing code doesn't disable the write access when it's done. This is also fixed now. Link: https://lore.kernel.org/r/[email protected] Fixes: 5d76117 ("PCI: qcom: Add support for IPQ8074 PCIe controller") Signed-off-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]>
1 parent a33d700 commit 60f0072

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/pci/controller/dwc/pcie-qcom.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
/* DBI registers */
6262
#define AXI_MSTR_RESP_COMP_CTRL0 0x818
6363
#define AXI_MSTR_RESP_COMP_CTRL1 0x81c
64-
#define MISC_CONTROL_1_REG 0x8bc
6564

6665
/* MHI registers */
6766
#define PARF_DEBUG_CNT_PM_LINKST_IN_L2 0xc04
@@ -132,9 +131,6 @@
132131
/* AXI_MSTR_RESP_COMP_CTRL1 register fields */
133132
#define CFG_BRIDGE_SB_INIT BIT(0)
134133

135-
/* MISC_CONTROL_1_REG register fields */
136-
#define DBI_RO_WR_EN 1
137-
138134
/* PCI_EXP_SLTCAP register fields */
139135
#define PCIE_CAP_SLOT_POWER_LIMIT_VAL FIELD_PREP(PCI_EXP_SLTCAP_SPLV, 250)
140136
#define PCIE_CAP_SLOT_POWER_LIMIT_SCALE FIELD_PREP(PCI_EXP_SLTCAP_SPLS, 1)
@@ -826,7 +822,9 @@ static int qcom_pcie_post_init_2_3_3(struct qcom_pcie *pcie)
826822
writel(0, pcie->parf + PARF_Q2A_FLUSH);
827823

828824
writel(PCI_COMMAND_MASTER, pci->dbi_base + PCI_COMMAND);
829-
writel(DBI_RO_WR_EN, pci->dbi_base + MISC_CONTROL_1_REG);
825+
826+
dw_pcie_dbi_ro_wr_en(pci);
827+
830828
writel(PCIE_CAP_SLOT_VAL, pci->dbi_base + offset + PCI_EXP_SLTCAP);
831829

832830
val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP);

0 commit comments

Comments
 (0)