From owner-svn-src-all@FreeBSD.ORG Mon Mar 26 06:50:12 2012 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43F23106566C; Mon, 26 Mar 2012 06:50:12 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) by mx1.freebsd.org (Postfix) with ESMTP id B4EFC8FC1E; Mon, 26 Mar 2012 06:50:11 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.4/8.14.4/ALCHEMY.FRANKEN.DE) with ESMTP id q2Q6o4Xn085026; Mon, 26 Mar 2012 08:50:04 +0200 (CEST) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.4/8.14.4/Submit) id q2Q6o4Us085025; Mon, 26 Mar 2012 08:50:04 +0200 (CEST) (envelope-from marius) Date: Mon, 26 Mar 2012 08:50:04 +0200 From: Marius Strobl To: Cy Schubert Message-ID: <20120326065004.GS37560@alchemy.franken.de> References: <201203210857.q2L8vFLB062984@svn.freebsd.org> <201203260535.q2Q5ZXE7043378@slippy.cwsent.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201203260535.q2Q5ZXE7043378@slippy.cwsent.com> User-Agent: Mutt/1.4.2.3i Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r233274 - in head/sys/dev/ata: . chipsets X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2012 06:50:12 -0000 On Sun, Mar 25, 2012 at 10:35:33PM -0700, Cy Schubert wrote: > In message <201203210857.q2L8vFLB062984@svn.freebsd.org>, Marius Strobl > writes: > > Author: marius > > Date: Wed Mar 21 08:57:15 2012 > > New Revision: 233274 > > URL: http://svn.freebsd.org/changeset/base/233274 > > > > Log: > > Remove remnants of ATA_LOCKING uses in the ATA_CAM case and wrap it > > along with functions, SYSCTLs and tunables that are not used with > > ATA_CAM in #ifndef ATA_CAM, similar to the existing #ifdef'ed ATA_CAM > > code for the other way around. This makes it easier to understand > > which parts of ata(4) actually are used in the new world order and > > to later on remove the !ATA_CAM bits. It also makes it obvious that > > there is something fishy with the C-bus front-end as well as in the > > ATP850 support, as these used ATA_LOCKING which is defunct in the > > ATA_CAM case. When fixing the former, ATA_LOCKING probably needs to > > be brought back in some form or other. > > > > Reviewed by: mav > > MFC after: 1 week > > > > Modified: > > head/sys/dev/ata/ata-all.c > > head/sys/dev/ata/ata-cbus.c > > head/sys/dev/ata/ata-pci.c > > head/sys/dev/ata/ata-pci.h > > head/sys/dev/ata/ata-queue.c > > head/sys/dev/ata/chipsets/ata-acard.c > > > [... diff removed for brevity ...] > > Hi, > > This commit broke kernels with device atapicam specified: > > # ATA and ATAPI devices > device atapicam # emulate ATAPI devices as SCSI ditto via > CAM > # needs CAM to be present (scbus & > pass) > > Here are two examples when device atapicam is specified in the kernel > config: > <...> Apparently, you are using both "device atapicam" and "options ATA_CAM", which are mutually exclusive at run-time. As an intentional side-effect, r233274 breaks such configurations. The fact that you could compile both into the same kernel before was a bug, as ATA_CAM always took precedence. > > And, the patch to fix the issue: No, this is backwards. Marius