]> git.sur5r.net Git - u-boot/blobdiff - drivers/net/fsl-mc/dpni.c
cfi_flash: Fix whitespace with casting
[u-boot] / drivers / net / fsl-mc / dpni.c
index 41bf56abf5b19c0a773c344d5094f07ed43ff796..481f9d882b0f647539d60da0cf8641496c12f7b1 100644 (file)
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2013-2015 Freescale Semiconductor
+ * Copyright (C) 2013-2016 Freescale Semiconductor
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -8,22 +9,22 @@
 #include <fsl-mc/fsl_mc_cmd.h>
 #include <fsl-mc/fsl_dpni.h>
 
-int dpni_prepare_extended_cfg(const struct dpni_extended_cfg   *cfg,
-                             uint8_t                   *ext_cfg_buf)
+int dpni_prepare_cfg(const struct dpni_cfg     *cfg,
+                    uint8_t                    *cfg_buf)
 {
-       uint64_t *ext_params = (uint64_t *)ext_cfg_buf;
+       uint64_t *params = (uint64_t *)cfg_buf;
 
-       DPNI_PREP_EXTENDED_CFG(ext_params, cfg);
+       DPNI_PREP_CFG(params, cfg);
 
        return 0;
 }
 
-int dpni_extract_extended_cfg(struct dpni_extended_cfg *cfg,
-                             const uint8_t             *ext_cfg_buf)
+int dpni_extract_cfg(struct dpni_cfg   *cfg,
+                    const uint8_t      *cfg_buf)
 {
-       uint64_t *ext_params = (uint64_t *)ext_cfg_buf;
+       uint64_t *params = (uint64_t *)cfg_buf;
 
-       DPNI_EXT_EXTENDED_CFG(ext_params, cfg);
+       DPNI_EXT_CFG(params, cfg);
 
        return 0;
 }
@@ -69,9 +70,10 @@ int dpni_close(struct fsl_mc_io *mc_io,
 }
 
 int dpni_create(struct fsl_mc_io *mc_io,
+               uint16_t dprc_token,
                uint32_t cmd_flags,
                const struct dpni_cfg *cfg,
-               uint16_t *token)
+               uint32_t *obj_id)
 {
        struct mc_command cmd = { 0 };
        int err;
@@ -79,7 +81,7 @@ int dpni_create(struct fsl_mc_io *mc_io,
        /* prepare command */
        cmd.header = mc_encode_cmd_header(DPNI_CMDID_CREATE,
                                          cmd_flags,
-                                         0);
+                                         dprc_token);
        DPNI_CMD_CREATE(cmd, cfg);
 
        /* send command to mc*/
@@ -88,21 +90,25 @@ int dpni_create(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       *token = MC_CMD_HDR_READ_TOKEN(cmd.header);
+        MC_CMD_READ_OBJ_ID(cmd, *obj_id);
 
        return 0;
 }
 
 int dpni_destroy(struct fsl_mc_io *mc_io,
+                uint16_t dprc_token,
                 uint32_t cmd_flags,
-                uint16_t token)
+                uint32_t obj_id)
 {
        struct mc_command cmd = { 0 };
 
        /* prepare command */
        cmd.header = mc_encode_cmd_header(DPNI_CMDID_DESTROY,
                                          cmd_flags,
-                                         token);
+                                         dprc_token);
+
+       /* set object id to destroy */
+       CMD_DESTROY_SET_OBJ_ID_PARAM0(cmd, obj_id);
 
        /* send command to mc*/
        return mc_send_command(mc_io, &cmd);
@@ -182,8 +188,6 @@ int dpni_get_attributes(struct fsl_mc_io *mc_io,
        cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_ATTR,
                                          cmd_flags,
                                          token);
-       DPNI_CMD_GET_ATTR(cmd, attr);
-
        /* send command to mc*/
        err = mc_send_command(mc_io, &cmd);
        if (err)
@@ -212,124 +216,19 @@ int dpni_set_errors_behavior(struct fsl_mc_io *mc_io,
        return mc_send_command(mc_io, &cmd);
 }
 
-int dpni_get_rx_buffer_layout(struct fsl_mc_io *mc_io,
-                             uint32_t cmd_flags,
-                             uint16_t token,
-                             struct dpni_buffer_layout *layout)
-{
-       struct mc_command cmd = { 0 };
-       int err;
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_RX_BUFFER_LAYOUT,
-                                         cmd_flags,
-                                         token);
-
-       /* send command to mc*/
-       err = mc_send_command(mc_io, &cmd);
-       if (err)
-               return err;
-
-       /* retrieve response parameters */
-       DPNI_RSP_GET_RX_BUFFER_LAYOUT(cmd, layout);
-
-       return 0;
-}
-
-int dpni_set_rx_buffer_layout(struct fsl_mc_io *mc_io,
-                             uint32_t cmd_flags,
-                             uint16_t token,
-                             const struct dpni_buffer_layout *layout)
+int dpni_set_buffer_layout(struct fsl_mc_io *mc_io,
+                          uint32_t cmd_flags,
+                          uint16_t token,
+                          const struct dpni_buffer_layout *layout,
+                          enum dpni_queue_type type)
 {
        struct mc_command cmd = { 0 };
 
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_RX_BUFFER_LAYOUT,
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_BUFFER_LAYOUT,
                                          cmd_flags,
                                          token);
