| Message ID | 1395735604-26706-6-git-send-email-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Lee, >From: Lee Jones [mailto:lee.jones@linaro.org] >Obtain IRQ number and request IRQ resource via the usual methods. We're >also registering an IRQ handler to inform us of any completed tasks. >Notice that we're starting to make use of the device struct that we >defined before. In keeping with the subject of the patch, we're also >adding the related local enable_irq() and disable_irq() methods. Again, >these will be utilised in a greater capacity in latter commits. > >Signed-off-by: Lee Jones <lee.jones@linaro.org> >--- > drivers/mtd/nand/stm_nand_bch.c | 62 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 62 insertions(+) > >diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c >index bd11070..76a0d02 100644 >--- a/drivers/mtd/nand/stm_nand_bch.c >+++ b/drivers/mtd/nand/stm_nand_bch.c >@@ -15,11 +15,14 @@ > #include <linux/kernel.h> > #include <linux/module.h> > #include <linux/io.h> >+#include <linux/interrupt.h> > #include <linux/device.h> > #include <linux/platform_device.h> > #include <linux/completion.h> > #include <linux/mtd/stm_nand.h> > >+#include "stm_nand_regs.h" >+ > /* NANDi Controller (Hamming/BCH) */ > struct nandi_controller { > void __iomem *base; /* Controller base*/ >@@ -54,6 +57,51 @@ struct nandi_controller { > /* 'page_buf' */ > }; > >+/* >+ * NANDi Interrupts (shared by Hamming and BCH controllers) >+ */ >+static irqreturn_t nandi_irq_handler(int irq, void *dev) >+{ >+ struct nandi_controller *nandi = dev; >+ unsigned int status; >+ >+ status = readl(nandi->base + NANDBCH_INT_STA); >+ >+ if (status & NANDBCH_INT_SEQNODESOVER) { You should also check, if BCH ECC mode is actually set to struct nandi_controller *nandi = dev; if (nandi->bch_ecc_mode && (status & NANDBCH_INT_SEQNODESOVER)) { >+ /* BCH */ >+ writel(NANDBCH_INT_CLR_SEQNODESOVER, >+ nandi->base + NANDBCH_INT_CLR); >+ complete(&nandi->seq_completed); At a given time only one of the two controllers (HAM/BCH) would be active. right ? So, do don't need to check for both interrupts. you can return if either one is successful. return IRQ_HANDLED; /* BCH ECC IRQ handles successfully */ >+ } >+ if (status & NAND_INT_RBN) { >+ /* Hamming */ >+ writel(NAND_INT_CLR_RBN, nandi->base + NANDHAM_INT_CLR); >+ complete(&nandi->rbn_completed); -- same for this -- return IRQ_HANDLED; /* HAM ECC IRQ handled successfully */ >+ } >+ >+ return IRQ_HANDLED; And if no valid source is found then return IRQ_NONE; /* spurious interrupt */ >+} >+ with regards, pekon
diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c index bd11070..76a0d02 100644 --- a/drivers/mtd/nand/stm_nand_bch.c +++ b/drivers/mtd/nand/stm_nand_bch.c @@ -15,11 +15,14 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/io.h> +#include <linux/interrupt.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/completion.h> #include <linux/mtd/stm_nand.h> +#include "stm_nand_regs.h" + /* NANDi Controller (Hamming/BCH) */ struct nandi_controller { void __iomem *base; /* Controller base*/ @@ -54,6 +57,51 @@ struct nandi_controller { /* 'page_buf' */ }; +/* + * NANDi Interrupts (shared by Hamming and BCH controllers) + */ +static irqreturn_t nandi_irq_handler(int irq, void *dev) +{ + struct nandi_controller *nandi = dev; + unsigned int status; + + status = readl(nandi->base + NANDBCH_INT_STA); + + if (status & NANDBCH_INT_SEQNODESOVER) { + /* BCH */ + writel(NANDBCH_INT_CLR_SEQNODESOVER, + nandi->base + NANDBCH_INT_CLR); + complete(&nandi->seq_completed); + } + if (status & NAND_INT_RBN) { + /* Hamming */ + writel(NAND_INT_CLR_RBN, nandi->base + NANDHAM_INT_CLR); + complete(&nandi->rbn_completed); + } + + return IRQ_HANDLED; +} + +static void nandi_enable_interrupts(struct nandi_controller *nandi, + uint32_t irqs) +{ + uint32_t val; + + val = readl(nandi->base + NANDBCH_INT_EN); + val |= irqs; + writel(val, nandi->base + NANDBCH_INT_EN); +} + +static void nandi_disable_interrupts(struct nandi_controller *nandi, + uint32_t irqs) +{ + uint32_t val; + + val = readl(nandi->base + NANDBCH_INT_EN); + val &= ~irqs; + writel(val, nandi->base + NANDBCH_INT_EN); +} + static int remap_named_resource(struct platform_device *pdev, char *name, void __iomem **io_ptr) @@ -85,6 +133,7 @@ static struct nandi_controller * nandi_init_resources(struct platform_device *pdev) { struct nandi_controller *nandi; + int irq; int err; nandi = devm_kzalloc(&pdev->dev, sizeof(*nandi), GFP_KERNEL); @@ -104,6 +153,19 @@ nandi_init_resources(struct platform_device *pdev) if (err) return ERR_PTR(err); + irq = platform_get_irq_byname(pdev, "nand_irq"); + if (irq < 0) { + dev_err(&pdev->dev, "failed to find IRQ resource\n"); + return ERR_PTR(irq); + } + + err = devm_request_irq(&pdev->dev, irq, nandi_irq_handler, + IRQF_DISABLED, dev_name(&pdev->dev), nandi); + if (err) { + dev_err(&pdev->dev, "irq request failed\n"); + return ERR_PTR(err); + } + platform_set_drvdata(pdev, nandi); return nandi;
Obtain IRQ number and request IRQ resource via the usual methods. We're also registering an IRQ handler to inform us of any completed tasks. Notice that we're starting to make use of the device struct that we defined before. In keeping with the subject of the patch, we're also adding the related local enable_irq() and disable_irq() methods. Again, these will be utilised in a greater capacity in latter commits. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/mtd/nand/stm_nand_bch.c | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)