From owner-svn-src-head@FreeBSD.ORG Mon Feb 23 08:15:07 2009 Return-Path: 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 DC9B61065701; Mon, 23 Feb 2009 08:15:07 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw2.york.ac.uk (mail-gw2.york.ac.uk [144.32.128.247]) by mx1.freebsd.org (Postfix) with ESMTP id 6E7DE8FC08; Mon, 23 Feb 2009 08:15:07 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from mail-gw7.york.ac.uk (mail-gw7.york.ac.uk [144.32.129.30]) by mail-gw2.york.ac.uk (8.13.6/8.13.6) with ESMTP id n1N8F4Dr008085; Mon, 23 Feb 2009 08:15:04 GMT Received: from ury.york.ac.uk ([144.32.108.81]) by mail-gw7.york.ac.uk with esmtps (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1LbVxw-0003Ri-DR; Mon, 23 Feb 2009 08:15:04 +0000 Received: from ury.york.ac.uk (localhost.york.ac.uk [127.0.0.1]) by ury.york.ac.uk (8.14.3/8.14.3) with ESMTP id n1N8F4xK042297; Mon, 23 Feb 2009 08:15:04 GMT (envelope-from gavin@FreeBSD.org) Received: from localhost (gavin@localhost) by ury.york.ac.uk (8.14.3/8.14.3/Submit) with ESMTP id n1N8F3Wr042285; Mon, 23 Feb 2009 08:15:04 GMT (envelope-from gavin@FreeBSD.org) X-Authentication-Warning: ury.york.ac.uk: gavin owned process doing -bs Date: Mon, 23 Feb 2009 08:15:03 +0000 (GMT) From: Gavin Atkinson X-X-Sender: gavin@ury.york.ac.uk To: Alexander Motin In-Reply-To: <200902221408.n1ME8K6n098261@svn.freebsd.org> Message-ID: <20090223080900.Q86550@ury.york.ac.uk> References: <200902221408.n1ME8K6n098261@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-York-MailScanner: Found to be clean X-York-MailScanner-From: gavin@freebsd.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r188918 - head/sys/dev/ata/chipsets 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2009 08:15:09 -0000 On Sun, 22 Feb 2009, Alexander Motin wrote: > Author: mav > Date: Sun Feb 22 14:08:20 2009 > New Revision: 188918 > URL: http://svn.freebsd.org/changeset/base/188918 > > Log: > Tune AHCI verbose messages to make log more readable. > [snip] > @@ -665,9 +670,10 @@ ata_ahci_softreset(device_t dev, int por > //ctp->cfis[7] = ATA_D_LBA | ATA_D_IBM; > ctp->cfis[15] = (ATA_A_4BIT | ATA_A_RESET); > > - if (ata_ahci_issue_cmd(dev, ATA_AHCI_CMD_RESET | ATA_AHCI_CMD_CLR_BUSY,100)) > - device_printf(dev, "setting SRST failed ??\n"); > - //return -1; > + if (ata_ahci_issue_cmd(dev, ATA_AHCI_CMD_RESET | ATA_AHCI_CMD_CLR_BUSY,100)) { > + device_printf(dev, "software reset set timeout\n"); > + return (-1); > + } > Was the uncommenting of the return intentional here? Before, the code would continue to clear the soft reset even if it didn't appear to have worked. > @@ -767,11 +778,11 @@ ata_ahci_reset(device_t dev) > break; > default: /* SOS XXX */ > if (bootverbose) > - device_printf(dev, "No signature, asuming disk device\n"); > + device_printf(dev, "Unknown signature, asuming disk device\n"); > ch->devices = ATA_ATA_MASTER; > } Spelling is wrong here (and was before you changed it too): should be "assuming" not "asuming" Gavin