-       DPNI_CMD_SET_RX_BUFFER_LAYOUT(cmd, layout);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
-int dpni_get_tx_buffer_layout(struct fsl_mc_io *mc_io,
-                             uint32_t cmd_flags,
-                             uint16_t token,
-                             struct dpni_buffer_layout *layout)
-{
-       struct mc_command cmd = { 0 };
-       int err;
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_TX_BUFFER_LAYOUT,
-                                         cmd_flags,
-                                         token);
-
-       /* send command to mc*/
-       err = mc_send_command(mc_io, &cmd);
-       if (err)
-               return err;
-
-       /* retrieve response parameters */
-       DPNI_RSP_GET_TX_BUFFER_LAYOUT(cmd, layout);
-
-       return 0;
-}
-
-int dpni_set_tx_buffer_layout(struct fsl_mc_io *mc_io,
-                             uint32_t cmd_flags,
-                             uint16_t token,
-                             const struct dpni_buffer_layout *layout)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_BUFFER_LAYOUT,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_SET_TX_BUFFER_LAYOUT(cmd, layout);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
-int dpni_get_tx_conf_buffer_layout(struct fsl_mc_io *mc_io,
-                                  uint32_t cmd_flags,
-                                  uint16_t token,
-                                  struct dpni_buffer_layout *layout)
-{
-       struct mc_command cmd = { 0 };
-       int err;
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_TX_CONF_BUFFER_LAYOUT,
-                                         cmd_flags,
-                                         token);
-
-       /* send command to mc*/
-       err = mc_send_command(mc_io, &cmd);
-       if (err)
-               return err;
-
-       /* retrieve response parameters */
-       DPNI_RSP_GET_TX_CONF_BUFFER_LAYOUT(cmd, layout);
-
-       return 0;
-}
-
-int dpni_set_tx_conf_buffer_layout(struct fsl_mc_io *mc_io,
-                                  uint32_t cmd_flags,
-                                  uint16_t token,
-                                  const struct dpni_buffer_layout *layout)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_CONF_BUFFER_LAYOUT,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_SET_TX_CONF_BUFFER_LAYOUT(cmd, layout);
+       DPNI_CMD_SET_BUFFER_LAYOUT(cmd, layout, type);
 
        /* send command to mc*/
        return mc_send_command(mc_io, &cmd);
@@ -383,50 +282,6 @@ int dpni_get_tx_data_offset(struct fsl_mc_io *mc_io,
        return 0;
 }
 
-int dpni_get_counter(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    enum dpni_counter counter,
-                    uint64_t *value)
-{
-       struct mc_command cmd = { 0 };
-       int err;
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_COUNTER,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_GET_COUNTER(cmd, counter);
-
-       /* send command to mc*/
-       err = mc_send_command(mc_io, &cmd);
-       if (err)
-               return err;
-
-       /* retrieve response parameters */
-       DPNI_RSP_GET_COUNTER(cmd, *value);
-
-       return 0;
-}
-
-int dpni_set_counter(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    enum dpni_counter counter,
-                    uint64_t value)
-{
-       struct mc_command cmd = { 0 };
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_COUNTER,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_SET_COUNTER(cmd, counter, value);
-
-       /* send command to mc*/
-       return mc_send_command(mc_io, &cmd);
-}
-
 int dpni_set_link_cfg(struct fsl_mc_io *mc_io,
                      uint32_t cmd_flags,
                      uint16_t token,
@@ -544,46 +399,64 @@ int dpni_remove_mac_addr(struct fsl_mc_io *mc_io,
        return mc_send_command(mc_io, &cmd);
 }
 
-int dpni_set_tx_flow(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    uint16_t *flow_id,
-                    const struct dpni_tx_flow_cfg *cfg)
+int dpni_get_api_version(struct fsl_mc_io *mc_io,
+                        u32 cmd_flags,
+                        u16 *major_ver,
+                        u16 *minor_ver)
 {
        struct mc_command cmd = { 0 };
        int err;
 
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_FLOW,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_SET_TX_FLOW(cmd, *flow_id, cfg);
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_API_VERSION,
+                                         cmd_flags, 0);
 
-       /* send command to mc*/
+       /* send command to mc */
        err = mc_send_command(mc_io, &cmd);
        if (err)
                return err;
 
        /* retrieve response parameters */
-       DPNI_RSP_SET_TX_FLOW(cmd, *flow_id);
+       mc_cmd_read_api_version(&cmd, major_ver, minor_ver);
 
        return 0;
 }
 
