Commit 57b8543c authored by Raag Jadav's avatar Raag Jadav Committed by Rafael J. Wysocki
Browse files

ACPI: bus: update acpi_dev_uid_match() to support multiple types 



According to the ACPI specification, a _UID object can evaluate to
either a numeric value or a string.

Update acpi_dev_uid_match() to support _UID matching for both integer
and string types.

Suggested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRaag Jadav <raag.jadav@intel.com>
[ rjw: Rename auxiliary macros, relocate kerneldoc comment ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 33cc938e

drivers/acpi/utils.c

+0 −19
Original line number Diff line number Diff line
@@ -824,25 +824,6 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) 
}

EXPORT_SYMBOL(acpi_check_dsm);



/**

 * acpi_dev_uid_match - Match device by supplied UID

 * @adev: ACPI device to match.

 * @uid2: Unique ID of the device.

 *

 * Matches UID in @adev with given @uid2.

 *

 * Returns:

 *  - %true if matches.

 *  - %false otherwise.

 */

bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2)

{

	const char *uid1 = acpi_device_uid(adev);



	return uid1 && uid2 && !strcmp(uid1, uid2);

}

EXPORT_SYMBOL_GPL(acpi_dev_uid_match);



/**

 * acpi_dev_hid_uid_match - Match device by supplied HID and UID

 * @adev: ACPI device to match.

include/acpi/acpi_bus.h

+40 −1
Original line number Diff line number Diff line
@@ -764,10 +764,49 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) 
		adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);

}



bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2);

bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2);

int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer);



static inline bool acpi_str_uid_match(struct acpi_device *adev, const char *uid2)

{

	const char *uid1 = acpi_device_uid(adev);



	return uid1 && uid2 && !strcmp(uid1, uid2);

}



static inline bool acpi_int_uid_match(struct acpi_device *adev, u64 uid2)

{

	u64 uid1;



	return !acpi_dev_uid_to_integer(adev, &uid1) && uid1 == uid2;

}



#define TYPE_ENTRY(type, x)			\

	const type: x,				\

	type: x



#define ACPI_STR_TYPES(match)			\

	TYPE_ENTRY(unsigned char *, match),	\

	TYPE_ENTRY(signed char *, match),		\

	TYPE_ENTRY(char *, match),		\

	TYPE_ENTRY(void *, match)



/**

 * acpi_dev_uid_match - Match device by supplied UID

 * @adev: ACPI device to match.

 * @uid2: Unique ID of the device.

 *

 * Matches UID in @adev with given @uid2.

 *

 * Returns: %true if matches, %false otherwise.

 */

#define acpi_dev_uid_match(adev, uid2)					\

	_Generic(uid2,							\

		 /* Treat @uid2 as a string for acpi string types */	\

		 ACPI_STR_TYPES(acpi_str_uid_match),			\

		 /* Treat as an integer otherwise */			\

		 default: acpi_int_uid_match)(adev, uid2)



void acpi_dev_clear_dependencies(struct acpi_device *supplier);

bool acpi_dev_ready_for_enumeration(const struct acpi_device *device);

struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier,

include/linux/acpi.h

+3 −5
Original line number Diff line number Diff line
@@ -756,6 +756,9 @@ const char *acpi_get_subsystem_id(acpi_handle handle); 
#define ACPI_HANDLE(dev)		(NULL)

#define ACPI_HANDLE_FWNODE(fwnode)	(NULL)



/* Get rid of the -Wunused-variable for adev */

#define acpi_dev_uid_match(adev, uid2)			(adev && false)



#include <acpi/acpi_numa.h>



struct fwnode_handle;
@@ -772,11 +775,6 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) 


struct acpi_device;



static inline bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2)

{

	return false;

}



static inline bool

acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2)

{