[RESEND PATCH 0/2]: Use correct DMA device in SCSI/libata

[RESEND PATCH 0/2]: Use correct DMA device in SCSI/libata

[Lin Ming]

Hi,

RESEND: add Jeff's ACK.

These 2 patches fix bug report at:

http://marc.info/?l=linux-ide&m=133177818318187&w=2

Please see the patches for more detail.

[PATCH 1/2] [SCSI] scsi_lib: use correct DMA device in __scsi_alloc_queue
[PATCH 2/2] libata: Pass correct DMA device to scsi host

 drivers/ata/libata-scsi.c |    3 ++-
 drivers/scsi/scsi_lib.c   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Thanks,
Lin Ming

[RESEND PATCH 1/2] scsi_lib: use correct DMA device in __scsi_alloc_queue

[Lin Ming]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 1429 bytes --]

Currently, __scsi_alloc_queue uses SCSI host's parent device
as DMA device to set segment boundary. But the parent device may not
refer to the DMA device. For example, for ATA disk, SCSI host's parent
device now refers to ATA port.

Since commit d139b9b([SCSI] scsi_lib_dma: fix bug with dma maps on
nested scsi objects), a new field Scsi_Host->dma_dev was introduced
to refer to the real DMA device.

Use ->dma_dev in __scsi_alloc_queue to correctly set segment
boundary.

Bug report: http://marc.info/?l=linux-ide&m=133177818318187&w=2

Reported-and-tested-by: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/scsi/scsi_lib.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ead6405..5dfd749 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1638,7 +1638,7 @@ struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,
 					 request_fn_proc *request_fn)
 {
 	struct request_queue *q;
-	struct device *dev = shost->shost_gendev.parent;
+	struct device *dev = shost->dma_dev;
 
 	q = blk_init_queue(request_fn, NULL);
 	if (!q)
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[RESEND PATCH 2/2] libata: Pass correct DMA device to scsi host

[Lin Ming]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 906 bytes --]

Use scsi_add_host_with_dma in ata_scsi_add_hosts to pass in the
correct DMA device(ATA host).

Bug report: http://marc.info/?l=linux-ide&m=133177818318187&w=2

Reported-and-tested-by: Jörg Sommer <joerg@alea.gnuu.de>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/ata/libata-scsi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 1ee00c8..dae08a6 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3399,7 +3399,8 @@ int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
 		 */
 		shost->max_host_blocked = 1;
 
-		rc = scsi_add_host(ap->scsi_host, &ap->tdev);
+		rc = scsi_add_host_with_dma(ap->scsi_host,
+						&ap->tdev, ap->host->dev);
 		if (rc)
 			goto err_add;
 	}
-- 
1.7.2.5

Re: [RESEND PATCH 0/2]: Use correct DMA device in SCSI/libata

[Lin Ming]

On Thu, Apr 12, 2012 at 1:50 PM, Lin Ming <ming.m.lin@intel.com> wrote:
> Hi,
>
> RESEND: add Jeff's ACK.

James, ping?

Lin Ming

>
> These 2 patches fix bug report at:
>
> http://marc.info/?l=linux-ide&m=133177818318187&w=2
>
> Please see the patches for more detail.
>
> [PATCH 1/2] [SCSI] scsi_lib: use correct DMA device in __scsi_alloc_queue
> [PATCH 2/2] libata: Pass correct DMA device to scsi host
>
>  drivers/ata/libata-scsi.c |    3 ++-
>  drivers/scsi/scsi_lib.c   |    2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> Thanks,
> Lin Ming
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [RESEND PATCH 0/2]: Use correct DMA device in SCSI/libata

[Jeff Garzik]

On 04/20/2012 01:17 AM, Lin Ming wrote:
> On Thu, Apr 12, 2012 at 1:50 PM, Lin Ming<ming.m.lin@intel.com>  wrote:
>> Hi,
>>
>> RESEND: add Jeff's ACK.
>
> James, ping?
>
> Lin Ming
>
>>
>> These 2 patches fix bug report at:
>>
>> http://marc.info/?l=linux-ide&m=133177818318187&w=2
>>
>> Please see the patches for more detail.
>>
>> [PATCH 1/2] [SCSI] scsi_lib: use correct DMA device in __scsi_alloc_queue
>> [PATCH 2/2] libata: Pass correct DMA device to scsi host
>>
>>   drivers/ata/libata-scsi.c |    3 ++-
>>   drivers/scsi/scsi_lib.c   |    2 +-
>>   2 files changed, 3 insertions(+), 2 deletions(-)


James, ping ping?

These simple bug fixes have been sent to you and linux-scsi, and ACK'd 
several times.

Should I send directly to Linus?

	Jeff