-int dpni_get_tx_flow(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    uint16_t flow_id,
-                    struct dpni_tx_flow_attr *attr)
+int dpni_set_queue(struct fsl_mc_io *mc_io,
+       uint32_t cmd_flags,
+       uint16_t token,
+       enum dpni_queue_type type,
+       uint8_t tc,
+       uint8_t index,
+       const struct dpni_queue *queue)
+{
+       struct mc_command cmd = { 0 };
+       /* prepare command */
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_QUEUE,
+                                         cmd_flags,
+                                         token);
+       DPNI_CMD_SET_QUEUE(cmd, type, tc, index, queue);
+
+       /* send command to mc*/
+       return mc_send_command(mc_io, &cmd);
+}
+
+int dpni_get_queue(struct fsl_mc_io *mc_io,
+       uint32_t cmd_flags,
+       uint16_t token,
+       enum dpni_queue_type type,
+       uint8_t tc,
+       uint8_t index,
+       struct dpni_queue *queue)
 {
        struct mc_command cmd = { 0 };
        int err;
 
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_TX_FLOW,
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_QUEUE,
                                          cmd_flags,
                                          token);
-       DPNI_CMD_GET_TX_FLOW(cmd, flow_id);
+       DPNI_CMD_GET_QUEUE(cmd, type, tc, index);
 
        /* send command to mc*/
        err = mc_send_command(mc_io, &cmd);
@@ -591,44 +464,43 @@ int dpni_get_tx_flow(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       DPNI_RSP_GET_TX_FLOW(cmd, attr);
-
+       DPNI_RSP_GET_QUEUE(cmd, queue);
        return 0;
 }
 
-int dpni_set_rx_flow(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    uint8_t tc_id,
-                    uint16_t flow_id,
-                    const struct dpni_queue_cfg *cfg)
+int dpni_set_tx_confirmation_mode(struct fsl_mc_io *mc_io,
+       uint32_t cmd_flags,
+       uint16_t token,
+       enum dpni_confirmation_mode mode)
 {
+       struct dpni_tx_confirmation_mode *cmd_params;
        struct mc_command cmd = { 0 };
 
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_RX_FLOW,
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_CONFIRMATION_MODE,
                                          cmd_flags,
                                          token);
-       DPNI_CMD_SET_RX_FLOW(cmd, tc_id, flow_id, cfg);
+
+       cmd_params = (struct dpni_tx_confirmation_mode *)cmd.params;
+       cmd_params->confirmation_mode = mode;
 
        /* send command to mc*/
        return mc_send_command(mc_io, &cmd);
 }
 
-int dpni_get_rx_flow(struct fsl_mc_io *mc_io,
-                    uint32_t cmd_flags,
-                    uint16_t token,
-                    uint8_t tc_id,
-                    uint16_t flow_id,
-                    struct dpni_queue_attr *attr)
+int dpni_get_statistics(struct fsl_mc_io *mc_io,
+                       uint32_t cmd_flags,
+                       uint16_t token,
+                       uint8_t  page,
+                       struct dpni_statistics *stat)
 {
        struct mc_command cmd = { 0 };
        int err;
+
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_RX_FLOW,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_GET_RX_FLOW(cmd, tc_id, flow_id);
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_STATISTICS,
+                                         cmd_flags, token);
+       DPNI_CMD_GET_STATISTICS(cmd, page);
 
        /* send command to mc*/
        err = mc_send_command(mc_io, &cmd);
@@ -636,50 +508,22 @@ int dpni_get_rx_flow(struct fsl_mc_io *mc_io,
                return err;
 
        /* retrieve response parameters */
-       DPNI_RSP_GET_RX_FLOW(cmd, attr);
+       DPNI_RSP_GET_STATISTICS(cmd, stat);
 
        return 0;
 }
 
-int dpni_set_tx_conf(struct fsl_mc_io  *mc_io,
-                    uint32_t           cmd_flags,
-                    uint16_t           token,
-                    uint16_t           flow_id,
-                    const struct dpni_tx_conf_cfg      *cfg)
+int dpni_reset_statistics(struct fsl_mc_io *mc_io,
+                         uint32_t cmd_flags,
+                         uint16_t token)
 {
        struct mc_command cmd = { 0 };
 
        /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_CONF,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_SET_TX_CONF(cmd, flow_id, cfg);
+       cmd.header = mc_encode_cmd_header(DPNI_CMDID_RESET_STATISTICS,
+                                         cmd_flags, token);
 
        /* send command to mc*/
        return mc_send_command(mc_io, &cmd);
 }
 
-int dpni_get_tx_conf(struct fsl_mc_io          *mc_io,
-                    uint32_t                   cmd_flags,
-                    uint16_t                   token,
-                    uint16_t                   flow_id,
-                    struct dpni_tx_conf_attr   *attr)
-{
-       struct mc_command cmd = { 0 };
-       int err;
-
-       /* prepare command */
-       cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_TX_CONF,
-                                         cmd_flags,
-                                         token);
-       DPNI_CMD_GET_TX_CONF(cmd, flow_id);
-
-       /* send command to mc*/
-       err = mc_send_command(mc_io, &cmd);
-       if (err)
-               return err;
-
-       DPNI_RSP_GET_TX_CONF(cmd, attr);
-
-       return 0;
-}