openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: qla4xxx: switch to pci_alloc_irq_vectors 

And simplify the MSI-X logic in general - just request the two vectors
directly instead of going through an indirection table.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nilesh Javali <nilesh.javali@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christoph Hellwig 2016-12-06 14:56:50 +01:00 committed by Martin K. Petersen
parent 26f3ba9600
commit f5b893c947
4 changed files with 36 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/qla4xxx/ql4_def.h
View File

@ -409,18 +409,9 @@ struct qla4_8xxx_legacy_intr_set {
/* MSI-X Support */ /* MSI-X Support */
#define QLA_MSIX_DEFAULT 0x00 #define QLA_MSIX_DEFAULT 0
#define QLA_MSIX_RSP_Q 0x01 #define QLA_MSIX_RSP_Q 1
#define QLA_MSIX_ENTRIES 2 #define QLA_MSIX_ENTRIES 2
#define QLA_MIDX_DEFAULT 0
#define QLA_MIDX_RSP_Q 1
struct ql4_msix_entry {
int have_irq;
uint16_t msix_vector;
uint16_t msix_entry;
};
/* /*
* ISP Operations * ISP Operations
@ -572,9 +563,6 @@ struct scsi_qla_host {
#define AF_IRQ_ATTACHED 10 /* 0x00000400 */ #define AF_IRQ_ATTACHED 10 /* 0x00000400 */
#define AF_DISABLE_ACB_COMPLETE 11 /* 0x00000800 */ #define AF_DISABLE_ACB_COMPLETE 11 /* 0x00000800 */
#define AF_HA_REMOVAL 12 /* 0x00001000 */ #define AF_HA_REMOVAL 12 /* 0x00001000 */
#define AF_INTx_ENABLED 15 /* 0x00008000 */
#define AF_MSI_ENABLED 16 /* 0x00010000 */
#define AF_MSIX_ENABLED 17 /* 0x00020000 */
#define AF_MBOX_COMMAND_NOPOLL 18 /* 0x00040000 */ #define AF_MBOX_COMMAND_NOPOLL 18 /* 0x00040000 */
#define AF_FW_RECOVERY 19 /* 0x00080000 */ #define AF_FW_RECOVERY 19 /* 0x00080000 */
#define AF_EEH_BUSY 20 /* 0x00100000 */ #define AF_EEH_BUSY 20 /* 0x00100000 */
@ -762,8 +750,6 @@ struct scsi_qla_host {
struct isp_operations *isp_ops; struct isp_operations *isp_ops;
struct ql82xx_hw_data hw; struct ql82xx_hw_data hw;
struct ql4_msix_entry msix_entries[QLA_MSIX_ENTRIES];
uint32_t nx_dev_init_timeout; uint32_t nx_dev_init_timeout;
uint32_t nx_reset_timeout; uint32_t nx_reset_timeout;
void *fw_dump; void *fw_dump;

1
drivers/scsi/qla4xxx/ql4_glbl.h
View File

@ -134,7 +134,6 @@ int qla4_8xxx_get_flash_info(struct scsi_qla_host *ha);
void qla4_82xx_enable_intrs(struct scsi_qla_host *ha); void qla4_82xx_enable_intrs(struct scsi_qla_host *ha);
void qla4_82xx_disable_intrs(struct scsi_qla_host *ha); void qla4_82xx_disable_intrs(struct scsi_qla_host *ha);
int qla4_8xxx_enable_msix(struct scsi_qla_host *ha); int qla4_8xxx_enable_msix(struct scsi_qla_host *ha);
void qla4_8xxx_disable_msix(struct scsi_qla_host *ha);
irqreturn_t qla4_8xxx_msi_handler(int irq, void *dev_id); irqreturn_t qla4_8xxx_msi_handler(int irq, void *dev_id);
irqreturn_t qla4_8xxx_default_intr_handler(int irq, void *dev_id); irqreturn_t qla4_8xxx_default_intr_handler(int irq, void *dev_id);
irqreturn_t qla4_8xxx_msix_rsp_q(int irq, void *dev_id); irqreturn_t qla4_8xxx_msix_rsp_q(int irq, void *dev_id);

27
drivers/scsi/qla4xxx/ql4_isr.c
View File

@ -1107,7 +1107,7 @@ static void qla4_82xx_spurious_interrupt(struct scsi_qla_host *ha,
DEBUG2(ql4_printk(KERN_INFO, ha, "Spurious Interrupt\n")); DEBUG2(ql4_printk(KERN_INFO, ha, "Spurious Interrupt\n"));
if (is_qla8022(ha)) { if (is_qla8022(ha)) {
writel(0, &ha->qla4_82xx_reg->host_int); writel(0, &ha->qla4_82xx_reg->host_int);
if (test_bit(AF_INTx_ENABLED, &ha->flags)) if (!ha->pdev->msi_enabled && !ha->pdev->msix_enabled)
qla4_82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, qla4_82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg,
0xfbff); 0xfbff);
} }
@ -1564,19 +1564,18 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha)
try_msi: try_msi:
/* Trying MSI */ /* Trying MSI */
ret = pci_enable_msi(ha->pdev); ret = pci_alloc_irq_vectors(ha->pdev, 1, 1, PCI_IRQ_MSI);
if (!ret) { if (ret > 0) {
ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler, ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler,
0, DRIVER_NAME, ha); 0, DRIVER_NAME, ha);
if (!ret) { if (!ret) {
DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n")); DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n"));
set_bit(AF_MSI_ENABLED, &ha->flags);
goto irq_attached; goto irq_attached;
} else { } else {
ql4_printk(KERN_WARNING, ha, ql4_printk(KERN_WARNING, ha,
"MSI: Failed to reserve interrupt %d " "MSI: Failed to reserve interrupt %d "
"already in use.\n", ha->pdev->irq); "already in use.\n", ha->pdev->irq);
pci_disable_msi(ha->pdev); pci_free_irq_vectors(ha->pdev);
} }
} }
@ -1592,7 +1591,6 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha)
IRQF_SHARED, DRIVER_NAME, ha); IRQF_SHARED, DRIVER_NAME, ha);
if (!ret) { if (!ret) {
DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n")); DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n"));
set_bit(AF_INTx_ENABLED, &ha->flags);
goto irq_attached; goto irq_attached;
} else { } else {
@ -1614,14 +1612,11 @@ int qla4xxx_request_irqs(struct scsi_qla_host *ha)
void qla4xxx_free_irqs(struct scsi_qla_host *ha) void qla4xxx_free_irqs(struct scsi_qla_host *ha)
{ {
if (test_and_clear_bit(AF_IRQ_ATTACHED, &ha->flags)) { if (!test_and_clear_bit(AF_IRQ_ATTACHED, &ha->flags))
if (test_bit(AF_MSIX_ENABLED, &ha->flags)) { return;
qla4_8xxx_disable_msix(ha);
} else if (test_and_clear_bit(AF_MSI_ENABLED, &ha->flags)) { if (ha->pdev->msix_enabled)
free_irq(ha->pdev->irq, ha); free_irq(pci_irq_vector(ha->pdev, 1), ha);
pci_disable_msi(ha->pdev); free_irq(pci_irq_vector(ha->pdev, 0), ha);
} else if (test_and_clear_bit(AF_INTx_ENABLED, &ha->flags)) { pci_free_irq_vectors(ha->pdev);
free_irq(ha->pdev->irq, ha);
}
}
} }

87
drivers/scsi/qla4xxx/ql4_nx.c
View File

@ -3945,7 +3945,7 @@ void qla4_82xx_process_mbox_intr(struct scsi_qla_host *ha, int out_count)
ha->isp_ops->interrupt_service_routine(ha, intr_status); ha->isp_ops->interrupt_service_routine(ha, intr_status);
if (test_bit(AF_INTERRUPTS_ON, &ha->flags) && if (test_bit(AF_INTERRUPTS_ON, &ha->flags) &&
test_bit(AF_INTx_ENABLED, &ha->flags)) (!ha->pdev->msi_enabled && !ha->pdev->msix_enabled))
qla4_82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg, qla4_82xx_wr_32(ha, ha->nx_legacy_intr.tgt_mask_reg,
0xfbff); 0xfbff);
} }
@ -4174,78 +4174,37 @@ qla4_82xx_disable_intrs(struct scsi_qla_host *ha)
spin_unlock_irq(&ha->hardware_lock); spin_unlock_irq(&ha->hardware_lock);
} }
struct ql4_init_msix_entry {
uint16_t entry;
uint16_t index;
const char *name;
irq_handler_t handler;
};
static struct ql4_init_msix_entry qla4_8xxx_msix_entries[QLA_MSIX_ENTRIES] = {
{ QLA_MSIX_DEFAULT, QLA_MIDX_DEFAULT,
"qla4xxx (default)",
(irq_handler_t)qla4_8xxx_default_intr_handler },
{ QLA_MSIX_RSP_Q, QLA_MIDX_RSP_Q,
"qla4xxx (rsp_q)", (irq_handler_t)qla4_8xxx_msix_rsp_q },
};
void
qla4_8xxx_disable_msix(struct scsi_qla_host *ha)
{
int i;
struct ql4_msix_entry *qentry;
for (i = 0; i < QLA_MSIX_ENTRIES; i++) {
qentry = &ha->msix_entries[qla4_8xxx_msix_entries[i].index];
if (qentry->have_irq) {
free_irq(qentry->msix_vector, ha);
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: %s\n",
__func__, qla4_8xxx_msix_entries[i].name));
}
}
pci_disable_msix(ha->pdev);
clear_bit(AF_MSIX_ENABLED, &ha->flags);
}
int int
qla4_8xxx_enable_msix(struct scsi_qla_host *ha) qla4_8xxx_enable_msix(struct scsi_qla_host *ha)
{ {
int i, ret; int ret;
struct msix_entry entries[QLA_MSIX_ENTRIES];
struct ql4_msix_entry *qentry;
for (i = 0; i < QLA_MSIX_ENTRIES; i++) ret = pci_alloc_irq_vectors(ha->pdev, QLA_MSIX_ENTRIES,
entries[i].entry = qla4_8xxx_msix_entries[i].entry; QLA_MSIX_ENTRIES, PCI_IRQ_MSIX);
if (ret < 0) {
ret = pci_enable_msix_exact(ha->pdev, entries, ARRAY_SIZE(entries));
if (ret) {
ql4_printk(KERN_WARNING, ha, ql4_printk(KERN_WARNING, ha,
"MSI-X: Failed to enable support -- %d/%d\n", "MSI-X: Failed to enable support -- %d/%d\n",
QLA_MSIX_ENTRIES, ret); QLA_MSIX_ENTRIES, ret);
goto msix_out; return ret;
} }
set_bit(AF_MSIX_ENABLED, &ha->flags);
for (i = 0; i < QLA_MSIX_ENTRIES; i++) { ret = request_irq(pci_irq_vector(ha->pdev, 0),
qentry = &ha->msix_entries[qla4_8xxx_msix_entries[i].index]; qla4_8xxx_default_intr_handler, 0, "qla4xxx (default)",
qentry->msix_vector = entries[i].vector; ha);
qentry->msix_entry = entries[i].entry; if (ret)
qentry->have_irq = 0; goto out_free_vectors;
ret = request_irq(qentry->msix_vector,
qla4_8xxx_msix_entries[i].handler, 0, ret = request_irq(pci_irq_vector(ha->pdev, 1),
qla4_8xxx_msix_entries[i].name, ha); qla4_8xxx_msix_rsp_q, 0, "qla4xxx (rsp_q)", ha);
if (ret) { if (ret)
ql4_printk(KERN_WARNING, ha, goto out_free_default_irq;
"MSI-X: Unable to register handler -- %x/%d.\n",
qla4_8xxx_msix_entries[i].index, ret); return 0;
qla4_8xxx_disable_msix(ha);
goto msix_out; out_free_default_irq:
} free_irq(pci_irq_vector(ha->pdev, 0), ha);
qentry->have_irq = 1; out_free_vectors:
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: %s\n", pci_free_irq_vectors(ha->pdev);
__func__, qla4_8xxx_msix_entries[i].name));
}
msix_out:
return ret; return ret;
} }