The patch titled Blackfin SPI Driver: pass DMA overflow error to the higher level has been added to the -mm tree. Its filename is blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Blackfin SPI Driver: pass DMA overflow error to the higher level From: Mike Frysinger <vapier.adi@xxxxxxxxx> If the SPI bus registers a receive overflow error, pass the result back up to the higher levels. Signed-off-by: Mike Frysinger <vapier.adi@xxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_bfin5xx.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff -puN drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level drivers/spi/spi_bfin5xx.c --- a/drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level +++ a/drivers/spi/spi_bfin5xx.c @@ -559,6 +559,7 @@ static irqreturn_t dma_irq_handler(int i struct driver_data *drv_data = dev_id; struct chip_data *chip = drv_data->cur_chip; struct spi_message *msg = drv_data->cur_msg; + u16 spistat = read_STAT(drv_data); dev_dbg(&drv_data->pdev->dev, "in dma_irq_handler\n"); clear_dma_irqstat(drv_data->dma_channel); @@ -582,13 +583,18 @@ static irqreturn_t dma_irq_handler(int i while (!(read_STAT(drv_data) & SPIF)) cpu_relax(); - msg->actual_length += drv_data->len_in_bytes; + if (spistat & RBSY) { + msg->state = ERROR_STATE; + dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n"); + } else { + msg->actual_length += drv_data->len_in_bytes; - if (drv_data->cs_change) - cs_deactive(drv_data, chip); + if (drv_data->cs_change) + cs_deactive(drv_data, chip); - /* Move to next transfer */ - msg->state = next_transfer(drv_data); + /* Move to next transfer */ + msg->state = next_transfer(drv_data); + } /* Schedule transfer tasklet */ tasklet_schedule(&drv_data->pump_transfers); _ Patches currently in -mm which might be from vapier.adi@xxxxxxxxx are video-framebuffer-move-the-probe-func-into-devinittext-in-blackfin-lcd-driver.patch linux-next.patch blackfin-nfc-driver-do-not-clobber-dmac1_perimux.patch blackfin-nfc-driver-mark-bf5xx_nand_add_partition-as-__devinit.patch blackfin-nfc-driver-drop-pointless-casts-with-set_dma_callback.patch mtd-maps-blackfin-async-flash-maps-fix-bug-dont-leak-resources-when-initializing-in-case-of-errors.patch mtd-maps-blackfin-async-flash-maps-bfin-async-mtd-driver-needs-complex-mappings.patch mtd-maps-blackfin-async-flash-maps-fix-up-memory-leak.patch blackfin-spi-driver-ensure-cache-coherency-before-doing-dma.patch blackfin-spi-driver-remove-useless-asm-cplbinith.patch blackfin-spi-driver-use-len_in_bytes-when-we-care-about-the-number-of-bytes-transferred.patch blackfin-spi-driver-pass-dma-overflow-error-to-the-higher-level.patch blackfin-spi-driver-unify-duplicated-code-in-dma-read-write-paths.patch blackfin-spi-driver-drop-bogus-cast-and-touchup-dma-label.patch blackfin-spi-driver-add-a-few-more-dma-debug-messages.patch blackfin-spi-driver-do-not-check-for-spi-errors-if-dma-itself-did-not-flag-any.patch blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines.patch blackfin-spi-driver-spi-slave-select-code-cleanup.patch blackfin-spi-driver-get-dma-working-for-spi-flashes.patch blackfin-spi-driver-add-timeout-while-waiting-for-spif-in-dma-irq-handler.patch blackfin-spi-driver-tweak-magic-spi-dma-sequence-to-get-it-working-on-bf54x.patch blackfin-spi-driver-use-bfin_spi_-prefix-on-all-functions.patch blackfin-spi-driver-fix-null-pointer-crash.patch blackfin-spi-driver-add-comment-about-full-duplex-dma-according-to-david-brownell.patch bin_elf_fdpic-check-the-return-value-of-clear_user.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html