Merge 09db99a15820955cef6ea396a39fc1ea1ad80fb7 on remote branch (6179691f) · Commits · e / devices / android_kernel_fairphone_FP5

config/dataipa_gsi_V1.h

+4 −1

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0-only */
		/*
		* Copyright (c) 2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
		*/

		#define CONFIG_GSI 1
		#define CONFIG_RMNET_IPA3 1
		#define CONFIG_RNDIS_IPA 1
		#define CONFIG_IPA_WDI_UNIFIED_API 1
		#define CONFIG_IPA3_REGDUMP 1
		#define CONFIG_IPA3_REGDUMP_IPA_4_1 1
		#define CONFIG_IPA3_REGDUMP_NUM_EXTRA_ENDP_REGS 0

config/dataipa_gsi_V1_GKI.conf

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,5 @@ export CONFIG_IPA_CLIENTS_MANAGER=m
		export CONFIG_IPA_WDI_UNIFIED_API=y
		export CONFIG_RMNET_IPA3=y
		export CONFIG_RNDIS_IPA=m
		export CONFIG_IPA3_REGDUMP=y
		export CONFIG_IPA3_REGDUMP_IPA_4_1=y

config/dataipa_gsi_V1_QGKI.conf

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,5 @@ export CONFIG_IPA_CLIENTS_MANAGER=y
		export CONFIG_IPA_WDI_UNIFIED_API=y
		export CONFIG_RMNET_IPA3=y
		export CONFIG_RNDIS_IPA=y
		export CONFIG_IPA3_REGDUMP=y
		export CONFIG_IPA3_REGDUMP_IPA_4_1=y

drivers/platform/msm/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,9 @@ ifneq (,$(filter $(CONFIG_IPA3_REGDUMP_IPA_4_5),y m))
		LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump/ipa4.5
		endif

		ifneq (,$(filter $(CONFIG_IPA3_REGDUMP_IPA_4_1),y m))
		LINUXINCLUDE += -I$(DATAIPADRVTOP)/ipa/ipa_v3/dump/ipa4.1
		endif

		obj-$(CONFIG_GSI) += gsi/
		obj-$(CONFIG_IPA3) += ipa/

drivers/platform/msm/gsi/gsi.c

+56 −4

Original line number	Diff line number	Diff line
		@@ -3652,6 +3652,7 @@ EXPORT_SYMBOL(gsi_query_channel_info);
		int gsi_is_channel_empty(unsigned long chan_hdl, bool *is_empty)
		{
		struct gsi_chan_ctx *ctx;
		struct gsi_evt_ctx *ev_ctx;
		spinlock_t *slock;
		unsigned long flags;
		uint64_t rp;
		@@ -3687,8 +3688,11 @@ int gsi_is_channel_empty(unsigned long chan_hdl, bool *is_empty)
		spin_lock_irqsave(slock, flags);

		if (ctx->props.dir == GSI_CHAN_DIR_FROM_GSI && ctx->evtr) {
		rp = gsi_readl(gsi_ctx->base +
		GSI_EE_n_EV_CH_k_CNTXT_4_OFFS(ctx->evtr->id, ee));
		ev_ctx = &gsi_ctx->evtr[ctx->evtr->id];
		/* Read the event ring rp from DDR to avoid mismatch */
		rp = ev_ctx->props.gsi_read_event_ring_rp(&ev_ctx->props,
		ev_ctx->id, ee);

		rp \|= ctx->evtr->ring.rp & 0xFFFFFFFF00000000;
		ctx->evtr->ring.rp = rp;

		@@ -4490,6 +4494,45 @@ void gsi_get_inst_ram_offset_and_size(unsigned long *base_offset,
		}
		EXPORT_SYMBOL(gsi_get_inst_ram_offset_and_size);

		/*
		* Dumping the Debug registers for halt issue debugging.
		*/
		static void gsi_dump_halt_debug_reg(unsigned int chan_idx, unsigned int ee)
		{
		uint32_t val;
		enum gsi_chan_state curr_state = GSI_CHAN_STATE_NOT_ALLOCATED;

		GSIERR("DEBUG_PC_FOR_DEBUG = 0x%x\n", gsi_readl(gsi_ctx->base +
		GSI_EE_n_GSI_DEBUG_PC_FOR_DEBUG_OFFS));

		GSIERR("GSI_DEBUG_BUSY_REG 0x%x\n",
		gsi_readl(gsi_ctx->base + GSI_EE_n_GSI_DEBUG_BUSY_REG_OFFS));

		GSIERR("GSI_EE_n_CNTXT_GLOB_IRQ_EN_OFFS = 0x%x\n",
		gsi_readl(gsi_ctx->base +
		GSI_EE_n_CNTXT_GLOB_IRQ_EN_OFFS(gsi_ctx->per.ee)));

		GSIERR("GSI_EE_n_CNTXT_GLOB_IRQ_STTS_OFFS IRQ type = 0x%x\n",
		gsi_readl(gsi_ctx->base +
		GSI_EE_n_CNTXT_GLOB_IRQ_STTS_OFFS(gsi_ctx->per.ee)));

		GSIERR("GSI_EE_n_CNTXT_SCRATCH_0_OFFS = 0x%x\n",
		gsi_readl(gsi_ctx->base +
		GSI_EE_n_CNTXT_SCRATCH_0_OFFS(gsi_ctx->per.ee)));

		if (gsi_ctx->per.ver >= GSI_VER_2_9)
		GSIERR("GSI_EE_n_GSI_CH_k_SCRATCH_4_OFFS = 0x%x\n",
		gsi_readl(gsi_ctx->base +
		GSI_EE_n_GSI_CH_k_SCRATCH_4_OFFS(chan_idx, ee)));

		val = gsi_readl(gsi_ctx->base +
		GSI_EE_n_GSI_CH_k_CNTXT_0_OFFS(chan_idx, ee));
		curr_state = (val &
		GSI_EE_n_GSI_CH_k_CNTXT_0_CHSTATE_BMSK) >>
		GSI_EE_n_GSI_CH_k_CNTXT_0_CHSTATE_SHFT;
		GSIERR("Q6 channel [%d] state = %d\n", chan_idx, curr_state);
		}

		int gsi_halt_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
		{
		enum gsi_generic_ee_cmd_opcode op = GSI_GEN_EE_CMD_HALT_CHANNEL;
		@@ -4544,9 +4587,18 @@ int gsi_halt_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
		}
		if (gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code == 0) {
		GSIERR("No response received\n");
		gsi_dump_halt_debug_reg(chan_idx, ee);
		usleep_range(GSI_RESET_WA_MIN_SLEEP, GSI_RESET_WA_MAX_SLEEP);
		GSIERR("Reading after usleep scratch 0 reg\n");
		gsi_ctx->scratch.word0.val = gsi_readl(gsi_ctx->base +
		GSI_EE_n_CNTXT_SCRATCH_0_OFFS(gsi_ctx->per.ee));
		if (gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code == 0) {
		GSIERR("No response received second attempt\n");
		gsi_dump_halt_debug_reg(chan_idx, ee);
		res = -GSI_STATUS_ERROR;
		goto free_lock;
		}
		}

		res = GSI_STATUS_SUCCESS;
		*code = gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code;