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

Commit 91e9b4e0 authored by Ivaylo Georgiev's avatar Ivaylo Georgiev
Browse files

Merge android-4.19.41 (44c5f031) into msm-4.19 



* refs/heads/tmp-44c5f031:
  Linux 4.19.41
  mm/kmemleak.c: fix unused-function warning
  ASoC: wm_adsp: Check for buffer in trigger stop
  media: v4l2: i2c: ov7670: Fix PLL bypass register values
  i2c: i2c-stm32f7: Fix SDADEL minimum formula
  x86/mm/tlb: Revert "x86/mm: Align TLB invalidation info"
  x86/mm: Fix a crash with kmemleak_scan()
  x86/mm/KASLR: Fix the size of the direct mapping section
  clk: x86: Add system specific quirk to mark clocks as critical
  x86/mce: Improve error message when kernel cannot recover, p2
  powerpc/mm/hash: Handle mmap_min_addr correctly in get_unmapped_area topdown search
  mac80211: Honor SW_CRYPTO_CONTROL for unicast keys in AP VLAN mode
  selinux: never allow relabeling on context mounts
  selinux: avoid silent denials in permissive mode under RCU walk
  gpio: mxc: add check to return defer probe if clock tree NOT ready
  Input: stmfts - acknowledge that setting brightness is a blocking call
  Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
  IB/core: Destroy QP if XRC QP fails
  IB/core: Fix potential memory leak while creating MAD agents
  IB/core: Unregister notifier before freeing MAD security
  platform/x86: intel_pmc_core: Handle CFL regmap properly
  platform/x86: intel_pmc_core: Fix PCH IP name
  ASoC: stm32: fix sai driver name initialisation
  ASoC: wm_adsp: Correct handling of compressed streams that restart
  ASoC: Intel: bytcr_rt5651: Revert "Fix DMIC map headsetmic mapping"
  scsi: RDMA/srpt: Fix a credit leak for aborted commands
  staging: iio: adt7316: fix the dac write calculation
  staging: iio: adt7316: fix the dac read calculation
  staging: iio: adt7316: allow adt751x to use internal vref for all dacs
  clk: qcom: Add missing freq for usb30_master_clk on 8998
  Bluetooth: mediatek: fix up an error path to restore bdev->tx_state
  Bluetooth: btusb: request wake pin with NOAUTOEN
  perf/x86/amd: Update generic hardware cache events for Family 17h
  block: pass no-op callback to INIT_WORK().
  ARM: iop: don't use using 64-bit DMA masks
  ARM: orion: don't use using 64-bit DMA masks
  fs: stream_open - opener for stream-like files so that read and write can run simultaneously without deadlock
  xsysace: Fix error handling in ace_setup
  sh: fix multiple function definition build errors
  hugetlbfs: fix memory leak for resv_map
  kmemleak: powerpc: skip scanning holes in the .bss section
  KVM: SVM: prevent DBG_DECRYPT and DBG_ENCRYPT overflow
  libcxgb: fix incorrect ppmax calculation
  net: hns: Fix WARNING when remove HNS driver with SMMU enabled
  net: hns: fix ICMP6 neighbor solicitation messages discard problem
  net: hns: Fix probabilistic memory overwrite when HNS driver initialized
  net: hns: Use NAPI_POLL_WEIGHT for hns driver
  net: hns: fix KASAN: use-after-free in hns_nic_net_xmit_hw()
  arm64: fix wrong check of on_sdei_stack in nmi context
  arm/mach-at91/pm : fix possible object reference leak
  scsi: storvsc: Fix calculation of sub-channel count
  scsi: core: add new RDAC LENOVO/DE_Series device
  vfio/pci: use correct format characters
  HID: input: add mapping for Assistant key
  rtc: da9063: set uie_unsupported when relevant
  block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
  mfd: twl-core: Disable IRQ while suspended
  debugfs: fix use-after-free on symlink traversal
  jffs2: fix use-after-free on symlink traversal
  net: stmmac: don't log oversized frames
  net: stmmac: fix dropping of multi-descriptor RX frames
  net: stmmac: don't overwrite discard_frame status
  net: stmmac: don't stop NAPI processing when dropping a packet
  net: stmmac: ratelimit RX error logs
  net: stmmac: use correct DMA buffer size in the RX descriptor
  bonding: show full hw address in sysfs for slave entries
  net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands
  net: hns3: fix compile error
  HID: quirks: Fix keyboard + touchpad on Lenovo Miix 630
  riscv: fix accessing 8-byte variable from RV32
  igb: Fix WARN_ONCE on runtime suspend
  reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
  ARM: dts: rockchip: Fix gpu opp node names for rk3288
  batman-adv: fix warning in function batadv_v_elp_get_throughput
  batman-adv: Reduce tt_global hash refcnt only for removed entry
  batman-adv: Reduce tt_local hash refcnt only for removed entry
  batman-adv: Reduce claim hash refcnt only for removed entry
  rtc: sh: Fix invalid alarm warning for non-enabled alarm
  rtc: cros-ec: Fail suspend/resume if wake IRQ can't be configured
  HID: debug: fix race condition with between rdesc_show() and device removal
  HID: logitech: check the return value of create_singlethread_workqueue
  arm64: dts: rockchip: fix rk3328-roc-cc gmac2io tx/rx_delay
  efi: Fix debugobjects warning on 'efi_rts_work'
  nvme-loop: init nvmet_ctrl fatal_err_work when allocate
  USB: core: Fix bug caused by duplicate interface PM usage counter
  USB: core: Fix unterminated string returned by usb_string()
  usb: usbip: fix isoc packet num validation in get_pipe
  USB: dummy-hcd: Fix failure to give back unlinked URBs
  USB: w1 ds2490: Fix bug caused by improper use of altsetting array
  USB: yurex: Fix protection fault after device removal
  ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR
  ALSA: hda/realtek - Fixed Dell AIO speaker noise
  ALSA: hda/realtek - Add new Dell platform for headset mode
  i2c: Prevent runtime suspend of adapter when Host Notify is required
  i2c: Allow recovery of the initial IRQ by an I2C client device.
  i2c: Clear client->irq in i2c_device_remove
  i2c: Remove unnecessary call to irq_find_mapping
  i2c: imx: correct the method of getting private data in notifier_call
  i2c: synquacer: fix enumeration of slave devices
  mac80211: don't attempt to rename ERR_PTR() debugfs dirs
  mwifiex: Make resume actually do something useful again on SDIO cards
  iwlwifi: fix driver operation for 5350
  ANDROID: cuttlefish 4.19: enable CONFIG_CRYPTO_AES_NI_INTEL=y

