net: aquantia: Introduce global AQC hardware reset sequence

BugLink: https://bugs.launchpad.net/bugs/1759303
The detailed reset sequence ensures all HW components are in aligned
state before NIC startup. It also supports cards with signed firmware (RBL)
and checks if their FW is valid.

Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c8c82eb387abcfa9a362f3e75106a9d2c7d2b67f)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index 51b55694a1f6b0e66d9add8d9a5962d61fee4ef9..a2d416b24ffc251c71d002a9befe825d5c585fbc 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -100,6 +100,7 @@ struct aq_stats_s {
 
 struct aq_hw_s {
        atomic_t flags;
+       u8 rbl_enabled:1;
        struct aq_nic_cfg_s *aq_nic_cfg;
        const struct aq_fw_ops *aq_fw_ops;
        void __iomem *mmio;

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 29abbc2588c6d638afc94b38e8780131b397cb74..819f6bcf9b4ee76e620691ae3861a1fad213eca9 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -87,32 +87,14 @@ static int hw_atl_b0_hw_reset(struct aq_hw_s *self)
 {
        int err = 0;
 
-       hw_atl_glb_glb_reg_res_dis_set(self, 1U);
-       hw_atl_pci_pci_reg_res_dis_set(self, 0U);
-       hw_atl_rx_rx_reg_res_dis_set(self, 0U);
-       hw_atl_tx_tx_reg_res_dis_set(self, 0U);
-
-       HW_ATL_FLUSH();
-       hw_atl_glb_soft_res_set(self, 1);
-
-       /* check 10 times by 1ms */
-       AQ_HW_WAIT_FOR(hw_atl_glb_soft_res_get(self) == 0, 1000U, 10U);
-       if (err < 0)
-               goto err_exit;
-
-       hw_atl_itr_irq_reg_res_dis_set(self, 0U);
-       hw_atl_itr_res_irq_set(self, 1U);
-
-       /* check 10 times by 1ms */
-       AQ_HW_WAIT_FOR(hw_atl_itr_res_irq_get(self) == 0, 1000U, 10U);
-       if (err < 0)
-               goto err_exit;
+       err = hw_atl_utils_soft_reset(self);
+       if (err)
+               return err;
 
        self->aq_fw_ops->set_state(self, MPI_RESET);
 
        err = aq_hw_err_from_flags(self);
 
-err_exit:
        return err;
 }
 

diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
index 56fb048c4ddc7ead9a6f4d6e93f4e27fbe8dca1c..967f0fd07fcf2d5c377476b6feabba9e9b4f1eac 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
@@ -31,32 +31,45 @@
 #define HW_ATL_MPI_SPEED_MSK    0xFFFF0000U
 #define HW_ATL_MPI_SPEED_SHIFT  16U
 
+#define HW_ATL_MPI_DAISY_CHAIN_STATUS  0x704
+#define HW_ATL_MPI_BOOT_EXIT_CODE      0x388
+
+#define HW_ATL_MAC_PHY_CONTROL 0x4000
+#define HW_ATL_MAC_PHY_MPI_RESET_BIT 0x1D
+
 #define HW_ATL_FW_VER_1X 0x01050006U
 #define HW_ATL_FW_VER_2X 0x02000000U
 #define HW_ATL_FW_VER_3X 0x03000000U
 
+#define FORCE_FLASHLESS 0
+
 static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);
 
 int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
 {
        int err = 0;
 
+       err = hw_atl_utils_soft_reset(self);
+       if (err)
+               return err;
+
        hw_atl_utils_hw_chip_features_init(self,
                                           &self->chip_features);
 
        hw_atl_utils_get_fw_version(self, &self->fw_ver_actual);
 
-       if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X, self->fw_ver_actual) == 0)
+       if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,
+                                  self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_1x_ops;
-       else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X,
-                                       self->fw_ver_actual) == 0)
+       } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X,
+                                       self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_2x_ops;
-       else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X,
-                                       self->fw_ver_actual) == 0)
+       } else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X,
+                                       self->fw_ver_actual) == 0) {
                *fw_ops = &aq_fw_2x_ops;
-       else {
+       } else {
                aq_pr_err("Bad FW version detected: %x\n",
-                      self->fw_ver_actual);
+                         self->fw_ver_actual);
                return -EOPNOTSUPP;
        }
        self->aq_fw_ops = *fw_ops;
@@ -64,6 +77,164 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
        return err;
 }
 
