mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Fix regression issue after r346645 in the LinuxKPI.

Browse Source 
Make sure LinuxKPI PCI devices get a default BUSDMA tag.

Found by:	Thomas Laus <lausts@acm.org>
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2019-05-09 09:45:19 +00:00
parent 50ec8b3b3e
commit eb6f534241
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=347385
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/compat/linuxkpi/common/src/linux_pci.c
View File

@ -89,6 +89,7 @@ static int
linux_pdev_dma_init(struct pci_dev *pdev)
{
struct linux_dma_priv *priv;
int error;
priv = malloc(sizeof(*priv), M_DEVBUF, M_WAITOK | M_ZERO);
pdev->dev.dma_priv = priv;
@ -97,7 +98,14 @@ linux_pdev_dma_init(struct pci_dev *pdev)
pctrie_init(&priv->ptree);
return (0);
/* create a default DMA tag */
error = linux_dma_tag_init(&pdev->dev, DMA_BIT_MASK(64));
if (error) {
mtx_destroy(&priv->lock);
free(priv, M_DEVBUF);
pdev->dev.dma_priv = NULL;
}
return (error);
}
static int
@ -241,7 +249,7 @@ linux_pci_attach(device_t dev)
pdev->irq = pdev->dev.irq;
error = linux_pdev_dma_init(pdev);
if (error)
goto out;
goto out_dma_init;
if (pdev->bus == NULL) {
pbus = malloc(sizeof(*pbus), M_DEVBUF, M_WAITOK | M_ZERO);
@ -255,15 +263,18 @@ linux_pci_attach(device_t dev)
spin_unlock(&pci_lock);
error = pdrv->probe(pdev, id);
out:
if (error) {
spin_lock(&pci_lock);
list_del(&pdev->links);
spin_unlock(&pci_lock);
put_device(&pdev->dev);
error = -error;
}
return (error);
if (error)
goto out_probe;
return (0);
out_probe:
linux_pdev_dma_uninit(pdev);
out_dma_init:
spin_lock(&pci_lock);
list_del(&pdev->links);
spin_unlock(&pci_lock);
put_device(&pdev->dev);
return (-error);
}
static int