Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1c82311 authored by Robert Richter's avatar Robert Richter Committed by Tejun Heo
Browse files

ahci: Move interrupt enablement code to a separate function 



This patch refactors ahci_init_interrupts() and moves msi code to a
separate function. Need the split since we add msix initialization in
a later patch. The initialization for msix will be done after msi but
before intx.

Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8485187b

drivers/ata/ahci.c

+22 −9
Original line number Diff line number Diff line
@@ -1201,17 +1201,17 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host) 
{}

#endif



static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports,

static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,

			struct ahci_host_priv *hpriv)

{

	int rc, nvec;



	if (hpriv->flags & AHCI_HFLAG_NO_MSI)

		goto intx;

		return -ENODEV;



	nvec = pci_msi_vec_count(pdev);

	if (nvec < 0)

		goto intx;

		return nvec;



	/*

	 * If number of MSIs is less than number of ports then Sharing Last
@@ -1224,8 +1224,8 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, 
	rc = pci_enable_msi_exact(pdev, nvec);

	if (rc == -ENOSPC)

		goto single_msi;

	else if (rc < 0)

		goto intx;

	if (rc < 0)

		return rc;



	/* fallback to single MSI mode if the controller enforced MRSM mode */

	if (readl(hpriv->mmio + HOST_CTL) & HOST_MRSM) {
@@ -1240,12 +1240,25 @@ static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports, 
	return nvec;



single_msi:

	if (pci_enable_msi(pdev))

		goto intx;

	rc = pci_enable_msi(pdev);

	if (rc < 0)

		return rc;



	return 1;

}



intx:

static int ahci_init_interrupts(struct pci_dev *pdev, unsigned int n_ports,

				struct ahci_host_priv *hpriv)

{

	int nvec;



	nvec = ahci_init_msi(pdev, n_ports, hpriv);

	if (nvec >= 0)

		return nvec;



	/* lagacy intx interrupts */

	pci_intx(pdev, 1);



	return 0;

}