Introduce an optional callback for outbound ATU address range
validation to handle cases that deviate from the generic check.
Signed-off-by: Randolph Lin <randolph@andestech.com>
---
drivers/pci/controller/dwc/pcie-designware.c | 29 ++++++++++++++++----
drivers/pci/controller/dwc/pcie-designware.h | 3 ++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c
index 89aad5a08928..087f9077cf21 100644
--- a/drivers/pci/controller/dwc/pcie-designware.c
+++ b/drivers/pci/controller/dwc/pcie-designware.c
@@ -528,6 +528,28 @@ static inline u32 dw_pcie_enable_ecrc(u32 val)
return val | PCIE_ATU_TD;
}
+static
+bool dw_pcie_outbound_atu_addr_valid(struct dw_pcie *pci,
+ const struct dw_pcie_ob_atu_cfg *atu,
+ u64 *limit_addr)
+{
+ u64 parent_bus_addr = atu->parent_bus_addr;
+
+ if (pci->ops && pci->ops->outbound_atu_addr_valid)
+ return pci->ops->outbound_atu_addr_valid(pci, atu, limit_addr);
+
+ *limit_addr = parent_bus_addr + atu->size - 1;
+
+ if ((*limit_addr & ~pci->region_limit) !=
+ (parent_bus_addr & ~pci->region_limit) ||
+ !IS_ALIGNED(parent_bus_addr, pci->region_align) ||
+ !IS_ALIGNED(atu->pci_addr, pci->region_align) ||
+ !atu->size)
+ return false;
+
+ return true;
+}
+
int dw_pcie_prog_outbound_atu(struct dw_pcie *pci,
const struct dw_pcie_ob_atu_cfg *atu)
{
@@ -535,13 +557,8 @@ int dw_pcie_prog_outbound_atu(struct dw_pcie *pci,
u32 retries, val;
u64 limit_addr;
- limit_addr = parent_bus_addr + atu->size - 1;
-
- if ((limit_addr & ~pci->region_limit) != (parent_bus_addr & ~pci->region_limit) ||
- !IS_ALIGNED(parent_bus_addr, pci->region_align) ||
- !IS_ALIGNED(atu->pci_addr, pci->region_align) || !atu->size) {
+ if (!dw_pcie_outbound_atu_addr_valid(pci, atu, &limit_addr))
return -EINVAL;
- }
dw_pcie_writel_atu_ob(pci, atu->index, PCIE_ATU_LOWER_BASE,
lower_32_bits(parent_bus_addr));
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 00f52d472dcd..6d4805048048 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -469,6 +469,9 @@ struct dw_pcie_ep {
struct dw_pcie_ops {
u64 (*cpu_addr_fixup)(struct dw_pcie *pcie, u64 cpu_addr);
+ bool (*outbound_atu_addr_valid)(struct dw_pcie *pcie,
+ const struct dw_pcie_ob_atu_cfg *atu,
+ u64 *limit_addr);
u32 (*read_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
size_t size);
void (*write_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
--
2.34.1