net: ipa: store BCR register values in config data

The backward compatibility register value is a platform-specific
property that is not stored in the platform data.  Create a data
field where this can be represented, and get rid ipa_reg_bcr_val().

This register is not present starting with IPA v4.5.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c
index c9b6a6aaadacc6448333923798fbc6ef0885090c..810c673be56eea92c31b9875536f8d45adb97349 100644 (file)
--- a/drivers/net/ipa/ipa_data-sc7180.c
+++ b/drivers/net/ipa/ipa_data-sc7180.c
@@ -349,6 +349,7 @@ static const struct ipa_clock_data ipa_clock_data = {
 /* Configuration data for the SC7180 SoC. */
 const struct ipa_data ipa_data_sc7180 = {
        .version        = IPA_VERSION_4_2,
+       /* backward_compat value is 0 */
        .qsb_count      = ARRAY_SIZE(ipa_qsb_data),
        .qsb_data       = ipa_qsb_data,
        .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data),

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index e14e3fb1d970041d51c668d7d6cfa05b25b6c54d..49a18b1047c583bbae3324a89ec4a124271b4c29 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -397,6 +397,11 @@ static const struct ipa_clock_data ipa_clock_data = {
 /* Configuration data for the SDM845 SoC. */
 const struct ipa_data ipa_data_sdm845 = {
        .version        = IPA_VERSION_3_5_1,
+       .backward_compat = BCR_CMDQ_L_LACK_ONE_ENTRY_FMASK |
+                          BCR_TX_NOT_USING_BRESP_FMASK |
+                          BCR_SUSPEND_L2_IRQ_FMASK |
+                          BCR_HOLB_DROP_L2_IRQ_FMASK |
+                          BCR_DUAL_TX_FMASK,
        .qsb_count      = ARRAY_SIZE(ipa_qsb_data),
        .qsb_data       = ipa_qsb_data,
        .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data),

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index ea8f99286228edc2255ffb7684fb101a7be48cb9..843d818f78e181a0dbbf4a0869cd26166cb4f232 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -279,6 +279,7 @@ struct ipa_clock_data {
 /**
  * struct ipa_data - combined IPA/GSI configuration data
  * @version:           IPA hardware version
+ * @backward_compat:   BCR register value (prior to IPA v4.5 only)
  * @qsb_count:         number of entries in the qsb_data array
  * @qsb_data:          Qualcomm System Bus configuration data
  * @endpoint_count:    number of entries in the endpoint_data array
@@ -289,6 +290,7 @@ struct ipa_clock_data {
  */
 struct ipa_data {
        enum ipa_version version;
+       u32 backward_compat;
        u32 qsb_count;          /* number of entries in qsb_data[] */
        const struct ipa_qsb_data *qsb_data;
        u32 endpoint_count;     /* number of entries in endpoint_data[] */

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index e18029152d780cdae002494dd9fba9485088d394..afb8eb5618f73ba3e15650a063dc03a893e1bfa1 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -397,9 +397,9 @@ static void ipa_hardware_config(struct ipa *ipa, const struct ipa_data *data)
        u32 granularity;
        u32 val;
 
-       /* IPA v4.5 has no backward compatibility register */
+       /* IPA v4.5+ has no backward compatibility register */
        if (version < IPA_VERSION_4_5) {
-               val = ipa_reg_bcr_val(version);
+               val = data->backward_compat;
                iowrite32(val, ipa->reg_virt + IPA_REG_BCR_OFFSET);
        }
 

diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h
index de2a944bad86b34d5f38f98c80cbcb33e90e289d..286ea9634c49d3925947b67ff03942006e7e2267 100644 (file)
--- a/drivers/net/ipa/ipa_reg.h
+++ b/drivers/net/ipa/ipa_reg.h
@@ -235,27 +235,6 @@ static inline u32 ipa_reg_state_aggr_active_offset(enum ipa_version version)
 #define BCR_FILTER_PREFETCH_EN_FMASK           GENMASK(8, 8)
 #define BCR_ROUTER_PREFETCH_EN_FMASK           GENMASK(9, 9)
 
-/* Backward compatibility register value to use for each version */
-static inline u32 ipa_reg_bcr_val(enum ipa_version version)
-{
-       if (version == IPA_VERSION_3_5_1)
-               return BCR_CMDQ_L_LACK_ONE_ENTRY_FMASK |
-                       BCR_TX_NOT_USING_BRESP_FMASK |
-                       BCR_SUSPEND_L2_IRQ_FMASK |
-                       BCR_HOLB_DROP_L2_IRQ_FMASK |
-                       BCR_DUAL_TX_FMASK;
-
-       if (version == IPA_VERSION_4_0 || version == IPA_VERSION_4_1)
-               return BCR_CMDQ_L_LACK_ONE_ENTRY_FMASK |
-                       BCR_SUSPEND_L2_IRQ_FMASK |
-                       BCR_HOLB_DROP_L2_IRQ_FMASK |
-                       BCR_DUAL_TX_FMASK;
-
-       /* assert(version != IPA_VERSION_4_5); */
-
-       return 0x00000000;
-}
-
 /* The value of the next register must be a multiple of 8 (bottom 3 bits 0) */
 #define IPA_REG_LOCAL_PKT_PROC_CNTXT_OFFSET            0x000001e8