Commit d927fae9 authored Oct 29, 2019 by Ivaylo Georgiev

Merge android-4.19-q.81 (9045ee1f) into msm-4.19



* refs/heads/tmp-9045ee1f:
  Linux 4.19.81
  RDMA/cxgb4: Do not dma memory off of the stack
  blk-rq-qos: fix first node deletion of rq_qos_del()
  PCI: PM: Fix pci_power_up()
  xen/netback: fix error path of xenvif_connect_data()
  cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown
  memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()'
  btrfs: tracepoints: Fix bad entry members of qgroup events
  Btrfs: check for the full sync flag while holding the inode lock during fsync
  Btrfs: add missing extents release on file extent cluster relocation error
  btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group()
  pinctrl: armada-37xx: swap polarity on LED group
  pinctrl: armada-37xx: fix control of pins 32 and up
  pinctrl: cherryview: restore Strago DMI workaround for all versions
  x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu
  x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area
  dm cache: fix bugs when a GFP_NOWAIT allocation fails
  tracing: Fix race in perf_trace_buf initialization
  perf/aux: Fix AUX output stopping
  CIFS: Fix use after free of file info structures
  CIFS: avoid using MID 0xFFFF
  arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT
  EDAC/ghes: Fix Use after free in ghes_edac remove path
  parisc: Fix vmap memory leak in ioremap()/iounmap()
  xtensa: drop EXPORT_SYMBOL for outs*/ins*
  mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once
  hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic()
  mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo
  mm/slub: fix a deadlock in show_slab_objects()
  mm/memory-failure.c: don't access uninitialized memmaps in memory_failure()
  mmc: cqhci: Commit descriptors before setting the doorbell
  fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c
  drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store()
  drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1
  drm/ttm: Restore ttm prefaulting
  drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50
  mac80211: Reject malformed SSID elements
  cfg80211: wext: avoid copying malformed SSIDs
  ACPI: CPPC: Set pcc_data[pcc_ss_id] to NULL in acpi_cppc_processor_exit()
  ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting
  Input: synaptics-rmi4 - avoid processing unknown IRQs
  Input: da9063 - fix capability and drop KEY_SLEEP
  scsi: ch: Make it possible to open a ch device multiple times again
  scsi: core: try to get module before removing device
  scsi: core: save/restore command resid for error handling
  scsi: sd: Ignore a failure to sync cache due to lack of authorization
  scsi: zfcp: fix reaction on bit error threshold notification
  staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS
  MIPS: tlbex: Fix build_restore_pagemask KScratch restore
  USB: ldusb: fix read info leaks
  USB: usblp: fix use-after-free on disconnect
  USB: ldusb: fix memleak on disconnect
  USB: serial: ti_usb_3410_5052: fix port-close races
  usb: udc: lpc32xx: fix bad bit shift operation
  ALSA: hda - Force runtime PM on Nvidia HDMI codecs
  ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers
  ALSA: hda/realtek - Enable headset mic on Asus MJ401TA
  ALSA: hda/realtek - Add support for ALC711
  USB: legousbtower: fix memleak on disconnect
  memfd: Fix locking when tagging pins
  sctp: change sctp_prot .no_autobind with true
  net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow
  net: ipv6: fix listify ip6_rcv_finish in case of forwarding
  net/ibmvnic: Fix EOI when running in XIVE mode.
  net: i82596: fix dma_alloc_attr for sni_82596
  net: bcmgenet: Set phydev->dev_flags only for internal PHYs
  net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3
  net: avoid potential infinite loop in tc_ctl_action()
  ipv4: Return -ENETUNREACH if we can't create route but saddr is valid
  ipv4: fix race condition between route lookup and invalidation
  ocfs2: fix panic due to ocfs2_wq is null
  Revert "drm/radeon: Fix EEH during kexec"
  md/raid0: fix warning message for parameter default_layout
  libata/ahci: Fix PCS quirk application
  namespace: fix namespace.pl script to support relative paths
  r8152: Set macpassthru in reset_resume callback
  lib: textsearch: fix escapes in example code
  net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write()
  mips: Loongson: Fix the link time qualifier of 'serial_exit()'
  net: dsa: rtl8366rb: add missing of_node_put after calling of_get_child_by_name
  netfilter: nft_connlimit: disable bh on garbage collection
  mac80211: fix txq null pointer dereference
  nl80211: fix null pointer dereference
  xen/efi: Set nonblocking callbacks
  MIPS: dts: ar9331: fix interrupt-controller size
  net: dsa: qca8k: Use up to 7 ports for all operations
  ARM: dts: am4372: Set memory bandwidth limit for DISPC
  ieee802154: ca8210: prevent memory leak
  ARM: OMAP2+: Fix warnings with broken omap2_set_init_voltage()
  ARM: OMAP2+: Fix missing reset done flag for am3 and am43
  scsi: qla2xxx: Fix unbound sleep in fcport delete path.
  scsi: megaraid: disable device when probe failed after enabled device
  scsi: ufs: skip shutdown if hba is not powered
  nvme-pci: Fix a race in controller removal
  rtlwifi: Fix potential overflow on P2P code
  ANDROID: clang: update to 9.0.8 based on r365631c
  ANDROID: move up spin_unlock_bh() ahead of remove_proc_entry()
  ANDROID: refactor build.config files to remove duplication

Conflicts:
	drivers/mmc/host/cqhci.c

Change-Id: I45709221db85529d4944cb1643589d641929a7d1
Signed-off-by: Ivaylo Georgiev <irgeorgiev@codeaurora.org>

