Message ID | 1511400674.9832.23.camel@Centos6.3-64 (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
On Thu, Nov 23, 2017 at 09:31:14AM +0800, Ching Huang wrote: > @@ -829,12 +833,15 @@ arcmsr_request_irq(struct pci_dev *pdev, > unsigned long flags; > int nvec, i; > > + if (msix_enable == 0) > + goto msi_int0; I feel like this goto is not very beautiful, but I can't actually apply this patch? Which tree is this written against? I'm using linux-next. regards, dan carpenter
On Thu, 2017-11-23 at 14:43 +0300, Dan Carpenter wrote: > On Thu, Nov 23, 2017 at 09:31:14AM +0800, Ching Huang wrote: > > @@ -829,12 +833,15 @@ arcmsr_request_irq(struct pci_dev *pdev, > > unsigned long flags; > > int nvec, i; > > > > + if (msix_enable == 0) > > + goto msi_int0; > > I feel like this goto is not very beautiful, but I can't actually apply > this patch? Which tree is this written against? I'm using linux-next. > This patch is apply to https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/tree/?h=4.16/scsi-queue > regards, > dan carpenter > >
diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c --- a/drivers/scsi/arcmsr/arcmsr_hba.c 2017-11-23 16:02:28.000000000 +0800 +++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2017-11-23 16:09:24.000000000 +0800 @@ -75,6 +75,10 @@ MODULE_DESCRIPTION("Areca ARC11xx/12xx/1 MODULE_LICENSE("Dual BSD/GPL"); MODULE_VERSION(ARCMSR_DRIVER_VERSION); +static int msix_enable = 1; +module_param(msix_enable, int, S_IRUGO); +MODULE_PARM_DESC(msix_enable, " Enable MSI-X interrupt(0 ~ 1), msix_enable=1(enable), =0(disable)"); + static int msi_enable = 1; module_param(msi_enable, int, S_IRUGO); MODULE_PARM_DESC(msi_enable, " Enable MSI interrupt(0 ~ 1), msi_enable=1(enable), =0(disable)"); @@ -829,12 +833,15 @@ arcmsr_request_irq(struct pci_dev *pdev, unsigned long flags; int nvec, i; + if (msix_enable == 0) + goto msi_int0; nvec = pci_alloc_irq_vectors(pdev, 1, ARCMST_NUM_MSIX_VECTORS, PCI_IRQ_MSIX); if (nvec > 0) { pr_info("arcmsr%d: msi-x enabled\n", acb->host->host_no); flags = 0; } else { +msi_int0: if (msi_enable == 1) nvec = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI); else