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

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

Merge "msm: ipa: gsi 2.0 upgrade" into msm-4.9

parents 6ccbd873 8522e21b

drivers/platform/msm/gsi/gsi.c

+14 −0
Original line number Diff line number Diff line
@@ -649,6 +649,13 @@ static uint32_t gsi_get_max_channels(enum gsi_ver ver) 
			GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK) >>

			GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT;

		break;

	case GSI_VER_2_0:

		reg = gsi_readl(gsi_ctx->base +

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		reg = (reg &

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK) >>

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT;

		break;

	default:

		GSIERR("bad gsi version %d\n", ver);

		WARN_ON(1);
@@ -684,6 +691,13 @@ static uint32_t gsi_get_max_event_rings(enum gsi_ver ver) 
			GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK) >>

			GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT;

		break;

	case GSI_VER_2_0:

		reg = gsi_readl(gsi_ctx->base +

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		reg = (reg &

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK) >>

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT;

		break;

	default:

		GSIERR("bad gsi version %d\n", ver);

		WARN_ON(1);

drivers/platform/msm/gsi/gsi_dbg.c

+10 −0
Original line number Diff line number Diff line
@@ -293,6 +293,16 @@ static ssize_t gsi_dump_ee(struct file *file, 
		val = gsi_readl(gsi_ctx->base +

			GSI_V1_3_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		TERR("EE%2d HW_PARAM_2 0x%x\n", gsi_ctx->per.ee, val);

	} else if (gsi_ctx->per.ver == GSI_VER_2_0) {

		val = gsi_readl(gsi_ctx->base +

			GSI_V1_3_EE_n_GSI_HW_PARAM_0_OFFS(gsi_ctx->per.ee));

		TERR("EE%2d HW_PARAM_0 0x%x\n", gsi_ctx->per.ee, val);

		val = gsi_readl(gsi_ctx->base +

			GSI_V1_3_EE_n_GSI_HW_PARAM_1_OFFS(gsi_ctx->per.ee));

		TERR("EE%2d HW_PARAM_1 0x%x\n", gsi_ctx->per.ee, val);

		val = gsi_readl(gsi_ctx->base +

			GSI_V2_0_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		TERR("EE%2d HW_PARAM_2 0x%x\n", gsi_ctx->per.ee, val);

	} else {

		WARN_ON(1);

	}

drivers/platform/msm/gsi/gsi_reg.h

+28 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,34 @@ 
#define GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_ONE_KB_FVAL 0x0

#define GSI_V1_3_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_KB_FVAL 0x1



/* v2.0 */

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_OFFS(n) \

	(GSI_GSI_REG_BASE_OFFS + 0x0001f040 + 0x4000 * (n))

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_RMSK 0x7fff

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_MAXn 2

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_BMSK 0x38000000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_SHFT 0x1b

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_BMSK 0x7F80000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_SHFT 0x13

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_BMSK 0x70000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_SHFT 0x10

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_BMSK 0x8000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_SHFT 0xf

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_BMSK 0x4000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_SHFT 0xe

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_BMSK 0x2000

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_SHFT 0xd

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK 0x1f00

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT 0x8

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK 0xf8

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT 0x3

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_BMSK 0x7

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_SHFT 0x0

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_ONE_KB_FVAL 0x0

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_KB_FVAL 0x1

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_N_HALF_KB_FVAL 0x2

#define GSI_V2_0_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_KB_FVAL 0x3



#define GSI_EE_n_GSI_SW_VERSION_OFFS(n) \

	(GSI_GSI_REG_BASE_OFFS + 0x0001f044 + 0x4000 * (n))

#define GSI_EE_n_GSI_SW_VERSION_RMSK 0xffffffff

include/linux/msm_gsi.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ enum gsi_ver { 
	GSI_VER_1_0 = 1,

	GSI_VER_1_2 = 2,

	GSI_VER_1_3 = 3,

	GSI_VER_2_0 = 4,

	GSI_VER_MAX,

};