[SCSI] megaraid_sas: Fix probe_one to clear MSI-X flags in kdump (66192dfe) · Commits · 戴 / test

drivers/scsi/megaraid/megaraid_sas.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1477,4 +1477,7 @@ struct megasas_mgmt_info {
		int max_index;
		};

		#define msi_control_reg(base) (base + PCI_MSI_FLAGS)
		#define PCI_MSIX_FLAGS_ENABLE (1 << 15)

		#endif /LSI_MEGARAID_SAS_H /

+18 −1

Original line number	Diff line number	Diff line
		@@ -3901,9 +3901,26 @@ fail_set_dma_mask:
		static int __devinit
		megasas_probe_one(struct pci_dev pdev, const struct pci_device_id id)
		{
		int rval;
		int rval, pos;
		struct Scsi_Host *host;
		struct megasas_instance *instance;
		u16 control = 0;

		/* Reset MSI-X in the kdump kernel */
		if (reset_devices) {
		pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX);
		if (pos) {
		pci_read_config_word(pdev, msi_control_reg(pos),
		&control);
		if (control & PCI_MSIX_FLAGS_ENABLE) {
		dev_info(&pdev->dev, "resetting MSI-X\n");
		pci_write_config_word(pdev,
		msi_control_reg(pos),
		control &
		~PCI_MSIX_FLAGS_ENABLE);
		}
		}
		}

		/*
		* Announce PCI information