PCI/TPH: Restore TPH Requester Enable correctly

rmurphy-arm · bjorn-helgaas · commit 6f64b83d9fe9 · 2025-02-06T10:30:11.000-06:00
When we reenable TPH after changing a Steering Tag value, we need the actual TPH Requester Enable value, not the ST Mode (which only happens to work out by chance for non-extended TPH in interrupt vector mode). Link: https://lore.kernel.org/r/13118098116d7bce07aa20b8c52e28c7d1847246.1738759933.git.robin.murphy@arm.com Fixes: d2e8a34 ("PCI/TPH: Add Steering Tag support") Signed-off-by: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Wei Huang <wei.huang2@amd.com>
diff --git a/drivers/pci/tph.c b/drivers/pci/tph.c
@@ -360,7 +360,7 @@ int pcie_tph_set_st_entry(struct pci_dev *pdev, unsigned int index, u16 tag)
 		return err;
 	}
 
-	set_ctrl_reg_req_en(pdev, pdev->tph_mode);
+	set_ctrl_reg_req_en(pdev, pdev->tph_req_type);
 
 	pci_dbg(pdev, "set steering tag: %s table, index=%d, tag=%#04x\n",
 		(loc == PCI_TPH_LOC_MSIX) ? "MSI-X" : "ST", index, tag);

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ int pcie_tph_set_st_entry(struct pci_dev *pdev, unsigned int index, u16 tag)`
`360`	`360`	`return err;`
`361`	`361`	`}`
`362`	`362`
`363`		`- set_ctrl_reg_req_en(pdev, pdev->tph_mode);`
	`363`	`+ set_ctrl_reg_req_en(pdev, pdev->tph_req_type);`
`364`	`364`
`365`	`365`	`pci_dbg(pdev, "set steering tag: %s table, index=%d, tag=%#04x\n",`
`366`	`366`	`(loc == PCI_TPH_LOC_MSIX) ? "MSI-X" : "ST", index, tag);`