@@ -36,6 +36,8 @@ libndctl_la_SOURCES += hpe1.c
libndctl_la_SOURCES += msft.c
endif
+libndctl_la_SOURCES += nfit.c
+
EXTRA_DIST += libndctl.sym
libndctl_la_LDFLAGS = $(AM_LDFLAGS) \
@@ -38,6 +38,7 @@
#include <ndctl/libndctl.h>
#include <ndctl/namespace.h>
#include <daxctl/libdaxctl.h>
+#include <ndctl/libndctl-nfit.h>
#include "private.h"
static uuid_t null_uuid;
@@ -1532,6 +1533,79 @@ static struct ndctl_dimm *ndctl_dimm_get_by_id(struct ndctl_bus *bus, unsigned i
return NULL;
}
+/**
+ * ndctl_bus_get_region_by_physical_address - get region by physical address
+ * @bus: ndctl_bus instance
+ * @address: (System) Physical Address
+ *
+ * If @bus and @address is valid, returns a region address, which
+ * physical address belongs to.
+ */
+NDCTL_EXPORT struct ndctl_region *ndctl_bus_get_region_by_physical_address(struct ndctl_bus *bus,
+ unsigned long long address)
+{
+ unsigned long long region_start, region_end;
+ struct ndctl_region *region;
+
+ ndctl_region_foreach(bus, region) {
+ region_start = ndctl_region_get_resource(region);
+ region_end = region_start + ndctl_region_get_size(region);
+ if (region_start <= address && address < region_end)
+ return region;
+ }
+
+ return NULL;
+}
+
+/**
+ * ndctl_bus_get_dimm_by_physical_address - get ndctl_dimm pointer by physical address
+ * @bus: ndctl_bus instance
+ * @address: (System) Physical Address
+ *
+ * Returns address of ndctl_dimm on success.
+ */
+NDCTL_EXPORT struct ndctl_dimm *ndctl_bus_get_dimm_by_physical_address(struct ndctl_bus *bus,
+ unsigned long long address)
+{
+ unsigned int handle;
+ unsigned long long dpa;
+ struct ndctl_region *region;
+
+ if (!bus)
+ return NULL;
+
+ region = ndctl_bus_get_region_by_physical_address(bus, address);
+ if (!region)
+ return NULL;
+
+ if (ndctl_region_get_interleave_ways(region) == 1) {
+ /*
+ * No need to ask firmware. The first dimm is iff.
+ */
+ struct ndctl_mapping *mapping = ndctl_mapping_get_first(region);
+ if (!mapping)
+ return NULL;
+ return ndctl_mapping_get_dimm(mapping);
+ }
+
+ /*
+ * Since the region is interleaved, we need to ask firmware about it.
+ * If it supports Translate SPA, the dimm is returned.
+ */
+ if (ndctl_bus_has_nfit(bus)) {
+ int rc;
+
+ rc = ndctl_bus_nfit_translate_spa(bus, address, &handle, &dpa);
+ if (rc)
+ return NULL;
+
+ return ndctl_dimm_get_by_handle(bus, handle);
+ }
+ /* No way to get dimm info */
+ return NULL;
+}
+
+
static int region_set_type(struct ndctl_region *region, char *path)
{
struct ndctl_ctx *ctx = ndctl_region_get_ctx(region);
@@ -36,6 +36,8 @@ global:
ndctl_bus_get_provider;
ndctl_bus_get_ctx;
ndctl_bus_wait_probe;
+ ndctl_bus_get_region_by_physical_address;
+ ndctl_bus_get_dimm_by_physical_address;
ndctl_dimm_get_first;
ndctl_dimm_get_next;
ndctl_dimm_get_handle;
new file mode 100644
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2017, FUJITSU LIMITED. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ */
+#include <stdlib.h>
+#include <ndctl/libndctl.h>
+#include "private.h"
+#include <ndctl/libndctl-nfit.h>
+
+/**
+ * ndctl_bus_is_nfit_cmd_supported - ask nfit command is supported on @bus.
+ * @bus: ndctl_bus instance
+ * @cmd: nfit command number (defined as NFIT_CMD_XXX in libndctl-nfit.h)
+ *
+ * Return 1: command is supported. Return 0: command is not supported.
+ *
+ */
+NDCTL_EXPORT int ndctl_bus_is_nfit_cmd_supported(struct ndctl_bus *bus,
+ int cmd)
+{
+ return !!(bus->nfit_dsm_mask & (1ULL << cmd));
+}
+
+static int bus_has_translate_spa(struct ndctl_bus *bus)
+{
+ if (!ndctl_bus_has_nfit(bus))
+ return 0;
+
+ return ndctl_bus_is_nfit_cmd_supported(bus, NFIT_CMD_TRANSLATE_SPA);
+}
+
+static struct ndctl_cmd *ndctl_bus_cmd_new_translate_spa(struct ndctl_bus *bus)
+{
+ struct ndctl_cmd *cmd;
+ struct nd_cmd_pkg *pkg;
+ struct nd_cmd_translate_spa *translate_spa;
+ size_t size, spa_length;
+
+ spa_length = sizeof(struct nd_cmd_translate_spa)
+ + sizeof(struct nd_nvdimm_device);
+ size = sizeof(*cmd) + sizeof(*pkg) + spa_length;
+ cmd = calloc(1, size);
+ if (!cmd)
+ return NULL;
+
+ cmd->bus = bus;
+ ndctl_cmd_ref(cmd);
+ cmd->type = ND_CMD_CALL;
+ cmd->size = size;
+ cmd->status = 1;
+ pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
+ pkg->nd_command = NFIT_CMD_TRANSLATE_SPA;
+ pkg->nd_size_in = sizeof(unsigned long long);
+ pkg->nd_size_out = spa_length;
+ pkg->nd_fw_size = spa_length;
+ translate_spa = (struct nd_cmd_translate_spa *)&pkg->nd_payload[0];
+ cmd->firmware_status = &translate_spa->status;
+ translate_spa->translate_length = spa_length;
+
+ return cmd;
+}
+
+static int ndctl_bus_cmd_get_translate_spa(struct ndctl_cmd *cmd,
+ unsigned int *handle, unsigned long long *dpa)
+{
+ struct nd_cmd_pkg *pkg;
+ struct nd_cmd_translate_spa *translate_spa;
+
+ pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
+ translate_spa = (struct nd_cmd_translate_spa *)&pkg->nd_payload[0];
+
+ if (translate_spa->status == ND_TRANSLATE_SPA_STATUS_INVALID_SPA)
+ return -EINVAL;
+
+ /*
+ * XXX: Currently NVDIMM mirroring is not supported.
+ * Even if ACPI returned plural dimms due to mirroring,
+ * this function returns just the first dimm.
+ */
+
+ *handle = translate_spa->devices[0].nfit_device_handle;
+ *dpa = translate_spa->devices[0].dpa;
+
+ return 0;
+}
+
+static int is_valid_spa(struct ndctl_bus *bus, unsigned long long spa)
+{
+ return !!ndctl_bus_get_region_by_physical_address(bus, spa);
+}
+
+/**
+ * ndctl_bus_nfit_translate_spa - call translate spa.
+ * @bus: bus which belongs to.
+ * @address: address (System Physical Address)
+ * @handle: pointer to return dimm handle
+ * @dpa: pointer to return Dimm Physical address
+ *
+ * If success, returns zero, store dimm's @handle, and @dpa.
+ */
+int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus,
+ unsigned long long address, unsigned int *handle, unsigned long long *dpa)
+{
+
+ struct ndctl_cmd *cmd;
+ struct nd_cmd_pkg *pkg;
+ struct nd_cmd_translate_spa *translate_spa;
+ int rc;
+
+ if (!bus || !handle || !dpa)
+ return -EINVAL;
+
+ if (!bus_has_translate_spa(bus))
+ return -ENOTTY;
+
+ if (!is_valid_spa(bus, address))
+ return -EINVAL;
+
+ cmd = ndctl_bus_cmd_new_translate_spa(bus);
+ if (!cmd)
+ return -ENOMEM;
+
+ pkg = (struct nd_cmd_pkg *)&cmd->cmd_buf[0];
+ translate_spa = (struct nd_cmd_translate_spa *)&pkg->nd_payload[0];
+ translate_spa->spa = address;
+
+ rc = ndctl_cmd_submit(cmd);
+ if (rc) {
+ ndctl_cmd_unref(cmd);
+ return rc;
+ }
+
+ rc = ndctl_bus_cmd_get_translate_spa(cmd, handle, dpa);
+ ndctl_cmd_unref(cmd);
+
+ return rc;
+}
@@ -73,4 +73,8 @@ struct nd_cmd_ars_err_inj_stat {
} __attribute__((packed)) record[0];
} __attribute__((packed));
+int ndctl_bus_is_nfit_cmd_supported(struct ndctl_bus *bus, int cmd);
+int ndctl_bus_nfit_translate_spa(struct ndctl_bus *bus,
+ unsigned long long addr, unsigned int *handle, unsigned long long *dpa);
+
#endif /* __LIBNDCTL_NFIT_H__ */
@@ -161,6 +161,8 @@ struct ndctl_smart_ops *ndctl_dimm_get_smart_ops(struct ndctl_dimm *dimm);
struct ndctl_ctx *ndctl_dimm_get_ctx(struct ndctl_dimm *dimm);
struct ndctl_dimm *ndctl_dimm_get_by_handle(struct ndctl_bus *bus,
unsigned int handle);
+struct ndctl_dimm *ndctl_bus_get_dimm_by_physical_address(struct ndctl_bus *bus,
+ unsigned long long address);
int ndctl_dimm_is_active(struct ndctl_dimm *dimm);
int ndctl_dimm_is_enabled(struct ndctl_dimm *dimm);
int ndctl_dimm_disable(struct ndctl_dimm *dimm);
@@ -421,6 +423,8 @@ struct ndctl_ctx *ndctl_region_get_ctx(struct ndctl_region *region);
struct ndctl_dimm *ndctl_region_get_first_dimm(struct ndctl_region *region);
struct ndctl_dimm *ndctl_region_get_next_dimm(struct ndctl_region *region,
struct ndctl_dimm *dimm);
+struct ndctl_region *ndctl_bus_get_region_by_physical_address(struct ndctl_bus *bus,
+ unsigned long long address);
#define ndctl_dimm_foreach_in_region(region, dimm) \
for (dimm = ndctl_region_get_first_dimm(region); \
dimm != NULL; \
This patch add features to get information by physical address. Here is new interfaces : - Confirm NFIT command is supported or not. (nfit.c) - Find region by System Physical Address (libndctl.c) - Find DIMM by System Physical Address. (libndctl.c) Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> --- ndctl/lib/Makefile.am | 2 + ndctl/lib/libndctl.c | 74 +++++++++++++++++++++++++ ndctl/lib/libndctl.sym | 2 + ndctl/lib/nfit.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++ ndctl/libndctl-nfit.h | 4 ++ ndctl/libndctl.h.in | 4 ++ 6 files changed, 231 insertions(+)