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

Commit 7dc11599 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.4 into android-5.4 



Changes in 5.4.4
	usb: gadget: configfs: Fix missing spin_lock_init()
	usb: gadget: pch_udc: fix use after free
	nvme: Namepace identification descriptor list is optional
	Revert "nvme: Add quirk for Kingston NVME SSD running FW E8FK11.T"
	scsi: lpfc: Fix bad ndlp ptr in xri aborted handling
	scsi: zfcp: trace channel log even for FCP command responses
	scsi: qla2xxx: Do command completion on abort timeout
	scsi: qla2xxx: Fix driver unload hang
	scsi: qla2xxx: Fix double scsi_done for abort path
	scsi: qla2xxx: Fix memory leak when sending I/O fails
	compat_ioctl: add compat_ptr_ioctl()
	ceph: fix compat_ioctl for ceph_dir_operations
	media: venus: remove invalid compat_ioctl32 handler
	USB: uas: honor flag to avoid CAPACITY16
	USB: uas: heed CAPACITY_HEURISTICS
	USB: documentation: flags on usb-storage versus UAS
	usb: Allow USB device to be warm reset in suspended state
	usb: host: xhci-tegra: Correct phy enable sequence
	binder: fix incorrect calculation for num_valid
	staging: exfat: fix multiple definition error of `rename_file'
	staging: rtl8188eu: fix interface sanity check
	staging: rtl8712: fix interface sanity check
	staging: vchiq: call unregister_chrdev_region() when driver registration fails
	staging: gigaset: fix general protection fault on probe
	staging: gigaset: fix illegal free on probe errors
	staging: gigaset: add endpoint-type sanity check
	usb: xhci: only set D3hot for pci device
	xhci: Fix memory leak in xhci_add_in_port()
	xhci: fix USB3 device initiated resume race with roothub autosuspend
	xhci: Increase STS_HALT timeout in xhci_suspend()
	xhci: handle some XHCI_TRUST_TX_LENGTH quirks cases as default behaviour.
	xhci: make sure interrupts are restored to correct state
	interconnect: qcom: sdm845: Walk the list safely on node removal
	interconnect: qcom: qcs404: Walk the list safely on node removal
	usb: common: usb-conn-gpio: Don't log an error on probe deferral
	ARM: dts: pandora-common: define wl1251 as child node of mmc3
	iio: adis16480: Add debugfs_reg_access entry
	iio: imu: st_lsm6dsx: fix ODR check in st_lsm6dsx_write_raw
	iio: adis16480: Fix scales factors
	iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting
	iio: imu: inv_mpu6050: fix temperature reporting using bad unit
	iio: adc: ad7606: fix reading unnecessary data from device
	iio: adc: ad7124: Enable internal reference
	USB: atm: ueagle-atm: add missing endpoint check
	USB: idmouse: fix interface sanity checks
	USB: serial: io_edgeport: fix epic endpoint lookup
	usb: roles: fix a potential use after free
	USB: adutux: fix interface sanity check
	usb: core: urb: fix URB structure initialization function
	usb: mon: Fix a deadlock in usbmon between mmap and read
	tpm: add check after commands attribs tab allocation
	tpm: Switch to platform_get_irq_optional()
	EDAC/altera: Use fast register IO for S10 IRQs
	brcmfmac: disable PCIe interrupts before bus reset
	mtd: spear_smi: Fix Write Burst mode
	mtd: rawnand: Change calculating of position page containing BBM
	virt_wifi: fix use-after-free in virt_wifi_newlink()
	virtio-balloon: fix managed page counts when migrating pages between zones
	usb: dwc3: pci: add ID for the Intel Comet Lake -H variant
	usb: dwc3: gadget: Fix logical condition
	usb: dwc3: gadget: Clear started flag for non-IOC
	usb: dwc3: ep0: Clear started flag on completion
	phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role"
	usb: typec: fix use after free in typec_register_port()
	iwlwifi: pcie: fix support for transmitting SKBs with fraglist
	btrfs: check page->mapping when loading free space cache
	btrfs: use btrfs_block_group_cache_done in update_block_group
	btrfs: use refcount_inc_not_zero in kill_all_nodes
	Btrfs: fix metadata space leak on fixup worker failure to set range as delalloc
	Btrfs: fix negative subv_writers counter and data space leak after buffered write
	btrfs: Avoid getting stuck during cyclic writebacks
	btrfs: Remove btrfs_bio::flags member
	Btrfs: send, skip backreference walking for extents with many references
	btrfs: record all roots for rename exchange on a subvol
	rtlwifi: rtl8192de: Fix missing code to retrieve RX buffer address
	rtlwifi: rtl8192de: Fix missing callback that tests for hw release of buffer
	rtlwifi: rtl8192de: Fix missing enable interrupt flag
	lib: raid6: fix awk build warnings
	ovl: fix lookup failure on multi lower squashfs
	ovl: fix corner case of non-unique st_dev;st_ino
	ovl: relax WARN_ON() on rename to self
	hwrng: omap - Fix RNG wait loop timeout
	dm writecache: handle REQ_FUA
	dm zoned: reduce overhead of backing device checks
	workqueue: Fix spurious sanity check failures in destroy_workqueue()
	workqueue: Fix pwq ref leak in rescuer_thread()
	ASoC: rt5645: Fixed buddy jack support.
	ASoC: rt5645: Fixed typo for buddy jack support.
	ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
	ASoC: fsl_audmix: Add spin lock to protect tdms
	md: improve handling of bio with REQ_PREFLUSH in md_flush_request()
	blk-mq: avoid sysfs buffer overflow with too many CPU cores
	cgroup: pids: use atomic64_t for pids->limit
	wil6210: check len before memcpy() calls
	ar5523: check NULL before memcpy() in ar5523_cmd()
	s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported
	media: hantro: Fix s_fmt for dynamic resolution changes
	media: hantro: Fix motion vectors usage condition
	media: hantro: Fix picture order count table enable
	media: vimc: sen: remove unused kthread_sen field
	media: bdisp: fix memleak on release
	media: radio: wl1273: fix interrupt masking on release
	media: cec.h: CEC_OP_REC_FLAG_ values were swapped
	cpuidle: Do not unset the driver if it is there already
	cpuidle: teo: Ignore disabled idle states that are too deep
	cpuidle: teo: Rename local variable in teo_select()
	cpuidle: teo: Consider hits and misses metrics of disabled states
	cpuidle: teo: Fix "early hits" handling for disabled idle states
	cpuidle: use first valid target residency as poll time
	erofs: zero out when listxattr is called with no xattr
	perf tests: Fix out of bounds memory access
	drm/panfrost: Open/close the perfcnt BO
	powerpc/perf: Disable trace_imc pmu
	intel_th: Fix a double put_device() in error path
	intel_th: pci: Add Ice Lake CPU support
	intel_th: pci: Add Tiger Lake CPU support
	PM / devfreq: Lock devfreq in trans_stat_show
	cpufreq: powernv: fix stack bloat and hard limit on number of CPUs
	ALSA: fireface: fix return value in error path of isochronous resources reservation
	ALSA: oxfw: fix return value in error path of isochronous resources reservation
	ALSA: hda/realtek - Line-out jack doesn't work on a Dell AIO
	ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI
	ACPI: LPSS: Add LNXVIDEO -> BYT I2C7 to lpss_device_links
	ACPI: LPSS: Add LNXVIDEO -> BYT I2C1 to lpss_device_links
	ACPI: LPSS: Add dmi quirk for skipping _DEP check for some device-links
	ACPI / hotplug / PCI: Allocate resources directly under the non-hotplug bridge
	ACPI: OSL: only free map once in osl.c
	ACPI: bus: Fix NULL pointer check in acpi_bus_get_private_data()
	ACPI: EC: Rework flushing of pending work
	ACPI: PM: Avoid attaching ACPI PM domain to certain devices
	pinctrl: rza2: Fix gpio name typos
	pinctrl: armada-37xx: Fix irq mask access in armada_37xx_irq_set_type()
	pinctrl: samsung: Add of_node_put() before return in error path
	pinctrl: samsung: Fix device node refcount leaks in Exynos wakeup controller init
	pinctrl: samsung: Fix device node refcount leaks in S3C24xx wakeup controller init
	pinctrl: samsung: Fix device node refcount leaks in init code
	pinctrl: samsung: Fix device node refcount leaks in S3C64xx wakeup controller init
	mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card
	ARM: dts: omap3-tao3530: Fix incorrect MMC card detection GPIO polarity
	RDMA/core: Fix ib_dma_max_seg_size()
	ppdev: fix PPGETTIME/PPSETTIME ioctls
	stm class: Lose the protocol driver when dropping its reference
	coresight: Serialize enabling/disabling a link device.
	powerpc: Allow 64bit VDSO __kernel_sync_dicache to work across ranges >4GB
	powerpc/xive: Prevent page fault issues in the machine crash handler
	powerpc: Allow flush_icache_range to work across ranges >4GB
	powerpc/xive: Skip ioremap() of ESB pages for LSI interrupts
	video/hdmi: Fix AVI bar unpack
	quota: Check that quota is not dirty before release
	ext2: check err when partial != NULL
	seccomp: avoid overflow in implicit constant conversion
	quota: fix livelock in dquot_writeback_dquots
	ext4: Fix credit estimate for final inode freeing
	reiserfs: fix extended attributes on the root directory
	scsi: qla2xxx: Fix SRB leak on switch command timeout
	scsi: qla2xxx: Fix a dma_pool_free() call
	Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
	iio: ad7949: kill pointless "readback"-handling code
	iio: ad7949: fix channels mixups
	omap: pdata-quirks: revert pandora specific gpiod additions
	omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251
	powerpc: Avoid clang warnings around setjmp and longjmp
	powerpc: Fix vDSO clock_getres()
	mm, memfd: fix COW issue on MAP_PRIVATE and F_SEAL_FUTURE_WRITE mappings
	mfd: rk808: Fix RK818 ID template
	mm: memcg/slab: wait for !root kmem_cache refcnt killing on root kmem_cache destruction
	ext4: work around deleting a file with i_nlink == 0 safely
	firmware: qcom: scm: Ensure 'a0' status code is treated as signed
	s390/smp,vdso: fix ASCE handling
	s390/kaslr: store KASLR offset for early dumps
	mm/shmem.c: cast the type of unmap_start to u64
	powerpc: Define arch_is_kernel_initmem_freed() for lockdep
	USB: dummy-hcd: increase max number of devices to 32
	rtc: disable uie before setting time and enable after
	splice: only read in as much information as there is pipe buffer space
	ext4: fix a bug in ext4_wait_for_tail_page_commit
	ext4: fix leak of quota reservations
	blk-mq: make sure that line break can be printed
	workqueue: Fix missing kfree(rescuer) in destroy_workqueue()
	r8169: fix rtl_hw_jumbo_disable for RTL8168evl
	EDAC/ghes: Do not warn when incrementing refcount on 0
	Linux 5.4.4

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8949a5fb2fbd836ce34907e70906e3aeb8a58b7c
parents 681294e7 dc71226e

Documentation/admin-guide/kernel-parameters.txt

+12 −10
Original line number Diff line number Diff line
@@ -5107,13 +5107,13 @@ 
			Flags is a set of characters, each corresponding

			to a common usb-storage quirk flag as follows:

				a = SANE_SENSE (collect more than 18 bytes

					of sense data);

					of sense data, not on uas);

				b = BAD_SENSE (don't collect more than 18

					bytes of sense data);

					bytes of sense data, not on uas);

				c = FIX_CAPACITY (decrease the reported

					device capacity by one sector);

				d = NO_READ_DISC_INFO (don't use

					READ_DISC_INFO command);

					READ_DISC_INFO command, not on uas);

				e = NO_READ_CAPACITY_16 (don't use

					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes
@@ -5128,17 +5128,18 @@ 
				j = NO_REPORT_LUNS (don't use report luns

					command, uas only);

				l = NOT_LOCKABLE (don't try to lock and

					unlock ejectable media);

					unlock ejectable media, not on uas);

				m = MAX_SECTORS_64 (don't transfer more

					than 64 sectors = 32 KB at a time);

					than 64 sectors = 32 KB at a time,

					not on uas);

				n = INITIAL_READ10 (force a retry of the

					initial READ(10) command);

					initial READ(10) command, not on uas);

				o = CAPACITY_OK (accept the capacity

					reported by the device);

					reported by the device, not on uas);

				p = WRITE_CACHE (the device cache is ON

					by default);

					by default, not on uas);

				r = IGNORE_RESIDUE (the device reports

					bogus residue values);

					bogus residue values, not on uas);

				s = SINGLE_LUN (the device has only one

					Logical Unit);

				t = NO_ATA_1X (don't allow ATA(12) and ATA(16)
@@ -5147,7 +5148,8 @@ 
				w = NO_WP_DETECT (don't test whether the

					medium is write-protected).

				y = ALWAYS_SYNC (issue a SYNCHRONIZE_CACHE

					even if the device claims no cache)

					even if the device claims no cache,

					not on uas)

			Example: quirks=0419:aaf5:rl,0421:0433:rc



	user_debug=	[KNL,ARM]

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 3

SUBLEVEL = 4

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/omap3-pandora-common.dtsi

+34 −2
Original line number Diff line number Diff line
@@ -226,6 +226,17 @@ 
		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;	/* GPIO_164 */

	};



	/* wl1251 wifi+bt module */

	wlan_en: fixed-regulator-wg7210_en {

		compatible = "regulator-fixed";

		regulator-name = "vwlan";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		startup-delay-us = <50000>;

		enable-active-high;

		gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;

	};



	/* wg7210 (wifi+bt module) 32k clock buffer */

	wg7210_32k: fixed-regulator-wg7210_32k {

		compatible = "regulator-fixed";
@@ -522,9 +533,30 @@ 
	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */

};



/* mmc3 is probed using pdata-quirks to pass wl1251 card data */

&mmc3 {

	status = "disabled";

	vmmc-supply = <&wlan_en>;



	bus-width = <4>;

	non-removable;

	ti,non-removable;

	cap-power-off-card;



	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;



	#address-cells = <1>;

	#size-cells = <0>;



	wlan: wifi@1 {

		compatible = "ti,wl1251";



		reg = <1>;



		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */



		ti,wl1251-has-eeprom;

	};

};



/* bluetooth*/

arch/arm/boot/dts/omap3-tao3530.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ 
	pinctrl-0 = <&mmc1_pins>;

	vmmc-supply = <&vmmc1>;

	vqmmc-supply = <&vsim>;

	cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;

	bus-width = <8>;

};

arch/arm/mach-omap2/pdata-quirks.c

+0 −104
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/clk.h>

#include <linux/davinci_emac.h>

#include <linux/gpio.h>

#include <linux/gpio/machine.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/of_platform.h>
@@ -311,118 +310,15 @@ static void __init omap3_logicpd_torpedo_init(void) 
}



/* omap3pandora legacy devices */

#define PANDORA_WIFI_IRQ_GPIO		21

#define PANDORA_WIFI_NRESET_GPIO	23



static struct platform_device pandora_backlight = {

	.name	= "pandora-backlight",

	.id	= -1,

};



static struct regulator_consumer_supply pandora_vmmc3_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"),

};



static struct regulator_init_data pandora_vmmc3 = {

	.constraints = {

		.valid_ops_mask		= REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(pandora_vmmc3_supply),

	.consumer_supplies	= pandora_vmmc3_supply,

};



static struct fixed_voltage_config pandora_vwlan = {

	.supply_name		= "vwlan",

	.microvolts		= 1800000, /* 1.8V */

	.startup_delay		= 50000, /* 50ms */

	.init_data		= &pandora_vmmc3,

};



static struct platform_device pandora_vwlan_device = {

	.name		= "reg-fixed-voltage",

	.id		= 1,

	.dev = {

		.platform_data = &pandora_vwlan,

	},

};



static struct gpiod_lookup_table pandora_vwlan_gpiod_table = {

	.dev_id = "reg-fixed-voltage.1",

	.table = {

		/*

		 * As this is a low GPIO number it should be at the first

		 * GPIO bank.

		 */

		GPIO_LOOKUP("gpio-0-31", PANDORA_WIFI_NRESET_GPIO,

			    NULL, GPIO_ACTIVE_HIGH),

		{ },

	},

};



static void pandora_wl1251_init_card(struct mmc_card *card)

{

	/*

	 * We have TI wl1251 attached to MMC3. Pass this information to

	 * SDIO core because it can't be probed by normal methods.

	 */

	if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {

		card->quirks |= MMC_QUIRK_NONSTD_SDIO;

		card->cccr.wide_bus = 1;

		card->cis.vendor = 0x104c;

		card->cis.device = 0x9066;

		card->cis.blksize = 512;

		card->cis.max_dtr = 24000000;

		card->ocr = 0x80;

	}

}



static struct omap2_hsmmc_info pandora_mmc3[] = {

	{

		.mmc		= 3,

		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD,

		.init_card	= pandora_wl1251_init_card,

	},

	{}	/* Terminator */

};



static void __init pandora_wl1251_init(void)

{

	struct wl1251_platform_data pandora_wl1251_pdata;

	int ret;



	memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));



	pandora_wl1251_pdata.power_gpio = -1;



	ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");

	if (ret < 0)

		goto fail;



	pandora_wl1251_pdata.irq = gpio_to_irq(PANDORA_WIFI_IRQ_GPIO);

	if (pandora_wl1251_pdata.irq < 0)

		goto fail_irq;



	pandora_wl1251_pdata.use_eeprom = true;

	ret = wl1251_set_platform_data(&pandora_wl1251_pdata);

	if (ret < 0)

		goto fail_irq;



	return;



fail_irq:

	gpio_free(PANDORA_WIFI_IRQ_GPIO);

fail:

	pr_err("wl1251 board initialisation failed\n");

}



static void __init omap3_pandora_legacy_init(void)

{

	platform_device_register(&pandora_backlight);

	gpiod_add_lookup_table(&pandora_vwlan_gpiod_table);

	platform_device_register(&pandora_vwlan_device);

	omap_hsmmc_init(pandora_mmc3);

	omap_hsmmc_late_init(pandora_mmc3);

	pandora_wl1251_init();

}

#endif /* CONFIG_ARCH_OMAP3 */