Change-Id: I855e323ab82278f40f6d48305c7e4d21027637fd
Signed-off-by: default avatarIvaylo Georgiev <irgeorgiev@codeaurora.org>
parents 246cff7d 44c5f031

Documentation/driver-api/usb/power-management.rst

+9 −5
Original line number Diff line number Diff line
@@ -370,11 +370,15 @@ autosuspend the interface's device. When the usage counter is = 0 
then the interface is considered to be idle, and the kernel may

autosuspend the device.



Drivers need not be concerned about balancing changes to the usage

counter; the USB core will undo any remaining "get"s when a driver

is unbound from its interface.  As a corollary, drivers must not call

any of the ``usb_autopm_*`` functions after their ``disconnect``

routine has returned.

Drivers must be careful to balance their overall changes to the usage

counter.  Unbalanced "get"s will remain in effect when a driver is

unbound from its interface, preventing the device from going into

runtime suspend should the interface be bound to a driver again.  On

the other hand, drivers are allowed to achieve this balance by calling

the ``usb_autopm_*`` functions even after their ``disconnect`` routine

has returned -- say from within a work-queue routine -- provided they

retain an active reference to the interface (via ``usb_get_intf`` and

``usb_put_intf``).



Drivers using the async routines are responsible for their own

synchronization and mutual exclusion.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 40

SUBLEVEL = 41

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/rk3288.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -1261,27 +1261,27 @@ 
	gpu_opp_table: gpu-opp-table {

		compatible = "operating-points-v2";



		opp@100000000 {

		opp-100000000 {

			opp-hz = /bits/ 64 <100000000>;

			opp-microvolt = <950000>;

		};

		opp@200000000 {

		opp-200000000 {

			opp-hz = /bits/ 64 <200000000>;

			opp-microvolt = <950000>;

		};

		opp@300000000 {

		opp-300000000 {

			opp-hz = /bits/ 64 <300000000>;

			opp-microvolt = <1000000>;

		};

		opp@400000000 {

		opp-400000000 {

			opp-hz = /bits/ 64 <400000000>;

			opp-microvolt = <1100000>;

		};

		opp@500000000 {

		opp-500000000 {

			opp-hz = /bits/ 64 <500000000>;

			opp-microvolt = <1200000>;

		};

		opp@600000000 {

		opp-600000000 {

			opp-hz = /bits/ 64 <600000000>;

			opp-microvolt = <1250000>;

		};

arch/arm/mach-at91/pm.c

+4 −2
Original line number Diff line number Diff line
@@ -594,13 +594,13 @@ static int __init at91_pm_backup_init(void) 


	np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");

	if (!np)

		goto securam_fail;

		goto securam_fail_no_ref_dev;



	pdev = of_find_device_by_node(np);

	of_node_put(np);

	if (!pdev) {

		pr_warn("%s: failed to find securam device!\n", __func__);

		goto securam_fail;

		goto securam_fail_no_ref_dev;

	}



	sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -623,6 +623,8 @@ static int __init at91_pm_backup_init(void) 
	return 0;



securam_fail:

	put_device(&pdev->dev);

securam_fail_no_ref_dev:

	iounmap(pm_data.sfrbu);

	pm_data.sfrbu = NULL;

	return ret;

arch/arm/mach-iop13xx/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static struct resource iop13xx_adma_2_resources[] = { 
	}

};



static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);

static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);

static struct iop_adma_platform_data iop13xx_adma_0_data = {

	.hw_id = 0,

	.pool_size = PAGE_SIZE,
@@ -324,7 +324,7 @@ static struct platform_device iop13xx_adma_0_channel = { 
	.resource = iop13xx_adma_0_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_0_data,

	},

};
@@ -336,7 +336,7 @@ static struct platform_device iop13xx_adma_1_channel = { 
	.resource = iop13xx_adma_1_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_1_data,

	},

};
@@ -348,7 +348,7 @@ static struct platform_device iop13xx_adma_2_channel = { 
	.resource = iop13xx_adma_2_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_2_data,

	},

};