msm: adsprpc: Fix virtual address for already mapped buffers
Virtual address was being set incorrectly for already mapped buffers
which was leading to invalid access in DSP. Fix is to set proper
virtual address.
Change-Id: I51407f20bb44f8fa1dd1f4c1951db3c34d153252
Acked-by: Tadakamalla Krishnaiah <ktadakam@qti.qualcomm.com>
Signed-off-by: Mohammed Nayeem Ur Rahman <mohara@codeaurora.org>
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index d1edfd9..54f2ef6 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -21,6 +21,7 @@
sa415m-ccard.dtb \
sa415m-ccard-pcie-ep.dtb \
sa415m-ccard-usb-ep.dtb \
+ sa415m-ttp-pcie-ep.dtb \
sa415m-ttp-usb-ep.dtb \
sa415m-mtp-256.dtb \
sa415m-cdp.dtb \
diff --git a/arch/arm/boot/dts/qcom/sa415m-cdp.dts b/arch/arm/boot/dts/qcom/sa415m-cdp.dts
index b9e7d49..908eb87 100644
--- a/arch/arm/boot/dts/qcom/sa415m-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sa415m-cdp.dts
@@ -30,3 +30,7 @@
&mss_mem {
reg = <0x86400000 0x9300000>;
};
+
+&smb138x {
+ status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts b/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts
index 09a8ea0..39ed5c6 100644
--- a/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts
+++ b/arch/arm/boot/dts/qcom/sa415m-mtp-256.dts
@@ -28,3 +28,7 @@
&mss_mem {
reg = <0x86400000 0x9300000>;
};
+
+&smb138x {
+ status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/sa415m-ttp-pcie-ep.dts b/arch/arm/boot/dts/qcom/sa415m-ttp-pcie-ep.dts
new file mode 100644
index 0000000..0cbc9e3
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/sa415m-ttp-pcie-ep.dts
@@ -0,0 +1,65 @@
+/* Copyright (c) 2019, 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 "sa415m-ttp.dtsi"
+#include "sdxpoorwills-v2.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. SA415M TTP PCIE-EP";
+ compatible = "qcom,sa415m-ttp",
+ "qcom,sdxpoorwills", "qcom,ttp";
+ qcom,board-id = <30 0x101>;
+};
+
+&mss_mem {
+ reg = <0x86400000 0x9300000>;
+};
+
+&usb {
+ /delete-property/ iommus;
+};
+
+&pcie_ep {
+ status = "okay";
+};
+
+&ipa_hw {
+ qcom,use-ipa-in-mhi-mode;
+ qcom,ipa-config-is-auto;
+ qcom,mhi-event-ring-id-limits = <7 11>; /* start and end */
+};
+
+&cnss_pcie {
+ status = "disabled";
+};
+
+&pcie0 {
+ status = "disabled";
+};
+
+&mhi_device {
+ status = "okay";
+};
+
+&restart_pshold {
+ qcom,force-warm-reboot;
+};
+
+&ipc_router_mhi_dev_xprt {
+ status = "okay";
+};
+
+&mhi_net_device {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi b/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi
index b0d746a..f918935 100644
--- a/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi
+++ b/arch/arm/boot/dts/qcom/sa415m-ttp.dtsi
@@ -53,8 +53,8 @@
};
cnss_pcie: qcom,cnss {
compatible = "qcom,cnss";
- reg = <0x10000000 0x10000000>,
- <0x20000000 0x10000>;
+ reg = <0xa0000000 0x10000000>,
+ <0xb0000000 0x10000>;
reg-names = "smmu_iova_base", "smmu_iova_ipa";
wlan-en-gpio = <&tlmm 52 0>;
@@ -91,6 +91,10 @@
};
};
+&smb138x {
+ status = "disabled";
+};
+
&i2c_4 {
status = "okay";
diff --git a/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts b/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts
index c8b7891..3a7b072 100644
--- a/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts
+++ b/arch/arm/boot/dts/qcom/sa415m-v2-cdp.dts
@@ -31,3 +31,7 @@
&mss_mem {
reg = <0x86400000 0x9300000>;
};
+
+&smb138x {
+ status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts b/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts
index c7cbbd1..fe59e05 100644
--- a/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts
+++ b/arch/arm/boot/dts/qcom/sa415m-v2-mtp.dts
@@ -33,3 +33,7 @@
&mss_mem {
reg = <0x86400000 0x9300000>;
};
+
+&smb138x {
+ status = "disabled";
+};
diff --git a/arch/arm/boot/dts/qcom/sdxpoorwills-pinctrl.dtsi b/arch/arm/boot/dts/qcom/sdxpoorwills-pinctrl.dtsi
index 09a6219..f441b3f 100644
--- a/arch/arm/boot/dts/qcom/sdxpoorwills-pinctrl.dtsi
+++ b/arch/arm/boot/dts/qcom/sdxpoorwills-pinctrl.dtsi
@@ -154,7 +154,7 @@
config {
pins = "gpio76", "gpio77";
drive-strength = <2>;
- bias-disable;
+ bias-pull-up;
};
};
diff --git a/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi b/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi
index c1bf404..f09e63d 100644
--- a/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi
+++ b/arch/arm/boot/dts/qcom/sdxpoorwills-regulator.dtsi
@@ -25,7 +25,7 @@
regulator-name = "pmxpoorwills_s1_level";
qcom,set = <RPMH_REGULATOR_SET_ALL>;
regulator-min-microvolt =
- <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+ <RPMH_REGULATOR_LEVEL_RETENTION>;
regulator-max-microvolt = <RPMH_REGULATOR_LEVEL_MAX>;
};
};
diff --git a/arch/arm/configs/msm8937go-perf_defconfig b/arch/arm/configs/msm8937go-perf_defconfig
index 8420285..1c37757 100755
--- a/arch/arm/configs/msm8937go-perf_defconfig
+++ b/arch/arm/configs/msm8937go-perf_defconfig
@@ -362,7 +362,6 @@
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_QCOM=y
CONFIG_QCOM_DLOAD_MODE=y
-CONFIG_POWER_SUPPLY=y
CONFIG_QPNP_FG=y
CONFIG_SMB135X_CHARGER=y
CONFIG_SMB1360_CHARGER_FG=y
@@ -460,6 +459,7 @@
CONFIG_HID_MAGICMOUSE=y
CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
+CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
diff --git a/arch/arm/configs/msm8937go_defconfig b/arch/arm/configs/msm8937go_defconfig
index b9cdd7e..2e63db2d 100755
--- a/arch/arm/configs/msm8937go_defconfig
+++ b/arch/arm/configs/msm8937go_defconfig
@@ -368,7 +368,6 @@
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_QCOM=y
CONFIG_QCOM_DLOAD_MODE=y
-CONFIG_POWER_SUPPLY=y
CONFIG_QPNP_FG=y
CONFIG_SMB135X_CHARGER=y
CONFIG_SMB1360_CHARGER_FG=y
@@ -467,6 +466,7 @@
CONFIG_HID_MAGICMOUSE=y
CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
+CONFIG_HID_SONY=y
CONFIG_USB_HIDDEV=y
CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
diff --git a/arch/arm64/boot/dts/qcom/sda845-svr.dtsi b/arch/arm64/boot/dts/qcom/sda845-svr.dtsi
index 2426b47..ece1392 100644
--- a/arch/arm64/boot/dts/qcom/sda845-svr.dtsi
+++ b/arch/arm64/boot/dts/qcom/sda845-svr.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019, 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
@@ -80,7 +80,15 @@
qcom,disable-ctm;
};
+&ipa_hw {
+ status="disabled";
+};
+
&soc {
+ qcom,rmnet-ipa {
+ status="disabled";
+ };
+
qcom,qbt1000 {
status = "disabled";
};
diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index df3469a..ed8923e 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -2776,6 +2776,7 @@
mutex_lock(&fl->fl_map_mutex);
if (!fastrpc_mmap_find(fl, ud->fd, (uintptr_t)ud->vaddrin,
ud->size, ud->flags, 1, &map)) {
+ ud->vaddrout = map->raddr;
mutex_unlock(&fl->fl_map_mutex);
mutex_unlock(&fl->map_mutex);
return 0;
diff --git a/drivers/power/supply/qcom/qg-reg.h b/drivers/power/supply/qcom/qg-reg.h
index 69f2e1e..dddc7b0 100644
--- a/drivers/power/supply/qcom/qg-reg.h
+++ b/drivers/power/supply/qcom/qg-reg.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019 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
@@ -118,6 +118,7 @@
#define QG_SDAM_ESR_DISCHARGE_DELTA_OFFSET 0x6E /* 4-byte 0x6E-0x71 */
#define QG_SDAM_ESR_CHARGE_SF_OFFSET 0x72 /* 2-byte 0x72-0x73 */
#define QG_SDAM_ESR_DISCHARGE_SF_OFFSET 0x74 /* 2-byte 0x74-0x75 */
+#define QG_SDAM_MAGIC_OFFSET 0x80 /* 4-byte 0x80-0x83 */
#define QG_SDAM_MAX_OFFSET 0xA4
/* Below offset is used by PBS */
diff --git a/drivers/power/supply/qcom/qg-sdam.c b/drivers/power/supply/qcom/qg-sdam.c
index a7cb97e..95ac8ec 100644
--- a/drivers/power/supply/qcom/qg-sdam.c
+++ b/drivers/power/supply/qcom/qg-sdam.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019 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
@@ -88,6 +88,11 @@
.offset = QG_SDAM_ESR_DISCHARGE_SF_OFFSET,
.length = 2,
},
+ [SDAM_MAGIC] = {
+ .name = "SDAM_MAGIC_OFFSET",
+ .offset = QG_SDAM_MAGIC_OFFSET,
+ .length = 4,
+ },
};
int qg_sdam_write(u8 param, u32 data)
@@ -242,6 +247,23 @@
return 0;
}
+int qg_sdam_clear(void)
+{
+ int i, rc = 0;
+ struct qg_sdam *chip = the_chip;
+ u8 data = 0;
+
+ if (!chip) {
+ pr_err("Invalid sdam-chip pointer\n");
+ return -EINVAL;
+ }
+
+ for (i = SDAM_MIN_OFFSET; i <= SDAM_MAX_OFFSET; i++)
+ rc |= qg_sdam_multibyte_write(i, &data, 1);
+
+ return rc;
+}
+
int qg_sdam_init(struct device *dev)
{
int rc;
diff --git a/drivers/power/supply/qcom/qg-sdam.h b/drivers/power/supply/qcom/qg-sdam.h
index 45218a8..d365f25 100644
--- a/drivers/power/supply/qcom/qg-sdam.h
+++ b/drivers/power/supply/qcom/qg-sdam.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019 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
@@ -14,6 +14,8 @@
#define __QG_SDAM_H__
#define SDAM_TYPE 0x2E
+#define SDAM_MIN_OFFSET 0x45
+#define SDAM_MAX_OFFSET 0xB3
enum qg_sdam_param {
SDAM_VALID,
@@ -28,6 +30,7 @@
SDAM_ESR_DISCHARGE_DELTA,
SDAM_ESR_CHARGE_SF,
SDAM_ESR_DISCHARGE_SF,
+ SDAM_MAGIC,
SDAM_MAX,
};
@@ -43,5 +46,6 @@
int qg_sdam_read_all(u32 *sdam_data);
int qg_sdam_multibyte_write(u32 offset, u8 *sdam_data, u32 length);
int qg_sdam_multibyte_read(u32 offset, u8 *sdam_data, u32 length);
+int qg_sdam_clear(void);
#endif
diff --git a/drivers/power/supply/qcom/qpnp-qg.c b/drivers/power/supply/qcom/qpnp-qg.c
index f84e072..e3ebe66 100644
--- a/drivers/power/supply/qcom/qpnp-qg.c
+++ b/drivers/power/supply/qcom/qpnp-qg.c
@@ -2767,6 +2767,39 @@
return 0;
}
+#define SDAM_MAGIC_NUMBER 0x12345678
+static int qg_sanitize_sdam(struct qpnp_qg *chip)
+{
+ int rc = 0;
+ u32 data = 0;
+
+ rc = qg_sdam_read(SDAM_MAGIC, &data);
+ if (rc < 0) {
+ pr_err("Failed to read SDAM rc=%d\n", rc);
+ return rc;
+ }
+
+ if (data == SDAM_MAGIC_NUMBER) {
+ qg_dbg(chip, QG_DEBUG_PON, "SDAM valid\n");
+ } else if (data == 0) {
+ rc = qg_sdam_write(SDAM_MAGIC, SDAM_MAGIC_NUMBER);
+ if (!rc)
+ qg_dbg(chip, QG_DEBUG_PON, "First boot. SDAM initilized\n");
+ } else {
+ /* SDAM has invalid value */
+ rc = qg_sdam_clear();
+ if (!rc) {
+ pr_err("SDAM uninitialized, SDAM reset\n");
+ rc = qg_sdam_write(SDAM_MAGIC, SDAM_MAGIC_NUMBER);
+ }
+ }
+
+ if (rc < 0)
+ pr_err("Failed in SDAM operation, rc=%d\n", rc);
+
+ return rc;
+}
+
#define ADC_CONV_DLY_512MS 0xA
static int qg_hw_init(struct qpnp_qg *chip)
{
@@ -3794,6 +3827,12 @@
return rc;
}
+ rc = qg_sanitize_sdam(chip);
+ if (rc < 0) {
+ pr_err("Failed to sanitize SDAM, rc=%d\n", rc);
+ return rc;
+ }
+
rc = qg_soc_init(chip);
if (rc < 0) {
pr_err("Failed to initialize SOC scaling init rc=%d\n", rc);
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 0c76bd1..e67a338 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1741,6 +1741,8 @@
static int f2fs_ioc_start_atomic_write(struct file *filp)
{
struct inode *inode = file_inode(filp);
+ struct f2fs_inode_info *fi = F2FS_I(inode);
+ struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
int ret;
if (!inode_owner_or_capable(inode))
@@ -1781,6 +1783,12 @@
goto out;
}
+ spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
+ if (list_empty(&fi->inmem_ilist))
+ list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
+ spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
+
+ /* add inode in inmem_list first and set atomic_file */
set_inode_flag(inode, FI_ATOMIC_FILE);
clear_inode_flag(inode, FI_ATOMIC_REVOKE_REQUEST);
up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]);
@@ -1822,11 +1830,8 @@
goto err_out;
ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
- if (!ret) {
- clear_inode_flag(inode, FI_ATOMIC_FILE);
- F2FS_I(inode)->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
- stat_dec_atomic_write(inode);
- }
+ if (!ret)
+ f2fs_drop_inmem_pages(inode);
} else {
ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 1, false);
}
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 2a8dc33..d45a18c 100755
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -185,8 +185,6 @@
void f2fs_register_inmem_page(struct inode *inode, struct page *page)
{
- struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
- struct f2fs_inode_info *fi = F2FS_I(inode);
struct inmem_pages *new;
f2fs_trace_pid(page);
@@ -200,15 +198,11 @@
INIT_LIST_HEAD(&new->list);
/* increase reference count with clean state */
- mutex_lock(&fi->inmem_lock);
get_page(page);
- list_add_tail(&new->list, &fi->inmem_pages);
- spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
- if (list_empty(&fi->inmem_ilist))
- list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
- spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
+ mutex_lock(&F2FS_I(inode)->inmem_lock);
+ list_add_tail(&new->list, &F2FS_I(inode)->inmem_pages);
inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);
- mutex_unlock(&fi->inmem_lock);
+ mutex_unlock(&F2FS_I(inode)->inmem_lock);
trace_f2fs_register_inmem_page(page, INMEM);
}
@@ -330,19 +324,17 @@
mutex_lock(&fi->inmem_lock);
__revoke_inmem_pages(inode, &fi->inmem_pages,
true, false, true);
-
- if (list_empty(&fi->inmem_pages)) {
- spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
- if (!list_empty(&fi->inmem_ilist))
- list_del_init(&fi->inmem_ilist);
- spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
- }
mutex_unlock(&fi->inmem_lock);
}
clear_inode_flag(inode, FI_ATOMIC_FILE);
fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
stat_dec_atomic_write(inode);
+
+ spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
+ if (!list_empty(&fi->inmem_ilist))
+ list_del_init(&fi->inmem_ilist);
+ spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
}
void f2fs_drop_inmem_page(struct inode *inode, struct page *page)
@@ -471,11 +463,6 @@
mutex_lock(&fi->inmem_lock);
err = __f2fs_commit_inmem_pages(inode);
-
- spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
- if (!list_empty(&fi->inmem_ilist))
- list_del_init(&fi->inmem_ilist);
- spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
mutex_unlock(&fi->inmem_lock);
clear_inode_flag(inode, FI_ATOMIC_COMMIT);
diff --git a/include/uapi/linux/msm_ipa.h b/include/uapi/linux/msm_ipa.h
index 73d65a6..60a5725 100644
--- a/include/uapi/linux/msm_ipa.h
+++ b/include/uapi/linux/msm_ipa.h
@@ -2,6 +2,7 @@
#define _UAPI_MSM_IPA_H_
#ifndef __KERNEL__
+#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
#include <sys/stat.h>
@@ -30,7 +31,7 @@
*/
#define IPA_IPV6CT_DEV_NAME "ipaIpv6CTTable"
- /**
+/**
* name of the default routing tables for v4 and v6
*/
#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"
@@ -108,7 +109,7 @@
#define IPA_IOCTL_GSB_CONNECT 61
#define IPA_IOCTL_GSB_DISCONNECT 62
#define IPA_IOCTL_GET_PHERIPHERAL_EP_INFO 63
-
+#define IPA_IOCTL_GET_NAT_IN_SRAM_INFO 64
/**
* max size of the header to be inserted
@@ -440,7 +441,27 @@
(IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))
/**
+ * The following is used to describe the types of memory NAT can
+ * reside in.
+ *
+ * PLEASE KEEP THE FOLLOWING IN SYNC WITH ipa3_nat_mem_in_as_str()
+ * BELOW.
+ */
+enum ipa3_nat_mem_in {
+ IPA_NAT_MEM_IN_DDR = 0,
+ IPA_NAT_MEM_IN_SRAM = 1,
+
+ IPA_NAT_MEM_IN_MAX
+};
+
+#define IPA_VALID_NAT_MEM_IN(t) \
+ ((t) >= IPA_NAT_MEM_IN_DDR && (t) < IPA_NAT_MEM_IN_MAX)
+
+/**
* enum ipa_ip_type - Address family: IPv4 or IPv6
+ *
+ * PLEASE KEEP THE FOLLOWING IN SYNC WITH ipa_ip_type_as_str()
+ * BELOW.
*/
enum ipa_ip_type {
IPA_IP_v4,
@@ -448,6 +469,9 @@
IPA_IP_MAX
};
+#define VALID_IPA_IP_TYPE(t) \
+ ((t) >= IPA_IP_v4 && (t) < IPA_IP_MAX)
+
/**
* enum ipa_rule_type - Type of routing or filtering rule
* Hashable: Rule will be located at the hashable tables
@@ -1636,9 +1660,11 @@
* @expn_table_entries: input parameter, ipv4 expansion rules table number of
* entries
* @ip_addr: input parameter, public ip address
+ * @mem_type: input parameter, type of memory the table resides in
+ * @focus_change: input parameter, are we moving to/from sram or ddr
*/
struct ipa_ioc_v4_nat_init {
- uint8_t tbl_index;
+ uint8_t tbl_index;
uint32_t ipv4_rules_offset;
uint32_t expn_rules_offset;
@@ -1648,6 +1674,9 @@
uint16_t table_entries;
uint16_t expn_table_entries;
uint32_t ip_addr;
+
+ uint8_t mem_type;
+ uint8_t focus_change;
};
/**
@@ -1680,9 +1709,11 @@
/**
* struct ipa_ioc_nat_ipv6ct_table_del - NAT/IPv6CT table delete parameter
* @table_index: input parameter, index of the table
+ * @mem_type: input parameter, type of memory the table resides in
*/
struct ipa_ioc_nat_ipv6ct_table_del {
uint8_t table_index;
+ uint8_t mem_type;
};
/**
@@ -1706,11 +1737,12 @@
* struct ipa_ioc_nat_dma_cmd - To hold multiple nat/ipv6ct dma commands
* @entries: number of dma commands in use
* @dma: data pointer to the dma commands
+ * @mem_type: input parameter, type of memory the table resides in
*/
struct ipa_ioc_nat_dma_cmd {
uint8_t entries;
+ uint8_t mem_type;
struct ipa_ioc_nat_dma_one dma[0];
-
};
/**
@@ -2244,6 +2276,10 @@
IPA_IOCTL_GET_PHERIPHERAL_EP_INFO, \
struct ipa_ioc_get_ep_info)
+#define IPA_IOC_GET_NAT_IN_SRAM_INFO _IOWR(IPA_IOC_MAGIC, \
+ IPA_IOCTL_GET_NAT_IN_SRAM_INFO, \
+ struct ipa_nat_in_sram_info)
+
/*
* unique magic number of the Tethering bridge ioctls
*/
@@ -2333,6 +2369,21 @@
uint16_t lcid;
};
+/**
+ * struct ipa_nat_in_sram_info - query for nat in sram particulars
+ * @sram_mem_available_for_nat: Amount SRAM available to fit nat table
+ * @nat_table_offset_into_mmap: Offset into mmap'd vm where table will be
+ * @best_nat_in_sram_size_rqst: The size to request for mmap
+ *
+ * The last two elements above are required to deal with situations
+ * where the SRAM's physical address and size don't play nice with
+ * mmap'ings page size and boundary attributes.
+ */
+struct ipa_nat_in_sram_info {
+ uint32_t sram_mem_available_for_nat;
+ uint32_t nat_table_offset_into_mmap;
+ uint32_t best_nat_in_sram_size_rqst;
+};
#define TETH_BRIDGE_IOC_SET_BRIDGE_MODE _IOW(TETH_BRIDGE_IOC_MAGIC, \
TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE, \
diff --git a/net/ipc_router/ipc_router_core.c b/net/ipc_router/ipc_router_core.c
index d62b582..0e5571d 100644
--- a/net/ipc_router/ipc_router_core.c
+++ b/net/ipc_router/ipc_router_core.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2019, 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
@@ -430,12 +430,19 @@
(xchng_type == IPC_ROUTER_LOG_EVENT_RX ? "RX" :
(xchng_type == IPC_ROUTER_LOG_EVENT_TX ? "TX" : "ERR")),
msg->cmd, msg->cli.node_id, msg->cli.port_id);
- else if (msg->cmd == IPC_ROUTER_CTRL_CMD_HELLO && hdr)
+ else if (msg->cmd == IPC_ROUTER_CTRL_CMD_HELLO && hdr) {
IPC_RTR_INFO(log_ctx,
"CTL MSG %s cmd:0x%x ADDR:0x%x",
(xchng_type == IPC_ROUTER_LOG_EVENT_RX ? "RX" :
(xchng_type == IPC_ROUTER_LOG_EVENT_TX ? "TX" : "ERR")),
msg->cmd, hdr->src_node_id);
+ if (hdr->src_node_id == 0 || hdr->src_node_id == 3)
+ pr_err("%s: Modem QMI Readiness %s cmd:0x%x ADDR:0x%x\n",
+ __func__,
+ (xchng_type == IPC_ROUTER_LOG_EVENT_RX ? "RX" :
+ (xchng_type == IPC_ROUTER_LOG_EVENT_TX ? "TX" :
+ "ERR")), msg->cmd, hdr->src_node_id);
+ }
else
IPC_RTR_INFO(log_ctx,
"%s UNKNOWN cmd:0x%x",