Commit aa07fd43 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: add "gsi_v4.11.c" 



The next patch adds a GSI register field that is only valid starting
at IPA v4.11.  Create "gsi_v4.11.c" from "gsi_v4.9.c", changing only
the name of the public regs structure it defines.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent edc6158b

drivers/net/ipa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
IPA_VERSIONS		:=	3.1 3.5.1 4.2 4.5 4.7 4.9 4.11



# Some IPA versions can reuse another set of GSI register definitions.

GSI_IPA_VERSIONS	:=	3.1 3.5.1 4.0 4.5 4.9

GSI_IPA_VERSIONS	:=	3.1 3.5.1 4.0 4.5 4.9 4.11



obj-$(CONFIG_QCOM_IPA)	+=	ipa.o

drivers/net/ipa/gsi_reg.c

+3 −1
Original line number Diff line number Diff line
@@ -111,9 +111,11 @@ static const struct regs *gsi_regs(struct gsi *gsi) 
		return &gsi_regs_v4_5;



	case IPA_VERSION_4_9:

	case IPA_VERSION_4_11:

		return &gsi_regs_v4_9;



	case IPA_VERSION_4_11:

		return &gsi_regs_v4_11;



	default:

		return NULL;

	}

drivers/net/ipa/gsi_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ extern const struct regs gsi_regs_v3_5_1; 
extern const struct regs gsi_regs_v4_0;

extern const struct regs gsi_regs_v4_5;

extern const struct regs gsi_regs_v4_9;

extern const struct regs gsi_regs_v4_11;



/**

 * gsi_reg() - Return the structure describing a GSI register

drivers/net/ipa/reg/gsi_reg-v4.11.c

0 → 100644
+251 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/* Copyright (C) 2023 Linaro Ltd. */



#include <linux/types.h>



#include "../gsi.h"

#include "../reg.h"

#include "../gsi_reg.h"



/* The inter-EE IRQ registers are relative to gsi->virt_raw (IPA v3.5+) */



REG(INTER_EE_SRC_CH_IRQ_MSK, inter_ee_src_ch_irq_msk,

    0x0000c020 + 0x1000 * GSI_EE_AP);



REG(INTER_EE_SRC_EV_CH_IRQ_MSK, inter_ee_src_ev_ch_irq_msk,

    0x0000c024 + 0x1000 * GSI_EE_AP);



/* All other register offsets are relative to gsi->virt */



static const u32 reg_ch_c_cntxt_0_fmask[] = {

	[CHTYPE_PROTOCOL]				= GENMASK(2, 0),

	[CHTYPE_DIR]					= BIT(3),

	[CH_EE]						= GENMASK(7, 4),

	[CHID]						= GENMASK(12, 8),

	[CHTYPE_PROTOCOL_MSB]				= BIT(13),

	[ERINDEX]					= GENMASK(18, 14),

						/* Bit 19 reserved */

	[CHSTATE]					= GENMASK(23, 20),

	[ELEMENT_SIZE]					= GENMASK(31, 24),

};



REG_STRIDE_FIELDS(CH_C_CNTXT_0, ch_c_cntxt_0,

		  0x0001c000 + 0x4000 * GSI_EE_AP, 0x80);



static const u32 reg_ch_c_cntxt_1_fmask[] = {

	[CH_R_LENGTH]					= GENMASK(19, 0),

						/* Bits 20-31 reserved */

};



REG_STRIDE_FIELDS(CH_C_CNTXT_1, ch_c_cntxt_1,

		  0x0001c004 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_CNTXT_2, ch_c_cntxt_2, 0x0001c008 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_CNTXT_3, ch_c_cntxt_3, 0x0001c00c + 0x4000 * GSI_EE_AP, 0x80);



static const u32 reg_ch_c_qos_fmask[] = {

	[WRR_WEIGHT]					= GENMASK(3, 0),

						/* Bits 4-7 reserved */

	[MAX_PREFETCH]					= BIT(8),

	[USE_DB_ENG]					= BIT(9),

	[PREFETCH_MODE]					= GENMASK(13, 10),

						/* Bits 14-15 reserved */

	[EMPTY_LVL_THRSHOLD]				= GENMASK(23, 16),

	[DB_IN_BYTES]					= BIT(24),

						/* Bits 25-31 reserved */

};



REG_STRIDE_FIELDS(CH_C_QOS, ch_c_qos, 0x0001c05c + 0x4000 * GSI_EE_AP, 0x80);



REG(ERROR_LOG, error_log, 0x0001f200 + 0x4000 * GSI_EE_AP);



REG(ERROR_LOG_CLR, error_log_clr, 0x0001f210 + 0x4000 * GSI_EE_AP);



REG_STRIDE(CH_C_SCRATCH_0, ch_c_scratch_0,

	   0x0001c060 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_SCRATCH_1, ch_c_scratch_1,

	   0x0001c064 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_SCRATCH_2, ch_c_scratch_2,

	   0x0001c068 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_SCRATCH_3, ch_c_scratch_3,

	   0x0001c06c + 0x4000 * GSI_EE_AP, 0x80);



