firmware: tisci: Drop all deprecated messages

SYSFW v2020.01 and later versions no longer supports the below messages:
- TI_SCI_MSG_RM_RING_GET_CFG
- TISCI_MSG_RM_UDMAP_TX_CH_GET_CFG   0x1206
- TISCI_MSG_RM_UDMAP_RX_CH_GET_CFG   0x1216
- TISCI_MSG_RM_UDMAP_FLOW_GET_CFG        0x1232
- TISCI_MSG_RM_UDMAP_FLOW_SIZE_THRESH_GET_CFG    0x1233

There are no users in U-Boot for any of the above messages, So drop the
support for all the corresponding messages.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 99b2e5dfed41ef03c74b49a42ff5fc1fc835e299..c3f95b252f24f3969d7cf5838e6304f7fe36c805 100644 (file)
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -2364,82 +2364,6 @@ fail:
        return ret;
 }
 
-/**
- * ti_sci_cmd_ring_get_config() - get RA ring configuration
- * @handle:    pointer to TI SCI handle
- * @nav_id: Device ID of Navigator Subsystem from which the ring is allocated
- * @index: Ring index.
- * @addr_lo: returns ring's base address lo 32 bits
- * @addr_hi: returns ring's base address hi 32 bits
- * @count: returns number of ring elements.
- * @mode: returns mode of the ring
- * @size: returns ring element size.
- * @order_id: returns ring's bus order ID.
- *
- * Return: 0 if all went well, else returns appropriate error value.
- *
- * See @ti_sci_msg_rm_ring_get_cfg_req for more info.
- */
-static int ti_sci_cmd_ring_get_config(const struct ti_sci_handle *handle,
-                                     u32 nav_id, u32 index, u8 *mode,
-                                     u32 *addr_lo, u32 *addr_hi,
-                                     u32 *count, u8 *size, u8 *order_id)
-{
-       struct ti_sci_msg_rm_ring_get_cfg_resp *resp;
-       struct ti_sci_msg_rm_ring_get_cfg_req req;
-       struct ti_sci_xfer *xfer;
-       struct ti_sci_info *info;
-       int ret = 0;
-
-       if (IS_ERR(handle))
-               return PTR_ERR(handle);
-       if (!handle)
-               return -EINVAL;
-
-       info = handle_to_ti_sci_info(handle);
-
-       xfer = ti_sci_setup_one_xfer(info, TI_SCI_MSG_RM_RING_GET_CFG,
-                                    TI_SCI_FLAG_REQ_ACK_ON_PROCESSED,
-                                    (u32 *)&req, sizeof(req), sizeof(*resp));
-       if (IS_ERR(xfer)) {
-               ret = PTR_ERR(xfer);
-               dev_err(info->dev,
-                       "RM_RA:Message get config failed(%d)\n", ret);
-               return ret;
-       }
-       req.nav_id = nav_id;
-       req.index = index;
-
-       ret = ti_sci_do_xfer(info, xfer);
-       if (ret) {
-               dev_err(info->dev, "RM_RA:Mbox get config send fail %d\n", ret);
-               goto fail;
-       }
-
-       resp = (struct ti_sci_msg_rm_ring_get_cfg_resp *)xfer->tx_message.buf;
-
-       if (!ti_sci_is_response_ack(resp)) {
-               ret = -ENODEV;
-       } else {
-               if (mode)
-                       *mode = resp->mode;
-               if (addr_lo)
-                       *addr_lo = resp->addr_lo;
-               if (addr_hi)
-                       *addr_hi = resp->addr_hi;
-               if (count)
-                       *count = resp->count;
-               if (size)
-                       *size = resp->size;
-               if (order_id)
-                       *order_id = resp->order_id;
-       };
-
-fail:
-       dev_dbg(info->dev, "RM_RA:get config ring %u ret:%d\n", index, ret);
-       return ret;
-}
-
 static int ti_sci_cmd_rm_psil_pair(const struct ti_sci_handle *handle,
                                   u32 nav_id, u32 src_thread, u32 dst_thread)
 {
@@ -2948,7 +2872,6 @@ static void ti_sci_setup_ops(struct ti_sci_info *info)
        pops->proc_shutdown_no_wait = ti_sci_cmd_proc_shutdown_no_wait;
 
        rops->config = ti_sci_cmd_ring_config;
-       rops->get_config = ti_sci_cmd_ring_get_config;
 
        psilops->pair = ti_sci_cmd_rm_psil_pair;
        psilops->unpair = ti_sci_cmd_rm_psil_unpair;

diff --git a/drivers/firmware/ti_sci.h b/drivers/firmware/ti_sci.h
index 69ff74d6a95476b75fd84e531f0246fc38655e02..24b4d1c7948a7b6ba2a4970d7f68aa3cc95c5cd3 100644 (file)
--- a/drivers/firmware/ti_sci.h
+++ b/drivers/firmware/ti_sci.h
@@ -58,7 +58,6 @@
 /* NAVSS resource management */
 /* Ringacc requests */
 #define TI_SCI_MSG_RM_RING_CFG                 0x1110
-#define TI_SCI_MSG_RM_RING_GET_CFG             0x1111
 
 /* PSI-L requests */
 #define TI_SCI_MSG_RM_PSIL_PAIR                        0x1280
@@ -72,13 +71,9 @@
 #define TI_SCI_MSG_RM_UDMAP_OPT_FLOW_CFG       0x1221
 
 #define TISCI_MSG_RM_UDMAP_TX_CH_CFG           0x1205
-#define TISCI_MSG_RM_UDMAP_TX_CH_GET_CFG       0x1206
 #define TISCI_MSG_RM_UDMAP_RX_CH_CFG           0x1215
-#define TISCI_MSG_RM_UDMAP_RX_CH_GET_CFG       0x1216
 #define TISCI_MSG_RM_UDMAP_FLOW_CFG            0x1230
 #define TISCI_MSG_RM_UDMAP_FLOW_SIZE_THRESH_CFG        0x1231
-#define TISCI_MSG_RM_UDMAP_FLOW_GET_CFG                0x1232
-#define TISCI_MSG_RM_UDMAP_FLOW_SIZE_THRESH_GET_CFG    0x1233
 
 #define TISCI_MSG_FWL_SET              0x9000
 #define TISCI_MSG_FWL_GET              0x9001

diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h
index 1cba8d9b790406231089a41daac28254ee3acbde..8c4863efe19167c019e539b77cf2856bab119e92 100644 (file)
--- a/include/linux/soc/ti/ti_sci_protocol.h
+++ b/include/linux/soc/ti/ti_sci_protocol.h
@@ -327,8 +327,6 @@ struct ti_sci_proc_ops {
 /**
  * struct ti_sci_rm_ringacc_ops - Ring Accelerator Management operations
  * @config: configure the SoC Navigator Subsystem Ring Accelerator ring
- * @get_config: get the SoC Navigator Subsystem Ring Accelerator ring
- *             configuration
  */
 struct ti_sci_rm_ringacc_ops {
        int (*config)(const struct ti_sci_handle *handle,
@@ -336,10 +334,6 @@ struct ti_sci_rm_ringacc_ops {
                      u32 addr_lo, u32 addr_hi, u32 count, u8 mode,
                      u8 size, u8 order_id
        );
-       int (*get_config)(const struct ti_sci_handle *handle,
-                         u32 nav_id, u32 index, u8 *mode,
-                         u32 *addr_lo, u32 *addr_hi, u32 *count,
-                         u8 *size, u8 *order_id);
 };
 
 /**