Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6548ae4 authored by Dave Jiang's avatar Dave Jiang Committed by Dan Williams
Browse files

acpi/nfit, libnvdimm: Store dimm id as a member to struct nvdimm 



The generated dimm id is needed for the sysfs attribute as well as being
used as the identifier/description for the security key. Since it's
constant and should never change, store it as a member of struct nvdimm.

As nvdimm_create() continues to grow parameters relative to NFIT driver
requirements, do not require other implementations to keep pace.
Introduce __nvdimm_create() to carry the new parameters and keep
nvdimm_create() with the long standing default api.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent b3ed2ce0

drivers/acpi/nfit/core.c

+18 −13
Original line number Diff line number Diff line
@@ -1594,18 +1594,10 @@ static DEVICE_ATTR_RO(flags); 
static ssize_t id_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);

	struct nvdimm *nvdimm = to_nvdimm(dev);

	struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);



	if (dcr->valid_fields & ACPI_NFIT_CONTROL_MFG_INFO_VALID)

		return sprintf(buf, "%04x-%02x-%04x-%08x\n",

				be16_to_cpu(dcr->vendor_id),

				dcr->manufacturing_location,

				be16_to_cpu(dcr->manufacturing_date),

				be32_to_cpu(dcr->serial_number));

	else

		return sprintf(buf, "%04x-%08x\n",

				be16_to_cpu(dcr->vendor_id),

				be32_to_cpu(dcr->serial_number));

	return sprintf(buf, "%s\n", nfit_mem->id);

}

static DEVICE_ATTR_RO(id);
@@ -1801,10 +1793,23 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, 
	const guid_t *guid;

	int i;

	int family = -1;

	struct acpi_nfit_control_region *dcr = nfit_mem->dcr;



	/* nfit test assumes 1:1 relationship between commands and dsms */

	nfit_mem->dsm_mask = acpi_desc->dimm_cmd_force_en;

	nfit_mem->family = NVDIMM_FAMILY_INTEL;



	if (dcr->valid_fields & ACPI_NFIT_CONTROL_MFG_INFO_VALID)

		sprintf(nfit_mem->id, "%04x-%02x-%04x-%08x",

				be16_to_cpu(dcr->vendor_id),

				dcr->manufacturing_location,

				be16_to_cpu(dcr->manufacturing_date),

				be32_to_cpu(dcr->serial_number));

	else

		sprintf(nfit_mem->id, "%04x-%08x",

				be16_to_cpu(dcr->vendor_id),

				be32_to_cpu(dcr->serial_number));



	adev = to_acpi_dev(acpi_desc);

	if (!adev) {

		/* unit test case */
@@ -1991,10 +1996,10 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 


		flush = nfit_mem->nfit_flush ? nfit_mem->nfit_flush->flush

			: NULL;

		nvdimm = nvdimm_create(acpi_desc->nvdimm_bus, nfit_mem,

		nvdimm = __nvdimm_create(acpi_desc->nvdimm_bus, nfit_mem,

				acpi_nfit_dimm_attribute_groups,

				flags, cmd_mask, flush ? flush->hint_count : 0,

				nfit_mem->flush_wpq);

				nfit_mem->flush_wpq, &nfit_mem->id[0]);

		if (!nvdimm)

			return -ENOMEM;

drivers/acpi/nfit/nfit.h

+3 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ enum nfit_mem_flags { 
	NFIT_MEM_DIRTY_COUNT,

};



#define NFIT_DIMM_ID_LEN	22



/* assembled tables for a given dimm/memory-device */

struct nfit_mem {

	struct nvdimm *nvdimm;
@@ -200,6 +202,7 @@ struct nfit_mem { 
	struct list_head list;

	struct acpi_device *adev;

	struct acpi_nfit_desc *acpi_desc;

	char id[NFIT_DIMM_ID_LEN+1];

	struct resource *flush_wpq;

	unsigned long dsm_mask;

	unsigned long flags;

drivers/nvdimm/dimm_devs.c

+7 −5
Original line number Diff line number Diff line
@@ -383,10 +383,10 @@ struct attribute_group nvdimm_attribute_group = { 
};

EXPORT_SYMBOL_GPL(nvdimm_attribute_group);



struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data,

		const struct attribute_group **groups, unsigned long flags,

		unsigned long cmd_mask, int num_flush,

		struct resource *flush_wpq)

struct nvdimm *__nvdimm_create(struct nvdimm_bus *nvdimm_bus,

		void *provider_data, const struct attribute_group **groups,

		unsigned long flags, unsigned long cmd_mask, int num_flush,

		struct resource *flush_wpq, const char *dimm_id)

{

	struct nvdimm *nvdimm = kzalloc(sizeof(*nvdimm), GFP_KERNEL);

	struct device *dev;
@@ -399,6 +399,8 @@ struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data, 
		kfree(nvdimm);

		return NULL;

	}



	nvdimm->dimm_id = dimm_id;

	nvdimm->provider_data = provider_data;

	nvdimm->flags = flags;

	nvdimm->cmd_mask = cmd_mask;
@@ -415,7 +417,7 @@ struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data, 


	return nvdimm;

}

EXPORT_SYMBOL_GPL(nvdimm_create);

EXPORT_SYMBOL_GPL(__nvdimm_create);



int alias_dpa_busy(struct device *dev, void *data)

{

drivers/nvdimm/nd-core.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ struct nvdimm { 
	atomic_t busy;

	int id, num_flush;

	struct resource *flush_wpq;

	const char *dimm_id;

};



/**

include/linux/libnvdimm.h

+13 −4
Original line number Diff line number Diff line
@@ -175,10 +175,19 @@ const char *nvdimm_name(struct nvdimm *nvdimm); 
struct kobject *nvdimm_kobj(struct nvdimm *nvdimm);

unsigned long nvdimm_cmd_mask(struct nvdimm *nvdimm);

void *nvdimm_provider_data(struct nvdimm *nvdimm);

struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data,

		const struct attribute_group **groups, unsigned long flags,

		unsigned long cmd_mask, int num_flush,

		struct resource *flush_wpq);

struct nvdimm *__nvdimm_create(struct nvdimm_bus *nvdimm_bus,

		void *provider_data, const struct attribute_group **groups,

		unsigned long flags, unsigned long cmd_mask, int num_flush,

		struct resource *flush_wpq, const char *dimm_id);

static inline struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus,

		void *provider_data, const struct attribute_group **groups,

		unsigned long flags, unsigned long cmd_mask, int num_flush,

		struct resource *flush_wpq)

{

	return __nvdimm_create(nvdimm_bus, provider_data, groups, flags,

			cmd_mask, num_flush, flush_wpq, NULL);

}



const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd);

const struct nd_cmd_desc *nd_cmd_bus_desc(int cmd);

u32 nd_cmd_in_size(struct nvdimm *nvdimm, int cmd,