Commit 5f92c329 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Fix several bugs in MSI handling. 



1) sun4{u,v}_build_msi() have improper return value handling.

   We should always return negative error codes, instead of
   using the magic value "0" which could in fact be a valid
   MSI number.

2) sun4{u,v}_build_msi() should return -ENOMEM instead of
   calling prom_prom() halt with kzalloc() of the interrupt
   data fails.

3) We 'remembered' the MSI number using a singleton in the
   struct device archdata area, this doesn't work for MSI-X
   which can cause multiple MSIs assosciated with one device.

   Delete that archdata member, and instead store the MSI
   number in the IRQ chip data area.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e69d606

arch/sparc64/kernel/irq.c

+22 −3
Original line number Original line Diff line number Diff line
@@ -217,8 +217,27 @@ struct irq_handler_data { 
	void		(*pre_handler)(unsigned int, void *, void *);

	void		(*pre_handler)(unsigned int, void *, void *);

	void		*pre_handler_arg1;

	void		*pre_handler_arg1;

	void		*pre_handler_arg2;

	void		*pre_handler_arg2;



	u32		msi;

};

};





void sparc64_set_msi(unsigned int virt_irq, u32 msi)

{

	struct irq_handler_data *data = get_irq_chip_data(virt_irq);



	if (data)

		data->msi = msi;

}



u32 sparc64_get_msi(unsigned int virt_irq)

{

	struct irq_handler_data *data = get_irq_chip_data(virt_irq);



	if (data)

		return data->msi;

	return 0xffffffff;

}



static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)

static inline struct ino_bucket *virt_irq_to_bucket(unsigned int virt_irq)

{

{

	unsigned int real_irq = virt_to_real_irq(virt_irq);

	unsigned int real_irq = virt_to_real_irq(virt_irq);
@@ -741,7 +760,7 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, 
			break;

			break;

	}

	}

	if (devino >= msi_end)

	if (devino >= msi_end)

		return 0;

		return -ENOSPC;





	sysino = sun4v_devino_to_sysino(devhandle, devino);

	sysino = sun4v_devino_to_sysino(devhandle, devino);

	bucket = &ivector_table[sysino];

	bucket = &ivector_table[sysino];
@@ -755,8 +774,8 @@ unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, 




	data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);

	data = kzalloc(sizeof(struct irq_handler_data), GFP_ATOMIC);

	if (unlikely(!data)) {

	if (unlikely(!data)) {

		prom_printf("IRQ: kzalloc(irq_handler_data) failed.\n");

		virt_irq_free(*virt_irq_p);

		prom_halt();

		return -ENOMEM;

	}

	}

	set_irq_chip_data(bucket->virt_irq, data);

	set_irq_chip_data(bucket->virt_irq, data);

arch/sparc64/kernel/pci.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -393,7 +393,6 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	sd->host_controller = pbm;

	sd->host_controller = pbm;

	sd->prom_node = node;

	sd->prom_node = node;

	sd->op = of_find_device_by_node(node);

	sd->op = of_find_device_by_node(node);

	sd->msi_num = 0xffffffff;





	sd = &sd->op->dev.archdata;

	sd = &sd->op->dev.archdata;

	sd->iommu = pbm->iommu;

	sd->iommu = pbm->iommu;

arch/sparc64/kernel/pci_sun4v.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -940,13 +940,13 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, 
	if (msi_num < 0)

	if (msi_num < 0)

		return msi_num;

		return msi_num;





	devino = sun4v_build_msi(pbm->devhandle, virt_irq_p,

	err = sun4v_build_msi(pbm->devhandle, virt_irq_p,

			      pbm->msiq_first_devino,

			      pbm->msiq_first_devino,

			      (pbm->msiq_first_devino +

			      (pbm->msiq_first_devino +

			       pbm->msiq_num));

			       pbm->msiq_num));

	err = -ENOMEM;

	if (err < 0)

	if (!devino)

		goto out_err;

		goto out_err;

	devino = err;





	msiqid = ((devino - pbm->msiq_first_devino) +

	msiqid = ((devino - pbm->msiq_first_devino) +

		  pbm->msiq_first);

		  pbm->msiq_first);
@@ -971,7 +971,7 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, 
	if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID))

	if (pci_sun4v_msi_setvalid(pbm->devhandle, msi_num, HV_MSIVALID_VALID))

		goto out_err;

		goto out_err;





	pdev->dev.archdata.msi_num = msi_num;

	sparc64_set_msi(*virt_irq_p, msi_num);





	if (entry->msi_attrib.is_64) {

	if (entry->msi_attrib.is_64) {

		msg.address_hi = pbm->msi64_start >> 32;

		msg.address_hi = pbm->msi64_start >> 32;
@@ -993,8 +993,6 @@ static int pci_sun4v_setup_msi_irq(unsigned int *virt_irq_p, 




out_err:

out_err:

	free_msi(pbm, msi_num);

	free_msi(pbm, msi_num);

	sun4v_destroy_msi(*virt_irq_p);

	*virt_irq_p = 0;

	return err;

	return err;





}

}
@@ -1006,7 +1004,7 @@ static void pci_sun4v_teardown_msi_irq(unsigned int virt_irq, 
	unsigned long msiqid, err;

	unsigned long msiqid, err;

	unsigned int msi_num;

	unsigned int msi_num;





	msi_num = pdev->dev.archdata.msi_num;

	msi_num = sparc64_get_msi(virt_irq);

	err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid);

	err = pci_sun4v_msi_getmsiq(pbm->devhandle, msi_num, &msiqid);

	if (err) {

	if (err) {

		printk(KERN_ERR "%s: getmsiq gives error %lu\n",

		printk(KERN_ERR "%s: getmsiq gives error %lu\n",

include/asm-sparc64/device.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ struct dev_archdata { 




	struct device_node	*prom_node;

	struct device_node	*prom_node;

	struct of_device	*op;

	struct of_device	*op;



	unsigned int		msi_num;

};

};





#endif /* _ASM_SPARC64_DEVICE_H */
 
#endif /* _ASM_SPARC64_DEVICE_H */

include/asm-sparc64/irq.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,9 @@ extern unsigned int sun4v_build_msi(u32 devhandle, unsigned int *virt_irq_p, 
extern void sun4v_destroy_msi(unsigned int virt_irq);

extern void sun4v_destroy_msi(unsigned int virt_irq);

extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);

extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);





extern void sparc64_set_msi(unsigned int virt_irq, u32 msi);

extern u32 sparc64_get_msi(unsigned int virt_irq);



extern void fixup_irqs(void);

extern void fixup_irqs(void);





static __inline__ void set_softint(unsigned long bits)

static __inline__ void set_softint(unsigned long bits)

CRA Git | Maintained and supported by SUSTech CRA and CCSE