Skip to content

Commit 787c72b

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/controller/dwc'
- Convert fu740 CONFIG_PCIE_FU740 dependency from SOC_SIFIVE to ARCH_SIFIVE (Conor Dooley) - Align iATU mapping for endpoint MSI-X (Niklas Cassel) - Drop "host_" prefix from struct dw_pcie_host_ops members (Yoshihiro Shimoda) - Drop "ep_" prefix from struct dw_pcie_ep_ops members (Yoshihiro Shimoda) - Rename struct dw_pcie_ep_ops.func_conf_select() to .get_dbi_offset() to be more descriptive (Yoshihiro Shimoda) - Add Endpoint DBI accessors to encapsulate offset lookups (Yoshihiro Shimoda) - Cast iproc and rcar-gen4 of_device_get_match_data() results to uintptr_t to avoid clang "cast to smaller integer type" warnings (Justin Stitt, Yoshihiro Shimoda) * pci/controller/dwc: PCI: rcar-gen4: Fix -Wvoid-pointer-to-enum-cast error PCI: iproc: Fix -Wvoid-pointer-to-enum-cast warning PCI: dwc: Add dw_pcie_ep_{read,write}_dbi[2] helpers PCI: dwc: Rename .func_conf_select to .get_dbi_offset in struct dw_pcie_ep_ops PCI: dwc: Rename .ep_init to .init in struct dw_pcie_ep_ops PCI: dwc: Drop host prefix from struct dw_pcie_host_ops members PCI: dwc: endpoint: Fix dw_pcie_ep_raise_msix_irq() alignment support PCI: dwc: Convert SOC_SIFIVE to ARCH_SIFIVE
2 parents 78fe51f + 7682f19 commit 787c72b

31 files changed

+222
-193
lines changed

‎drivers/pci/controller/dwc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ config PCI_EXYNOS
336336
config PCIE_FU740
337337
bool "SiFive FU740 PCIe controller"
338338
depends on PCI_MSI
339-
depends on SOC_SIFIVE || COMPILE_TEST
339+
depends on ARCH_SIFIVE || COMPILE_TEST
340340
select PCIE_DW_HOST
341341
help
342342
Say Y here if you want PCIe controller support for the SiFive

‎drivers/pci/controller/dwc/pci-dra7xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int dra7xx_pcie_init_irq_domain(struct dw_pcie_rp *pp)
371371
}
372372

373373
static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = {
374-
.host_init = dra7xx_pcie_host_init,
374+
.init = dra7xx_pcie_host_init,
375375
};
376376

377377
static void dra7xx_pcie_ep_init(struct dw_pcie_ep *ep)
@@ -436,7 +436,7 @@ dra7xx_pcie_get_features(struct dw_pcie_ep *ep)
436436
}
437437

438438
static const struct dw_pcie_ep_ops pcie_ep_ops = {
439-
.ep_init = dra7xx_pcie_ep_init,
439+
.init = dra7xx_pcie_ep_init,
440440
.raise_irq = dra7xx_pcie_raise_irq,
441441
.get_features = dra7xx_pcie_get_features,
442442
};

‎drivers/pci/controller/dwc/pci-exynos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static int exynos_pcie_host_init(struct dw_pcie_rp *pp)
268268
}
269269

270270
static const struct dw_pcie_host_ops exynos_pcie_host_ops = {
271-
.host_init = exynos_pcie_host_init,
271+
.init = exynos_pcie_host_init,
272272
};
273273

274274
static int exynos_add_pcie_port(struct exynos_pcie *ep,

‎drivers/pci/controller/dwc/pci-imx6.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,8 +1039,8 @@ static void imx6_pcie_host_exit(struct dw_pcie_rp *pp)
10391039
}
10401040

10411041
static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
1042-
.host_init = imx6_pcie_host_init,
1043-
.host_deinit = imx6_pcie_host_exit,
1042+
.init = imx6_pcie_host_init,
1043+
.deinit = imx6_pcie_host_exit,
10441044
};
10451045

10461046
static const struct dw_pcie_ops dw_pcie_ops = {
@@ -1093,7 +1093,7 @@ imx6_pcie_ep_get_features(struct dw_pcie_ep *ep)
10931093
}
10941094

