From 0a852409fa94f6306c628615275234b69fe7d726 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 9 Oct 2007 13:51:57 -0400 Subject: [PATCH] --- yaml --- r: 65327 b: refs/heads/master c: baf14aa14efcfdb5a74d5cf804691086c6bec743 h: refs/heads/master i: 65325: f88018e664936c83909d7dbebae01e313519e74c 65323: 95155bba19ec0a071f1e7d8b465706e833698405 65319: 1e3372af7b7ae5063679b42f55598851d24cd6f1 65311: a9e7efeb9dbd0d7593853a2da84b3b87c3dd27fd v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 239a821db357..a5212980a112 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2a57a815933b2d2e375f9de6be223098024ab90 +refs/heads/master: baf14aa14efcfdb5a74d5cf804691086c6bec743 diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index 1a82e22b3efd..cb7dec97fee6 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -313,7 +313,10 @@ enum { #define IS_GEN_IIE(hpriv) ((hpriv)->hp_flags & MV_HP_GEN_IIE) enum { - MV_DMA_BOUNDARY = 0xffffffffU, + /* DMA boundary 0xffff is required by the s/g splitting + * we need on /length/ in mv_fill-sg(). + */ + MV_DMA_BOUNDARY = 0xffffU, /* mask of register bits containing lower 32 bits * of EDMA request queue DMA address @@ -448,7 +451,7 @@ static struct scsi_host_template mv5_sht = { .queuecommand = ata_scsi_queuecmd, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, - .sg_tablesize = MV_MAX_SG_CT, + .sg_tablesize = MV_MAX_SG_CT / 2, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = 1, @@ -466,7 +469,7 @@ static struct scsi_host_template mv6_sht = { .queuecommand = ata_scsi_queuecmd, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, - .sg_tablesize = MV_MAX_SG_CT, + .sg_tablesize = MV_MAX_SG_CT / 2, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = 1,