Commit dfef7710 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-bus', 'acpi-scan' and 'acpi-tables' 

* acpi-bus:
  ACPI: Remove redundant clearing of context->ret.pointer from acpi_run_osc()

* acpi-scan:
  ACPI: scan: Simplify acpi_table_events_fn()
  ACPI: scan: Fix race related to dropping dependencies
  ACPI: scan: Reorganize acpi_device_add()
  ACPI: scan: Fix device object rescan in acpi_scan_clear_dep()
  ACPI: scan: Make acpi_walk_dep_device_list()
  ACPI: scan: Rearrange acpi_dev_get_first_consumer_dev_cb()
  ACPI: scan: Define acpi_bus_put_acpi_device() as static inline
  ACPI: scan: initialize local variable to avoid garbage being returned
  ACPI: scan: Add function to fetch dependent of ACPI device
  ACPI: scan: Extend acpi_walk_dep_device_list()
  ACPI: scan: Rearrange dep_unmet initialization

* acpi-tables:
  ACPI: tables: Add custom DSDT file as makefile prerequisite
  ACPI: bgrt: Use sysfs_emit
  ACPI: bgrt: Fix CFI violation
  ACPI: tables: FPDT: Add missing acpi_put_table() in acpi_init_fpdt()
  ACPI: tables: PPTT: Populate cache-id if provided by firmware
parents f9ef9b82 84b7355b 8d287e82 d1059c1b

drivers/acpi/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT 
#

# ACPI Boot-Time Table Parsing

#

ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y)

tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ;



endif



obj-$(CONFIG_ACPI)		+= tables.o

obj-$(CONFIG_X86)		+= blacklist.o

drivers/acpi/acpi_fpdt.c

+3 −1
Original line number Diff line number Diff line
@@ -240,8 +240,10 @@ static int __init acpi_init_fpdt(void) 
		return 0;



	fpdt_kobj = kobject_create_and_add("fpdt", acpi_kobj);

	if (!fpdt_kobj)

	if (!fpdt_kobj) {

		acpi_put_table(header);

		return -ENOMEM;

	}



	while (offset < header->length) {

		subtable = (void *)header + offset;

drivers/acpi/bgrt.c

+18 −39
Original line number Diff line number Diff line
@@ -15,40 +15,19 @@ 
static void *bgrt_image;

static struct kobject *bgrt_kobj;



static ssize_t version_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.version);

}

static DEVICE_ATTR_RO(version);



static ssize_t status_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.status);

}

static DEVICE_ATTR_RO(status);



static ssize_t type_show(struct device *dev,

			 struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_type);

}

static DEVICE_ATTR_RO(type);



static ssize_t xoffset_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_x);

}

static DEVICE_ATTR_RO(xoffset);



static ssize_t yoffset_show(struct device *dev,

			    struct device_attribute *attr, char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%d\n", bgrt_tab.image_offset_y);

}

static DEVICE_ATTR_RO(yoffset);

#define BGRT_SHOW(_name, _member) \

	static ssize_t _name##_show(struct kobject *kobj,			\

				    struct kobj_attribute *attr, char *buf)	\

	{									\

		return sysfs_emit(buf, "%d\n", bgrt_tab._member);		\

	}									\

	struct kobj_attribute bgrt_attr_##_name = __ATTR_RO(_name)



BGRT_SHOW(version, version);

BGRT_SHOW(status, status);

BGRT_SHOW(type, image_type);

BGRT_SHOW(xoffset, image_offset_x);

BGRT_SHOW(yoffset, image_offset_y);



static ssize_t image_read(struct file *file, struct kobject *kobj,

	       struct bin_attribute *attr, char *buf, loff_t off, size_t count)
@@ -60,11 +39,11 @@ static ssize_t image_read(struct file *file, struct kobject *kobj, 
static BIN_ATTR_RO(image, 0);	/* size gets filled in later */



static struct attribute *bgrt_attributes[] = {

	&dev_attr_version.attr,

	&dev_attr_status.attr,

	&dev_attr_type.attr,

	&dev_attr_xoffset.attr,

	&dev_attr_yoffset.attr,

	&bgrt_attr_version.attr,

	&bgrt_attr_status.attr,

	&bgrt_attr_type.attr,

	&bgrt_attr_xoffset.attr,

	&bgrt_attr_yoffset.attr,

	NULL,

};

drivers/acpi/bus.c

+2 −3
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context) 


out_kfree:

	kfree(output.pointer);

	if (status != AE_OK)

		context->ret.pointer = NULL;

	return status;

}

EXPORT_SYMBOL(acpi_run_osc);
@@ -1195,7 +1193,8 @@ void __init acpi_subsystem_init(void) 


static acpi_status acpi_bus_table_handler(u32 event, void *table, void *context)

{

	acpi_scan_table_handler(event, table, context);

	if (event == ACPI_TABLE_EVENT_LOAD)

		acpi_scan_table_notify();



	return acpi_sysfs_table_handler(event, table, context);

}

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,7 @@ static int acpi_ec_add(struct acpi_device *device) 
	WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr);



	/* Reprobe devices depending on the EC */

	acpi_walk_dep_device_list(ec->handle);

	acpi_dev_clear_dependencies(device);



	acpi_handle_debug(ec->handle, "enumerated.\n");

	return 0;