From owner-svn-src-head@FreeBSD.ORG  Tue Dec  8 20:32:46 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1C1F106568B
	for <svn-src-head@freebsd.org>; Tue,  8 Dec 2009 20:32:46 +0000 (UTC)
	(envelope-from kristof@sigsegv.be)
Received: from yergi.telenet-ops.be (yergi.telenet-ops.be [195.130.132.36])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D7A58FC15
	for <svn-src-head@freebsd.org>; Tue,  8 Dec 2009 20:32:46 +0000 (UTC)
Received: from brigitte.telenet-ops.be (unknown [195.130.137.66])
	by yergi.telenet-ops.be (Postfix) with ESMTP id 72C99D01FE
	for <svn-src-head@freebsd.org>; Tue,  8 Dec 2009 21:21:11 +0100 (CET)
Received: from triton.sigsegv.be ([213.119.65.102])
	by brigitte.telenet-ops.be with bizsmtp
	id EkM91d0092CNSFp0GkM9pp; Tue, 08 Dec 2009 21:21:09 +0100
Received: from nereid (nereid.neptune.sigsegv.be
	[IPv6:2001:470:c8f4:0:200:ff:fe00:8])
	by triton.sigsegv.be (Postfix) with SMTP id 54C811C1E3;
	Tue,  8 Dec 2009 22:21:54 +0100 (CET)
Received: by nereid (sSMTP sendmail emulation); Tue, 08 Dec 2009 21:21:04 +0100
Date: Tue, 8 Dec 2009 21:21:03 +0100
From: Kristof Provost <kristof@sigsegv.be>
To: Alexander Motin <mav@FreeBSD.org>
Message-ID: <20091208202103.GN2753@nereid>
References: <200912060010.nB60AD12004058@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200912060010.nB60AD12004058@svn.freebsd.org>
X-PGP-Fingerprint: 6B6E 5EED 8ECF FAE7 1F61  7458 5046 7D0E 11B0 0EE8
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r200171 - in head: sbin/atacontrol sys/arm/mv
 sys/cam/ata sys/cam/scsi sys/conf sys/dev/ata sys/dev/ata/chipsets
 sys/powerpc/powermac sys/powerpc/psim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Dec 2009 20:32:46 -0000

On 2009-12-06 00:10:13 (+0000), Alexander Motin <mav@FreeBSD.org> wrote:
> Author: mav
> Date: Sun Dec  6 00:10:13 2009
> New Revision: 200171
> URL: http://svn.freebsd.org/changeset/base/200171

I think this commit broke the build for mv_sata.

sys/arm/mv/mv_sata.c currently reads:
@@ -751,10 +751,10 @@
 static int
 sata_channel_setmode(device_t parent, int target, int mode)
 {

  /* Disable EDMA before using legacy registers */
  sata_edma_ctrl(parent, 0);
  return (ata_sata_setmode(dev, mode));
 }
 
This doesn't build because 'dev' isn't defined. As far as I can tell the
following patch matches what was intended, but I have no idea if it's
correct. It does at least build:

Index: sys/arm/mv/mv_sata.c
===================================================================
--- sys/arm/mv/mv_sata.c  (revision 200245)
+++ sys/arm/mv/mv_sata.c  (working copy)
@@ -751,10 +751,10 @@
 static int
 sata_channel_setmode(device_t parent, int target, int mode)
 {

  /* Disable EDMA before using legacy registers */
  sata_edma_ctrl(parent, 0);
- return (ata_sata_setmode(dev, mode));
+ return (min(mode, ATA_UDMA5));
 }
 
Regards,
Kristof