Commit d46e6a21 authored by Dan Williams's avatar Dan Williams Committed by Vishal Verma
Browse files

ACPI: NFIT: Move bus_dsm_mask out of generic nvdimm_bus_descriptor 



DSMs are strictly an ACPI mechanism, evict the bus_dsm_mask concept from
the generic 'struct nvdimm_bus_descriptor' object.

As a side effect the test facility ->bus_nfit_cmd_force_en is no longer
necessary. The test infrastructure can communicate that information
directly in ->bus_dsm_mask.

Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
parent 92fe2aa8

drivers/acpi/nfit/core.c

+4 −4
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 


		cmd_name = nvdimm_bus_cmd_name(cmd);

		cmd_mask = nd_desc->cmd_mask;

		dsm_mask = nd_desc->bus_dsm_mask;

		dsm_mask = acpi_desc->bus_dsm_mask;

		desc = nd_cmd_bus_desc(cmd);

		guid = to_nfit_uuid(NFIT_DEV_BUS);

		handle = adev->handle;
@@ -1238,8 +1238,9 @@ static ssize_t bus_dsm_mask_show(struct device *dev, 
{

	struct nvdimm_bus *nvdimm_bus = to_nvdimm_bus(dev);

	struct nvdimm_bus_descriptor *nd_desc = to_nd_desc(nvdimm_bus);

	struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);



	return sprintf(buf, "%#lx\n", nd_desc->bus_dsm_mask);

	return sprintf(buf, "%#lx\n", acpi_desc->bus_dsm_mask);

}

static struct device_attribute dev_attr_bus_dsm_mask =

		__ATTR(dsm_mask, 0444, bus_dsm_mask_show, NULL);
@@ -2157,7 +2158,6 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) 
	int i;



	nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en;

	nd_desc->bus_dsm_mask = acpi_desc->bus_nfit_cmd_force_en;

	set_bit(ND_CMD_CALL, &nd_desc->cmd_mask);

	set_bit(NVDIMM_BUS_FAMILY_NFIT, &nd_desc->bus_family_mask);
@@ -2180,7 +2180,7 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) 
		(1 << NFIT_CMD_ARS_INJECT_GET);

	for_each_set_bit(i, &dsm_mask, BITS_PER_LONG)

		if (acpi_check_dsm(adev->handle, guid, 1, 1ULL << i))

			set_bit(i, &nd_desc->bus_dsm_mask);

			set_bit(i, &acpi_desc->bus_dsm_mask);

}



static ssize_t range_index_show(struct device *dev,

drivers/acpi/nfit/nfit.h

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ struct acpi_nfit_desc { 
	unsigned long scrub_flags;

	unsigned long dimm_cmd_force_en;

	unsigned long bus_cmd_force_en;

	unsigned long bus_nfit_cmd_force_en;

	unsigned long bus_dsm_mask;

	unsigned int platform_cap;

	unsigned int scrub_tmo;

	int (*blk_do_io)(struct nd_blk_region *ndbr, resource_size_t dpa,

include/linux/libnvdimm.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc, 
struct device_node;

struct nvdimm_bus_descriptor {

	const struct attribute_group **attr_groups;

	unsigned long bus_dsm_mask;

	unsigned long cmd_mask;

	unsigned long dimm_family_mask;

	unsigned long bus_family_mask;

tools/testing/nvdimm/test/nfit.c

+8 −8
Original line number Diff line number Diff line
@@ -2507,10 +2507,10 @@ static void nfit_test0_setup(struct nfit_test *t) 
	set_bit(ND_CMD_ARS_STATUS, &acpi_desc->bus_cmd_force_en);

	set_bit(ND_CMD_CLEAR_ERROR, &acpi_desc->bus_cmd_force_en);

	set_bit(ND_CMD_CALL, &acpi_desc->bus_cmd_force_en);

	set_bit(NFIT_CMD_TRANSLATE_SPA, &acpi_desc->bus_nfit_cmd_force_en);

	set_bit(NFIT_CMD_ARS_INJECT_SET, &acpi_desc->bus_nfit_cmd_force_en);

	set_bit(NFIT_CMD_ARS_INJECT_CLEAR, &acpi_desc->bus_nfit_cmd_force_en);

	set_bit(NFIT_CMD_ARS_INJECT_GET, &acpi_desc->bus_nfit_cmd_force_en);

	set_bit(NFIT_CMD_TRANSLATE_SPA, &acpi_desc->bus_dsm_mask);

	set_bit(NFIT_CMD_ARS_INJECT_SET, &acpi_desc->bus_dsm_mask);

	set_bit(NFIT_CMD_ARS_INJECT_CLEAR, &acpi_desc->bus_dsm_mask);

	set_bit(NFIT_CMD_ARS_INJECT_GET, &acpi_desc->bus_dsm_mask);

	set_bit(ND_INTEL_FW_GET_INFO, &acpi_desc->dimm_cmd_force_en);

	set_bit(ND_INTEL_FW_START_UPDATE, &acpi_desc->dimm_cmd_force_en);

	set_bit(ND_INTEL_FW_SEND_DATA, &acpi_desc->dimm_cmd_force_en);
@@ -2731,11 +2731,11 @@ static int nfit_ctl_test(struct device *dev) 
			.module = THIS_MODULE,

			.provider_name = "ACPI.NFIT",

			.ndctl = acpi_nfit_ctl,

		},

		.bus_dsm_mask = 1UL << NFIT_CMD_TRANSLATE_SPA

			| 1UL << NFIT_CMD_ARS_INJECT_SET

			| 1UL << NFIT_CMD_ARS_INJECT_CLEAR

			| 1UL << NFIT_CMD_ARS_INJECT_GET,

		},

		.dev = &adev->dev,

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE