nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

PCI: EPF: dma-test: Fix BAR and MSI allocations

Browse Source 
Fix BAR-1 and BAR-2 allocations for T264. Platform MSI is supported in
T264 only, fix the chip_id comparision check so that MSI is allocated
only for T264.

Bug 4549851

Signed-off-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
Change-Id: I13dad41375e607d78c6a99924ed6fef0c9113208
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3131939
Reviewed-by: Nagarjuna Kristam <nkristam@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
This commit is contained in:
Manikanta Maddireddy
2024-05-06 16:51:20 +05:30
committed by mobile promotions
parent 71ce55ca52
commit a77ffaf1d0
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pci/endpoint/functions/pci-epf-dma-test.c
View File

@@ -186,12 +186,13 @@ static int pcie_dma_epf_core_init(struct pci_epf *epf)
return 0; return 0;
/* Expose MSI address as BAR2 to allow RP to send MSI to EP. */ /* Expose MSI address as BAR2 to allow RP to send MSI to EP. */
epf_bar = &epf->bar[BAR_2]; bar = BAR_2;
epf_bar[bar].phys_addr = gepfnv->edma.msi_addr & ~(SZ_32M - 1); epf_bar = &epf->bar[bar];
epf_bar[bar].addr = NULL; epf_bar->phys_addr = gepfnv->edma.msi_addr & ~(SZ_32M - 1);
epf_bar[bar].size = SZ_32M; epf_bar->addr = NULL;
epf_bar[bar].barno = BAR_2; epf_bar->size = SZ_32M;
epf_bar[bar].flags |= PCI_BASE_ADDRESS_MEM_TYPE_64; epf_bar->barno = bar;
epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH;
ret = lpci_epc_set_bar(epc, epf->func_no, epf_bar); ret = lpci_epc_set_bar(epc, epf->func_no, epf_bar);
if (ret < 0) { if (ret < 0) {
dev_err(fdev, "PCIe set BAR2 failed: %d\n", ret); dev_err(fdev, "PCIe set BAR2 failed: %d\n", ret);
@@ -327,9 +328,9 @@ static int pcie_dma_epf_bind(struct pci_epf *epf)
} }
#if defined(NV_PCI_EPF_ALLOC_SPACE_HAS_EPC_FEATURES_ARG) /* Linux v6.9 */ #if defined(NV_PCI_EPF_ALLOC_SPACE_HAS_EPC_FEATURES_ARG) /* Linux v6.9 */
epfnv->bar_virt = lpci_epf_alloc_space(epf, BAR0_SIZE, BAR_0, epc_features); epfnv->bar_virt = lpci_epf_alloc_space(epf, BAR0_SIZE, bar, epc_features);
#else #else
epfnv->bar_virt = lpci_epf_alloc_space(epf, BAR0_SIZE, BAR_0, epc_features->align); epfnv->bar_virt = lpci_epf_alloc_space(epf, BAR0_SIZE, bar, epc_features->align);
#endif #endif
if (!epfnv->bar_virt) { if (!epfnv->bar_virt) {
dev_err(fdev, "Failed to allocate memory for BAR0\n"); dev_err(fdev, "Failed to allocate memory for BAR0\n");
@@ -353,7 +354,7 @@ static int pcie_dma_epf_bind(struct pci_epf *epf)
for (i = 0; i < TEGRA_PCIE_DMA_WRITE; i++) for (i = 0; i < TEGRA_PCIE_DMA_WRITE; i++)
init_waitqueue_head(&epfnv->edma.wr_wq[i]); init_waitqueue_head(&epfnv->edma.wr_wq[i]);
if (epfnv->chip_id == TEGRA234) { if (epfnv->chip_id == TEGRA264) {
domain = dev_get_msi_domain(&pdev->dev); domain = dev_get_msi_domain(&pdev->dev);
if (!domain) { if (!domain) {
dev_err(fdev, "failed to get MSI domain\n"); dev_err(fdev, "failed to get MSI domain\n");