Skip to content

Commit a729c16

Browse files
Manivannan Sadhasivambjorn-helgaas
authored andcommitted
PCI: qcom: Remove custom ASPM enablement code
Since the PCI subsystem has started enabling all ASPM states for all devicetree based platforms, the ASPM enablement code from this driver can now be dropped. Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Link: https://patch.msgid.link/20250922-pci-dt-aspm-v2-2-2a65cf84e326@oss.qualcomm.com
1 parent f3ac2ff commit a729c16

File tree

1 file changed

+0
-32
lines changed

1 file changed

+0
-32
lines changed

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ struct qcom_pcie_ops {
247247
int (*get_resources)(struct qcom_pcie *pcie);
248248
int (*init)(struct qcom_pcie *pcie);
249249
int (*post_init)(struct qcom_pcie *pcie);
250-
void (*host_post_init)(struct qcom_pcie *pcie);
251250
void (*deinit)(struct qcom_pcie *pcie);
252251
void (*ltssm_enable)(struct qcom_pcie *pcie);
253252
int (*config_sid)(struct qcom_pcie *pcie);
@@ -1040,25 +1039,6 @@ static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie)
10401039
return 0;
10411040
}
10421041

1043-
static int qcom_pcie_enable_aspm(struct pci_dev *pdev, void *userdata)
1044-
{
1045-
/*
1046-
* Downstream devices need to be in D0 state before enabling PCI PM
1047-
* substates.
1048-
*/
1049-
pci_set_power_state_locked(pdev, PCI_D0);
1050-
pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL);
1051-
1052-
return 0;
1053-
}
1054-
1055-
static void qcom_pcie_host_post_init_2_7_0(struct qcom_pcie *pcie)
1056-
{
1057-
struct dw_pcie_rp *pp = &pcie->pci->pp;
1058-
1059-
pci_walk_bus(pp->bridge->bus, qcom_pcie_enable_aspm, NULL);
1060-
}
1061-
10621042
static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)
10631043
{
10641044
struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
@@ -1358,19 +1338,9 @@ static void qcom_pcie_host_deinit(struct dw_pcie_rp *pp)
13581338
pcie->cfg->ops->deinit(pcie);
13591339
}
13601340

1361-
static void qcom_pcie_host_post_init(struct dw_pcie_rp *pp)
1362-
{
1363-
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
1364-
struct qcom_pcie *pcie = to_qcom_pcie(pci);
1365-
1366-
if (pcie->cfg->ops->host_post_init)
1367-
pcie->cfg->ops->host_post_init(pcie);
1368-
}
1369-
13701341
static const struct dw_pcie_host_ops qcom_pcie_dw_ops = {
13711342
.init = qcom_pcie_host_init,
13721343
.deinit = qcom_pcie_host_deinit,
1373-
.post_init = qcom_pcie_host_post_init,
13741344
};
13751345

13761346
/* Qcom IP rev.: 2.1.0 Synopsys IP rev.: 4.01a */
@@ -1432,7 +1402,6 @@ static const struct qcom_pcie_ops ops_1_9_0 = {
14321402
.get_resources = qcom_pcie_get_resources_2_7_0,
14331403
.init = qcom_pcie_init_2_7_0,
14341404
.post_init = qcom_pcie_post_init_2_7_0,
1435-
.host_post_init = qcom_pcie_host_post_init_2_7_0,
14361405
.deinit = qcom_pcie_deinit_2_7_0,
14371406
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
14381407
.config_sid = qcom_pcie_config_sid_1_9_0,
@@ -1443,7 +1412,6 @@ static const struct qcom_pcie_ops ops_1_21_0 = {
14431412
.get_resources = qcom_pcie_get_resources_2_7_0,
14441413
.init = qcom_pcie_init_2_7_0,
14451414
.post_init = qcom_pcie_post_init_2_7_0,
1446-
.host_post_init = qcom_pcie_host_post_init_2_7_0,
14471415
.deinit = qcom_pcie_deinit_2_7_0,
14481416
.ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
14491417
};

0 commit comments

Comments
 (0)