ACPI: cleanup pci_root _OSC code. (3a9622dc) · Commits · e / devices / android_kernel_samsung_smdk4412

drivers/acpi/pci_root.c

+14 −62

Original line number	Original line	Diff line number	Diff line
	@@ -202,72 +202,24 @@ static void acpi_pci_bridge_scan(struct acpi_device *device)
	}		}
	}		}

	static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,		static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766";
	0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};

	static acpi_status acpi_pci_run_osc(acpi_handle handle,		static acpi_status acpi_pci_run_osc(acpi_handle handle,
	const u32 capbuf, u32 retval)		const u32 capbuf, u32 retval)
	{		{
			struct acpi_osc_context context = {
			.uuid_str = pci_osc_uuid_str,
			.rev = 1,
			.cap.length = 12,
			.cap.pointer = (void *)capbuf,
			};
	acpi_status status;		acpi_status status;
	struct acpi_object_list input;
	union acpi_object in_params[4];
	struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
	union acpi_object *out_obj;
	u32 errors;

	/* Setting up input parameters */
	input.count = 4;
	input.pointer = in_params;
	in_params[0].type = ACPI_TYPE_BUFFER;
	in_params[0].buffer.length = 16;
	in_params[0].buffer.pointer = OSC_UUID;
	in_params[1].type = ACPI_TYPE_INTEGER;
	in_params[1].integer.value = 1;
	in_params[2].type = ACPI_TYPE_INTEGER;
	in_params[2].integer.value = 3;
	in_params[3].type = ACPI_TYPE_BUFFER;
	in_params[3].buffer.length = 12;
	in_params[3].buffer.pointer = (u8 *)capbuf;

	status = acpi_evaluate_object(handle, "_OSC", &input, &output);
	if (ACPI_FAILURE(status))
	return status;

	if (!output.length)		status = acpi_run_osc(handle, &context);
	return AE_NULL_OBJECT;		if (ACPI_SUCCESS(status)) {
			retval = ((u32 *)(context.ret.pointer + 8));
	out_obj = output.pointer;		kfree(context.ret.pointer);
	if (out_obj->type != ACPI_TYPE_BUFFER) {
	printk(KERN_DEBUG "_OSC evaluation returned wrong type\n");
	status = AE_TYPE;
	goto out_kfree;
	}
	/* Need to ignore the bit0 in result code */
	errors = ((u32 )out_obj->buffer.pointer) & ~(1 << 0);
	if (errors) {
	if (errors & OSC_REQUEST_ERROR)
	printk(KERN_DEBUG "_OSC request failed\n");
	if (errors & OSC_INVALID_UUID_ERROR)
	printk(KERN_DEBUG "_OSC invalid UUID\n");
	if (errors & OSC_INVALID_REVISION_ERROR)
	printk(KERN_DEBUG "_OSC invalid revision\n");
	if (errors & OSC_CAPABILITIES_MASK_ERROR) {
	if (capbuf[OSC_QUERY_TYPE] & OSC_QUERY_ENABLE)
	goto out_success;
	printk(KERN_DEBUG
	"Firmware did not grant requested _OSC control\n");
	status = AE_SUPPORT;
	goto out_kfree;
	}
	status = AE_ERROR;
	goto out_kfree;
	}		}
	out_success:
	retval = ((u32 *)(out_obj->buffer.pointer + 8));
	status = AE_OK;

	out_kfree:
	kfree(output.pointer);
	return status;		return status;
	}		}

	@@ -277,10 +229,10 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root, u32 flags)
	u32 support_set, result, capbuf[3];		u32 support_set, result, capbuf[3];

	/* do _OSC query for all possible controls */		/* do _OSC query for all possible controls */
	support_set = root->osc_support_set \| (flags & OSC_SUPPORT_MASKS);		support_set = root->osc_support_set \| (flags & OSC_PCI_SUPPORT_MASKS);
	capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;		capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
	capbuf[OSC_SUPPORT_TYPE] = support_set;		capbuf[OSC_SUPPORT_TYPE] = support_set;
	capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;		capbuf[OSC_CONTROL_TYPE] = OSC_PCI_CONTROL_MASKS;

	status = acpi_pci_run_osc(root->device->handle, capbuf, &result);		status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
	if (ACPI_SUCCESS(status)) {		if (ACPI_SUCCESS(status)) {
	@@ -427,7 +379,7 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags)
	if (ACPI_FAILURE(status))		if (ACPI_FAILURE(status))
	return status;		return status;

	control_req = (flags & OSC_CONTROL_MASKS);		control_req = (flags & OSC_PCI_CONTROL_MASKS);
	if (!control_req)		if (!control_req)
	return AE_TYPE;		return AE_TYPE;

include/linux/acpi.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -263,7 +263,6 @@ struct acpi_osc_context {
	#define OSC_QUERY_TYPE 0		#define OSC_QUERY_TYPE 0
	#define OSC_SUPPORT_TYPE 1		#define OSC_SUPPORT_TYPE 1
	#define OSC_CONTROL_TYPE 2		#define OSC_CONTROL_TYPE 2
	#define OSC_SUPPORT_MASKS 0x1f

	/* _OSC DW0 Definition */		/* _OSC DW0 Definition */
	#define OSC_QUERY_ENABLE 1		#define OSC_QUERY_ENABLE 1
	@@ -274,12 +273,14 @@ struct acpi_osc_context {

	acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);		acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);

			/* PCI defined _OSC bits */
	/* _OSC DW1 Definition (OS Support Fields) */		/* _OSC DW1 Definition (OS Support Fields) */
	#define OSC_EXT_PCI_CONFIG_SUPPORT 1		#define OSC_EXT_PCI_CONFIG_SUPPORT 1
	#define OSC_ACTIVE_STATE_PWR_SUPPORT 2		#define OSC_ACTIVE_STATE_PWR_SUPPORT 2
	#define OSC_CLOCK_PWR_CAPABILITY_SUPPORT 4		#define OSC_CLOCK_PWR_CAPABILITY_SUPPORT 4
	#define OSC_PCI_SEGMENT_GROUPS_SUPPORT 8		#define OSC_PCI_SEGMENT_GROUPS_SUPPORT 8
	#define OSC_MSI_SUPPORT 16		#define OSC_MSI_SUPPORT 16
			#define OSC_PCI_SUPPORT_MASKS 0x1f

	/* _OSC DW1 Definition (OS Control Fields) */		/* _OSC DW1 Definition (OS Control Fields) */
	#define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL 1		#define OSC_PCI_EXPRESS_NATIVE_HP_CONTROL 1
	@@ -288,7 +289,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
	#define OSC_PCI_EXPRESS_AER_CONTROL 8		#define OSC_PCI_EXPRESS_AER_CONTROL 8
	#define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL 16		#define OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL 16

	#define OSC_CONTROL_MASKS (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL \| \		#define OSC_PCI_CONTROL_MASKS (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL \| \
	OSC_SHPC_NATIVE_HP_CONTROL \| \		OSC_SHPC_NATIVE_HP_CONTROL \| \
	OSC_PCI_EXPRESS_PME_CONTROL \| \		OSC_PCI_EXPRESS_PME_CONTROL \| \
	OSC_PCI_EXPRESS_AER_CONTROL \| \		OSC_PCI_EXPRESS_AER_CONTROL \| \