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

Unverified Commit d1f52d84 authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

Merge tag 'LA.UM.6.4.r1-09000-8x98.0' into kernel.lnx.4.4.r27-rel 



"LA.UM.6.4.r1-09000-8x98.0"

* tag 'LA.UM.6.4.r1-09000-8x98.0':
  ANDROID: sdcardfs: Use lower getattr times/size
  msm: ipa: fix to not allow NAT DMA command without device initialization
  ipv6: ip6_make_skb() needs to clear cork.base.dst
  ipv6: fix possible mem leaks in ipv6_make_skb()
  ARM: dts: msm: Add support for truly FHD panel on SDM660 CDP
  msm: kgsl: Don't dump GPMU registers on non GPMU devices
  qcom: qpnp-haptics: extend stop timer for a longer request
  ARM: dts: msm: add support FULL HD Display for SDM660
  ARM: dts: msm: Add speed-bin 4 support for sdm660
  regulator: cprh-kbss: Add speed-bin 4 support for sdm660
  drm/msm : check buffer size before writing to user buffer
  ARM: dts: msm: Add support for new speed bin for SDM660
  ASoC: msm: check payload size before memory allocation
  crypto: hmac - require that the underlying hash algorithm is unkeyed

Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>

Conflicts:
	include/crypto/internal/hash.h
	net/ipv6/ip6_output.c
parents fea4b298 ea1f49b0

arch/arm/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \ 
	sdm660-pm660a-headset-jacktype-no-rcm.dtb \

	sdm660-usbc-audio-mtp.dtb \

	sdm660-usbc-audio-rcm.dtb \

	sdm660-fhd-cdp.dtb \

	sdm660-pm660a-fhd-cdp.dtb \

	sdm658-mtp.dtb \

	sdm658-cdp.dtb \

	sdm658-rcm.dtb \

arch/arm/boot/dts/qcom/sdm660-fhd-cdp.dts

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;



#include "sdm660.dtsi"

#include "sdm660-cdp.dtsi"

#include "sdm660-internal-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660L Int. FHD Display";

	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";

	qcom,board-id = <1 3>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

			<0x0001001b 0x0201011a 0x0 0x0>;

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_nt35695b_truly_fhd_video>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-reset-gpio = <&tlmm 53 0>;

	qcom,platform-te-gpio = <&tlmm 59 0>;

};



&mdss_dsi1 {

	status = "disabled";

	qcom,dsi-pref-prim-pan = <&dsi_dual_nt35597_truly_video>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-reset-gpio = <&tlmm 53 0>;

	qcom,platform-te-gpio = <&tlmm 59 0>;

};

arch/arm/boot/dts/qcom/sdm660-pm660a-fhd-cdp.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





/dts-v1/;



#include "sdm660.dtsi"

#include "sdm660-cdp.dtsi"

#include "msm-pm660a.dtsi"

#include "sdm660-internal-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660A Int. FHD Display";

	compatible = "qcom,sdm660-cdp", "qcom,sdm660", "qcom,cdp";

	qcom,board-id = <1 3>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>;

};

drivers/gpu/drm/msm/sde_dbg.c

+5 −0
Original line number Diff line number Diff line
@@ -1643,6 +1643,11 @@ static ssize_t sde_evtlog_dump_read(struct file *file, char __user *buff, 


	len = sde_evtlog_dump_to_buffer(sde_dbg_base.evtlog, evtlog_buf,

			SDE_EVTLOG_BUF_MAX, true);

	if (len < 0 || len > count) {

		pr_err("len is more than user buffer size");

		return 0;

	}



	if (copy_to_user(buff, evtlog_buf, len))

		return -EFAULT;

	*ppos += len;

drivers/platform/msm/ipa/ipa_v2/ipa_nat.c

+21 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -327,6 +327,11 @@ int ipa2_nat_init_cmd(struct ipa_ioc_v4_nat_init *init) 
	size_t tmp;

	gfp_t flag = GFP_KERNEL | (ipa_ctx->use_dma_zone ? GFP_DMA : 0);



	if (!ipa_ctx->nat_mem.is_dev_init) {

		IPAERR_RL("Nat table not initialized\n");

		return -EPERM;

	}



	IPADBG("\n");

	if (init->table_entries == 0) {

		IPADBG("Table entries is zero\n");
@@ -572,6 +577,11 @@ int ipa2_nat_dma_cmd(struct ipa_ioc_nat_dma_cmd *dma) 
	int ret = 0;

	gfp_t flag = GFP_KERNEL | (ipa_ctx->use_dma_zone ? GFP_DMA : 0);



	if (!ipa_ctx->nat_mem.is_dev_init) {

		IPAERR_RL("Nat table not initialized\n");

		return -EPERM;

	}



	IPADBG("\n");

	if (dma->entries <= 0) {

		IPAERR_RL("Invalid number of commands %d\n",
@@ -760,6 +770,16 @@ int ipa2_nat_del_cmd(struct ipa_ioc_v4_nat_del *del) 
	int result;

	gfp_t flag = GFP_KERNEL | (ipa_ctx->use_dma_zone ? GFP_DMA : 0);



	if (!ipa_ctx->nat_mem.is_dev_init) {

		IPAERR_RL("Nat table not initialized\n");

		return -EPERM;

	}



	if (ipa_ctx->nat_mem.public_ip_addr) {

		IPAERR_RL("Public IP addr not assigned and trying to delete\n");

		return -EPERM;

	}



	IPADBG("\n");

	if (ipa_ctx->nat_mem.is_tmp_mem) {

		IPAERR("using temp memory during nat del\n");