narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[intel] Configure DMA mask as 64-bit 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/181/head
Michael Brown 2020-11-24 17:46:39 +00:00
parent 0b5467b658
commit 9e280aecb7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/net/intel.c
View File

@ -983,7 +983,6 @@ static int intel_probe ( struct pci_device *pci ) {
pci_set_drvdata ( pci, netdev ); pci_set_drvdata ( pci, netdev );
netdev->dev = &pci->dev; netdev->dev = &pci->dev;
memset ( intel, 0, sizeof ( *intel ) ); memset ( intel, 0, sizeof ( *intel ) );
intel->dma = &pci->dma;
intel->port = PCI_FUNC ( pci->busdevfn ); intel->port = PCI_FUNC ( pci->busdevfn );
intel->flags = pci->id->driver_data; intel->flags = pci->id->driver_data;
intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTEL_TD, intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTEL_TD,
@ -1001,6 +1000,10 @@ static int intel_probe ( struct pci_device *pci ) {
goto err_ioremap; goto err_ioremap;
} }
/* Configure DMA */
intel->dma = &pci->dma;
dma_set_mask_64bit ( intel->dma );
/* Reset the NIC */ /* Reset the NIC */
if ( ( rc = intel_reset ( intel ) ) != 0 ) if ( ( rc = intel_reset ( intel ) ) != 0 )
goto err_reset; goto err_reset;

5
src/drivers/net/intelx.c
View File

@ -394,7 +394,6 @@ static int intelx_probe ( struct pci_device *pci ) {
pci_set_drvdata ( pci, netdev ); pci_set_drvdata ( pci, netdev );
netdev->dev = &pci->dev; netdev->dev = &pci->dev;
memset ( intel, 0, sizeof ( *intel ) ); memset ( intel, 0, sizeof ( *intel ) );
intel->dma = &pci->dma;
intel->port = PCI_FUNC ( pci->busdevfn ); intel->port = PCI_FUNC ( pci->busdevfn );
intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTELX_TD, intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTELX_TD,
intel_describe_tx ); intel_describe_tx );
@ -411,6 +410,10 @@ static int intelx_probe ( struct pci_device *pci ) {
goto err_ioremap; goto err_ioremap;
} }
/* Configure DMA */
intel->dma = &pci->dma;
dma_set_mask_64bit ( intel->dma );
/* Reset the NIC */ /* Reset the NIC */
if ( ( rc = intelx_reset ( intel ) ) != 0 ) if ( ( rc = intelx_reset ( intel ) ) != 0 )
goto err_reset; goto err_reset;

5
src/drivers/net/intelxvf.c
View File

@ -446,7 +446,6 @@ static int intelxvf_probe ( struct pci_device *pci ) {
pci_set_drvdata ( pci, netdev ); pci_set_drvdata ( pci, netdev );
netdev->dev = &pci->dev; netdev->dev = &pci->dev;
memset ( intel, 0, sizeof ( *intel ) ); memset ( intel, 0, sizeof ( *intel ) );
intel->dma = &pci->dma;
intel_init_mbox ( &intel->mbox, INTELXVF_MBCTRL, INTELXVF_MBMEM ); intel_init_mbox ( &intel->mbox, INTELXVF_MBCTRL, INTELXVF_MBMEM );
intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTELXVF_TD(0), intel_init_ring ( &intel->tx.ring, INTEL_NUM_TX_DESC, INTELXVF_TD(0),
intel_describe_tx_adv ); intel_describe_tx_adv );
@ -463,6 +462,10 @@ static int intelxvf_probe ( struct pci_device *pci ) {
goto err_ioremap; goto err_ioremap;
} }
/* Configure DMA */
intel->dma = &pci->dma;
dma_set_mask_64bit ( intel->dma );
/* Reset the function */ /* Reset the function */
intelxvf_reset ( intel ); intelxvf_reset ( intel );