Merge "icnss: Restrict MSA0 permission to HLOS only during SSR" (a309e793) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/icnss.c

+3 −18

Original line number	Diff line number	Diff line
		@@ -200,7 +200,6 @@ enum icnss_driver_event_type {
		enum icnss_msa_perm {
		ICNSS_MSA_PERM_HLOS_ALL = 0,
		ICNSS_MSA_PERM_WLAN_HW_RW = 1,
		ICNSS_MSA_PERM_DUMP_COLLECT = 2,
		ICNSS_MSA_PERM_MAX,
		};

		@@ -233,13 +232,6 @@ struct icnss_msa_perm_list_t msa_perm_secure_list[ICNSS_MSA_PERM_MAX] = {
		.nelems = 2,
		},

		[ICNSS_MSA_PERM_DUMP_COLLECT] = {
		.vmids = {VMID_MSS_MSA, VMID_WLAN, VMID_HLOS},
		.perms = {PERM_READ \| PERM_WRITE,
		PERM_READ \| PERM_WRITE,
		PERM_READ},
		.nelems = 3,
		},
		};

		struct icnss_msa_perm_list_t msa_perm_list[ICNSS_MSA_PERM_MAX] = {
		@@ -257,14 +249,6 @@ struct icnss_msa_perm_list_t msa_perm_list[ICNSS_MSA_PERM_MAX] = {
		.nelems = 3,
		},

		[ICNSS_MSA_PERM_DUMP_COLLECT] = {
		.vmids = {VMID_MSS_MSA, VMID_WLAN, VMID_WLAN_CE, VMID_HLOS},
		.perms = {PERM_READ \| PERM_WRITE,
		PERM_READ \| PERM_WRITE,
		PERM_READ \| PERM_WRITE,
		PERM_READ},
		.nelems = 4,
		},
		};

		struct icnss_event_pd_service_down_data {
		@@ -2491,9 +2475,10 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb,

		icnss_pr_vdbg("Modem-Notify: event %lu\n", code);

		if (code == SUBSYS_AFTER_SHUTDOWN) {
		if (code == SUBSYS_AFTER_SHUTDOWN &&
		notif->crashed != CRASH_STATUS_WDOG_BITE) {
		ret = icnss_assign_msa_perm_all(priv,
		ICNSS_MSA_PERM_DUMP_COLLECT);
		ICNSS_MSA_PERM_HLOS_ALL);
		if (!ret) {
		icnss_pr_info("Collecting msa0 segment dump\n");
		icnss_msa0_ramdump(priv);