Skip to content

Commit 1bfeafa

Browse files
Alex Elderdavem330
authored andcommitted
net: ipa: add IPA v5.5 register definitions
GSI register definitions for IPA v5.5 are the same as those used for IPA v5.0. Update ipa_reg_id_valid() to reflect that IPA v5.0+ supports source and destination resource groups 4 through 7. Add the definitions of IPA register offsets and fields for IPA v5.5. Signed-off-by: Alex Elder <elder@linaro.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b00e190 commit 1bfeafa

File tree

5 files changed

+572
-3
lines changed

5 files changed

+572
-3
lines changed

drivers/net/ipa/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for the Qualcomm IPA driver.
44

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

77
# Some IPA versions can reuse another set of GSI register definitions.
88
GSI_REG_VERSIONS := 3.1 3.5.1 4.0 4.5 4.9 4.11 5.0

drivers/net/ipa/gsi_reg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ static const struct regs *gsi_regs(struct gsi *gsi)
110110
return &gsi_regs_v4_11;
111111

112112
case IPA_VERSION_5_0:
113+
case IPA_VERSION_5_5:
113114
return &gsi_regs_v5_0;
114115

115116
default:

drivers/net/ipa/ipa_reg.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ static bool ipa_reg_id_valid(struct ipa *ipa, enum ipa_reg_id reg_id)
4444
case DST_RSRC_GRP_45_RSRC_TYPE:
4545
return version <= IPA_VERSION_3_1 ||
4646
version == IPA_VERSION_4_5 ||
47-
version == IPA_VERSION_5_0;
47+
version >= IPA_VERSION_5_0;
4848

4949
case SRC_RSRC_GRP_67_RSRC_TYPE:
5050
case DST_RSRC_GRP_67_RSRC_TYPE:
5151
return version <= IPA_VERSION_3_1 ||
52-
version == IPA_VERSION_5_0;
52+
version >= IPA_VERSION_5_0;
5353

5454
case ENDP_FILTER_ROUTER_HSH_CFG:
5555
return version < IPA_VERSION_5_0 &&
@@ -125,6 +125,8 @@ static const struct regs *ipa_regs(enum ipa_version version)
125125
return &ipa_regs_v4_11;
126126
case IPA_VERSION_5_0:
127127
return &ipa_regs_v5_0;
128+
case IPA_VERSION_5_5:
129+
return &ipa_regs_v5_5;
128130
default:
129131
return NULL;
130132
}

drivers/net/ipa/ipa_reg.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,7 @@ extern const struct regs ipa_regs_v4_7;
639639
extern const struct regs ipa_regs_v4_9;
640640
extern const struct regs ipa_regs_v4_11;
641641
extern const struct regs ipa_regs_v5_0;
642+
extern const struct regs ipa_regs_v5_5;
642643

643644
const struct reg *ipa_reg(struct ipa *ipa, enum ipa_reg_id reg_id);
644645

0 commit comments

Comments
 (0)