On Tue, 2010-04-20 at 20:20 +0800, Li Yang wrote:
> Put all fsl_msi banks in a linked list. The list of banks then can be
> traversed when allocating new msi interrupts. Also fix failing path
> of fsl_setup_msi_irqs().
>
> Signed-off-by: Zhao Chenhui <b26...@freescale.com>
> Signed-off-by: Li Yang <le...@freescale.com>
> ---
> arch/powerpc/sysdev/fsl_msi.c | 16 +++++++++++++---
> arch/powerpc/sysdev/fsl_msi.h | 2 ++
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
> index 93a638a..712f934 100644
> --- a/arch/powerpc/sysdev/fsl_msi.c
> +++ b/arch/powerpc/sysdev/fsl_msi.c
> @@ -24,6 +24,8 @@
> #include <asm/mpic.h>
> #include "fsl_msi.h"
>
> +LIST_HEAD(msi_head);
> +
> struct fsl_msi_feature {
> u32 fsl_pic_ip;
> u32 msiir_offset;
> @@ -137,16 +139,19 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev,
> int hwirq,
>
> static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
> {
> - int rc, hwirq = NO_IRQ;
> + int rc, hwirq = -ENOMEM;
> unsigned int virq;
> struct msi_desc *entry;
> struct msi_msg msg;
> struct fsl_msi *msi_data;
>
> list_for_each_entry(entry, &pdev->msi_list, list) {
> - msi_data = get_irq_chip_data(entry->irq);
> + list_for_each_entry(msi_data, &msi_head, list) {
> + hwirq = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1);
> + if (hwirq >= 0)
> + break;
> + }
>
> - hwirq = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1);
> if (hwirq < 0) {
> rc = hwirq;
> pr_debug("%s: fail allocating msi interrupt\n",
> @@ -160,6 +165,7 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int
> nvec, int type)
> pr_debug("%s: fail mapping hwirq 0x%x\n",
> __func__, hwirq);
> msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);
> + irq_dispose_mapping(virq);No, you're in the body of this if because virq == NO_IRQ, so you don't need to dispose of the mapping - there is no mapping. Unless the out-of-context code has changed from what I'm looking at. > @@ -172,6 +178,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int > nvec, int type) > return 0; > > out_free: > + /* free MSI interrupt already allocated */ > + fsl_teardown_msi_irqs(pdev); You don't need to do this. The generic code (drivers/pci/msi.c) always calls teardown if setup fails. cheers
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
