return rc;
 }
 
+static int bnxt_set_dump(struct net_device *dev, struct ethtool_dump *dump)
+{
+       struct bnxt *bp = netdev_priv(dev);
+
+       if (dump->flag > BNXT_DUMP_CRASH) {
+               netdev_info(dev, "Supports only Live(0) and Crash(1) dumps.\n");
+               return -EINVAL;
+       }
+
+       if (!IS_ENABLED(CONFIG_TEE_BNXT_FW) && dump->flag == BNXT_DUMP_CRASH) {
+               netdev_info(dev, "Cannot collect crash dump as TEE_BNXT_FW config option is not enabled.\n");
+               return -EOPNOTSUPP;
+       }
+
+       bp->dump_flag = dump->flag;
+       return 0;
+}
+
 static int bnxt_get_dump_flag(struct net_device *dev, struct ethtool_dump *dump)
 {
        struct bnxt *bp = netdev_priv(dev);
                        bp->ver_resp.hwrm_fw_bld_8b << 8 |
                        bp->ver_resp.hwrm_fw_rsvd_8b;
 
-       return bnxt_get_coredump(bp, NULL, &dump->len);
+       dump->flag = bp->dump_flag;
+       if (bp->dump_flag == BNXT_DUMP_CRASH)
+               dump->len = BNXT_CRASH_DUMP_LEN;
+       else
+               bnxt_get_coredump(bp, NULL, &dump->len);
+       return 0;
 }
 
 static int bnxt_get_dump_data(struct net_device *dev, struct ethtool_dump *dump,
 
        memset(buf, 0, dump->len);
 
-       return bnxt_get_coredump(bp, buf, &dump->len);
+       dump->flag = bp->dump_flag;
+       if (dump->flag == BNXT_DUMP_CRASH) {
+#ifdef CONFIG_TEE_BNXT_FW
+               return tee_bnxt_copy_coredump(buf, 0, dump->len);
+#endif
+       } else {
+               return bnxt_get_coredump(bp, buf, &dump->len);
+       }
+
+       return 0;
 }
 
 void bnxt_ethtool_init(struct bnxt *bp)
        .set_phys_id            = bnxt_set_phys_id,
        .self_test              = bnxt_self_test,
        .reset                  = bnxt_reset,
+       .set_dump               = bnxt_set_dump,
        .get_dump_flag          = bnxt_get_dump_flag,
        .get_dump_data          = bnxt_get_dump_data,
 };