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

Commit 94116f81 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Christoph Hellwig
Browse files

ACPI: Switch to use generic guid_t in acpi_evaluate_dsm() 



acpi_evaluate_dsm() and friends take a pointer to a raw buffer of 16
bytes. Instead we convert them to use guid_t type. At the same time we
convert current users.

acpi_str_to_uuid() becomes useless after the conversion and it's safe to
get rid of it.

Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Cc: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Acked-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Yisen Zhuang <yisen.zhuang@huawei.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b7fe9299

drivers/acpi/acpi_extlog.c

+2 −2
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ static bool __init extlog_get_l1addr(void) 
		return false;

	if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))

		return false;

	if (!acpi_check_dsm(handle, guid.b, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR))

	if (!acpi_check_dsm(handle, &guid, EXTLOG_DSM_REV, 1 << EXTLOG_FN_ADDR))

		return false;

	obj = acpi_evaluate_dsm_typed(handle, guid.b, EXTLOG_DSM_REV,

	obj = acpi_evaluate_dsm_typed(handle, &guid, EXTLOG_DSM_REV,

				      EXTLOG_FN_ADDR, NULL, ACPI_TYPE_INTEGER);

	if (!obj) {

		return false;

drivers/acpi/bus.c

+0 −23
Original line number Diff line number Diff line
@@ -196,29 +196,6 @@ static void acpi_print_osc_error(acpi_handle handle, 
	pr_debug("\n");

}



acpi_status acpi_str_to_uuid(char *str, u8 *uuid)

{

	int i;

	static int opc_map_to_uuid[16] = {6, 4, 2, 0, 11, 9, 16, 14, 19, 21,

		24, 26, 28, 30, 32, 34};



	if (strlen(str) != 36)

		return AE_BAD_PARAMETER;

	for (i = 0; i < 36; i++) {

		if (i == 8 || i == 13 || i == 18 || i == 23) {

			if (str[i] != '-')

				return AE_BAD_PARAMETER;

		} else if (!isxdigit(str[i]))

			return AE_BAD_PARAMETER;

	}

	for (i = 0; i < 16; i++) {

		uuid[i] = hex_to_bin(str[opc_map_to_uuid[i]]) << 4;

		uuid[i] |= hex_to_bin(str[opc_map_to_uuid[i] + 1]);

	}

	return AE_OK;

}

EXPORT_SYMBOL_GPL(acpi_str_to_uuid);



acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)

{

	acpi_status status;

drivers/acpi/nfit/core.c

+3 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm, 
			in_buf.buffer.pointer,

			min_t(u32, 256, in_buf.buffer.length), true);



	out_obj = acpi_evaluate_dsm(handle, guid.b, 1, func, &in_obj);

	out_obj = acpi_evaluate_dsm(handle, guid, 1, func, &in_obj);

	if (!out_obj) {

		dev_dbg(dev, "%s:%s _DSM failed cmd: %s\n", __func__, dimm_name,

				cmd_name);
@@ -1476,7 +1476,7 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, 


	guid = to_nfit_uuid(nfit_mem->family);

	for_each_set_bit(i, &dsm_mask, BITS_PER_LONG)

		if (acpi_check_dsm(adev_dimm->handle, guid.b, 1, 1ULL << i))

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

			set_bit(i, &nfit_mem->dsm_mask);



	return 0;
@@ -1621,7 +1621,7 @@ static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) 
		return;



	for (i = ND_CMD_ARS_CAP; i <= ND_CMD_CLEAR_ERROR; i++)

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

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

			set_bit(i, &nd_desc->cmd_mask);

}

drivers/acpi/utils.c

+8 −8
Original line number Diff line number Diff line
@@ -613,19 +613,19 @@ acpi_status acpi_evaluate_lck(acpi_handle handle, int lock) 
/**

 * acpi_evaluate_dsm - evaluate device's _DSM method

 * @handle: ACPI device handle

 * @uuid: UUID of requested functions, should be 16 bytes

 * @guid: GUID of requested functions, should be 16 bytes

 * @rev: revision number of requested function

 * @func: requested function number

 * @argv4: the function specific parameter

 *

 * Evaluate device's _DSM method with specified UUID, revision id and

 * Evaluate device's _DSM method with specified GUID, revision id and

 * function number. Caller needs to free the returned object.

 *

 * Though ACPI defines the fourth parameter for _DSM should be a package,

 * some old BIOSes do expect a buffer or an integer etc.

 */

union acpi_object *

acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 func,

acpi_evaluate_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 func,

		  union acpi_object *argv4)

{

	acpi_status ret;
@@ -638,7 +638,7 @@ acpi_evaluate_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 func, 


	params[0].type = ACPI_TYPE_BUFFER;

	params[0].buffer.length = 16;

	params[0].buffer.pointer = (char *)uuid;

	params[0].buffer.pointer = (u8 *)guid;

	params[1].type = ACPI_TYPE_INTEGER;

	params[1].integer.value = rev;

	params[2].type = ACPI_TYPE_INTEGER;
@@ -666,7 +666,7 @@ EXPORT_SYMBOL(acpi_evaluate_dsm); 
/**

 * acpi_check_dsm - check if _DSM method supports requested functions.

 * @handle: ACPI device handle

 * @uuid: UUID of requested functions, should be 16 bytes at least

 * @guid: GUID of requested functions, should be 16 bytes at least

 * @rev: revision number of requested functions

 * @funcs: bitmap of requested functions

 *
@@ -674,7 +674,7 @@ EXPORT_SYMBOL(acpi_evaluate_dsm); 
 * functions. Currently only support 64 functions at maximum, should be

 * enough for now.

 */

bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 funcs)

bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs)

{

	int i;

	u64 mask = 0;
@@ -683,7 +683,7 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 funcs) 
	if (funcs == 0)

		return false;



	obj = acpi_evaluate_dsm(handle, uuid, rev, 0, NULL);

	obj = acpi_evaluate_dsm(handle, guid, rev, 0, NULL);

	if (!obj)

		return false;
@@ -697,7 +697,7 @@ bool acpi_check_dsm(acpi_handle handle, const u8 *uuid, u64 rev, u64 funcs) 


	/*

	 * Bit 0 indicates whether there's support for any functions other than

	 * function 0 for the specified UUID and revision.

	 * function 0 for the specified GUID and revision.

	 */

	if ((mask & 0x1) && (mask & funcs) == funcs)

		return true;

drivers/char/tpm/tpm_crb.c

+4 −5
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ 


#define ACPI_SIG_TPM2 "TPM2"



static const u8 CRB_ACPI_START_UUID[] = {

	/* 0000 */ 0xAB, 0x6C, 0xBF, 0x6B, 0x63, 0x54, 0x14, 0x47,

	/* 0008 */ 0xB7, 0xCD, 0xF0, 0x20, 0x3C, 0x03, 0x68, 0xD4

};

static const guid_t crb_acpi_start_guid =

	GUID_INIT(0x6BBF6CAB, 0x5463, 0x4714,

		  0xB7, 0xCD, 0xF0, 0x20, 0x3C, 0x03, 0x68, 0xD4);



enum crb_defaults {

	CRB_ACPI_START_REVISION_ID = 1,
@@ -266,7 +265,7 @@ static int crb_do_acpi_start(struct tpm_chip *chip) 
	int rc;



	obj = acpi_evaluate_dsm(chip->acpi_dev_handle,

				CRB_ACPI_START_UUID,

				&crb_acpi_start_guid,

				CRB_ACPI_START_REVISION_ID,

				CRB_ACPI_START_INDEX,

				NULL);