net: ipa: expose IPA version to the GSI layer

Although GSI is integral to IPA, it is a separate hardware component
and the IPA code supporting it has been structured to avoid explicit
dependence on IPA details.  An example of this is that gsi_init() is
passed a number of Boolean flags to indicate special behaviors,
whose values are dependent on the IPA hardware version.  Looking
ahead, newer hardware versions would require even more such special
behaviors.

For any given version of IPA hardware (like 3.5.1 or 4.2), the GSI
hardware version is fixed (in this case, 1.3 and 2.2, respectively).
So the IPA version *implies* the GSI version, and the IPA version
can be used as effectively the equivalent of the GSI hardware version.

Rather than proliferating new special behavior flags, just provide
the IPA version to the GSI layer when it is initialized.  The GSI
code can then use that directly to determine whether special
behaviors are required.  The IPA version enumerated type is already
isolated to its own header file, so the exposure of this IPA detail
is very limited.

For now, just change gsi_init() to pass the version rather than the
Boolean flags, and set the flag values internal to that function.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index 6bfac1efe037cac26b54337f9017fc1ee075de77..1e19160281dd35dcf2b6e96bfb903ef97d8d9dc3 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -21,6 +21,7 @@
 #include "gsi_trans.h"
 #include "ipa_gsi.h"
 #include "ipa_data.h"
+#include "ipa_version.h"
 
 /**
  * DOC: The IPA Generic Software Interface
@@ -1952,18 +1953,25 @@ static void gsi_channel_exit(struct gsi *gsi)
 }
 
 /* Init function for GSI.  GSI hardware does not need to be "ready" */
-int gsi_init(struct gsi *gsi, struct platform_device *pdev, bool prefetch,
-            u32 count, const struct ipa_gsi_endpoint_data *data,
-            bool modem_alloc)
+int gsi_init(struct gsi *gsi, struct platform_device *pdev,
+            enum ipa_version version, u32 count,
+            const struct ipa_gsi_endpoint_data *data)
 {
        struct device *dev = &pdev->dev;
        struct resource *res;
        resource_size_t size;
        unsigned int irq;
+       bool modem_alloc;
+       bool prefetch;
        int ret;
 
        gsi_validate_build();
 
+       /* IPA v4.0+ (GSI v2.0+) uses prefetch for the command channel */
+       prefetch = version != IPA_VERSION_3_5_1;
+       /* IPA v4.2 requires the AP to allocate channels for the modem */
+       modem_alloc = version == IPA_VERSION_4_2;
+
        gsi->dev = dev;
 
        /* The GSI layer performs NAPI on all endpoints.  NAPI requires a

diff --git a/drivers/net/ipa/gsi.h b/drivers/net/ipa/gsi.h
index 3f9f29d531c431f43161a8671aa608c0bd1418bc..2dd8ee78aa8c78390c25ca9a58c11e021f16b492 100644 (file)
--- a/drivers/net/ipa/gsi.h
+++ b/drivers/net/ipa/gsi.h
@@ -20,6 +20,8 @@
 /* Maximum TLV FIFO size for a channel; 64 here is arbitrary (and high) */
 #define GSI_TLV_MAX            64
 
+enum ipa_version;
+
 struct device;
 struct scatterlist;
 struct platform_device;
@@ -236,15 +238,18 @@ int gsi_channel_resume(struct gsi *gsi, u32 channel_id, bool start);
  * gsi_init() - Initialize the GSI subsystem
  * @gsi:       Address of GSI structure embedded in an IPA structure
  * @pdev:      IPA platform device
+ * @version:   IPA hardware version (implies GSI version)
+ * @count:     Number of entries in the configuration data array
+ * @data:      Endpoint and channel configuration data
  *
  * Return:     0 if successful, or a negative error code
  *
  * Early stage initialization of the GSI subsystem, performing tasks
  * that can be done before the GSI hardware is ready to use.
  */
-int gsi_init(struct gsi *gsi, struct platform_device *pdev, bool prefetch,
-            u32 count, const struct ipa_gsi_endpoint_data *data,
-            bool modem_alloc);
+int gsi_init(struct gsi *gsi, struct platform_device *pdev,
+            enum ipa_version version, u32 count,
+            const struct ipa_gsi_endpoint_data *data);
 
 /**
  * gsi_exit() - Exit the GSI subsystem

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index f4dd14d9550fe3a417fa126095a77f6a5f36d7bd..0d3d1a5cf07c17c2e1f673fed59918c283f37168 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -723,10 +723,8 @@ static int ipa_probe(struct platform_device *pdev)
        const struct ipa_data *data;
        struct ipa_clock *clock;
        struct rproc *rproc;
-       bool modem_alloc;
        bool modem_init;
        struct ipa *ipa;
-       bool prefetch;
        phandle ph;
        int ret;
 
@@ -788,13 +786,8 @@ static int ipa_probe(struct platform_device *pdev)
        if (ret)
                goto err_reg_exit;
 
-       /* GSI v2.0+ (IPA v4.0+) uses prefetch for the command channel */
-       prefetch = ipa->version != IPA_VERSION_3_5_1;
-       /* IPA v4.2 requires the AP to allocate channels for the modem */
-       modem_alloc = ipa->version == IPA_VERSION_4_2;
-
-       ret = gsi_init(&ipa->gsi, pdev, prefetch, data->endpoint_count,
-                      data->endpoint_data, modem_alloc);
+       ret = gsi_init(&ipa->gsi, pdev, ipa->version, data->endpoint_count,
+                      data->endpoint_data);
        if (ret)
                goto err_mem_exit;