From owner-freebsd-current@FreeBSD.ORG Mon Jun 29 10:06:47 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BBCD91065675 for ; Mon, 29 Jun 2009 10:06:47 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from cmail.optima.ua (cmail.optima.ua [195.248.191.121]) by mx1.freebsd.org (Postfix) with ESMTP id 3B9E28FC0C for ; Mon, 29 Jun 2009 10:06:46 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from [212.86.226.226] (account mav@alkar.net HELO mavbook.mavhome.dp.ua) by cmail.optima.ua (CommuniGate Pro SMTP 5.2.9) with ESMTPSA id 247063475; Mon, 29 Jun 2009 13:06:43 +0300 Message-ID: <4A48922D.5090507@FreeBSD.org> Date: Mon, 29 Jun 2009 13:06:37 +0300 From: Alexander Motin User-Agent: Thunderbird 2.0.0.21 (X11/20090405) MIME-Version: 1.0 To: Kamigishi Rei References: <1246206181.00132972.1246192801@10.7.7.3> <1246206186.00132982.1246194002@10.7.7.3> <1246209783.00133001.1246197001@10.7.7.3> <1246260183.00133237.1246247402@10.7.7.3> <4A48798A.5070604@FreeBSD.org> <4A487BF7.8060103@haruhiism.net> In-Reply-To: <4A487BF7.8060103@haruhiism.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Goran Lowkrantz , freebsd-current@freebsd.org, Alexander Best Subject: Re: RFC: ATA to CAM integration patch X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jun 2009 10:06:48 -0000 Kamigishi Rei wrote: > Alexander Motin wrote: >>> Kernel builds fine for me after "sed >>> 's/AHCI_DMA_ENTRIES/AHCI_SG_ENTRIES/' /usr/src/sys/dev/ahci/ahci.c" >>> (only one occurrence of that macro, aside from the .h file, anyway). >> You are right. Thank you. Committed to P4. > On a side note: the two secondary patches mentioned in the discussion > (camcontrol and the other one) do not apply cleanly to r195137, even > though the files' contents match. I had to edit the files manually, > however, kernel still panics in xpt during boot right after the AHCI bus > poll. > I didn't remove atapicam from the kernel configuration, because > according to your post with that patch earlier the patch should have > fixed that behaviour. Sorry, my fault, it is the different bug, due to disabled invariants I have missed two locking issues. Here is regenerated patch, including this fix and all previous fixes and improvements: http://people.freebsd.org/~mav/cam-ata.20090629.patch -- Alexander Motin