From: Olof Johansson <olof@lixom•net>
To: Roel Kluin <roel.kluin@gmail•com>
Cc: linuxppc-dev@ozlabs•org
Subject: Re: [PATCH] [POWERPC] pasemi: ioremap/iounmap balance and failure handling
Date: Sat, 13 Dec 2008 15:13:35 -0600 [thread overview]
Message-ID: <20081213211335.GC17331@lixom.net> (raw)
In-Reply-To: <4943E6B5.6010501@gmail.com>
On Sat, Dec 13, 2008 at 05:45:41PM +0100, Roel Kluin wrote:
> map_onedev can return NULL, so catch that. Also iounmap if DMA controller can't be
> found.
>
> Signed-off-by: Roel Kluin <roel.kluin@gmail•com>
> ---
> UNTESTED! I am a bit new, so please confirm whether this is correct. especially:
>
> * can we iounmap while init_lock is held?
Yes, should be OK.
> * is it ok to add another BUG() here?
>
> diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
> index 217af32..bdf5440 100644
> --- a/arch/powerpc/platforms/pasemi/dma_lib.c
> +++ b/arch/powerpc/platforms/pasemi/dma_lib.c
> @@ -534,14 +534,21 @@ int pasemi_dma_init(void)
> err = -ENODEV;
> goto out;
> }
> +
> iob_regs = map_onedev(iob_pdev, 0);
> + if (iob_regs == NULL) {
> + BUG();
> + printk(KERN_WARNING "Can't ioremap I/O Bridge registers\n");
> + err = -ENODEV;
> + goto out;
> + }
I don't see the point of doing BUG() _and_ error recovery. BUG() is
definitely heavy handed. Something like "pasemi_dma_init: Can't..." would
be a good and detailed enough error message.
>
> dma_pdev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa007, NULL);
> if (!dma_pdev) {
> BUG();
> printk(KERN_WARNING "Can't find DMA controller\n");
> err = -ENODEV;
> - goto out;
> + goto out_unmap;
> }
> dma_regs = map_onedev(dma_pdev, 0);
> base_hw_irq = virq_to_hw(dma_pdev->irq);
> @@ -624,6 +631,10 @@ int pasemi_dma_init(void)
>
> printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
> "(%d tx, %d rx channels)\n", num_txch, num_rxch);
> + goto out;
> +
> +out_unmap:
> + iounmap(iob_regs);
>
> out:
> spin_unlock(&init_lock);
next prev parent reply other threads:[~2008-12-13 21:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-13 16:45 [PATCH] [POWERPC] pasemi: ioremap/iounmap balance and failure handling Roel Kluin
2008-12-13 19:15 ` Roel Kluin
2008-12-13 21:13 ` Olof Johansson [this message]
2008-12-16 10:52 ` Roel Kluin
2009-01-07 0:50 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081213211335.GC17331@lixom.net \
--to=olof@lixom$(echo .)net \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=roel.kluin@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox