Merge branches 'acpi-scan', 'acpi-tables' and 'acpi-platform' (131b3a8d) · Commits · 戴 / test

Documentation/ABI/obsolete/sysfs-firmware-acpi

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		What: /sys/firmware/acpi/hotplug/force_remove
		Date: Mar 2017
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		Since the force_remove is inherently broken and dangerous to
		use for some hotplugable resources like memory (because ignoring
		the offline failure might lead to memory corruption and crashes)
		enabling this knob is not safe and thus unsupported.

Documentation/ABI/testing/sysfs-firmware-acpi

+0 −10

Original line number	Diff line number	Diff line
		@@ -44,16 +44,6 @@ Description:
		or 0 (unset). Attempts to write any other values to it will
		cause -EINVAL to be returned.

		What: /sys/firmware/acpi/hotplug/force_remove
		Date: May 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		The number in this file (0 or 1) determines whether (1) or not
		(0) the ACPI subsystem will allow devices to be hot-removed even
		if they cannot be put offline gracefully (from the kernel's
		viewpoint). That number can be changed by writing a boolean
		value to this file.

		What: /sys/firmware/acpi/interrupts/
		Date: February 2008
		Contact: Len Brown <lenb@kernel.org>

drivers/acpi/acpi_platform.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -121,11 +121,14 @@ struct platform_device acpi_create_platform_device(struct acpi_device adev,
		if (IS_ERR(pdev))
		dev_err(&adev->dev, "platform device creation failed: %ld\n",
		PTR_ERR(pdev));
		else
		else {
		set_dev_node(&pdev->dev, acpi_get_node(adev->handle));
		dev_dbg(&adev->dev, "created platform device %s\n",
		dev_name(&pdev->dev));
		}

		kfree(resources);

		return pdev;
		}
		EXPORT_SYMBOL_GPL(acpi_create_platform_device);

drivers/acpi/internal.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -65,8 +65,6 @@ static inline void acpi_cmos_rtc_init(void) {}
		#endif
		int acpi_rev_override_setup(char *str);

		extern bool acpi_force_hot_remove;

		void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
		const char *name);
		int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,

drivers/acpi/scan.c

+8 −16

Original line number	Diff line number	Diff line
		@@ -30,12 +30,6 @@ extern struct acpi_device *acpi_root;

		#define INVALID_ACPI_HANDLE ((acpi_handle)empty_zero_page)

		/*
		* If set, devices will be hot-removed even if they cannot be put offline
		* gracefully (from the kernel's standpoint).
		*/
		bool acpi_force_hot_remove;

		static const char *dummy_hid = "device";

		static LIST_HEAD(acpi_dep_list);
		@@ -170,9 +164,6 @@ static acpi_status acpi_bus_offline(acpi_handle handle, u32 lvl, void *data,
		pn->put_online = false;
		}
		ret = device_offline(pn->dev);
		if (acpi_force_hot_remove)
		continue;

		if (ret >= 0) {
		pn->put_online = !ret;
		} else {
		@@ -241,11 +232,11 @@ static int acpi_scan_try_to_offline(struct acpi_device *device)
		acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,
		NULL, acpi_bus_offline, (void *)true,
		(void **)&errdev);
		if (!errdev \|\| acpi_force_hot_remove)
		if (!errdev)
		acpi_bus_offline(handle, 0, (void *)true,
		(void **)&errdev);

		if (errdev && !acpi_force_hot_remove) {
		if (errdev) {
		dev_warn(errdev, "Offline failed.\n");
		acpi_bus_online(handle, 0, NULL, NULL);
		acpi_walk_namespace(ACPI_TYPE_ANY, handle,
		@@ -263,8 +254,7 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
		unsigned long long sta;
		acpi_status status;

		if (device->handler && device->handler->hotplug.demand_offline
		&& !acpi_force_hot_remove) {
		if (device->handler && device->handler->hotplug.demand_offline) {
		if (!acpi_scan_is_offline(device, true))
		return -EBUSY;
		} else {
		@@ -1850,6 +1840,8 @@ static void acpi_bus_attach(struct acpi_device *device)
		device->flags.power_manageable = 0;

		device->flags.initialized = true;
		} else if (device->flags.visited) {
		goto ok;
		}

		ret = acpi_scan_attach_handler(device);
		@@ -1866,10 +1858,10 @@ static void acpi_bus_attach(struct acpi_device *device)
		if (ret < 0)
		return;

		if (ret > 0 \|\| !device->pnp.type.platform_id)
		acpi_device_set_enumerated(device);
		else
		if (device->pnp.type.platform_id)
		acpi_default_enumeration(device);
		else
		acpi_device_set_enumerated(device);

		ok:
		list_for_each_entry(child, &device->children, node)

Admin message