+static int hw_atl_utils_soft_reset_flb(struct aq_hw_s *self)
+{
+       int k = 0;
+       u32 gsr;
+
+       aq_hw_write_reg(self, 0x404, 0x40e1);
+       AQ_HW_SLEEP(50);
+
+       /* Cleanup SPI */
+       aq_hw_write_reg(self, 0x534, 0xA0);
+       aq_hw_write_reg(self, 0x100, 0x9F);
+       aq_hw_write_reg(self, 0x100, 0x809F);
+
+       gsr = aq_hw_read_reg(self, HW_ATL_GLB_SOFT_RES_ADR);
+       aq_hw_write_reg(self, HW_ATL_GLB_SOFT_RES_ADR, (gsr & 0xBFFF) | 0x8000);
+
+       /* Kickstart MAC */
+       aq_hw_write_reg(self, 0x404, 0x80e0);
+       aq_hw_write_reg(self, 0x32a8, 0x0);
+       aq_hw_write_reg(self, 0x520, 0x1);
+       AQ_HW_SLEEP(10);
+       aq_hw_write_reg(self, 0x404, 0x180e0);
+
+       for (k = 0; k < 1000; k++) {
+               u32 flb_status = aq_hw_read_reg(self,
+                                               HW_ATL_MPI_DAISY_CHAIN_STATUS);
+
+               flb_status = flb_status & 0x10;
+               if (flb_status)
+                       break;
+               AQ_HW_SLEEP(10);
+       }
+       if (k == 1000) {
+               aq_pr_err("MAC kickstart failed\n");
+               return -EIO;
+       }
+
+       /* FW reset */
+       aq_hw_write_reg(self, 0x404, 0x80e0);
+       AQ_HW_SLEEP(50);
+       aq_hw_write_reg(self, 0x3a0, 0x1);
+
+       /* Kickstart PHY - skipped */
+
+       /* Global software reset*/
+       hw_atl_rx_rx_reg_res_dis_set(self, 0U);
+       hw_atl_tx_tx_reg_res_dis_set(self, 0U);
+       aq_hw_write_reg_bit(self, HW_ATL_MAC_PHY_CONTROL,
+                           BIT(HW_ATL_MAC_PHY_MPI_RESET_BIT),
+                           HW_ATL_MAC_PHY_MPI_RESET_BIT, 0x0);
+       gsr = aq_hw_read_reg(self, HW_ATL_GLB_SOFT_RES_ADR);
+       aq_hw_write_reg(self, HW_ATL_GLB_SOFT_RES_ADR, (gsr & 0xBFFF) | 0x8000);
+
+       for (k = 0; k < 1000; k++) {
+               u32 fw_state = aq_hw_read_reg(self, HW_ATL_MPI_FW_VERSION);
+
+               if (fw_state)
+                       break;
+               AQ_HW_SLEEP(10);
+       }
+       if (k == 1000) {
+               aq_pr_err("FW kickstart failed\n");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int hw_atl_utils_soft_reset_rbl(struct aq_hw_s *self)
+{
+       u32 gsr, rbl_status;
+       int k;
+
+       aq_hw_write_reg(self, 0x404, 0x40e1);
+       aq_hw_write_reg(self, 0x3a0, 0x1);
+       aq_hw_write_reg(self, 0x32a8, 0x0);
+
+       /* Alter RBL status */
+       aq_hw_write_reg(self, 0x388, 0xDEAD);
+
+       /* Global software reset*/
+       hw_atl_rx_rx_reg_res_dis_set(self, 0U);
+       hw_atl_tx_tx_reg_res_dis_set(self, 0U);
+       aq_hw_write_reg_bit(self, HW_ATL_MAC_PHY_CONTROL,
+                           BIT(HW_ATL_MAC_PHY_MPI_RESET_BIT),
+                           HW_ATL_MAC_PHY_MPI_RESET_BIT, 0x0);
+       gsr = aq_hw_read_reg(self, HW_ATL_GLB_SOFT_RES_ADR);
+       aq_hw_write_reg(self, HW_ATL_GLB_SOFT_RES_ADR,
+                       (gsr & 0xFFFFBFFF) | 0x8000);
+
+       if (FORCE_FLASHLESS)
+               aq_hw_write_reg(self, 0x534, 0x0);
+
+       aq_hw_write_reg(self, 0x404, 0x40e0);
+
+       /* Wait for RBL boot */
+       for (k = 0; k < 1000; k++) {
+               rbl_status = aq_hw_read_reg(self, 0x388) & 0xFFFF;
+               if (rbl_status && rbl_status != 0xDEAD)
+                       break;
+               AQ_HW_SLEEP(10);
+       }
+       if (!rbl_status || rbl_status == 0xDEAD) {
+               aq_pr_err("RBL Restart failed");
+               return -EIO;
+       }
+
+       /* Restore NVR */
+       if (FORCE_FLASHLESS)
+               aq_hw_write_reg(self, 0x534, 0xA0);
+
+       if (rbl_status == 0xF1A7) {
+               aq_pr_err("No FW detected. Dynamic FW load not implemented\n");
+               return -ENOTSUPP;
+       }
+
+       for (k = 0; k < 1000; k++) {
+               u32 fw_state = aq_hw_read_reg(self, HW_ATL_MPI_FW_VERSION);
+
+               if (fw_state)
+                       break;
+               AQ_HW_SLEEP(10);
+       }
+       if (k == 1000) {
+               aq_pr_err("FW kickstart failed\n");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+int hw_atl_utils_soft_reset(struct aq_hw_s *self)
+{
+       int k;
+       u32 boot_exit_code = 0;
+
+       for (k = 0; k < 1000; ++k) {
+               u32 flb_status = aq_hw_read_reg(self,
+                                               HW_ATL_MPI_DAISY_CHAIN_STATUS);
+               boot_exit_code = aq_hw_read_reg(self,
+                                               HW_ATL_MPI_BOOT_EXIT_CODE);
+               if (flb_status != 0x06000000 || boot_exit_code != 0)
+                       break;
+       }
+
+       if (k == 1000) {
+               aq_pr_err("Neither RBL nor FLB firmware started\n");
+               return -EOPNOTSUPP;
+       }
+
+       self->rbl_enabled = (boot_exit_code != 0);
+
+       if (self->rbl_enabled)
+               return hw_atl_utils_soft_reset_rbl(self);
+       else
+               return hw_atl_utils_soft_reset_flb(self);
+}
+
 int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,
                                  u32 *p, u32 cnt)
 {
@@ -598,7 +769,7 @@ int hw_atl_utils_hw_get_regs(struct aq_hw_s *self,
 
        for (i = 0; i < aq_hw_caps->mac_regs_count; i++)
                regs_buff[i] = aq_hw_read_reg(self,
-                       hw_atl_utils_hw_mac_regs[i]);
+                                             hw_atl_utils_hw_mac_regs[i]);
        return 0;
 }