net: ipa: greater timer granularity options

Starting with IPA v5.0, the head-of-line blocking timer has more
than two pulse generators available to define timer granularity.
To prepare for that, change the way the field value is encoded
to use ipa_reg_encode() rather than ipa_reg_bit().

The aggregation granularity selection could (in principle) also use
an additional pulse generator starting with IPA v5.0.  Encode the
AGGR_GRAN_SEL field differently to allow that as well.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 8909ba8bfd0e902680d209763d8bd944644cb518..c029209191d41c2e8a821067078f491a6fab1426 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -965,7 +965,7 @@ static u32 aggr_time_limit_encode(struct ipa *ipa, const struct ipa_reg *reg,
                ret = ipa_qtime_val(microseconds, max);
                if (ret < 0) {
                        val = -ret;
-                       gran_sel = ipa_reg_bit(reg, AGGR_GRAN_SEL);
+                       gran_sel = ipa_reg_encode(reg, AGGR_GRAN_SEL, 1);
                } else {
                        val = ret;
                        gran_sel = 0;
@@ -1057,7 +1057,7 @@ static u32 hol_block_timer_encode(struct ipa *ipa, const struct ipa_reg *reg,
                ret = ipa_qtime_val(microseconds, max);
                if (ret < 0) {
                        val = -ret;
-                       gran_sel = ipa_reg_bit(reg, TIMER_GRAN_SEL);
+                       gran_sel = ipa_reg_encode(reg, TIMER_GRAN_SEL, 1);
                } else {
                        val = ret;
                        gran_sel = 0;