From 806adc6c0016dd1c13a2d8697d7f95d877e00222 Mon Sep 17 00:00:00 2001
From: D Scott Phillips <scottph@FreeBSD.org>
Date: Thu, 6 Jun 2019 20:12:04 +0000
Subject: [PATCH] nvdimm: Provide nvdimm location information

Provide the acpi handle path as the location string for the nvdimm
children of the nvdimm_root device.

Reviewed by:	kib
Approved by:	jhb (mentor)
MFC after:	1 week
Sponsored by:	Intel Corporation
Differential Revision:	https://reviews.freebsd.org/D20528
---
 sys/dev/nvdimm/nvdimm.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/sys/dev/nvdimm/nvdimm.c b/sys/dev/nvdimm/nvdimm.c
index aed02a2782a..5c6b6ee6dc7 100644
--- a/sys/dev/nvdimm/nvdimm.c
+++ b/sys/dev/nvdimm/nvdimm.c
@@ -560,6 +560,24 @@ nvdimm_root_write_ivar(device_t dev, device_t child, int index,
 	return (0);
 }
 
+static int
+nvdimm_root_child_location_str(device_t dev, device_t child, char *buf,
+    size_t buflen)
+{
+	ACPI_HANDLE handle;
+	int res;
+
+	handle = nvdimm_root_get_acpi_handle(child);
+	if (handle != NULL)
+		res = snprintf(buf, buflen, "handle=%s", acpi_name(handle));
+	else
+		res = snprintf(buf, buflen, "unknown");
+
+	if (res >= buflen)
+		return (EOVERFLOW);
+	return (0);
+}
+
 static device_method_t nvdimm_methods[] = {
 	DEVMETHOD(device_probe, nvdimm_probe),
 	DEVMETHOD(device_attach, nvdimm_attach),
@@ -582,6 +600,7 @@ static device_method_t nvdimm_root_methods[] = {
 	DEVMETHOD(bus_add_child, bus_generic_add_child),
 	DEVMETHOD(bus_read_ivar, nvdimm_root_read_ivar),
 	DEVMETHOD(bus_write_ivar, nvdimm_root_write_ivar),
+	DEVMETHOD(bus_child_location_str, nvdimm_root_child_location_str),
 	DEVMETHOD_END
 };