From owner-svn-src-all@FreeBSD.ORG  Sat May 11 23:13:50 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1DB3CF3F;
 Sat, 11 May 2013 23:13:50 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 107EDE6C;
 Sat, 11 May 2013 23:13:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4BNDnRh014729;
 Sat, 11 May 2013 23:13:49 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4BNDniE014728;
 Sat, 11 May 2013 23:13:49 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201305112313.r4BNDniE014728@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sat, 11 May 2013 23:13:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250532 - head/sys/cam/ata
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 11 May 2013 23:13:50 -0000

Author: eadler
Date: Sat May 11 23:13:49 2013
New Revision: 250532
URL: http://svnweb.freebsd.org/changeset/base/250532

Log:
  Intel's 320-series and 510-series SSDs advertise 512-byte sectors
  sizes for both logical and physical. Add ADA_Q_4K quirks
  for both.
  
  PR:		kern/178040
  Submitted by:	Jeremy Chadwick <jdc@koitsu.org>

Modified:
  head/sys/cam/ata/ata_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Sat May 11 22:32:43 2013	(r250531)
+++ head/sys/cam/ata/ata_da.c	Sat May 11 23:13:49 2013	(r250532)
@@ -350,6 +350,14 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
+		 * Intel 320 Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSA2CW*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
 		 * Intel 330 Series SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 * Submitted by: Steven Hartland <steven.hartland@multiplay.co.uk>
@@ -360,6 +368,14 @@ static struct ada_quirk_entry ada_quirk_
 	},
 	{
 		/*
+		 * Intel 510 Series SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSC2MH*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
+	{
+		/*
 		 * OCZ Deneva R Series SSDs
 		 * 4k optimised & trim only works in 4k requests + 4k aligned
 		 * Submitted by: Steven Hartland <steven.hartland@multiplay.co.uk>