10951095
static const struct dw_pcie_ep_ops pcie_ep_ops = {
1096-
.ep_init = imx6_pcie_ep_init,
1096+
.init = imx6_pcie_ep_init,
10971097
.raise_irq = imx6_pcie_ep_raise_irq,
10981098
.get_features = imx6_pcie_ep_get_features,
10991099
};

‎drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -838,12 +838,12 @@ static int __init ks_pcie_host_init(struct dw_pcie_rp *pp)
838838
}
839839

840840
static const struct dw_pcie_host_ops ks_pcie_host_ops = {
841-
.host_init = ks_pcie_host_init,
842-
.msi_host_init = ks_pcie_msi_host_init,
841+
.init = ks_pcie_host_init,
842+
.msi_init = ks_pcie_msi_host_init,
843843
};
844844

845845
static const struct dw_pcie_host_ops ks_pcie_am654_host_ops = {
846-
.host_init = ks_pcie_host_init,
846+
.init = ks_pcie_host_init,
847847
};
848848

849849
static irqreturn_t ks_pcie_err_irq_handler(int irq, void *priv)
@@ -944,7 +944,7 @@ ks_pcie_am654_get_features(struct dw_pcie_ep *ep)
944944
}
945945

946946
static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = {
947-
.ep_init = ks_pcie_am654_ep_init,
947+
.init = ks_pcie_am654_ep_init,
948948
.raise_irq = ks_pcie_am654_raise_irq,
949949
.get_features = &ks_pcie_am654_get_features,
950950
};

‎drivers/pci/controller/dwc/pci-layerscape-ep.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ static int ls_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no,
184184
}
185185
}
186186

187-
static unsigned int ls_pcie_ep_func_conf_select(struct dw_pcie_ep *ep,
188-
u8 func_no)
187+
static unsigned int ls_pcie_ep_get_dbi_offset(struct dw_pcie_ep *ep, u8 func_no)
189188
{
190189
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
191190
struct ls_pcie_ep *pcie = to_ls_pcie_ep(pci);
@@ -195,10 +194,10 @@ static unsigned int ls_pcie_ep_func_conf_select(struct dw_pcie_ep *ep,
195194
}
196195

197196
static const struct dw_pcie_ep_ops ls_pcie_ep_ops = {
198-
.ep_init = ls_pcie_ep_init,
197+
.init = ls_pcie_ep_init,
199198
.raise_irq = ls_pcie_ep_raise_irq,
200199
.get_features = ls_pcie_ep_get_features,
201-
.func_conf_select = ls_pcie_ep_func_conf_select,
200+
.get_dbi_offset = ls_pcie_ep_get_dbi_offset,
202201
};
203202

204203
static const struct ls_pcie_ep_drvdata ls1_ep_drvdata = {

‎drivers/pci/controller/dwc/pci-layerscape.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static int ls_pcie_host_init(struct dw_pcie_rp *pp)
169169
}
170170

171171
static const struct dw_pcie_host_ops ls_pcie_host_ops = {
172-
.host_init = ls_pcie_host_init,
172+
.init = ls_pcie_host_init,
173173
.pme_turn_off = ls_pcie_send_turnoff_msg,
174174
};
175175

‎drivers/pci/controller/dwc/pci-meson.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp)
389389
}
390390

391391
static const struct dw_pcie_host_ops meson_pcie_host_ops = {
392-
.host_init = meson_pcie_host_init,
392+
.init = meson_pcie_host_init,
393393
};
394394

395395
static const struct dw_pcie_ops dw_pcie_ops = {

‎drivers/pci/controller/dwc/pcie-al.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static int al_pcie_host_init(struct dw_pcie_rp *pp)
311311
}
312312

313313
static const struct dw_pcie_host_ops al_pcie_host_ops = {
314-
.host_init = al_pcie_host_init,
314+
.init = al_pcie_host_init,
315315
};
316316

317317
static int al_pcie_probe(struct platform_device *pdev)

‎drivers/pci/controller/dwc/pcie-armada8k.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg)
225225
}
226226

227227
static const struct dw_pcie_host_ops armada8k_pcie_host_ops = {
228-
.host_init = armada8k_pcie_host_init,
228+
.init = armada8k_pcie_host_init,
229229
};
230230

231231
static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,

0 commit comments

Comments
 (0)