Commit e891681b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Martin K. Petersen
Browse files

scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting() 



pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since commit f26e58bf ("PCI/AER: Enable error reporting when
AER is native"), the PCI core does this for all devices during enumeration,
so the driver doesn't need to do it itself.

Remove the redundant pci_enable_pcie_error_reporting() call from the
driver.  Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.

Note that this only controls ERR_* Messages from the device.  An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20230307182842.870378-8-helgaas@kernel.org


Cc: James Smart <james.smart@broadcom.com>
Cc: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b2bce40c

drivers/scsi/lpfc/lpfc.h

+0 −2
Original line number Diff line number Diff line
@@ -1036,7 +1036,6 @@ struct lpfc_hba { 
#define FCF_TS_INPROG           0x200 /* FCF table scan in progress */

#define FCF_RR_INPROG           0x400 /* FCF roundrobin flogi in progress */

#define HBA_FIP_SUPPORT		0x800 /* FIP support in HBA */

#define HBA_AER_ENABLED		0x1000 /* AER enabled with HBA */

#define HBA_DEVLOSS_TMO         0x2000 /* HBA in devloss timeout */

#define HBA_RRQ_ACTIVE		0x4000 /* process the rrq active list */

#define HBA_IOQ_FLUSH		0x8000 /* FCP/NVME I/O queues being flushed */
@@ -1190,7 +1189,6 @@ struct lpfc_hba { 
#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP

#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP

#endif

	uint32_t cfg_aer_support;

	uint32_t cfg_sriov_nr_virtfn;

	uint32_t cfg_request_firmware_upgrade;

	uint32_t cfg_suppress_link_up;

drivers/scsi/lpfc/lpfc_attr.c

+27 −69
Original line number Diff line number Diff line
@@ -4365,13 +4365,22 @@ static DEVICE_ATTR_RW(lpfc_link_speed); 


/*

# lpfc_aer_support: Support PCIe device Advanced Error Reporting (AER)

#       0  = aer disabled or not supported

#       1  = aer supported and enabled (default)

# Value range is [0,1]. Default value is 1.

# PCIe error reporting is always enabled by the PCI core, so this always

# shows 1.

#

# N.B. Parts of LPFC_ATTR open-coded since some of the underlying

# infrastructure (phba->cfg_aer_support) is gone.

*/

LPFC_ATTR(aer_support, 1, 0, 1,

	"Enable PCIe device AER support");

lpfc_param_show(aer_support)

static uint lpfc_aer_support = 1;

module_param(lpfc_aer_support, uint, S_IRUGO);

MODULE_PARM_DESC(lpfc_aer_support, "Enable PCIe device AER support");

static ssize_t

lpfc_aer_support_show(struct device *dev, struct device_attribute *attr,

		      char *buf)

{

	return scnprintf(buf, PAGE_SIZE, "%d\n", lpfc_aer_support);

}



/**

 * lpfc_aer_support_store - Set the adapter for aer support
@@ -4382,76 +4391,27 @@ lpfc_param_show(aer_support) 
 * @count: unused variable.

 *

 * Description:

 * If the val is 1 and currently the device's AER capability was not

 * enabled, invoke the kernel's enable AER helper routine, trying to

 * enable the device's AER capability. If the helper routine enabling

 * AER returns success, update the device's cfg_aer_support flag to

 * indicate AER is supported by the device; otherwise, if the device

 * AER capability is already enabled to support AER, then do nothing.

 *

 * If the val is 0 and currently the device's AER support was enabled,

 * invoke the kernel's disable AER helper routine. After that, update

 * the device's cfg_aer_support flag to indicate AER is not supported

 * by the device; otherwise, if the device AER capability is already

 * disabled from supporting AER, then do nothing.

 * PCIe error reporting is enabled by the PCI core, so drivers don't need

 * to do anything.  Retain this interface for backwards compatibility,

 * but do nothing.

 *

 * Returns:

 * length of the buf on success if val is in range the intended mode

 * is supported.

 * -EINVAL if val out of range or intended mode is not supported.

 * length of the buf on success

 * -EINVAL if val out of range

 **/

static ssize_t

lpfc_aer_support_store(struct device *dev, struct device_attribute *attr,

		       const char *buf, size_t count)

{

	struct Scsi_Host *shost = class_to_shost(dev);

	struct lpfc_vport *vport = (struct lpfc_vport *)shost->hostdata;

	struct lpfc_hba *phba = vport->phba;

	int val = 0, rc = -EINVAL;

	int val = 0;



	if (!isdigit(buf[0]))

		return -EINVAL;

	if (sscanf(buf, "%i", &val) != 1)

		return -EINVAL;



	switch (val) {

	case 0:

		if (phba->hba_flag & HBA_AER_ENABLED) {

			rc = pci_disable_pcie_error_reporting(phba->pcidev);

			if (!rc) {

				spin_lock_irq(&phba->hbalock);

				phba->hba_flag &= ~HBA_AER_ENABLED;

				spin_unlock_irq(&phba->hbalock);

				phba->cfg_aer_support = 0;

				rc = strlen(buf);

			} else

				rc = -EPERM;

		} else {

			phba->cfg_aer_support = 0;

			rc = strlen(buf);

		}

		break;

	case 1:

		if (!(phba->hba_flag & HBA_AER_ENABLED)) {

			rc = pci_enable_pcie_error_reporting(phba->pcidev);

			if (!rc) {

				spin_lock_irq(&phba->hbalock);

				phba->hba_flag |= HBA_AER_ENABLED;

				spin_unlock_irq(&phba->hbalock);

				phba->cfg_aer_support = 1;

				rc = strlen(buf);

			} else

				 rc = -EPERM;

		} else {

			phba->cfg_aer_support = 1;

			rc = strlen(buf);

		}

		break;

	default:

		rc = -EINVAL;

		break;

	}

	return rc;

	dev_info_once(dev, "PCIe error reporting automatically enabled by the PCI core; sysfs write ignored\n");

	return strlen(buf);

}



static DEVICE_ATTR_RW(lpfc_aer_support);
@@ -4464,16 +4424,16 @@ static DEVICE_ATTR_RW(lpfc_aer_support); 
 * @count: unused variable.

 *

 * Description:

 * If the @buf contains 1 and the device currently has the AER support

 * enabled, then invokes the kernel AER helper routine

 * If the @buf contains 1, invokes the kernel AER helper routine

 * pci_aer_clear_nonfatal_status() to clean up the uncorrectable

 * error status register.

 *

 * Notes:

 *

 * Returns:

 * -EINVAL if the buf does not contain the 1 or the device is not currently

 * enabled with the AER support.

 * -EINVAL if the buf does not contain 1

 * -EPERM if the OS cannot clear AER error status, i.e., when platform

 * firmware owns the AER Capability

 **/

static ssize_t

lpfc_aer_cleanup_state(struct device *dev, struct device_attribute *attr,
@@ -4491,7 +4451,6 @@ lpfc_aer_cleanup_state(struct device *dev, struct device_attribute *attr, 
	if (val != 1)

		return -EINVAL;



	if (phba->hba_flag & HBA_AER_ENABLED)

	rc = pci_aer_clear_nonfatal_status(phba->pcidev);



	if (rc == 0)
@@ -7277,7 +7236,6 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 


	lpfc_sg_seg_cnt_init(phba, lpfc_sg_seg_cnt);

	lpfc_hba_queue_depth_init(phba, lpfc_hba_queue_depth);

	lpfc_aer_support_init(phba, lpfc_aer_support);

	lpfc_sriov_nr_virtfn_init(phba, lpfc_sriov_nr_virtfn);

	lpfc_request_firmware_upgrade_init(phba, lpfc_req_fw_upgrade);

	lpfc_suppress_link_up_init(phba, lpfc_suppress_link_up);

drivers/scsi/lpfc/lpfc_init.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/spinlock.h>

#include <linux/sched/clock.h>

#include <linux/ctype.h>

#include <linux/aer.h>

#include <linux/slab.h>

#include <linux/firmware.h>

#include <linux/miscdevice.h>

drivers/scsi/lpfc/lpfc_sli.c

+0 −55
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_fc.h>

#include <scsi/fc/fc_fs.h>

#include <linux/aer.h>

#include <linux/crash_dump.h>

#ifdef CONFIG_X86

#include <asm/set_memory.h>
@@ -5204,13 +5203,9 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba) 
	volatile struct MAILBOX_word0 mb;

	struct lpfc_sli *psli;

	void __iomem *to_slim;

	uint32_t hba_aer_enabled;









	spin_lock_irq(&phba->hbalock);

















	/* Take PCIe device Advanced Error Reporting (AER) state */









	hba_aer_enabled = phba->hba_flag & HBA_AER_ENABLED;

















	psli = &phba->sli;

















	/* Restart HBA */








@@ -5251,10 +5246,6 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)







	/* Give the INITFF and Post time to settle. */









	mdelay(100);

















	/* Reset HBA AER if it was enabled, note hba_flag was reset above */









	if (hba_aer_enabled)









		pci_disable_pcie_error_reporting(phba->pcidev);

















	lpfc_hba_down_post(phba);

















	return 0;








@@ -5273,7 +5264,6 @@ static int







lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)









{









	struct lpfc_sli *psli = &phba->sli;









	uint32_t hba_aer_enabled;









	int rc;

















	/* Restart HBA */








@@ -5281,9 +5271,6 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)







			"0296 Restart HBA Data: x%x x%x\n",









			phba->pport->port_state, psli->sli_flag);

















	/* Take PCIe device Advanced Error Reporting (AER) state */









	hba_aer_enabled = phba->hba_flag & HBA_AER_ENABLED;

















	rc = lpfc_sli4_brdreset(phba);









	if (rc) {









		phba->link_state = LPFC_HBA_ERROR;








@@ -5301,10 +5288,6 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)







	memset(&psli->lnk_stat_offsets, 0, sizeof(psli->lnk_stat_offsets));









	psli->stats_start = ktime_get_seconds();

















	/* Reset HBA AER if it was enabled, note hba_flag was reset above */









	if (hba_aer_enabled)









		pci_disable_pcie_error_reporting(phba->pcidev);

















hba_down_queue:









	lpfc_hba_down_post(phba);









	lpfc_sli4_queue_destroy(phba);








@@ -5725,25 +5708,6 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)







	}









	phba->fcp_embed_io = 0;	/* SLI4 FC support only */

















	/* Enable PCIe device Advanced Error Reporting (AER) if configured */









	if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) {









		rc = pci_enable_pcie_error_reporting(phba->pcidev);









		if (!rc) {









			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,









					"2709 This device supports "









					"Advanced Error Reporting (AER)\n");









			spin_lock_irq(&phba->hbalock);









			phba->hba_flag |= HBA_AER_ENABLED;









			spin_unlock_irq(&phba->hbalock);









		} else {









			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,









					"2708 This device does not support "









					"Advanced Error Reporting (AER): %d\n",









					rc);









			phba->cfg_aer_support = 0;









		}









	}

















	if (phba->sli_rev == 3) {









		phba->iocb_cmd_size = SLI3_IOCB_CMD_SIZE;









		phba->iocb_rsp_size = SLI3_IOCB_RSP_SIZE;








@@ -9053,25 +9017,6 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)







	mod_timer(&phba->eratt_poll,









		  jiffies + msecs_to_jiffies(1000 * phba->eratt_poll_interval));

















	/* Enable PCIe device Advanced Error Reporting (AER) if configured */









	if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) {









		rc = pci_enable_pcie_error_reporting(phba->pcidev);









		if (!rc) {









			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,









					"2829 This device supports "









					"Advanced Error Reporting (AER)\n");









			spin_lock_irq(&phba->hbalock);









			phba->hba_flag |= HBA_AER_ENABLED;









			spin_unlock_irq(&phba->hbalock);









		} else {









			lpfc_printf_log(phba, KERN_INFO, LOG_INIT,









					"2830 This device does not support "









					"Advanced Error Reporting (AER)\n");









			phba->cfg_aer_support = 0;









		}









		rc = 0;









	}

















	/*









	 * The port is ready, set the host's link state to LINK_DOWN









	 * in preparation for link interrupts.