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

Commit 6781c6af authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa4: Endpoint configuration and IPA driver changes for lito"

parents 9bbc49ca 68c83617

drivers/platform/msm/gsi/gsi.c

+18 −0
Original line number Diff line number Diff line
@@ -857,6 +857,13 @@ static uint32_t gsi_get_max_channels(enum gsi_ver ver) 
			GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK) >>

			GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT;

		break;

	case GSI_VER_2_7:

		reg = gsi_readl(gsi_ctx->base +

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		reg = (reg &

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK) >>

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT;

		break;

	}



	GSIDBG("max channels %d\n", reg);
@@ -914,6 +921,13 @@ static uint32_t gsi_get_max_event_rings(enum gsi_ver ver) 
			GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK) >>

			GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT;

		break;

	case GSI_VER_2_7:

		reg = gsi_readl(gsi_ctx->base +

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_OFFS(gsi_ctx->per.ee));

		reg = (reg &

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK) >>

			GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT;

		break;

	}



	GSIDBG("max event rings %d\n", reg);
@@ -1038,6 +1052,7 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl) 
		needed_reg_ver = GSI_REGISTER_VER_1;

		break;

	case GSI_VER_2_5:

	case GSI_VER_2_7:

		needed_reg_ver = GSI_REGISTER_VER_2;

		break;

	case GSI_VER_ERR:
