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

Commit b72c1f65 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Make radeon 32-bit MSI quirk work on powernv 



This moves the quirk itself to pci_64.c as to get built on all ppc64
platforms (the only ones with a pci_dn), factors the two implementations
of get_pdn() into a single pci_get_dn() and use the quirk to do 32-bit
MSIs on IODA based powernv platforms.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 59affcd3

arch/powerpc/include/asm/pci-bridge.h

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ struct pci_dn { 
/* Get the pointer to a device_node's pci_dn */

#define PCI_DN(dn)	((struct pci_dn *) (dn)->data)



extern struct pci_dn *pci_get_pdn(struct pci_dev *pdev);



extern void * update_dn_pci_info(struct device_node *dn, void *data);



static inline int pci_device_from_OF_node(struct device_node *np,

arch/powerpc/kernel/pci_64.c

+10 −0
Original line number Diff line number Diff line
@@ -266,3 +266,13 @@ int pcibus_to_node(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pcibus_to_node);

#endif



static void quirk_radeon_32bit_msi(struct pci_dev *dev)

{

	struct pci_dn *pdn = pci_get_pdn(dev);



	if (pdn)

		pdn->force_32bit_msi = 1;

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x68f2, quirk_radeon_32bit_msi);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0xaa68, quirk_radeon_32bit_msi);

arch/powerpc/kernel/pci_dn.c

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ 
#include <asm/ppc-pci.h>

#include <asm/firmware.h>



struct pci_dn *pci_get_pdn(struct pci_dev *pdev)

{

	struct device_node *dn = pci_device_to_OF_node(pdev);

	if (!dn)

		return NULL;

	return PCI_DN(dn);

}



/*

 * Traverse_func that inits the PCI fields of the device node.

 * NOTE: this *must* be done before read/write config to the device.

arch/powerpc/platforms/powernv/pci-ioda.c

+11 −16
Original line number Diff line number Diff line
@@ -68,16 +68,6 @@ define_pe_printk_level(pe_err, KERN_ERR); 
define_pe_printk_level(pe_warn, KERN_WARNING);

define_pe_printk_level(pe_info, KERN_INFO);



static struct pci_dn *pnv_ioda_get_pdn(struct pci_dev *dev)

{

	struct device_node *np;



	np = pci_device_to_OF_node(dev);

	if (!np)

		return NULL;

	return PCI_DN(np);

}



static int pnv_ioda_alloc_pe(struct pnv_phb *phb)

{

	unsigned long pe;
@@ -110,7 +100,7 @@ static struct pnv_ioda_pe *pnv_ioda_get_pe(struct pci_dev *dev) 
{

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

	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);

	struct pci_dn *pdn = pci_get_pdn(dev);



	if (!pdn)

		return NULL;
@@ -173,7 +163,7 @@ static int pnv_ioda_configure_pe(struct pnv_phb *phb, struct pnv_ioda_pe *pe) 


	/* Add to all parents PELT-V */

	while (parent) {

		struct pci_dn *pdn = pnv_ioda_get_pdn(parent);

		struct pci_dn *pdn = pci_get_pdn(parent);

		if (pdn && pdn->pe_number != IODA_INVALID_PE) {

			rc = opal_pci_set_peltv(phb->opal_id, pdn->pe_number,

						pe->pe_number, OPAL_ADD_PE_TO_DOMAIN);
@@ -252,7 +242,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev) 
{

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

	struct pnv_phb *phb = hose->private_data;

	struct pci_dn *pdn = pnv_ioda_get_pdn(dev);

	struct pci_dn *pdn = pci_get_pdn(dev);

	struct pnv_ioda_pe *pe;

	int pe_num;
@@ -323,7 +313,7 @@ static void pnv_ioda_setup_same_PE(struct pci_bus *bus, struct pnv_ioda_pe *pe) 
	struct pci_dev *dev;



	list_for_each_entry(dev, &bus->devices, bus_list) {

		struct pci_dn *pdn = pnv_ioda_get_pdn(dev);

		struct pci_dn *pdn = pci_get_pdn(dev);



		if (pdn == NULL) {

			pr_warn("%s: No device node associated with device !\n",
@@ -436,7 +426,7 @@ static void pnv_pci_ioda_setup_PEs(void) 


static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev)

{

	struct pci_dn *pdn = pnv_ioda_get_pdn(pdev);

	struct pci_dn *pdn = pci_get_pdn(pdev);

	struct pnv_ioda_pe *pe;



	/*
@@ -768,6 +758,7 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev, 
				  unsigned int is_64, struct msi_msg *msg)

{

	struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev);

	struct pci_dn *pdn = pci_get_pdn(dev);

	struct irq_data *idata;

	struct irq_chip *ichip;

	unsigned int xive_num = hwirq - phb->msi_base;
@@ -783,6 +774,10 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev, 
	if (pe->mve_number < 0)

		return -ENXIO;



	/* Force 32-bit MSI on some broken devices */

	if (pdn && pdn->force_32bit_msi)

		is_64 = 0;



	/* Assign XIVE to PE */

	rc = opal_pci_set_xive_pe(phb->opal_id, pe->pe_number, xive_num);

	if (rc) {
@@ -1035,7 +1030,7 @@ static int pnv_pci_enable_device_hook(struct pci_dev *dev) 
	if (!phb->initialized)

		return 0;



	pdn = pnv_ioda_get_pdn(dev);

	pdn = pci_get_pdn(dev);

	if (!pdn || pdn->pe_number == IODA_INVALID_PE)

		return -EINVAL;

arch/powerpc/platforms/powernv/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ 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;

}