From owner-svn-src-head@freebsd.org  Sun Nov  5 22:10:00 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3592E536B3;
 Sun,  5 Nov 2017 22:10:00 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75AC36E710;
 Sun,  5 Nov 2017 22:10:00 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA5M9xku098534;
 Sun, 5 Nov 2017 22:09:59 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA5M9xPD098533;
 Sun, 5 Nov 2017 22:09:59 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201711052209.vA5M9xPD098533@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Sun, 5 Nov 2017 22:09:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325453 - head/sys/powerpc/mpc85xx
X-SVN-Group: head
X-SVN-Commit-Author: jhibbits
X-SVN-Commit-Paths: head/sys/powerpc/mpc85xx
X-SVN-Commit-Revision: 325453
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Nov 2017 22:10:00 -0000

Author: jhibbits
Date: Sun Nov  5 22:09:59 2017
New Revision: 325453
URL: https://svnweb.freebsd.org/changeset/base/325453

Log:
  Fix an off-by-one error missed in the initial commit of this driver
  
  When the segment count is > 16 it spills into an 'indirect descriptor list',
  which immediately follows the main table, but the indirect list is entry 15, so
  needs to be skipped for the general list.

Modified:
  head/sys/powerpc/mpc85xx/fsl_sata.c

Modified: head/sys/powerpc/mpc85xx/fsl_sata.c
==============================================================================
--- head/sys/powerpc/mpc85xx/fsl_sata.c	Sun Nov  5 22:00:54 2017	(r325452)
+++ head/sys/powerpc/mpc85xx/fsl_sata.c	Sun Nov  5 22:09:59 2017	(r325453)
@@ -988,11 +988,12 @@ fsl_sata_dmasetprd(void *arg, bus_dma_segment_t *segs,
 			prd[j].dba = FSL_SATA_CTP_BUS(ch, slot) +
 				     FSL_SATA_PRD_OFFSET(j+1);
 			j++;
+			extlen = 0;
 		}
 		len = segs[i].ds_len;
 		len = roundup2(len, sizeof(uint32_t));
-		prd[i].dba = htole32((uint32_t)segs[i].ds_addr);
-		prd[i].dwc_flg = htole32(FSL_SATA_PRD_SNOOP | len);
+		prd[j].dba = htole32((uint32_t)segs[i].ds_addr);
+		prd[j].dwc_flg = htole32(FSL_SATA_PRD_SNOOP | len);
 		slot->ttl += len;
 		if (j > FSL_SATA_PRD_MAX_DIRECT)
 			extlen += len;