static const u32 reg_ev_ch_e_cntxt_0_fmask[] = {

	[EV_CHTYPE]					= GENMASK(3, 0),

	[EV_EE]						= GENMASK(7, 4),

	[EV_EVCHID]					= GENMASK(15, 8),

	[EV_INTYPE]					= BIT(16),

						/* Bits 17-19 reserved */

	[EV_CHSTATE]					= GENMASK(23, 20),

	[EV_ELEMENT_SIZE]				= GENMASK(31, 24),

};



REG_STRIDE_FIELDS(EV_CH_E_CNTXT_0, ev_ch_e_cntxt_0,

		  0x0001d000 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_1, ev_ch_e_cntxt_1,

	   0x0001d004 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_2, ev_ch_e_cntxt_2,

	   0x0001d008 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_3, ev_ch_e_cntxt_3,

	   0x0001d00c + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_4, ev_ch_e_cntxt_4,

	   0x0001d010 + 0x4000 * GSI_EE_AP, 0x80);



static const u32 reg_ev_ch_e_cntxt_8_fmask[] = {

	[EV_MODT]					= GENMASK(15, 0),

	[EV_MODC]					= GENMASK(23, 16),

	[EV_MOD_CNT]					= GENMASK(31, 24),

};



REG_STRIDE_FIELDS(EV_CH_E_CNTXT_8, ev_ch_e_cntxt_8,

		  0x0001d020 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_9, ev_ch_e_cntxt_9,

	   0x0001d024 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_10, ev_ch_e_cntxt_10,

	   0x0001d028 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_11, ev_ch_e_cntxt_11,

	   0x0001d02c + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_12, ev_ch_e_cntxt_12,

	   0x0001d030 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_CNTXT_13, ev_ch_e_cntxt_13,

	   0x0001d034 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_SCRATCH_0, ev_ch_e_scratch_0,

	   0x0001d048 + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(EV_CH_E_SCRATCH_1, ev_ch_e_scratch_1,

	   0x0001d04c + 0x4000 * GSI_EE_AP, 0x80);



REG_STRIDE(CH_C_DOORBELL_0, ch_c_doorbell_0,

	   0x0001e000 + 0x4000 * GSI_EE_AP, 0x08);



REG_STRIDE(EV_CH_E_DOORBELL_0, ev_ch_e_doorbell_0,

	   0x0001e100 + 0x4000 * GSI_EE_AP, 0x08);



REG(GSI_STATUS, gsi_status, 0x0001f000 + 0x4000 * GSI_EE_AP);



REG(CH_CMD, ch_cmd, 0x0001f008 + 0x4000 * GSI_EE_AP);



REG(EV_CH_CMD, ev_ch_cmd, 0x0001f010 + 0x4000 * GSI_EE_AP);



REG(GENERIC_CMD, generic_cmd, 0x0001f018 + 0x4000 * GSI_EE_AP);



REG(HW_PARAM_2, hw_param_2, 0x0001f040 + 0x4000 * GSI_EE_AP);



REG(CNTXT_TYPE_IRQ, cntxt_type_irq, 0x0001f080 + 0x4000 * GSI_EE_AP);



REG(CNTXT_TYPE_IRQ_MSK, cntxt_type_irq_msk, 0x0001f088 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_CH_IRQ, cntxt_src_ch_irq, 0x0001f090 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_EV_CH_IRQ, cntxt_src_ev_ch_irq, 0x0001f094 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_CH_IRQ_MSK, cntxt_src_ch_irq_msk,

    0x0001f098 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_EV_CH_IRQ_MSK, cntxt_src_ev_ch_irq_msk,

    0x0001f09c + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_CH_IRQ_CLR, cntxt_src_ch_irq_clr,

    0x0001f0a0 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_EV_CH_IRQ_CLR, cntxt_src_ev_ch_irq_clr,

    0x0001f0a4 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_IEOB_IRQ, cntxt_src_ieob_irq, 0x0001f0b0 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_IEOB_IRQ_MSK, cntxt_src_ieob_irq_msk,

    0x0001f0b8 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SRC_IEOB_IRQ_CLR, cntxt_src_ieob_irq_clr,

    0x0001f0c0 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GLOB_IRQ_STTS, cntxt_glob_irq_stts, 0x0001f100 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GLOB_IRQ_EN, cntxt_glob_irq_en, 0x0001f108 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GLOB_IRQ_CLR, cntxt_glob_irq_clr, 0x0001f110 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GSI_IRQ_STTS, cntxt_gsi_irq_stts, 0x0001f118 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GSI_IRQ_EN, cntxt_gsi_irq_en, 0x0001f120 + 0x4000 * GSI_EE_AP);



REG(CNTXT_GSI_IRQ_CLR, cntxt_gsi_irq_clr, 0x0001f128 + 0x4000 * GSI_EE_AP);



REG(CNTXT_INTSET, cntxt_intset, 0x0001f180 + 0x4000 * GSI_EE_AP);



REG(CNTXT_SCRATCH_0, cntxt_scratch_0, 0x0001f400 + 0x4000 * GSI_EE_AP);



static const struct reg *reg_array[] = {

	[INTER_EE_SRC_CH_IRQ_MSK]	= &reg_inter_ee_src_ch_irq_msk,

	[INTER_EE_SRC_EV_CH_IRQ_MSK]	= &reg_inter_ee_src_ev_ch_irq_msk,

	[CH_C_CNTXT_0]			= &reg_ch_c_cntxt_0,

	[CH_C_CNTXT_1]			= &reg_ch_c_cntxt_1,

	[CH_C_CNTXT_2]			= &reg_ch_c_cntxt_2,

	[CH_C_CNTXT_3]			= &reg_ch_c_cntxt_3,

	[CH_C_QOS]			= &reg_ch_c_qos,

	[CH_C_SCRATCH_0]		= &reg_ch_c_scratch_0,

	[CH_C_SCRATCH_1]		= &reg_ch_c_scratch_1,

	[CH_C_SCRATCH_2]		= &reg_ch_c_scratch_2,

	[CH_C_SCRATCH_3]		= &reg_ch_c_scratch_3,

	[EV_CH_E_CNTXT_0]		= &reg_ev_ch_e_cntxt_0,

	[EV_CH_E_CNTXT_1]		= &reg_ev_ch_e_cntxt_1,

	[EV_CH_E_CNTXT_2]		= &reg_ev_ch_e_cntxt_2,

	[EV_CH_E_CNTXT_3]		= &reg_ev_ch_e_cntxt_3,

	[EV_CH_E_CNTXT_4]		= &reg_ev_ch_e_cntxt_4,

	[EV_CH_E_CNTXT_8]		= &reg_ev_ch_e_cntxt_8,

	[EV_CH_E_CNTXT_9]		= &reg_ev_ch_e_cntxt_9,

	[EV_CH_E_CNTXT_10]		= &reg_ev_ch_e_cntxt_10,

	[EV_CH_E_CNTXT_11]		= &reg_ev_ch_e_cntxt_11,

	[EV_CH_E_CNTXT_12]		= &reg_ev_ch_e_cntxt_12,

	[EV_CH_E_CNTXT_13]		= &reg_ev_ch_e_cntxt_13,

	[EV_CH_E_SCRATCH_0]		= &reg_ev_ch_e_scratch_0,

	[EV_CH_E_SCRATCH_1]		= &reg_ev_ch_e_scratch_1,

	[CH_C_DOORBELL_0]		= &reg_ch_c_doorbell_0,

	[EV_CH_E_DOORBELL_0]		= &reg_ev_ch_e_doorbell_0,

	[GSI_STATUS]			= &reg_gsi_status,

	[CH_CMD]			= &reg_ch_cmd,

	[EV_CH_CMD]			= &reg_ev_ch_cmd,

	[GENERIC_CMD]			= &reg_generic_cmd,

	[HW_PARAM_2]			= &reg_hw_param_2,

	[CNTXT_TYPE_IRQ]		= &reg_cntxt_type_irq,

	[CNTXT_TYPE_IRQ_MSK]		= &reg_cntxt_type_irq_msk,

	[CNTXT_SRC_CH_IRQ]		= &reg_cntxt_src_ch_irq,

	[CNTXT_SRC_EV_CH_IRQ]		= &reg_cntxt_src_ev_ch_irq,

	[CNTXT_SRC_CH_IRQ_MSK]		= &reg_cntxt_src_ch_irq_msk,

	[CNTXT_SRC_EV_CH_IRQ_MSK]	= &reg_cntxt_src_ev_ch_irq_msk,

	[CNTXT_SRC_CH_IRQ_CLR]		= &reg_cntxt_src_ch_irq_clr,

	[CNTXT_SRC_EV_CH_IRQ_CLR]	= &reg_cntxt_src_ev_ch_irq_clr,

	[CNTXT_SRC_IEOB_IRQ]		= &reg_cntxt_src_ieob_irq,

	[CNTXT_SRC_IEOB_IRQ_MSK]	= &reg_cntxt_src_ieob_irq_msk,

	[CNTXT_SRC_IEOB_IRQ_CLR]	= &reg_cntxt_src_ieob_irq_clr,

	[CNTXT_GLOB_IRQ_STTS]		= &reg_cntxt_glob_irq_stts,

	[CNTXT_GLOB_IRQ_EN]		= &reg_cntxt_glob_irq_en,

	[CNTXT_GLOB_IRQ_CLR]		= &reg_cntxt_glob_irq_clr,

	[CNTXT_GSI_IRQ_STTS]		= &reg_cntxt_gsi_irq_stts,

	[CNTXT_GSI_IRQ_EN]		= &reg_cntxt_gsi_irq_en,

	[CNTXT_GSI_IRQ_CLR]		= &reg_cntxt_gsi_irq_clr,

	[CNTXT_INTSET]			= &reg_cntxt_intset,

	[ERROR_LOG]			= &reg_error_log,

	[ERROR_LOG_CLR]			= &reg_error_log_clr,

	[CNTXT_SCRATCH_0]		= &reg_cntxt_scratch_0,

};



const struct regs gsi_regs_v4_11 = {

	.reg_count	= ARRAY_SIZE(reg_array),

	.reg		= reg_array,

};