]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
net: ipa: reverse logic on escape buffer use
authorAlex Elder <elder@linaro.org>
Wed, 25 Nov 2020 20:45:17 +0000 (14:45 -0600)
committerJakub Kicinski <kuba@kernel.org>
Sat, 28 Nov 2020 20:13:54 +0000 (12:13 -0800)
Starting with IPA v4.2 there is a GSI channel option to use an
"escape buffer" instead of prefetch buffers.  This should be used
for all channels *except* the AP command TX channel.  The logic
that implements this has it backwards; fix this bug.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ipa/gsi.c

index eb4c5d408a835b788f8d6a975e6a94d87aca7fa3..2cf10c9f0143de297d7a7e64a49ca456f17874f7 100644 (file)
@@ -781,8 +781,10 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell)
        if (gsi->version == IPA_VERSION_3_5_1 && doorbell)
                val |= USE_DB_ENG_FMASK;
 
-       /* Starting with IPA v4.0 the command channel uses the escape buffer */
-       if (gsi->version != IPA_VERSION_3_5_1 && channel->command)
+       /* v4.0 introduces an escape buffer for prefetch.  We use it
+        * on all but the AP command channel.
+        */
+       if (gsi->version != IPA_VERSION_3_5_1 && !channel->command)
                val |= USE_ESCAPE_BUF_ONLY_FMASK;
 
        iowrite32(val, gsi->virt + GSI_CH_C_QOS_OFFSET(channel_id));