net: ipa: introduce ipa_cmd_init()

Currently, ipa_cmd_data_valid() is called by ipa_mem_config().
Nothing it does requires access to hardware though, so it can be
done during the init phase of IPA driver startup.

Create a new function ipa_cmd_init(), whose purpose is to do early
initialization related to IPA immediate commands.  It will call the
build-time validation function, then will make the two calls made
previously by ipa_cmd_data_valid().  This make ipa_cmd_data_valid()
unnecessary, so get rid of it.

Rename ipa_cmd_header_valid() to be ipa_cmd_header_init_local_valid(),
so its name is clearer about which IPA immediate command it is
associated with.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c
index abee6cc018a27ce544c52450b3f290900dc4fcf6..de2cd86aa9e28424294a9dabfe7a1cb92c82efd9 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.c
+++ b/drivers/net/ipa/ipa_cmd.c
@@ -202,7 +202,7 @@ bool ipa_cmd_table_init_valid(struct ipa *ipa, const struct ipa_mem *mem,
 }
 
 /* Validate the memory region that holds headers */
-static bool ipa_cmd_header_valid(struct ipa *ipa)
+static bool ipa_cmd_header_init_local_valid(struct ipa *ipa)
 {
        struct device *dev = &ipa->pdev->dev;
        const struct ipa_mem *mem;
@@ -318,26 +318,11 @@ static bool ipa_cmd_register_write_valid(struct ipa *ipa)
        return true;
 }
 
-bool ipa_cmd_data_valid(struct ipa *ipa)
-{
-       if (!ipa_cmd_header_valid(ipa))
-               return false;
-
-       if (!ipa_cmd_register_write_valid(ipa))
-               return false;
-
-       return true;
-}
-
-
 int ipa_cmd_pool_init(struct gsi_channel *channel, u32 tre_max)
 {
        struct gsi_trans_info *trans_info = &channel->trans_info;
        struct device *dev = channel->gsi->dev;
 
-       /* This is as good a place as any to validate build constants */
-       ipa_cmd_validate_build();
-
        /* Command payloads are allocated one at a time, but a single
         * transaction can require up to the maximum supported by the
         * channel; treat them as if they were allocated all at once.
@@ -637,3 +622,17 @@ struct gsi_trans *ipa_cmd_trans_alloc(struct ipa *ipa, u32 tre_count)
        return gsi_channel_trans_alloc(&ipa->gsi, endpoint->channel_id,
                                       tre_count, DMA_NONE);
 }
+
+/* Init function for immediate commands; there is no ipa_cmd_exit() */
+int ipa_cmd_init(struct ipa *ipa)
+{
+       ipa_cmd_validate_build();
+
+       if (!ipa_cmd_header_init_local_valid(ipa))
+               return -EINVAL;
+
+       if (!ipa_cmd_register_write_valid(ipa))
+               return -EINVAL;
+
+       return 0;
+}

diff --git a/drivers/net/ipa/ipa_cmd.h b/drivers/net/ipa/ipa_cmd.h
index d03cc619e2c319c8a81ea9345baab716763fbf09..e2cf1c2b0ef2411ef09551c205934d330e7fde5c 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.h
+++ b/drivers/net/ipa/ipa_cmd.h
@@ -162,4 +162,14 @@ void ipa_cmd_pipeline_clear_wait(struct ipa *ipa);
  */
 struct gsi_trans *ipa_cmd_trans_alloc(struct ipa *ipa, u32 tre_count);
 
+/**
+ * ipa_cmd_init() - Initialize IPA immediate commands
+ * @ipa:       - IPA pointer
+ *
+ * Return:     0 if successful, or a negative error code
+ *
+ * There is no need for a matching ipa_cmd_exit() function.
+ */
+int ipa_cmd_init(struct ipa *ipa);
+
 #endif /* _IPA_CMD_H_ */

diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c
index f84c6830495a4c295489300b8edbdc0aa93a4dbb..2238dac2af07ee4930ba25a66630f05b5ab20067 100644 (file)
--- a/drivers/net/ipa/ipa_mem.c
+++ b/drivers/net/ipa/ipa_mem.c
@@ -370,10 +370,6 @@ int ipa_mem_config(struct ipa *ipa)
        if (!ipa_table_valid(ipa))
                goto err_dma_free;
 
-       /* Validate memory-related properties relevant to immediate commands */
-       if (!ipa_cmd_data_valid(ipa))
-               goto err_dma_free;
-
        /* Verify the microcontroller ring alignment (if defined) */
        mem = ipa_mem_find(ipa, IPA_MEM_UC_EVENT_RING);
        if (mem && mem->offset % 1024) {