Commit ef3a7cd2 authored by Damien Le Moal's avatar Damien Le Moal Committed by sanglipeng
Browse files

scsi: pm8001: Setup IRQs on resume 

stable inclusion
from stable-v5.10.197
commit 8768583b2509092bd070f2e04c89b5d2a5f94ae4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96Q8P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8768583b2509092bd070f2e04c89b5d2a5f94ae4



--------------------------------

commit c9177481 upstream.

The function pm8001_pci_resume() only calls pm8001_request_irq() without
calling pm8001_setup_irq(). This causes the IRQ allocation to fail, which
leads all drives being removed from the system.

Fix this issue by integrating the code for pm8001_setup_irq() directly
inside pm8001_request_irq() so that MSI-X setup is performed both during
normal initialization and resume operations.

Fixes: dbf9bfe6 ("[SCSI] pm8001: add SAS/SATA HBA driver")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230911232745.325149-2-dlemoal@kernel.org


Acked-by: default avatarJack Wang <jinpu.wang@ionos.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 3672797f

drivers/scsi/pm8001/pm8001_init.c

+17 −34
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ static irqreturn_t pm8001_interrupt_handler_intx(int irq, void *dev_id) 
	return ret;

}



static u32 pm8001_setup_irq(struct pm8001_hba_info *pm8001_ha);

static u32 pm8001_request_irq(struct pm8001_hba_info *pm8001_ha);



/**
@@ -275,13 +274,6 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, 
	pm8001_dbg(pm8001_ha, INIT, "pm8001_alloc: PHY:%x\n",

		   pm8001_ha->chip->n_phy);



	/* Setup Interrupt */

	rc = pm8001_setup_irq(pm8001_ha);

	if (rc) {

		pm8001_dbg(pm8001_ha, FAIL,

			   "pm8001_setup_irq failed [ret: %d]\n", rc);

		goto err_out;

	}

	/* Request Interrupt */

	rc = pm8001_request_irq(pm8001_ha);

	if (rc)
@@ -990,47 +982,38 @@ static u32 pm8001_request_msix(struct pm8001_hba_info *pm8001_ha) 
}

#endif



static u32 pm8001_setup_irq(struct pm8001_hba_info *pm8001_ha)

{

	struct pci_dev *pdev;



	pdev = pm8001_ha->pdev;



#ifdef PM8001_USE_MSIX

	if (pci_find_capability(pdev, PCI_CAP_ID_MSIX))

		return pm8001_setup_msix(pm8001_ha);

	pm8001_dbg(pm8001_ha, INIT, "MSIX not supported!!!\n");

#endif

	return 0;

}



/**

 * pm8001_request_irq - register interrupt

 * @pm8001_ha: our ha struct.

 */

static u32 pm8001_request_irq(struct pm8001_hba_info *pm8001_ha)

{

	struct pci_dev *pdev;

	struct pci_dev *pdev = pm8001_ha->pdev;

#ifdef PM8001_USE_MSIX

	int rc;



	pdev = pm8001_ha->pdev;

	if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {

		rc = pm8001_setup_msix(pm8001_ha);

		if (rc) {

			pm8001_dbg(pm8001_ha, FAIL,

				   "pm8001_setup_irq failed [ret: %d]\n", rc);

			return rc;

		}



#ifdef PM8001_USE_MSIX

		if (pdev->msix_cap && pci_msi_enabled())

			return pm8001_request_msix(pm8001_ha);

	else {

		pm8001_dbg(pm8001_ha, INIT, "MSIX not supported!!!\n");

		goto intx;

	}



	pm8001_dbg(pm8001_ha, INIT, "MSIX not supported!!!\n");

#endif



intx:

	/* initialize the INT-X interrupt */

	pm8001_ha->irq_vector[0].irq_id = 0;

	pm8001_ha->irq_vector[0].drv_inst = pm8001_ha;

	rc = request_irq(pdev->irq, pm8001_interrupt_handler_intx, IRQF_SHARED,

		pm8001_ha->name, SHOST_TO_SAS_HA(pm8001_ha->shost));

	return rc;



	return request_irq(pdev->irq, pm8001_interrupt_handler_intx,

			   IRQF_SHARED, pm8001_ha->name,

			   SHOST_TO_SAS_HA(pm8001_ha->shost));

}



/**