Commit b6554cfe authored by Dave Carroll's avatar Dave Carroll Committed by Martin K. Petersen
Browse files

scsi: aacraid: Insure we don't access PCIe space during AER/EEH 



There are a few windows during AER/EEH when we can access PCIe I/O mapped
registers. This will harden the access to insure we do not allow PCIe
access during errors

Signed-off-by: default avatarDave Carroll <david.carroll@microsemi.com>
Reviewed-by: default avatarSagar Biradar <sagar.biradar@microchip.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c2fe742f

drivers/scsi/aacraid/aacraid.h

+6 −1
Original line number Diff line number Diff line
@@ -2640,9 +2640,14 @@ static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor) 
	return capacity;

}



static inline int aac_pci_offline(struct aac_dev *dev)

{

	return pci_channel_offline(dev->pdev) || dev->handle_pci_error;

}



static inline int aac_adapter_check_health(struct aac_dev *dev)

{

	if (unlikely(pci_channel_offline(dev->pdev)))

	if (unlikely(aac_pci_offline(dev)))

		return -1;



	return (dev)->a_ops.adapter_check_health(dev);

drivers/scsi/aacraid/commsup.c

+2 −2
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, 
					return -ETIMEDOUT;

				}



				if (unlikely(pci_channel_offline(dev->pdev)))

				if (unlikely(aac_pci_offline(dev)))

					return -EFAULT;



				if ((blink = aac_adapter_check_health(dev)) > 0) {
@@ -772,7 +772,7 @@ int aac_hba_send(u8 command, struct fib *fibptr, fib_callback callback, 


		spin_unlock_irqrestore(&fibptr->event_lock, flags);



		if (unlikely(pci_channel_offline(dev->pdev)))

		if (unlikely(aac_pci_offline(dev)))

			return -EFAULT;



		fibptr->flags |= FIB_CONTEXT_FLAG_WAIT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE