diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2014-09-25 15:13:21 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-09-28 11:43:56 -0400 |
| commit | c3ebd6a9b614ef1fbb5a44a3a33cd639ff4694bf (patch) | |
| tree | df33c8be5ae2ac6d0bbd21400a643df9b8de9b5f | |
| parent | 6d8ca28fa688a9354bc9fbc935bdaeb3651b6677 (diff) | |
AHCI: Cleanup checking of multiple MSIs/SLM modes
Sharing Last Message (SLM) mode is currently checked in two
functions: ahci_host_activate() and ahci_init_interrupts().
This update consolidates SLM mode check with activation of
multiple MSIs mode.
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
| -rw-r--r-- | drivers/ata/ahci.c | 18 | ||||
| -rw-r--r-- | drivers/ata/ahci.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index c880699a7d0b..f68a995ec3fd 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1211,6 +1211,9 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, goto single_msi; } + if (nvec > 1) + hpriv->flags |= AHCI_HFLAG_MULTI_MSI; + return nvec; single_msi: @@ -1227,7 +1230,6 @@ intx: * ahci_host_activate - start AHCI host, request IRQs and register it * @host: target ATA host * @irq: base IRQ number to request - * @n_msis: number of MSIs allocated for this host * @irq_handler: irq_handler used when requesting IRQs * @irq_flags: irq_flags used when requesting IRQs * @@ -1241,14 +1243,10 @@ intx: * RETURNS: * 0 on success, -errno otherwise. */ -int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis) +int ahci_host_activate(struct ata_host *host, int irq) { int i, rc; - /* Sharing Last Message among several ports is not supported */ - if (n_msis < host->n_ports) - return -EINVAL; - rc = ata_host_start(host); if (rc) return rc; @@ -1296,7 +1294,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) struct device *dev = &pdev->dev; struct ahci_host_priv *hpriv; struct ata_host *host; - int n_ports, n_msis, i, rc; + int n_ports, i, rc; int ahci_pci_bar = AHCI_PCI_BAR_STANDARD; VPRINTK("ENTER\n"); @@ -1437,9 +1435,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) */ n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map)); - n_msis = ahci_init_interrupts(pdev, n_ports, hpriv); - if (n_msis > 1) - hpriv->flags |= AHCI_HFLAG_MULTI_MSI; + ahci_init_interrupts(pdev, n_ports, hpriv); host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports); if (!host) @@ -1492,7 +1488,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) - return ahci_host_activate(host, pdev->irq, n_msis); + return ahci_host_activate(host, pdev->irq); return ata_host_activate(host, pdev->irq, ahci_interrupt, IRQF_SHARED, &ahci_sht); diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 90156ff1e9cb..a074c7301504 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -392,7 +392,7 @@ irqreturn_t ahci_interrupt(int irq, void *dev_instance); irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance); irqreturn_t ahci_thread_fn(int irq, void *dev_instance); void ahci_print_info(struct ata_host *host, const char *scc_s); -int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis); +int ahci_host_activate(struct ata_host *host, int irq); void ahci_error_handler(struct ata_port *ap); static inline void __iomem *__ahci_port_base(struct ata_host *host, |