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

Commit 38add9b4 authored by Len Brown's avatar Len Brown
Browse files

Merge branches 'bugzilla-15807', 'bugzilla-15979-v2' and 'bugzilla-19162' into release

parents f3ab69a3 dab5fff1 557d5868 620e112c

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+1 −0
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy) 
		per_cpu(acfreq_data, policy->cpu) = NULL;

		acpi_processor_unregister_performance(data->acpi_data,

						      policy->cpu);

		kfree(data->freq_table);

		kfree(data);

	}

drivers/acpi/battery.c

+37 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ enum { 
	 * due to bad math.

	 */

	ACPI_BATTERY_QUIRK_SIGNED16_CURRENT,

	ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,

};



struct acpi_battery {
@@ -405,6 +406,8 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
		result = extract_package(battery, buffer.pointer,

				info_offsets, ARRAY_SIZE(info_offsets));

	kfree(buffer.pointer);

	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))

		battery->full_charge_capacity = battery->design_capacity;

	return result;

}
@@ -441,6 +444,10 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
	    battery->rate_now != -1)

		battery->rate_now = abs((s16)battery->rate_now);



	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)

	    && battery->capacity_now >= 0 && battery->capacity_now <= 100)

		battery->capacity_now = (battery->capacity_now *

				battery->full_charge_capacity) / 100;

	return result;

}
@@ -552,6 +559,33 @@ static void acpi_battery_quirks(struct acpi_battery *battery) 
	}

}



/*

 * According to the ACPI spec, some kinds of primary batteries can

 * report percentage battery remaining capacity directly to OS.

 * In this case, it reports the Last Full Charged Capacity == 100

 * and BatteryPresentRate == 0xFFFFFFFF.

 *

 * Now we found some battery reports percentage remaining capacity

 * even if it's rechargeable.

 * https://bugzilla.kernel.org/show_bug.cgi?id=15979

 *

 * Handle this correctly so that they won't break userspace.

 */

static void acpi_battery_quirks2(struct acpi_battery *battery)

{

	if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))

		return ;



        if (battery->full_charge_capacity == 100 &&

            battery->rate_now == ACPI_BATTERY_VALUE_UNKNOWN &&

            battery->capacity_now >=0 && battery->capacity_now <= 100) {

		set_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags);

		battery->full_charge_capacity = battery->design_capacity;

		battery->capacity_now = (battery->capacity_now *

				battery->full_charge_capacity) / 100;

	}

}



static int acpi_battery_update(struct acpi_battery *battery)

{

	int result, old_present = acpi_battery_present(battery);
@@ -573,7 +607,9 @@ static int acpi_battery_update(struct acpi_battery *battery) 
	}

	if (!battery->bat.dev)

		sysfs_add_battery(battery);

	return acpi_battery_get_state(battery);

	result = acpi_battery_get_state(battery);

	acpi_battery_quirks2(battery);

	return result;

}



/* --------------------------------------------------------------------------

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static int acpi_button_add(struct acpi_device *device) 
{

	struct acpi_button *button;

	struct input_dev *input;

	char *hid, *name, *class;

	const char *hid = acpi_device_hid(device);

	char *name, *class;

	int error;



	button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
@@ -353,7 +354,6 @@ static int acpi_button_add(struct acpi_device *device) 
		goto err_free_button;

	}



	hid = acpi_device_hid(device);

	name = acpi_device_name(device);

	class = acpi_device_class(device);

drivers/acpi/scan.c

+20 −17
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ extern struct acpi_device *acpi_root; 


#define ACPI_IS_ROOT_DEVICE(device)    (!(device)->parent)



static const char *dummy_hid = "device";



static LIST_HEAD(acpi_device_list);

static LIST_HEAD(acpi_bus_id_list);

DEFINE_MUTEX(acpi_device_lock);
@@ -49,6 +51,9 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, 
	int count;

	struct acpi_hardware_id *id;



	if (list_empty(&acpi_dev->pnp.ids))

		return 0;



	len = snprintf(modalias, size, "acpi:");

	size -= len;
@@ -202,6 +207,7 @@ static int acpi_device_setup_files(struct acpi_device *dev) 
			goto end;

	}



	if (!list_empty(&dev->pnp.ids)) {

		result = device_create_file(&dev->dev, &dev_attr_hid);

		if (result)

			goto end;
@@ -209,6 +215,7 @@ static int acpi_device_setup_files(struct acpi_device *dev) 
		result = device_create_file(&dev->dev, &dev_attr_modalias);

		if (result)

			goto end;

	}



        /*

         * If device has _EJ0, 'eject' file is created that is used to trigger
@@ -316,6 +323,9 @@ static int acpi_device_uevent(struct device *dev, struct kobj_uevent_env *env) 
	struct acpi_device *acpi_dev = to_acpi_device(dev);

	int len;



	if (list_empty(&acpi_dev->pnp.ids))

		return 0;



	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;

	len = create_modalias(acpi_dev, &env->buf[env->buflen - 1],
@@ -1010,10 +1020,13 @@ static int acpi_dock_match(struct acpi_device *device) 
	return acpi_get_handle(device->handle, "_DCK", &tmp);

}



char *acpi_device_hid(struct acpi_device *device)

const char *acpi_device_hid(struct acpi_device *device)

{

	struct acpi_hardware_id *hid;



	if (list_empty(&device->pnp.ids))

		return dummy_hid;



	hid = list_first_entry(&device->pnp.ids, struct acpi_hardware_id, list);

	return hid->id;

}
@@ -1142,16 +1155,6 @@ static void acpi_device_set_id(struct acpi_device *device) 
		acpi_add_id(device, ACPI_BUTTON_HID_SLEEPF);

		break;

	}



	/*

	 * We build acpi_devices for some objects that don't have _HID or _CID,

	 * e.g., PCI bridges and slots.  Drivers can't bind to these objects,

	 * but we do use them indirectly by traversing the acpi_device tree.

	 * This generic ID isn't useful for driver binding, but it provides

	 * the useful property that "every acpi_device has an ID."

	 */

	if (list_empty(&device->pnp.ids))

		acpi_add_id(device, "device");

}



static int acpi_device_set_context(struct acpi_device *device)

drivers/pnp/base.h

+3 −2
Original line number Diff line number Diff line
@@ -12,11 +12,12 @@ void pnp_unregister_protocol(struct pnp_protocol *protocol); 


#define PNP_EISA_ID_MASK 0x7fffffff

void pnp_eisa_id_to_string(u32 id, char *str);

struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);

struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id,

			      const char *pnpid);

struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);



int pnp_add_device(struct pnp_dev *dev);

struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);

struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id);



int pnp_add_card(struct pnp_card *card);

void pnp_remove_card(struct pnp_card *card);