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

Commit 7db5bb33 authored by Jerry Hoemann's avatar Jerry Hoemann Committed by Dan Williams
Browse files

libnvdimm, acpi, nfit: Add bus level dsm mask for pass thru. 



Add a bus level dsm_mask to nvdimm_bus_descriptor to allow the passthru
calling mechanism to specify a different mask from the cmd_mask.

Populate bus_dsm_mask and use it to filter dsm calls that user can
make through the pass thru interface.

Signed-off-by: default avatarJerry Hoemann <jerry.hoemann@hpe.com>
[djbw: use command number constants instead of a magic mask value]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 37d74841

drivers/acpi/nfit/core.c

+27 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ 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 = cmd_mask;

		if (cmd == ND_CMD_CALL)

			dsm_mask = nd_desc->bus_dsm_mask;

		desc = nd_cmd_bus_desc(cmd);

		guid = to_nfit_uuid(NFIT_DEV_BUS);

		handle = adev->handle;
@@ -1608,11 +1610,23 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc) 
			acpi_desc);

}



/*

 * These constants are private because there are no kernel consumers of

 * these commands.

 */

enum nfit_aux_cmds {

        NFIT_CMD_TRANSLATE_SPA = 5,

        NFIT_CMD_ARS_INJECT_SET = 7,

        NFIT_CMD_ARS_INJECT_CLEAR = 8,

        NFIT_CMD_ARS_INJECT_GET = 9,

};



static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc)

{

	struct nvdimm_bus_descriptor *nd_desc = &acpi_desc->nd_desc;

	const guid_t *guid = to_nfit_uuid(NFIT_DEV_BUS);

	struct acpi_device *adev;

	unsigned long dsm_mask;

	int i;



	nd_desc->cmd_mask = acpi_desc->bus_cmd_force_en;
@@ -1624,6 +1638,19 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) 
		if (acpi_check_dsm(adev->handle, guid, 1, 1ULL << i))

			set_bit(i, &nd_desc->cmd_mask);

	set_bit(ND_CMD_CALL, &nd_desc->cmd_mask);



	dsm_mask =

		(1 << ND_CMD_ARS_CAP) |

		(1 << ND_CMD_ARS_START) |

		(1 << ND_CMD_ARS_STATUS) |

		(1 << ND_CMD_CLEAR_ERROR) |

		(1 << NFIT_CMD_TRANSLATE_SPA) |

		(1 << NFIT_CMD_ARS_INJECT_SET) |

		(1 << NFIT_CMD_ARS_INJECT_CLEAR) |

		(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);

}



static ssize_t range_index_show(struct device *dev,

include/linux/libnvdimm.h

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


struct nvdimm_bus_descriptor {

	const struct attribute_group **attr_groups;

	unsigned long bus_dsm_mask;

	unsigned long cmd_mask;

	struct module *module;

	char *provider_name;