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

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

Merge "ARM: dts: msm: Enable IPA_V2 for 32 bit kernel"

parents 3a6b9f27 cd314afe

arch/arm/configs/msm8953-perf_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -400,9 +400,8 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_RMNET_IPA3=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

arch/arm/configs/msm8953_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -412,9 +412,8 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_GSI=y

CONFIG_IPA3=y

CONFIG_RMNET_IPA3=y

CONFIG_IPA=y

CONFIG_RMNET_IPA=y

CONFIG_RNDIS_IPA=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int __ipa_generate_rt_hw_rule_v2(enum ipa_ip_type ip, 
		entry->hw_len = buf - start;

	} else if (entry->hw_len != (buf - start)) {

		IPAERR(

		"hw_len differs b/w passes passed=0x%x calc=0x%lxtd\n",

		"hw_len differs b/w passes passed=0x%x calc=0x%zxtd\n",

		entry->hw_len,

		(buf - start));

		return -EPERM;
@@ -197,7 +197,7 @@ int __ipa_generate_rt_hw_rule_v2_5(enum ipa_ip_type ip, 
	if (entry->hw_len == 0) {

		entry->hw_len = buf - start;

	} else if (entry->hw_len != (buf - start)) {

		IPAERR("hw_len differs b/w passes passed=0x%x calc=0x%lxtd\n",

		IPAERR("hw_len differs b/w passes passed=0x%x calc=0x%zxtd\n",

			entry->hw_len, (buf - start));

		return -EPERM;

	}