From jdc@koitsu.org  Mon Apr 22 04:44:43 2013
Return-Path: <jdc@koitsu.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id AA20F9C0
	for <freebsd-gnats-submit@freebsd.org>; Mon, 22 Apr 2013 04:44:43 +0000 (UTC)
	(envelope-from jdc@koitsu.org)
Received: from qmta05.emeryville.ca.mail.comcast.net (qmta05.emeryville.ca.mail.comcast.net [IPv6:2001:558:fe2d:43:76:96:30:48])
	by mx1.freebsd.org (Postfix) with ESMTP id 9182A1FC3
	for <freebsd-gnats-submit@freebsd.org>; Mon, 22 Apr 2013 04:44:43 +0000 (UTC)
Received: from omta06.emeryville.ca.mail.comcast.net ([76.96.30.51])
	by qmta05.emeryville.ca.mail.comcast.net with comcast
	id Ssho1l00316AWCUA5skiXy; Mon, 22 Apr 2013 04:44:42 +0000
Received: from koitsu.strangled.net ([67.180.84.87])
	by omta06.emeryville.ca.mail.comcast.net with comcast
	id Sskh1l00W1t3BNj8Sskizh; Mon, 22 Apr 2013 04:44:42 +0000
Received: by icarus.home.lan (Postfix, from userid 1000)
	id B527073A33; Sun, 21 Apr 2013 21:44:41 -0700 (PDT)
Message-Id: <20130422044441.B527073A33@icarus.home.lan>
Date: Sun, 21 Apr 2013 21:44:41 -0700 (PDT)
From: Jeremy Chadwick <jdc@koitsu.org>
Reply-To: Jeremy Chadwick <jdc@koitsu.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Steven Hartland <killing@multiplay.co.uk>
Subject: [cam] [patch] Add 4K quirks for Intel 320 and 510-series SSDs
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         178040
>Category:       kern
>Synopsis:       [cam] [patch] Add 4K quirks for Intel 320 and 510-series SSDs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 22 04:50:00 UTC 2013
>Closed-Date:    Tue Jun 25 19:40:11 UTC 2013
>Last-Modified:  Tue Jun 25 19:40:11 UTC 2013
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 9.1-STABLE FreeBSD 9.1-STABLE #1 r249715M: Sun Apr 21 21:07:17 PDT 2013 root@icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_9_amd64 amd64
>Description:
	Intel's 320-series and 510-series SSDs advertise 512-byte sectors
	sizes for both logical and physical.  This adds ADA_Q_4K quirks
	for both.  (Intel, for whatever reason, didn't add physical sector
	advertisement in ATA IDENTIFY; maybe they're strictly adhering to
	non-draft specs, I don't know...)

	Validation of my claims:

root@icarus:~ # smartctl -a /dev/ada0
...
Model Family:     Intel 320 Series SSDs
Device Model:     INTEL SSDSA2CW080G3
...
Firmware Version: 4PC10302
User Capacity:    80,026,361,856 bytes [80.0 GB]
Sector Size:      512 bytes logical/physical
...

root@icarus:~ # smartctl -a /dev/ada5
...
Model Family:     Intel 510 Series SSDs
Device Model:     INTEL SSDSC2MH120A2
...
Firmware Version: PPG4
User Capacity:    120,034,123,776 bytes [120 GB]
Sector Size:      512 bytes logical/physical
...
>How-To-Repeat:
	n/a
>Fix:
	Apply below patch.  Patch will also be available at the following
	URL once I get a GNATS PR:

	http://jdc.koitsu.org/freebsd/{prnum}/


Index: sys/cam/ata/ata_da.c
===================================================================
--- sys/cam/ata/ata_da.c	(revision 249745)
+++ sys/cam/ata/ata_da.c	(working copy)
@@ -350,6 +350,14 @@ static struct ada_quirk_entry ada_quirk_table[] =
 	},
 	{
 		/*
+		 * 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_table[] =
 	},
 	{
 		/*
+		 * 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>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->patched 
State-Changed-By: eadler 
State-Changed-When: Sat May 11 23:14:49 UTC 2013 
State-Changed-Why:  
committed 


http://www.freebsd.org/cgi/query-pr.cgi?pr=178040 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/178040: commit references a PR
Date: Sat, 11 May 2013 23:13:57 +0000 (UTC)

 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>
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sat May 11 23:29:30 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178040 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Tue Jun 25 19:40:10 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178040 
>Unformatted:
