Merge pull request #23 from derfelot/lineage-18.1_update (099adae0) · Commits · e / devices / android_kernel_sony_msm8998

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 260
		SUBLEVEL = 261
		EXTRAVERSION =
		NAME = Blurry Fish Butt

drivers/block/rsxx/core.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -180,15 +180,17 @@ static ssize_t rsxx_cram_read(struct file fp, char __user ubuf,
		{
		struct rsxx_cardinfo *card = file_inode(fp)->i_private;
		char *buf;
		ssize_t st;
		int st;

		buf = kzalloc(cnt, GFP_KERNEL);
		if (!buf)
		return -ENOMEM;

		st = rsxx_creg_read(card, CREG_ADD_CRAM + (u32)*ppos, cnt, buf, 1);
		if (!st)
		st = copy_to_user(ubuf, buf, cnt);
		if (!st) {
		if (copy_to_user(ubuf, buf, cnt))
		st = -EFAULT;
		}
		kfree(buf);
		if (st)
		return st;

drivers/md/dm-table.c

+53 −30

Original line number	Diff line number	Diff line
		@@ -1211,6 +1211,46 @@ struct dm_target dm_table_find_target(struct dm_table t, sector_t sector)
		return &t->targets[(KEYS_PER_NODE * n) + k];
		}

		/*
		* type->iterate_devices() should be called when the sanity check needs to
		* iterate and check all underlying data devices. iterate_devices() will
		* iterate all underlying data devices until it encounters a non-zero return
		* code, returned by whether the input iterate_devices_callout_fn, or
		* iterate_devices() itself internally.
		*
		* For some target type (e.g. dm-stripe), one call of iterate_devices() may
		* iterate multiple underlying devices internally, in which case a non-zero
		* return code returned by iterate_devices_callout_fn will stop the iteration
		* in advance.
		*
		* Cases requiring _any_ underlying device supporting some kind of attribute,
		* should use the iteration structure like dm_table_any_dev_attr(), or call
		* it directly. @func should handle semantics of positive examples, e.g.
		* capable of something.
		*
		* Cases requiring _all_ underlying devices supporting some kind of attribute,
		* should use the iteration structure like dm_table_supports_nowait() or
		* dm_table_supports_discards(). Or introduce dm_table_all_devs_attr() that
		* uses an @anti_func that handle semantics of counter examples, e.g. not
		* capable of something. So: return !dm_table_any_dev_attr(t, anti_func);
		*/
		static bool dm_table_any_dev_attr(struct dm_table *t,
		iterate_devices_callout_fn func)
		{
		struct dm_target *ti;
		unsigned int i;

		for (i = 0; i < dm_table_get_num_targets(t); i++) {
		ti = dm_table_get_target(t, i);

		if (ti->type->iterate_devices &&
		ti->type->iterate_devices(ti, func, NULL))
		return true;
		}

		return false;
		}

		static int count_device(struct dm_target ti, struct dm_dev dev,
		sector_t start, sector_t len, void *data)
		{
		@@ -1381,12 +1421,12 @@ static bool dm_table_discard_zeroes_data(struct dm_table *t)
		return true;
		}

		static int device_is_nonrot(struct dm_target ti, struct dm_dev dev,
		static int device_is_rotational(struct dm_target ti, struct dm_dev dev,
		sector_t start, sector_t len, void *data)
		{
		struct request_queue *q = bdev_get_queue(dev->bdev);

		return q && blk_queue_nonrot(q);
		return q && !blk_queue_nonrot(q);
		}

		static int device_is_not_random(struct dm_target ti, struct dm_dev dev,
		@@ -1397,29 +1437,12 @@ static int device_is_not_random(struct dm_target ti, struct dm_dev dev,
		return q && !blk_queue_add_random(q);
		}

		static int queue_supports_sg_merge(struct dm_target ti, struct dm_dev dev,
		static int queue_no_sg_merge(struct dm_target ti, struct dm_dev dev,
		sector_t start, sector_t len, void *data)
		{
		struct request_queue *q = bdev_get_queue(dev->bdev);

		return q && !test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
		}

		static bool dm_table_all_devices_attribute(struct dm_table *t,
		iterate_devices_callout_fn func)
		{
		struct dm_target *ti;
		unsigned i = 0;

		while (i < dm_table_get_num_targets(t)) {
		ti = dm_table_get_target(t, i++);

		if (!ti->type->iterate_devices \|\|
		!ti->type->iterate_devices(ti, func, NULL))
		return false;
		}

		return true;
		return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
		}

		static int device_not_write_same_capable(struct dm_target ti, struct dm_dev dev,
		@@ -1512,18 +1535,18 @@ void dm_table_set_restrictions(struct dm_table t, struct request_queue q,
		q->limits.discard_zeroes_data = 0;

		/* Ensure that all underlying devices are non-rotational. */
		if (dm_table_all_devices_attribute(t, device_is_nonrot))
		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
		else
		if (dm_table_any_dev_attr(t, device_is_rotational))
		queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, q);
		else
		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);

		if (!dm_table_supports_write_same(t))
		q->limits.max_write_same_sectors = 0;

		if (dm_table_all_devices_attribute(t, queue_supports_sg_merge))
		queue_flag_clear_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);
		else
		if (dm_table_any_dev_attr(t, queue_no_sg_merge))
		queue_flag_set_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);
		else
		queue_flag_clear_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);

		dm_table_verify_integrity(t);

		@@ -1533,7 +1556,7 @@ void dm_table_set_restrictions(struct dm_table t, struct request_queue q,
		* Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not
		* have it set.
		*/
		if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))
		if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random))
		queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q);

		/*

drivers/pci/quirks.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -3649,6 +3649,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x917a,
		/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c46 */
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0,
		quirk_dma_func1_alias);
		/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c135 */
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9215,
		quirk_dma_func1_alias);
		/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c127 */
		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9220,
		quirk_dma_func1_alias);

drivers/platform/x86/acer-wmi.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ static int mailled = -1;
		static int brightness = -1;
		static int threeg = -1;
		static int force_series;
		static int force_caps = -1;
		static bool ec_raw_mode;
		static bool has_type_aa;
		static u16 commun_func_bitmap;
		@@ -238,11 +239,13 @@ module_param(mailled, int, 0444);
		module_param(brightness, int, 0444);
		module_param(threeg, int, 0444);
		module_param(force_series, int, 0444);
		module_param(force_caps, int, 0444);
		module_param(ec_raw_mode, bool, 0444);
		MODULE_PARM_DESC(mailled, "Set initial state of Mail LED");
		MODULE_PARM_DESC(brightness, "Set initial LCD backlight brightness");
		MODULE_PARM_DESC(threeg, "Set initial state of 3G hardware");
		MODULE_PARM_DESC(force_series, "Force a different laptop series");
		MODULE_PARM_DESC(force_caps, "Force the capability bitmask to this value");
		MODULE_PARM_DESC(ec_raw_mode, "Enable EC raw mode");

		struct acer_data {
		@@ -2150,7 +2153,7 @@ static int __init acer_wmi_init(void)
		}
		/* WMID always provides brightness methods */
		interface->capability \|= ACER_CAP_BRIGHTNESS;
		} else if (!wmi_has_guid(WMID_GUID2) && interface && !has_type_aa) {
		} else if (!wmi_has_guid(WMID_GUID2) && interface && !has_type_aa && force_caps == -1) {
		pr_err("No WMID device detection method found\n");
		return -ENODEV;
		}
		@@ -2180,6 +2183,9 @@ static int __init acer_wmi_init(void)
		if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
		interface->capability &= ~ACER_CAP_BRIGHTNESS;

		if (force_caps != -1)
		interface->capability = force_caps;

		if (wmi_has_guid(WMID_GUID3)) {
		if (ec_raw_mode) {
		if (ACPI_FAILURE(acer_wmi_enable_ec_raw())) {