Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2b302e4 authored Mar 22, 2019 by Dave Carroll Committed by Greg Kroah-Hartman May 04, 2019

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



[ Upstream commit b6554cfe09e1f610aed7d57164ab7760be57acd9 ]

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: Dave Carroll <david.carroll@microsemi.com>
Reviewed-by: Sagar Biradar <sagar.biradar@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>

parent 2c8c8ef8

drivers/scsi/aacraid/aacraid.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -2639,9 +2639,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
		@@ -673,7 +673,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) {
		@@ -773,7 +773,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;