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

Commit 2f329195 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes... 

Merge changes I15eed530,Ib432918a,I355b9a45,I53de9309,I5d2ef6ff,Id5adbd0f,I793b7c9f,I7cbc0366,I9e94033b,I11cf9399,Ib8cb4cb0,I4b5daf6a,I7cba0e70,Ief636ecd,Icb91b5ab,I55955583,I93210bee,I35f4bcf3,I69c46c18,I95438e43,I60b06455 into kernel.lnx.4.14.r1

* changes:
  Merge commit 'refs/changes/29/2485329/3' of ssh://git.quicinc.com:29418/kernel/msm-4.14 into HEAD
  dma-buf: Use task_lock instead of taking reference to file_struct
  ARM: dts: msm: Disable ATOS for apps and kgsl smmu for sm8150
  arm64: fix erroneous warnings in page freeing functions
  arm64: Implement page table free interfaces
  arm64: tlbflush: Introduce __flush_tlb_kernel_pgtable
  arm64: tlbflush: avoid writing RES0 bits
  arm64: Make sure permission updates happen for pmd/pud
  arm64: Enforce BBM for huge IO/VMAP mappings
  soc: qcom: spcom: fix unlock ion buffer
  scsi: ufs: enable hibern8 during clk gating
  dwc3-msm: Don't unmap IPA GSI channel related doorbell register mapping
  net: qrtr: Rearrange tx wait and protect critical section
  rpmsg: glink: spi: Reduce tx sleep
  rpmsg: glink: spi: Ensure rx_done is sent before data
  drm/msm/dp: listen to USB events to terminate simulation
  soc: qcom: mem-offline: Set offlinable region based on minimum DDR sizes
  qseecom: set rcv_req_flag to 0 when listener is just registered
  drm/msm/sde: move src_split_order setting to commit phase
  drm/msm/dp: check for aborted flag before controller power on
  ion: Don't create a kernel mapping in begin_cpu_access
parents 50907dbd 5436ad11

Documentation/devicetree/bindings/arm/msm/memory-offline.txt

+24 −4
Original line number Diff line number Diff line
@@ -16,9 +16,28 @@ see the memory hotplug documentation (Documentation/memory-hotplug.txt). 
Required properties:

- compatible: "qcom,mem-offline"

- granule: The minimum granule size in mega-bytes for memory onlining/offlining.

- mem-percent: Percentage of the DDR which will support being onlined/offlined.

	The system will round down the value to align with the minimum offlinable

	granule size supported by DDR.

- offline-sizes: Array of offlinable memory region sizes to apply to targets

	based on their DDR size.



	Each entry in the array is a pair of sizes, where the first size in the

	pair is the minimum amount of DDR required in the system in bytes, and

	the second item in the pair is the size of the offlinable region in

	bytes which will be applied to the system.



	The offlinable memory region size from the entry where the minimum amount

	of DDR required in the system is closest, but not greater, than the

	amount of DDR in the system will be applied.

	If there are no entries with a minimum amount of DDR required that is less

	than the amount of DDR in the system then no offlinable region will be

	created.



	For example, in the following configuration:

              offline-sizes = <0x1 0x40000000 0x0 0x40000000>,

			      <0x1 0xc0000000 0x0 0x80000000>;

	On a 4GB target no offlinable region will be created.

	On a 6GB target a 1GB offlinable region will be created.

	On an 8GB target a 2GB offlinable region will be created.

	On a 12GB target a 2GB offlinable region will be created.

- mboxes: Reference to the mailbox used by the driver to make requests to

	online/offline memory.
@@ -26,6 +45,7 @@ Example: 
  mem-offline {

	compatible = "qcom,mem-offline";

	granule = <512>;

	mem-percent = "35";

	offline-sizes = <0x1 0x40000000 0x0 0x40000000>,

                        <0x1 0xc0000000 0x0 0x80000000>;

	mboxes = <&qmp_aop 0>;

  };

Documentation/devicetree/bindings/net/macb.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on

  the Cadence GEM, or the generic form: "cdns,gem".

  Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.

  Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.

  Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 76

SUBLEVEL = 77

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/sama5d3_emac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
			};



			macb1: ethernet@f802c000 {

				compatible = "cdns,at91sam9260-macb", "cdns,macb";

				compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";

				reg = <0xf802c000 0x100>;

				interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;

				pinctrl-names = "default";

arch/arm/include/asm/assembler.h

+12 −0
Original line number Diff line number Diff line
@@ -447,11 +447,23 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) 
	.size \name , . - \name

	.endm



	.macro	csdb

#ifdef CONFIG_THUMB2_KERNEL

	.inst.w	0xf3af8014

#else

	.inst	0xe320f014

#endif

	.endm



	.macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req

#ifndef CONFIG_CPU_USE_DOMAINS

	adds	\tmp, \addr, #\size - 1

	sbcccs	\tmp, \tmp, \limit

	bcs	\bad

#ifdef CONFIG_CPU_SPECTRE

	movcs	\addr, #0

	csdb

#endif

#endif

	.endm