Commit b559b99a authored by Karan Tilak Kumar's avatar Karan Tilak Kumar Committed by Martin K. Petersen
Browse files

scsi: fnic: Replace DMA mask of 64 bits with 47 bits 

Cisco VIC supports only 47 bits.  If the host sends DMA addresses that are
greater than 47 bits, it causes work queue (WQ) errors in the VIC.

Link: https://lore.kernel.org/r/20220513205605.81788-1-kartilak@cisco.com


Tested-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Co-developed-by: default avatarDhanraj Jhawar <djhawar@cisco.com>
Signed-off-by: default avatarDhanraj Jhawar <djhawar@cisco.com>
Co-developed-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarArulprabhu Ponnusamy <arulponn@cisco.com>
Signed-off-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 9feb5c4c

drivers/scsi/fnic/fnic.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define DRV_NAME		"fnic"

#define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"

#define DRV_VERSION		"1.6.0.53"

#define DRV_VERSION		"1.6.0.54"

#define PFX			DRV_NAME ": "

#define DFX                     DRV_NAME "%d: "

drivers/scsi/fnic/fnic_main.c

+3 −3
Original line number Diff line number Diff line
@@ -612,10 +612,10 @@ static int fnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_set_master(pdev);



	/* Query PCI controller on system for DMA addressing

	 * limitation for the device.  Try 64-bit first, and

	 * fail to 32-bit.

	 * limitation for the device.  Try 47-bit first, and

	 * fail to 32-bit. Cisco VIC supports 47 bits only.

	 */

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(47));

	if (err) {

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (err) {