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

Commit e95172d6 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Merge android-4.14.54 (a6d69138) into msm-4.14 



* remotes/origin/tmp-a6d69138:
  Linux 4.14.54
  net: dsa: b53: Add BCM5389 support
  net/sonic: Use dma_mapping_error()
  platform/x86: asus-wmi: Fix NULL pointer dereference
  sched/core: Require cpu_active() in select_task_rq(), for user tasks
  sched/core: Fix rules for running on online && !active CPUs
  fs: clear writeback errors in inode_init_always
  perf bpf: Fix NULL return handling in bpf__prepare_load()
  perf test: "Session topology" dumps core on s390
  net: qmi_wwan: Add Netgear Aircard 779S
  atm: zatm: fix memcmp casting
  iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs
  ipvs: fix buffer overflow with sync daemon and service
  netfilter: nft_limit: fix packet ratelimiting
  s390/dasd: use blk_mq_rq_from_pdu for per request data
  netfilter: ebtables: handle string from userspace with care
  afs: Fix directory permissions check
  xfrm6: avoid potential infinite loop in _decode_session6()
  mtd: rawnand: fix return value check for bad block status
  ARM: dts: imx6q: Use correct SDMA script for SPI5 core
  netfilter: nf_tables: use WARN_ON_ONCE instead of BUG_ON in nft_do_chain()
  netfilter: ip6t_rpfilter: provide input interface for route lookup
  netfilter: don't set F_IFACE on ipv6 fib lookups
  md: remove special meaning of ->quiesce(.., 2)
  md: allow metadata update while suspending.
  md: use mddev_suspend/resume instead of ->quiesce()
  md: move suspend_hi/lo handling into core md code
  md: don't call bitmap_create() while array is quiesced.
  md: always hold reconfig_mutex when calling mddev_suspend()
  netfilter: nf_tables: fix NULL-ptr in nf_tables_dump_obj()
  netfilter: nf_tables: add missing netlink attrs to policies
  netfilter: nf_tables: fix memory leak on error exit return
  netfilter: nf_tables: increase nft_counters_enabled in nft_chain_stats_replace()
  netfilter: nf_tables: disable preemption in nft_update_chain_stats()
  netfilter: nft_meta: fix wrong value dereference in nft_meta_set_eval
  netfilter: nf_tables: bogus EBUSY in chain deletions
  netfilter: nf_tables: don't assume chain stats are set when jumplabel is set
  netfilter: nft_compat: fix handling of large matchinfo size
  netfilter: nft_compat: prepare for indirect info storage
  netfilter: nf_tables: nft_compat: fix refcount leak on xt module
  drm/i915: Enable provoking vertex fix on Gen9 systems.
  drm/amdgpu: Refactor amdgpu_vram_mgr_bo_invisible_size helper
  drm/amdgpu: Use kvmalloc_array for allocating VRAM manager nodes array
  drm/atmel-hlcdc: check stride values in the first plane
  drm/qxl: Call qxl_bo_unref outside atomic context
  drm/amdgpu: fix the missed vcn fw version report
  drm/amdgpu: Add APU support in vi_set_vce_clocks
  drm/amdgpu: Add APU support in vi_set_uvd_clocks
  vt: prevent leaking uninitialized data to userspace via /dev/vcs*
  serdev: fix memleak on module unload
  serial: 8250_pci: Remove stalled entries in blacklist
  staging: android: ion: Return an ERR_PTR in ion_map_kernel
  n_tty: Access echo_* variables carefully.
  n_tty: Fix stall at n_tty_receive_char_special().
  xhci: Fix kernel oops in trace_xhci_free_virt_device
  usb: typec: ucsi: Fix for incorrect status data issue
  usb: typec: ucsi: acpi: Workaround for cache mode issue
  acpi: Add helper for deactivating memory region
  usb: dwc2: fix the incorrect bitmaps for the ports of multi_tt hub
  USB: serial: cp210x: add Silicon Labs IDs for Windows Update
  USB: serial: cp210x: add CESINEL device ids
  usb: cdc_acm: Add quirk for Uniden UBC125 scanner

