Skip to content

Commit 19ffb03

Browse files
Koichiro Dengregkh
authored andcommitted
PCI: dwc: ep: Always clear IB maps on BAR update
[ Upstream commit 8c746e2 ] dw_pcie_ep_set_bar() currently tears down existing inbound mappings only when either the previous or the new struct pci_epf_bar uses submaps (num_submap != 0). If both the old and new mappings are BAR Match Mode, reprogramming the same ATU index is sufficient, so no explicit teardown was needed. However, some callers may reuse the same struct pci_epf_bar instance and update it in place before calling set_bar() again. In that case ep_func->epf_bar[bar] and the passed-in epf_bar can point to the same object, so we cannot reliably distinguish BAR Match Mode -> BAR Match Mode from Address Match Mode -> BAR Match Mode. As a result, the conditional teardown based on num_submap becomes unreliable and existing inbound maps may be left active. Call dw_pcie_ep_clear_ib_maps() unconditionally before reprogramming the BAR so that in-place updates are handled correctly. This introduces a behavioral change in a corner case: if a BAR reprogramming attempt fails (especially for the long-standing BAR Match Mode -> BAR Match Mode update case), the previously programmed inbound mapping will already have been torn down. This should be acceptable, since the caller observes the error and should not use the BAR for any real transactions in that case. While at it, document that the existing update parameter check is best-effort for in-place updates. Fixes: cc839be ("PCI: dwc: ep: Support BAR subrange inbound mapping via Address Match Mode iATU") Signed-off-by: Koichiro Den <den@valinux.co.jp> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Niklas Cassel <cassel@kernel.org> Link: https://patch.msgid.link/20260202145407.503348-3-den@valinux.co.jp Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 37acc30 commit 19ffb03

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,12 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
518518
/*
519519
* We can only dynamically change a BAR if the new BAR size and
520520
* BAR flags do not differ from the existing configuration.
521+
*
522+
* Note: this safety check only works when the caller uses
523+
* a new struct pci_epf_bar in the second set_bar() call.
524+
* If the same instance is updated in place and passed in,
525+
* we cannot reliably detect invalid barno/size/flags
526+
* changes here.
521527
*/
522528
if (ep_func->epf_bar[bar]->barno != bar ||
523529
ep_func->epf_bar[bar]->size != size ||
@@ -526,10 +532,12 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
526532

527533
/*
528534
* When dynamically changing a BAR, tear down any existing
529-
* mappings before re-programming.
535+
* mappings before re-programming. This is redundant when
536+
* both the old and new mappings are BAR Match Mode, but
537+
* required to handle in-place updates and match-mode
538+
* changes reliably.
530539
*/
531-
if (ep_func->epf_bar[bar]->num_submap || epf_bar->num_submap)
532-
dw_pcie_ep_clear_ib_maps(ep, func_no, bar);
540+
dw_pcie_ep_clear_ib_maps(ep, func_no, bar);
533541

534542
/*
535543
* When dynamically changing a BAR, skip writing the BAR reg, as

0 commit comments

Comments
 (0)