From owner-svn-src-all@FreeBSD.ORG  Sat Aug 25 23:01:58 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 7AA2D1065673;
	Sat, 25 Aug 2012 23:01:58 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6607A8FC1C;
	Sat, 25 Aug 2012 23:01:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7PN1wSv010229;
	Sat, 25 Aug 2012 23:01:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PN1wQR010227;
	Sat, 25 Aug 2012 23:01:58 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201208252301.q7PN1wQR010227@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 25 Aug 2012 23:01:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239693 - head/sys/dev/ahci
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 23:01:58 -0000

Author: mav
Date: Sat Aug 25 23:01:57 2012
New Revision: 239693
URL: http://svn.freebsd.org/changeset/base/239693

Log:
  Return "locally assigned" Enclosure Logical Identifier instead of 8 zero
  bytes. Zeroes there are incorrect and tend to cause false device ID matches.

Modified:
  head/sys/dev/ahci/ahciem.c

Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c	Sat Aug 25 22:45:26 2012	(r239692)
+++ head/sys/dev/ahci/ahciem.c	Sat Aug 25 23:01:57 2012	(r239693)
@@ -380,6 +380,8 @@ ahci_em_emulate_ses_on_led(device_t dev,
 	    ccb->ataio.cmd.sector_count >= 16) {
 		bzero(buf, ccb->ataio.dxfer_len);
 		buf[0] = 64;		/* Valid bytes. */
+		buf[2] = 0x30;		/* NAA Locally Assigned. */
+		strncpy(&buf[3], device_get_nameunit(dev), 7);
 		strncpy(&buf[10], "AHCI    ", SID_VENDOR_SIZE);
 		strncpy(&buf[18], "SGPIO Enclosure ", SID_PRODUCT_SIZE);
 		strncpy(&buf[34], "1.00", SID_REVISION_SIZE);