Conflicts:
	kernel/sched/core.c

Change-Id: I3013b90524ff80708423429a3715b1bdf1f9ad4c
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parents a60934ca a6d69138

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 53

SUBLEVEL = 54

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/imx6q.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ 
					clocks = <&clks IMX6Q_CLK_ECSPI5>,

						 <&clks IMX6Q_CLK_ECSPI5>;

					clock-names = "ipg", "per";

					dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;

					dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;

					dma-names = "rx", "tx";

					status = "disabled";

				};

drivers/acpi/osl.c

+72 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include <linux/uaccess.h>

#include <linux/io-64-nonatomic-lo-hi.h>



#include "acpica/accommon.h"

#include "acpica/acnamesp.h"

#include "internal.h"



#define _COMPONENT		ACPI_OS_SERVICES
@@ -1477,6 +1479,76 @@ int acpi_check_region(resource_size_t start, resource_size_t n, 
}

EXPORT_SYMBOL(acpi_check_region);



static acpi_status acpi_deactivate_mem_region(acpi_handle handle, u32 level,

					      void *_res, void **return_value)

{

	struct acpi_mem_space_context **mem_ctx;

	union acpi_operand_object *handler_obj;

	union acpi_operand_object *region_obj2;

	union acpi_operand_object *region_obj;

	struct resource *res = _res;

	acpi_status status;



	region_obj = acpi_ns_get_attached_object(handle);

	if (!region_obj)

		return AE_OK;



	handler_obj = region_obj->region.handler;

	if (!handler_obj)

		return AE_OK;



	if (region_obj->region.space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY)

		return AE_OK;



	if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE))

		return AE_OK;



	region_obj2 = acpi_ns_get_secondary_object(region_obj);

	if (!region_obj2)

		return AE_OK;



	mem_ctx = (void *)&region_obj2->extra.region_context;



	if (!(mem_ctx[0]->address >= res->start &&

	      mem_ctx[0]->address < res->end))

		return AE_OK;



	status = handler_obj->address_space.setup(region_obj,

						  ACPI_REGION_DEACTIVATE,

						  NULL, (void **)mem_ctx);

	if (ACPI_SUCCESS(status))

		region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);



	return status;

}



/**

 * acpi_release_memory - Release any mappings done to a memory region

 * @handle: Handle to namespace node

 * @res: Memory resource

 * @level: A level that terminates the search

 *

 * Walks through @handle and unmaps all SystemMemory Operation Regions that

 * overlap with @res and that have already been activated (mapped).

 *

 * This is a helper that allows drivers to place special requirements on memory

 * region that may overlap with operation regions, primarily allowing them to

 * safely map the region as non-cached memory.

 *

 * The unmapped Operation Regions will be automatically remapped next time they

 * are called, so the drivers do not need to do anything else.

 */

acpi_status acpi_release_memory(acpi_handle handle, struct resource *res,

				u32 level)

{

	if (!(res->flags & IORESOURCE_MEM))

		return AE_TYPE;



	return acpi_walk_namespace(ACPI_TYPE_REGION, handle, level,

				   acpi_deactivate_mem_region, NULL, res, NULL);

}

EXPORT_SYMBOL_GPL(acpi_release_memory);



/*

 * Let drivers know whether the resource checks are effective

 */

drivers/atm/zatm.c

+2 −2
Original line number Diff line number Diff line
@@ -1151,8 +1151,8 @@ static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte, 
}





static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd,

				   int offset, int swap)

static int eprom_try_esi(struct atm_dev *dev, unsigned short cmd, int offset,

			 int swap)

{

	unsigned char buf[ZEPROM_SIZE];

	struct zatm_dev *zatm_dev;