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

Commit 6f07f86c authored by Dan Williams's avatar Dan Williams
Browse files

acpi, nfit: Introduce nfit_mem flags 



In preparation for adding a flag to indicate whether a DIMM publishes a
dirty-shutdown count, convert the existing flags to a bit field.

Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 97052c1c

drivers/acpi/nfit/core.c

+16 −11
Original line number Diff line number Diff line
@@ -191,18 +191,20 @@ static int xlat_nvdimm_status(struct nvdimm *nvdimm, void *buf, unsigned int cmd 
		 * In the _LSI, _LSR, _LSW case the locked status is

		 * communicated via the read/write commands

		 */

		if (nfit_mem->has_lsr)

		if (test_bit(NFIT_MEM_LSR, &nfit_mem->flags))

			break;



		if (status >> 16 & ND_CONFIG_LOCKED)

			return -EACCES;

		break;

	case ND_CMD_GET_CONFIG_DATA:

		if (nfit_mem->has_lsr && status == ACPI_LABELS_LOCKED)

		if (test_bit(NFIT_MEM_LSR, &nfit_mem->flags)

				&& status == ACPI_LABELS_LOCKED)

			return -EACCES;

		break;

	case ND_CMD_SET_CONFIG_DATA:

		if (nfit_mem->has_lsw && status == ACPI_LABELS_LOCKED)

		if (test_bit(NFIT_MEM_LSW, &nfit_mem->flags)

				&& status == ACPI_LABELS_LOCKED)

			return -EACCES;

		break;

	default:
@@ -480,14 +482,16 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
			min_t(u32, 256, in_buf.buffer.length), true);



	/* call the BIOS, prefer the named methods over _DSM if available */

	if (nvdimm && cmd == ND_CMD_GET_CONFIG_SIZE && nfit_mem->has_lsr)

	if (nvdimm && cmd == ND_CMD_GET_CONFIG_SIZE

			&& test_bit(NFIT_MEM_LSR, &nfit_mem->flags))

		out_obj = acpi_label_info(handle);

	else if (nvdimm && cmd == ND_CMD_GET_CONFIG_DATA && nfit_mem->has_lsr) {

	else if (nvdimm && cmd == ND_CMD_GET_CONFIG_DATA

			&& test_bit(NFIT_MEM_LSR, &nfit_mem->flags)) {

		struct nd_cmd_get_config_data_hdr *p = buf;



		out_obj = acpi_label_read(handle, p->in_offset, p->in_length);

	} else if (nvdimm && cmd == ND_CMD_SET_CONFIG_DATA

			&& nfit_mem->has_lsw) {

			&& test_bit(NFIT_MEM_LSW, &nfit_mem->flags)) {

		struct nd_cmd_set_config_hdr *p = buf;



		out_obj = acpi_label_write(handle, p->in_offset, p->in_length,
@@ -1784,12 +1788,13 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, 
	if (acpi_nvdimm_has_method(adev_dimm, "_LSI")

			&& acpi_nvdimm_has_method(adev_dimm, "_LSR")) {

		dev_dbg(dev, "%s: has _LSR\n", dev_name(&adev_dimm->dev));

		nfit_mem->has_lsr = true;

		set_bit(NFIT_MEM_LSR, &nfit_mem->flags);

	}



	if (nfit_mem->has_lsr && acpi_nvdimm_has_method(adev_dimm, "_LSW")) {

	if (test_bit(NFIT_MEM_LSR, &nfit_mem->flags)

			&& acpi_nvdimm_has_method(adev_dimm, "_LSW")) {

		dev_dbg(dev, "%s: has _LSW\n", dev_name(&adev_dimm->dev));

		nfit_mem->has_lsw = true;

		set_bit(NFIT_MEM_LSW, &nfit_mem->flags);

	}



	return 0;
@@ -1878,11 +1883,11 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 
			cmd_mask |= nfit_mem->dsm_mask & NVDIMM_STANDARD_CMDMASK;

		}



		if (nfit_mem->has_lsr) {

		if (test_bit(NFIT_MEM_LSR, &nfit_mem->flags)) {

			set_bit(ND_CMD_GET_CONFIG_SIZE, &cmd_mask);

			set_bit(ND_CMD_GET_CONFIG_DATA, &cmd_mask);

		}

		if (nfit_mem->has_lsw)

		if (test_bit(NFIT_MEM_LSW, &nfit_mem->flags))

			set_bit(ND_CMD_SET_CONFIG_DATA, &cmd_mask);



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

drivers/acpi/nfit/nfit.h

+6 −2
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ struct nfit_memdev { 
	struct acpi_nfit_memory_map memdev[0];

};



enum nfit_mem_flags {

	NFIT_MEM_LSR,

	NFIT_MEM_LSW,

};



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

struct nfit_mem {

	struct nvdimm *nvdimm;
@@ -178,9 +183,8 @@ struct nfit_mem { 
	struct acpi_nfit_desc *acpi_desc;

	struct resource *flush_wpq;

	unsigned long dsm_mask;

	unsigned long flags;

	int family;

	bool has_lsr;

	bool has_lsw;

};



struct acpi_nfit_desc {