The patch titled Documentation: add SCSI drivers' mapping error handling to DMA-API-HOWTO has been added to the -mm tree. Its filename is documentation-add-scsi-drivers-mapping-error-handling-to-dma-api-howto.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: Documentation: add SCSI drivers' mapping error handling to DMA-API-HOWTO From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Add the concrete DMA mapping error handling for SCSI drivers on the queuecommand path. Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/DMA-API-HOWTO.txt | 4 ++++ 1 file changed, 4 insertions(+) diff -puN Documentation/DMA-API-HOWTO.txt~documentation-add-scsi-drivers-mapping-error-handling-to-dma-api-howto Documentation/DMA-API-HOWTO.txt --- a/Documentation/DMA-API-HOWTO.txt~documentation-add-scsi-drivers-mapping-error-handling-to-dma-api-howto +++ a/Documentation/DMA-API-HOWTO.txt @@ -745,6 +745,10 @@ and return NETDEV_TX_OK if the DMA mappi (ndo_start_xmit). This means that the socket buffer is just dropped in the failure case. +SCSI drivers must return SCSI_MLQUEUE_HOST_BUSY if the DMA mapping +fails in the queuecommand hook. This means that the SCSI subsystem +passes the command to the driver again later. + Closing This document, and the API itself, would not be in its current _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are origin.patch linux-next.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch ia64-remove-unnecessary-sync_single_range_-in-swiotlb_dma_ops.patch x86-remove-unnecessary-sync_single_range_-in-swiotlb_dma_ops.patch powerpc-remove-unnecessary-sync_single_range_-in-swiotlb_dma_ops.patch swiotlb-remove-unnecessary-swiotlb_sync_single_range_.patch dma-mapping-remove-unnecessary-sync_single_range_-in-dma_map_ops.patch documentation-add-networking-drivers-mapping-error-handling-to-dma-api-howto.patch documentation-add-scsi-drivers-mapping-error-handling-to-dma-api-howto.patch documentation-update-scatterlist-struct-description-in-dma-api-howto.patch documentation-move-the-error-handling-to-the-better-place-in-dma-api-howto.patch ssb-add-dma_dev-to-ssb_device-structure.patch b43legacy-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b43-replace-the-ssb_dma-api-with-the-generic-dma-api.patch b44-replace-the-ssb_dma-api-with-the-generic-dma-api.patch ssb-remove-the-ssb-dma-api.patch asm-generic-remove-isa_dma_threshold-in-scatterlisth.patch asm-generic-add-need_sg_dma_length-to-define-sg_dma_len.patch x86_32-use-asm-generic-scatterlisth.patch powerpc-use-asm-generic-scatterlisth.patch alpha-use-asm-generic-scatterlisth.patch asm-generic-remove-arch_has_sg_chain-in-scatterlisth.patch avr32-use-asm-generic-scatterlisth.patch cris-use-asm-generic-scatterlisth.patch h8300-use-asm-generic-scatterlisth.patch m32r-use-use-asm-generic-scatterlisth.patch m68k-use-asm-generic-scatterlisth.patch mips-use-use-asm-generic-scatterlisth.patch xtensa-use-use-asm-generic-scatterlisth.patch blackfin-use-use-asm-generic-scatterlisth.patch frv-use-asm-generic-scatterlisth.patch mn10300-use-asm-generic-scatterlisth.patch parisc-use-asm-generic-scatterlisth.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