Skip to content

Commit 2b4049d

Browse files
committed
Merge branch 'pci/controller/dwc'
- Clear outbound address on unmap so dw_pcie_find_index() won't match an ATU index that was already unmapped (Damien Le Moal) - Use of_property_present() instead of of_property_read_bool() when testing for presence of non-boolean DT properties (Rob Herring) - Advertise 1MB size if endpoint supports Resizable BARs, which was inadvertently lost in v6.11 (Niklas Cassel) * pci/controller/dwc: PCI: dwc: ep: Fix advertised resizable BAR size regression PCI: dwc: Use of_property_present() for non-boolean properties PCI: dwc: endpoint: Clear outbound address on unmap
2 parents 5b8d59c + 118397c commit 2b4049d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/pci/controller/dwc/pcie-designware-ep.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ static void dw_pcie_ep_unmap_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
294294
if (ret < 0)
295295
return;
296296

297+
ep->outbound_addr[atu_index] = 0;
297298
dw_pcie_disable_atu(pci, PCIE_ATU_REGION_DIR_OB, atu_index);
298299
clear_bit(atu_index, ep->ob_window_map);
299300
}
@@ -704,7 +705,7 @@ static void dw_pcie_ep_init_non_sticky_registers(struct dw_pcie *pci)
704705
* for 1 MB BAR size only.
705706
*/
706707
for (i = 0; i < nbars; i++, offset += PCI_REBAR_CTRL)
707-
dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
708+
dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, BIT(4));
708709
}
709710

710711
dw_pcie_setup(pci);

drivers/pci/controller/dwc/pcie-designware-host.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,8 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)
474474

475475
if (pci_msi_enabled()) {
476476
pp->has_msi_ctrl = !(pp->ops->msi_init ||
477-
of_property_read_bool(np, "msi-parent") ||
478-
of_property_read_bool(np, "msi-map"));
477+
of_property_present(np, "msi-parent") ||
478+
of_property_present(np, "msi-map"));
479479

480480
/*
481481
* For the has_msi_ctrl case the default assignment is handled

0 commit comments

Comments
 (0)