From 14f900e2cd3f569d9b731990485f8e292d0a7035 Mon Sep 17 00:00:00 2001
From: Will Andrews <will@FreeBSD.org>
Date: Wed, 22 Jun 2011 21:43:10 +0000
Subject: [PATCH] Plumb support for the device advanced information CCB in the
 ATA XPT.

This was previously done only for SCSI XPT in r223081, on which the change
in r223089 depended in order to respond to serial number requests.  As a
result of r223089, da(4) and ada(4) devices register a d_getattr for geom to
use to obtain the information.

Reported by:	ache
Reviewed by:	ken
---
 sys/cam/ata/ata_xpt.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index d02b36f1148..216805d0c6b 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -1600,6 +1600,34 @@ ata_device_transport(struct cam_path *path)
 	xpt_action((union ccb *)&cts);
 }
 
+static void
+ata_dev_advinfo(union ccb *start_ccb)
+{
+	struct cam_ed *device;
+	struct ccb_dev_advinfo *cdai;
+	off_t amt; 
+
+	start_ccb->ccb_h.status = CAM_REQ_INVALID;
+	device = start_ccb->ccb_h.path->device;
+	cdai = &start_ccb->cdai;
+	switch(cdai->buftype) {
+	case CDAI_TYPE_SERIAL_NUM:
+		if (cdai->flags & CDAI_FLAG_STORE)
+			break;
+		start_ccb->ccb_h.status = CAM_REQ_CMP;
+		cdai->provsiz = device->serial_num_len;
+		if (device->serial_num_len == 0)
+			break;
+		amt = device->serial_num_len;
+		if (cdai->provsiz > cdai->bufsiz)
+			amt = cdai->bufsiz;
+		memcpy(cdai->buf, device->serial_num, amt);
+		break;
+	default:
+		break;
+	}
+}
+
 static void
 ata_action(union ccb *start_ccb)
 {
@@ -1652,6 +1680,11 @@ ata_action(union ccb *start_ccb)
 		}
 		/* FALLTHROUGH */
 	}
+	case XPT_DEV_ADVINFO:
+	{
+		ata_dev_advinfo(start_ccb);
+		break;
+	}
 	default:
 		xpt_action_default(start_ccb);
 		break;