Skip to content

Commit 58fbf08

Browse files
floatiousMani-Sadhasivam
authored andcommitted
PCI: dwc: Fix msg_atu_index assignment
When dw_pcie_iatu_setup() configures outbound address translation for both type PCIE_ATU_TYPE_MEM and PCIE_ATU_TYPE_IO, the iATU index to use is incremented before calling dw_pcie_prog_outbound_atu(). However for msg_atu_index, the index is not incremented before use, causing the iATU index to be the same as the last configured iATU index, which means that it will incorrectly use the same iATU index that is already in use, breaking outbound address translation. In total there are three problems with this code: -It assigns msg_atu_index the same index that was used for the last outbound address translation window, rather than incrementing the index before assignment. -The index should only be incremented (and msg_atu_index assigned) if the use_atu_msg feature is actually requested/in use (pp->use_atu_msg is set). -If the use_atu_msg feature is requested/in use, and there are no outbound iATUs available, the code should return an error, as otherwise when this this feature is used, it will use an iATU index that is out of bounds. Fixes: e1a4ec1 ("PCI: dwc: Add generic MSG TLP support for sending PME_Turn_Off when system suspend") Signed-off-by: Niklas Cassel <cassel@kernel.org> Signed-off-by: Manivannan Sadhasivam <mani@kernel.org> Tested-by: Maciej W. Rozycki <macro@orcam.me.uk> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Hans Zhang <zhanghuabing@ecosda.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260127151038.1484881-6-cassel@kernel.org
1 parent e3c3a5d commit 58fbf08

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,14 @@ static int dw_pcie_iatu_setup(struct dw_pcie_rp *pp)
982982
dev_warn(pci->dev, "Ranges exceed outbound iATU size (%d)\n",
983983
pci->num_ob_windows);
984984

985-
pp->msg_atu_index = i;
985+
if (pp->use_atu_msg) {
986+
if (pci->num_ob_windows > ++i) {
987+
pp->msg_atu_index = i;
988+
} else {
989+
dev_err(pci->dev, "Cannot add outbound window for MSG TLP\n");
990+
return -ENOMEM;
991+
}
992+
}
986993

987994
i = 0;
988995
resource_list_for_each_entry(entry, &pp->bridge->dma_ranges) {

0 commit comments

Comments
 (0)