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

Commit 6b2fd7ef authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Bjorn Helgaas
Browse files

PCI/MSI/PPC: Remove arch_msi_check_device() 



Move MSI checks from arch_msi_check_device() to arch_setup_msi_irqs().
This makes the code more compact and allows removing
arch_msi_check_device() from generic MSI code.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 52addcf9

arch/powerpc/include/asm/machdep.h

+0 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ struct machdep_calls { 
	int		(*pci_setup_phb)(struct pci_controller *host);



#ifdef CONFIG_PCI_MSI

	int		(*msi_check_device)(struct pci_dev* dev,

					    int nvec, int type);

	int		(*setup_msi_irqs)(struct pci_dev *dev,

					  int nvec, int type);

	void		(*teardown_msi_irqs)(struct pci_dev *dev);

arch/powerpc/kernel/msi.c

+1 −11
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include <asm/machdep.h>



int arch_msi_check_device(struct pci_dev* dev, int nvec, int type)

int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) {

		pr_debug("msi: Platform doesn't provide MSI callbacks.\n");
@@ -24,16 +24,6 @@ int arch_msi_check_device(struct pci_dev* dev, int nvec, int type) 
	if (type == PCI_CAP_ID_MSI && nvec > 1)

		return 1;



	if (ppc_md.msi_check_device) {

		pr_debug("msi: Using platform check routine.\n");

		return ppc_md.msi_check_device(dev, nvec, type);

	}



        return 0;

}



int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	return ppc_md.setup_msi_irqs(dev, nvec, type);

}

arch/powerpc/platforms/cell/axon_msi.c

+0 −9
Original line number Diff line number Diff line
@@ -199,14 +199,6 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev) 
	return msic;

}



static int axon_msi_check_device(struct pci_dev *dev, int nvec, int type)

{

	if (!find_msi_translator(dev))

		return -ENODEV;



	return 0;

}



static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)

{

	struct device_node *dn;
@@ -416,7 +408,6 @@ static int axon_msi_probe(struct platform_device *device) 


	ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;

	ppc_md.teardown_msi_irqs = axon_msi_teardown_msi_irqs;

	ppc_md.msi_check_device = axon_msi_check_device;



	axon_msi_debug_setup(dn, msic);

arch/powerpc/platforms/powernv/pci.c

+5 −14
Original line number Diff line number Diff line
@@ -46,29 +46,21 @@ 
//#define cfg_dbg(fmt...)	printk(fmt)



#ifdef CONFIG_PCI_MSI

static int pnv_msi_check_device(struct pci_dev* pdev, int nvec, int type)

{

	struct pci_controller *hose = pci_bus_to_host(pdev->bus);

	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pci_get_pdn(pdev);



	if (pdn && pdn->force_32bit_msi && !phb->msi32_support)

		return -ENODEV;



	return (phb && phb->msi_bmp.bitmap) ? 0 : -ENODEV;

}



static int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

{

	struct pci_controller *hose = pci_bus_to_host(pdev->bus);

	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pci_get_pdn(pdev);

	struct msi_desc *entry;

	struct msi_msg msg;

	int hwirq;

	unsigned int virq;

	int rc;



	if (WARN_ON(!phb))

	if (WARN_ON(!phb) || !phb->msi_bmp.bitmap)

		return -ENODEV;



	if (pdn && pdn->force_32bit_msi && !phb->msi32_support)

		return -ENODEV;



	list_for_each_entry(entry, &pdev->msi_list, list) {
@@ -860,7 +852,6 @@ void __init pnv_pci_init(void) 


	/* Configure MSIs */

#ifdef CONFIG_PCI_MSI

	ppc_md.msi_check_device = pnv_msi_check_device;

	ppc_md.setup_msi_irqs = pnv_setup_msi_irqs;

	ppc_md.teardown_msi_irqs = pnv_teardown_msi_irqs;

#endif

arch/powerpc/platforms/pseries/msi.c

+16 −26
Original line number Diff line number Diff line
@@ -336,26 +336,6 @@ static int msi_quota_for_device(struct pci_dev *dev, int request) 
	return request;

}



static int rtas_msi_check_device(struct pci_dev *pdev, int nvec, int type)

{

	int quota, rc;



	if (type == PCI_CAP_ID_MSIX)

		rc = check_req_msix(pdev, nvec);

	else

		rc = check_req_msi(pdev, nvec);



	if (rc)

		return rc;



	quota = msi_quota_for_device(pdev, nvec);



	if (quota && quota < nvec)

		return quota;



	return 0;

}



static int check_msix_entries(struct pci_dev *pdev)

{

	struct msi_desc *entry;
@@ -397,15 +377,24 @@ static void rtas_hack_32bit_msi_gen2(struct pci_dev *pdev) 
static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type)

{

	struct pci_dn *pdn;

	int hwirq, virq, i, rc;

	int hwirq, virq, i, quota, rc;

	struct msi_desc *entry;

	struct msi_msg msg;

	int nvec = nvec_in;

	int use_32bit_msi_hack = 0;



	pdn = pci_get_pdn(pdev);

	if (!pdn)

		return -ENODEV;

	if (type == PCI_CAP_ID_MSIX)

		rc = check_req_msix(pdev, nvec);

	else

		rc = check_req_msi(pdev, nvec);



	if (rc)

		return rc;



	quota = msi_quota_for_device(pdev, nvec);



	if (quota && quota < nvec)

		return quota;



	if (type == PCI_CAP_ID_MSIX && check_msix_entries(pdev))

		return -EINVAL;
@@ -416,12 +405,14 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec_in, int type) 
	 */

	if (type == PCI_CAP_ID_MSIX) {

		int m = roundup_pow_of_two(nvec);

		int quota = msi_quota_for_device(pdev, m);

		quota = msi_quota_for_device(pdev, m);



		if (quota >= m)

			nvec = m;

	}



	pdn = pci_get_pdn(pdev);



	/*

	 * Try the new more explicit firmware interface, if that fails fall

	 * back to the old interface. The old interface is known to never
@@ -526,7 +517,6 @@ static int rtas_msi_init(void) 
	WARN_ON(ppc_md.setup_msi_irqs);

	ppc_md.setup_msi_irqs = rtas_setup_msi_irqs;

	ppc_md.teardown_msi_irqs = rtas_teardown_msi_irqs;

	ppc_md.msi_check_device = rtas_msi_check_device;



	WARN_ON(ppc_md.pci_irq_fixup);

	ppc_md.pci_irq_fixup = rtas_msi_pci_irq_fixup;