@@ -3973,6 +3988,9 @@ void gsi_get_inst_ram_offset_and_size(unsigned long *base_offset, 
	case GSI_VER_2_5:

		maxn = GSI_V2_5_GSI_INST_RAM_n_MAXn;

		break;

	case GSI_VER_2_7:

		maxn = GSI_V2_7_GSI_INST_RAM_n_MAXn;

		break;

	case GSI_VER_ERR:

	case GSI_VER_MAX:

	default:

drivers/platform/msm/gsi/gsi_reg_v1.h

+36 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 */



#ifndef __GSI_REG_V1_H__
@@ -441,6 +441,8 @@ 
#define GSI_V2_0_GSI_INST_RAM_n_MAXn 6143

#define GSI_V2_2_GSI_INST_RAM_n_MAXn 4095

#define GSI_V2_5_GSI_INST_RAM_n_MAXn 8191

#define GSI_V2_7_GSI_INST_RAM_n_MAXn 5119



#define GSI_GSI_INST_RAM_n_INST_BYTE_3_BMSK 0xff000000

#define GSI_GSI_INST_RAM_n_INST_BYTE_3_SHFT 0x18

#define GSI_GSI_INST_RAM_n_INST_BYTE_2_BMSK 0xff0000
@@ -1060,4 +1062,37 @@ 
#define GSI_V2_5_GSI_MAP_EE_n_CH_k_VP_TABLE_PHY_CH_BMSK 0x1f

#define GSI_V2_5_GSI_MAP_EE_n_CH_k_VP_TABLE_PHY_CH_SHFT 0x0



#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_OFFS(n) \

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

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_INTER_EE_BMSK 0x8000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_INTER_EE_SHFT 0xf

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_RD_WR_ENG_BMSK 0x4000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_RD_WR_ENG_SHFT 0xE

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_RMSK 0x7fff

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_MAXn 2

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_BMSK 0x38000000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_SHFT 0x1b

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_BMSK 0x7F80000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_SHFT 0x13

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_BMSK 0x70000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_SHFT 0x10

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_BMSK 0x8000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_SHFT 0xf

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_BMSK 0x4000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_SHFT 0xe

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_BMSK 0x2000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_SHFT 0xd

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK 0x1f00

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT 0x8

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK 0xf8

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT 0x3

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_BMSK 0x7

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_SHFT 0x0

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_ONE_KB_FVAL 0x0

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_KB_FVAL 0x1

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_N_HALF_KB_FVAL 0x2

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_KB_FVAL 0x3

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_N_HALF_KB_FVAL 0x4

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_FOUR_KB_FVAL 0x5



#endif /* __GSI_REG_V1_H__ */

drivers/platform/msm/gsi/gsi_reg_v2.h

+37 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 */



#ifndef __GSI_REG_V2_H__
@@ -441,6 +441,8 @@ 
#define GSI_V2_0_GSI_INST_RAM_n_MAXn 6143

#define GSI_V2_2_GSI_INST_RAM_n_MAXn 4095

#define GSI_V2_5_GSI_INST_RAM_n_MAXn 8191

#define GSI_V2_7_GSI_INST_RAM_n_MAXn 5119



#define GSI_GSI_INST_RAM_n_INST_BYTE_3_BMSK 0xff000000

#define GSI_GSI_INST_RAM_n_INST_BYTE_3_SHFT 0x18

#define GSI_GSI_INST_RAM_n_INST_BYTE_2_BMSK 0xff0000
@@ -848,6 +850,40 @@ 
#define GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_N_HALF_KB_FVAL 0x4

#define GSI_V2_5_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_FOUR_KB_FVAL 0x5





#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_OFFS(n) \

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

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_INTER_EE_BMSK 0x8000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_INTER_EE_SHFT 0xf

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_RD_WR_ENG_BMSK 0x4000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_RD_WR_ENG_SHFT 0xE

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_RMSK 0x7fff

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_MAXn 2

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_BMSK 0x38000000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_IOVEC_SHFT 0x1b

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_BMSK 0x7F80000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_MAX_BURST_SHFT 0x13

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_BMSK 0x70000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_SDMA_N_INT_SHFT 0x10

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_BMSK 0x8000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_USE_SDMA_SHFT 0xf

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_BMSK 0x4000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_FULL_LOGIC_SHFT 0xe

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_BMSK 0x2000

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_CH_PEND_TRANSLATE_SHFT 0xd

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_BMSK 0x1f00

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_EV_PER_EE_SHFT 0x8

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_BMSK 0xf8

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_NUM_CH_PER_EE_SHFT 0x3

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_BMSK 0x7

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_SHFT 0x0

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_ONE_KB_FVAL 0x0

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_KB_FVAL 0x1

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_TWO_N_HALF_KB_FVAL 0x2

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_KB_FVAL 0x3

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_THREE_N_HALF_KB_FVAL 0x4

#define GSI_V2_7_EE_n_GSI_HW_PARAM_2_GSI_IRAM_SIZE_FOUR_KB_FVAL 0x5



#define GSI_EE_n_GSI_SW_VERSION_OFFS(n) \

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

#define GSI_EE_n_GSI_SW_VERSION_MAJOR_BMSK 0xf0000000

drivers/platform/msm/ipa/ipa_api.c

+4 −0
Original line number Diff line number Diff line
@@ -2930,6 +2930,9 @@ const char *ipa_get_version_string(enum ipa_hw_type ver) 
	case IPA_HW_v4_5:

		str = "4.5";

		break;

	case IPA_HW_v4_7:

		str = "4.7";

		break;

	default:

		str = "Invalid version";

		break;
@@ -3039,6 +3042,7 @@ static int ipa_generic_plat_drv_probe(struct platform_device *pdev_p) 
	case IPA_HW_v4_1:

	case IPA_HW_v4_2:

	case IPA_HW_v4_5:

	case IPA_HW_v4_7:

		result = ipa3_plat_drv_probe(pdev_p, ipa_api_ctrl,

			ipa_plat_drv_match);

		break;

drivers/platform/msm/ipa/ipa_v3/ipa.c

+3 −0
Original line number Diff line number Diff line
@@ -4463,6 +4463,9 @@ static enum gsi_ver ipa3_get_gsi_ver(enum ipa_hw_type ipa_hw_type) 
	case IPA_HW_v4_5:

		gsi_ver = GSI_VER_2_5;

		break;

	case IPA_HW_v4_7:

		gsi_ver = GSI_VER_2_7;

		break;

	default:

		IPAERR("No GSI version for ipa type %d\n", ipa_hw_type);

		WARN_ON(1);