Skip to content

Commit 0edcb26

Browse files
ShayAgrosksacilotto
authored andcommitted
net: ena: set initial DMA width to avoid intel iommu issue
BugLink: https://bugs.launchpad.net/bugs/1908562 [ Upstream commit 09323b3 ] The ENA driver uses the readless mechanism, which uses DMA, to find out what the DMA mask is supposed to be. If DMA is used without setting the dma_mask first, it causes the Intel IOMMU driver to think that ENA is a 32-bit device and therefore disables IOMMU passthrough permanently. This patch sets the dma_mask to be ENA_MAX_PHYS_ADDR_SIZE_BITS=48 before readless initialization in ena_device_init()->ena_com_mmio_reg_read_request_init(), which is large enough to workaround the intel_iommu issue. DMA mask is set again to the correct value after it's received from the device after readless is initialized. The patch also changes the driver to use dma_set_mask_and_coherent() function instead of the two pci_set_dma_mask() and pci_set_consistent_dma_mask() ones. Both methods achieve the same effect. Fixes: 1738cd3 ("net: ena: Add a driver for Amazon Elastic Network Adapters (ENA)") Signed-off-by: Mike Cui <mikecui@amazon.com> Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com> Signed-off-by: Shay Agroskin <shayagr@amazon.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Ian May <ian.may@canonical.com>
1 parent d7e532c commit 0edcb26

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/net/ethernet/amazon/ena/ena_netdev.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3386,16 +3386,9 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,
33863386
goto err_mmio_read_less;
33873387
}
33883388

3389-
rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_width));
3389+
rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_width));
33903390
if (rc) {
3391-
dev_err(dev, "pci_set_dma_mask failed 0x%x\n", rc);
3392-
goto err_mmio_read_less;
3393-
}
3394-
3395-
rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(dma_width));
3396-
if (rc) {
3397-
dev_err(dev, "err_pci_set_consistent_dma_mask failed 0x%x\n",
3398-
rc);
3391+
dev_err(dev, "dma_set_mask_and_coherent failed %d\n", rc);
33993392
goto err_mmio_read_less;
34003393
}
34013394

@@ -4165,6 +4158,12 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
41654158
return rc;
41664159
}
41674160

4161+
rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(ENA_MAX_PHYS_ADDR_SIZE_BITS));
4162+
if (rc) {
4163+
dev_err(&pdev->dev, "dma_set_mask_and_coherent failed %d\n", rc);
4164+
goto err_disable_device;
4165+
}
4166+
41684167
pci_set_master(pdev);
41694168

41704169
ena_dev = vzalloc(sizeof(*ena_dev));

0 commit comments

Comments
 (0)