parents 0f16018c 9045ee1f

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 80
		SUBLEVEL = 81
		EXTRAVERSION =
		NAME = "People's Front"

arch/arm/boot/dts/am4372.dtsi

+2 −0

Original line number	Diff line number	Diff line
		@@ -1142,6 +1142,8 @@
		ti,hwmods = "dss_dispc";
		clocks = <&disp_clk>;
		clock-names = "fck";

		max-memory-bandwidth = <230000000>;
		};

		rfbi: rfbi@4832a800 {

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -946,7 +946,8 @@ static struct omap_hwmod_class_sysconfig am33xx_timer_sysc = {
		.rev_offs = 0x0000,
		.sysc_offs = 0x0010,
		.syss_offs = 0x0014,
		.sysc_flags = (SYSC_HAS_SIDLEMODE \| SYSC_HAS_SOFTRESET),
		.sysc_flags = SYSC_HAS_SIDLEMODE \| SYSC_HAS_SOFTRESET \|
		SYSC_HAS_RESET_STATUS,
		.idlemodes = (SIDLE_FORCE \| SIDLE_NO \| SIDLE_SMART \|
		SIDLE_SMART_WKUP),
		.sysc_fields = &omap_hwmod_sysc_type2,

arch/arm/mach-omap2/pm.c

+0 −100

Original line number	Diff line number	Diff line
		@@ -77,83 +77,6 @@ int omap_pm_clkdms_setup(struct clockdomain clkdm, void unused)
		return 0;
		}

		/*
		* This API is to be called during init to set the various voltage
		* domains to the voltage as per the opp table. Typically we boot up
		* at the nominal voltage. So this function finds out the rate of
		* the clock associated with the voltage domain, finds out the correct
		* opp entry and sets the voltage domain to the voltage specified
		* in the opp entry
		*/
		static int __init omap2_set_init_voltage(char vdd_name, char clk_name,
		const char *oh_name)
		{
		struct voltagedomain *voltdm;
		struct clk *clk;
		struct dev_pm_opp *opp;
		unsigned long freq, bootup_volt;
		struct device *dev;

		if (!vdd_name \|\| !clk_name \|\| !oh_name) {
		pr_err("%s: invalid parameters\n", __func__);
		goto exit;
		}

		if (!strncmp(oh_name, "mpu", 3))
		/*
		* All current OMAPs share voltage rail and clock
		* source, so CPU0 is used to represent the MPU-SS.
		*/
		dev = get_cpu_device(0);
		else
		dev = omap_device_get_by_hwmod_name(oh_name);

		if (IS_ERR(dev)) {
		pr_err("%s: Unable to get dev pointer for hwmod %s\n",
		__func__, oh_name);
		goto exit;
		}

		voltdm = voltdm_lookup(vdd_name);
		if (!voltdm) {
		pr_err("%s: unable to get vdd pointer for vdd_%s\n",
		__func__, vdd_name);
		goto exit;
		}

		clk = clk_get(NULL, clk_name);
		if (IS_ERR(clk)) {
		pr_err("%s: unable to get clk %s\n", __func__, clk_name);
		goto exit;
		}

		freq = clk_get_rate(clk);
		clk_put(clk);

		opp = dev_pm_opp_find_freq_ceil(dev, &freq);
		if (IS_ERR(opp)) {
		pr_err("%s: unable to find boot up OPP for vdd_%s\n",
		__func__, vdd_name);
		goto exit;
		}

		bootup_volt = dev_pm_opp_get_voltage(opp);
		dev_pm_opp_put(opp);

		if (!bootup_volt) {
		pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n",
		__func__, vdd_name);
		goto exit;
		}

		voltdm_scale(voltdm, bootup_volt);
		return 0;

		exit:
		pr_err("%s: unable to set vdd_%s\n", __func__, vdd_name);
		return -EINVAL;
		}

		#ifdef CONFIG_SUSPEND
		static int omap_pm_enter(suspend_state_t suspend_state)
		{
		@@ -211,25 +134,6 @@ void omap_common_suspend_init(void *pm_suspend)
		}
		#endif /* CONFIG_SUSPEND */

		static void __init omap3_init_voltages(void)
		{
		if (!soc_is_omap34xx())
		return;

		omap2_set_init_voltage("mpu_iva", "dpll1_ck", "mpu");
		omap2_set_init_voltage("core", "l3_ick", "l3_main");
		}

		static void __init omap4_init_voltages(void)
		{
		if (!soc_is_omap44xx())
		return;

		omap2_set_init_voltage("mpu", "dpll_mpu_ck", "mpu");
		omap2_set_init_voltage("core", "l3_div_ck", "l3_main_1");
		omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
		}

		int __maybe_unused omap_pm_nop_init(void)
		{
		return 0;
		@@ -249,10 +153,6 @@ int __init omap2_common_pm_late_init(void)
		omap4_twl_init();
		omap_voltage_late_init();

		/* Initialize the voltages */
		omap3_init_voltages();
		omap4_init_voltages();

		/* Smartreflex device init */
		omap_devinit_smartreflex();

arch/arm/xen/efi.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -31,7 +31,9 @@ void __init xen_efi_runtime_setup(void)
		efi.get_variable = xen_efi_get_variable;
		efi.get_next_variable = xen_efi_get_next_variable;
		efi.set_variable = xen_efi_set_variable;
		efi.set_variable_nonblocking = xen_efi_set_variable;
		efi.query_variable_info = xen_efi_query_variable_info;
		efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
		efi.update_capsule = xen_efi_update_capsule;
		efi.query_capsule_caps = xen_efi_query_capsule_caps;
		efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;