Skip to content

Commit ed4c7d6

Browse files
Alex Elderkuba-moo
authored andcommitted
net: ipa: add IPA v5.0 register definitions
Add the definitions of IPA register offsets and fields for IPA v5.0. These are used for the SDX65 SoC. In the Makefile, split IPA_VERSIONS to use IPA_REG_VERSIONS and IPA_DATA_VERSIONS instead, to allow IPA register definitions for a new version to be added separate from the IPA data. Rename GSI_IPA_VERSIONS to be GSI_REG_VERSIONS for consistency. Signed-off-by: Alex Elder <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 6e4a93b commit ed4c7d6

File tree

4 files changed

+574
-5
lines changed

4 files changed

+574
-5
lines changed

drivers/net/ipa/Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
#
33
# Makefile for the Qualcomm IPA driver.
44

5-
IPA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11
5+
IPA_REG_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0
66

77
# Some IPA versions can reuse another set of GSI register definitions.
8-
GSI_IPA_VERSIONS := 3.1 3.5.1 4.0 4.5 4.9 4.11
8+
GSI_REG_VERSIONS := 3.1 3.5.1 4.0 4.5 4.9 4.11
9+
10+
IPA_DATA_VERSIONS := 3.1 3.5.1 4.2 4.5 4.7 4.9 4.11
911

1012
obj-$(CONFIG_QCOM_IPA) += ipa.o
1113

@@ -16,8 +18,8 @@ ipa-y := ipa_main.o ipa_power.o ipa_reg.o ipa_mem.o \
1618
ipa_resource.o ipa_qmi.o ipa_qmi_msg.o \
1719
ipa_sysfs.o
1820

19-
ipa-y += $(GSI_IPA_VERSIONS:%=reg/gsi_reg-v%.o)
21+
ipa-y += $(IPA_REG_VERSIONS:%=reg/ipa_reg-v%.o)
2022

21-
ipa-y += $(IPA_VERSIONS:%=reg/ipa_reg-v%.o)
23+
ipa-y += $(GSI_REG_VERSIONS:%=reg/gsi_reg-v%.o)
2224

23-
ipa-y += $(IPA_VERSIONS:%=data/ipa_data-v%.o)
25+
ipa-y += $(IPA_DATA_VERSIONS:%=data/ipa_data-v%.o)

drivers/net/ipa/ipa_reg.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ static const struct regs *ipa_regs(enum ipa_version version)
123123
return &ipa_regs_v4_9;
124124
case IPA_VERSION_4_11:
125125
return &ipa_regs_v4_11;
126+
case IPA_VERSION_5_0:
127+
return &ipa_regs_v5_0;
126128
default:
127129
return NULL;
128130
}

drivers/net/ipa/ipa_reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ extern const struct regs ipa_regs_v4_5;
636636
extern const struct regs ipa_regs_v4_7;
637637
extern const struct regs ipa_regs_v4_9;
638638
extern const struct regs ipa_regs_v4_11;
639+
extern const struct regs ipa_regs_v5_0;
639640

640641
const struct reg *ipa_reg(struct ipa *ipa, enum ipa_reg_id reg_id);
641642

0 commit comments

Comments
 (0)