net: add rte prefix to ether functions

[dpdk.git] / drivers / net / atlantic / hw_atl / hw_atl_utils_fw2x.c

diff --git a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
index 89a3759..70d6e14 100644 (file)
--- a/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
+++ b/drivers/net/atlantic/hw_atl/hw_atl_utils_fw2x.c
@@ -34,7 +34,6 @@
 #define HAL_ATLANTIC_WOL_FILTERS_COUNT     8
 #define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL    0x0E
 
-#define HW_ATL_FW_FEATURE_EEPROM 0x03010025
 #define HW_ATL_FW_FEATURE_LED 0x03010026
 
 struct fw2x_msg_wol_pattern {
@@ -229,8 +228,8 @@ int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)
                mac_addr[1] = rte_constant_bswap32(mac_addr[1]);
        }
 
-       ether_addr_copy((struct ether_addr *)mac_addr,
-                       (struct ether_addr *)mac);
+       rte_ether_addr_copy((struct rte_ether_addr *)mac_addr,
+                       (struct rte_ether_addr *)mac);
 
        if ((mac[0] & 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {
                unsigned int rnd = (uint32_t)rte_rand();
@@ -473,7 +472,15 @@ static int aq_fw2x_get_eee_rate(struct aq_hw_s *self, u32 *rate,
        return err;
 }
 
+static int aq_fw2x_get_flow_control(struct aq_hw_s *self, u32 *fc)
+{
+       u32 mpi_state = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);
 
+       *fc = ((mpi_state & BIT(CAPS_HI_PAUSE)) ? AQ_NIC_FC_RX : 0) |
+             ((mpi_state & BIT(CAPS_HI_ASYMMETRIC_PAUSE)) ? AQ_NIC_FC_TX : 0);
+
+       return 0;
+}
 
 static int aq_fw2x_set_flow_control(struct aq_hw_s *self)
 {
@@ -498,14 +505,17 @@ static int aq_fw2x_led_control(struct aq_hw_s *self, u32 mode)
 static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr,
                              u32 *data, u32 len, u32 offset)
 {
-       int err = 0;
-       struct smbus_read_request request;
-       u32 mpi_opts;
+       u32 bytes_remains = len % sizeof(u32);
+       u32 num_dwords = len / sizeof(u32);
+       struct smbus_request request;
        u32 result = 0;
+       u32 mpi_opts;
+       int err = 0;
 
-       if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM)
+       if ((self->caps_lo & BIT(CAPS_LO_SMBUS_READ)) == 0)
                return -EOPNOTSUPP;
 
+       request.msg_id = 0;
        request.device_id = dev_addr;
        request.address = offset;
        request.length = len;
@@ -540,34 +550,33 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr,
        if (err < 0)
                return err;
 
-       if (result == 0) {
-               u32 num_dwords = len / sizeof(u32);
-               u32 bytes_remains = len % sizeof(u32);
+       if (result)
+               return -EIO;
 
-               if (num_dwords) {
-                       err = hw_atl_utils_fw_downld_dwords(self,
-                               self->rpc_addr + sizeof(u32) * 2,
-                               data,
-                               num_dwords);
+       if (num_dwords) {
+               err = hw_atl_utils_fw_downld_dwords(self,
+                       self->rpc_addr + sizeof(u32) * 2,
+                       data,
+                       num_dwords);
 
-                       if (err < 0)
-                               return err;
-               }
+               if (err < 0)
+                       return err;
+       }
 
-               if (bytes_remains) {
-                       u32 val = 0;
+       if (bytes_remains) {
+               u32 val = 0;
 
-                       err = hw_atl_utils_fw_downld_dwords(self,
-                               self->rpc_addr + sizeof(u32) * 2 + num_dwords,
-                               &val,
-                               sizeof(u32));
+               err = hw_atl_utils_fw_downld_dwords(self,
+                       self->rpc_addr + (sizeof(u32) * 2) +
+                       (num_dwords * sizeof(u32)),
+                       &val,
+                       1);
 
-                       if (err < 0)
-                               return err;
+               if (err < 0)
+                       return err;
 
-                       rte_memcpy((u8 *)data + len - bytes_remains,
-                                  &val, bytes_remains);
-               }
+               rte_memcpy((u8 *)data + len - bytes_remains,
+                               &val, bytes_remains);
        }
 
        return 0;
@@ -575,17 +584,18 @@ static int aq_fw2x_get_eeprom(struct aq_hw_s *self, int dev_addr,
 
 
 static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr,
-                             u32 *data, u32 len)
+                             u32 *data, u32 len, u32 offset)
 {
-       struct smbus_write_request request;
+       struct smbus_request request;
        u32 mpi_opts, result = 0;
        int err = 0;
 
-       if (self->fw_ver_actual < HW_ATL_FW_FEATURE_EEPROM)
+       if ((self->caps_lo & BIT(CAPS_LO_SMBUS_WRITE)) == 0)
                return -EOPNOTSUPP;
 
+       request.msg_id = 0;
        request.device_id = dev_addr;
-       request.address = 0;
+       request.address = offset;
        request.length = len;
 
        /* Write SMBUS request to cfg memory */
@@ -597,13 +607,34 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr,
                return err;
 
        /* Write SMBUS data to cfg memory */
-       err = hw_atl_utils_fw_upload_dwords(self,
-                               self->rpc_addr + sizeof(request),
-                               (u32 *)(void *)data,
-                               RTE_ALIGN(len, sizeof(u32)));
+       u32 num_dwords = len / sizeof(u32);
+       u32 bytes_remains = len % sizeof(u32);
 
-       if (err < 0)
-               return err;
+       if (num_dwords) {
+               err = hw_atl_utils_fw_upload_dwords(self,
+                       self->rpc_addr + sizeof(request),
+                       (u32 *)(void *)data,
+                       num_dwords);
+
+               if (err < 0)
+                       return err;
+       }
+
+       if (bytes_remains) {
+               u32 val = 0;
+
+               rte_memcpy(&val, (u8 *)data + (sizeof(u32) * num_dwords),
+                          bytes_remains);
+
+               err = hw_atl_utils_fw_upload_dwords(self,
+                       self->rpc_addr + sizeof(request) +
+                       (num_dwords * sizeof(u32)),
+                       &val,
+                       1);
+
+               if (err < 0)
+                       return err;
+       }
 
        /* Toggle 0x368.CAPS_LO_SMBUS_WRITE bit */
        mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL_ADDR);
@@ -627,6 +658,9 @@ static int aq_fw2x_set_eeprom(struct aq_hw_s *self, int dev_addr,
        if (err < 0)
                return err;
 
+       if (result)
+               return -EIO;
+
        return 0;
 }
 
@@ -637,7 +671,7 @@ static int aq_fw2x_send_macsec_request(struct aq_hw_s *self,
        int err = 0;
        u32 mpi_opts = 0;
 
-       if (!response || !response)
+       if (!req || !response)
                return 0;
 
        if ((self->caps_lo & BIT(CAPS_LO_MACSEC)) == 0)
@@ -687,6 +721,7 @@ const struct aq_fw_ops aq_fw_2x_ops = {
        .get_cable_len = aq_fw2x_get_cable_len,
        .set_eee_rate = aq_fw2x_set_eee_rate,
        .get_eee_rate = aq_fw2x_get_eee_rate,
+       .get_flow_control = aq_fw2x_get_flow_control,
        .set_flow_control = aq_fw2x_set_flow_control,
        .led_control = aq_fw2x_led_control,
        .get_eeprom = aq_fw2x_get_eeprom,