From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D689FCA9EC3 for ; Thu, 31 Oct 2019 10:09:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB8222086D for ; Thu, 31 Oct 2019 10:09:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="UEM+IQJN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727514AbfJaKJE (ORCPT ); Thu, 31 Oct 2019 06:09:04 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42802 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727481AbfJaKJA (ORCPT ); Thu, 31 Oct 2019 06:09:00 -0400 Received: by mail-wr1-f68.google.com with SMTP id a15so5526286wrf.9 for ; Thu, 31 Oct 2019 03:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1b/PjoEJ3+h+SBh6G5LSt0fwIln3xfl7/abE1bFQX1U=; b=UEM+IQJNCIRkC+Zz26kydgCfcVSwtF8Sd742PhPGZYJ2EEjU2WLKAgZojPv2WPsVby e+y1oSgRNd+jPfiLxIVNc8TWj2ePd7zfp1wsNpsKrqFn8MqGNkNnVFhH4Koi6996tsoV yABReLlbrhd0UObtjrntiW2ZH4PrVilWXUYec= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1b/PjoEJ3+h+SBh6G5LSt0fwIln3xfl7/abE1bFQX1U=; b=GU0ts8fS8FmeUy0fvxo1E8HdAzmAVz2mvFQkk0br3tR1NK+J26vjh7aTFI7vPxL5BJ F1Ykb2vmHaZAelD5U6fchUdvmjCut224Q4zEZtKyf+Uij7apOycmQDJ9bZecKK2vuKPd XjgOpSyKBRAqSpSVy9cHXh4gUAsbjOTguqi9y8VM27O3ppoBXL1WjhXPbij2VO84dWhj vgbwBHLXGb3gSQWXMycOd3YfBUVENzFc88I5qhc/pt0nnv5FZMDQluoCmToZNwQUQenM XuJxiTUVDt0sZPUXgTMzpaRa5CQAHJTBXICNsr61Iu7ZawpAJZu2p3jt39RvsQJiQyI5 ySsQ== X-Gm-Message-State: APjAAAVtrRi1ZxhvYRsvQ9PsCG53tlupI63U9ft45oJQVrBnCplilI5G RooXEUY3UmFgWb53iHrBQmrfBQ== X-Google-Smtp-Source: APXvYqwqeMLgZTiv2t/y7ulQTNl2LeGGoGdpvP9Wm3tZW+ENEK6kwM0/MIefJnaXXNAu8b7E1Fq/Pg== X-Received: by 2002:adf:ea8d:: with SMTP id s13mr3799182wrm.366.1572516538705; Thu, 31 Oct 2019 03:08:58 -0700 (PDT) Received: from shitalt.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id w8sm3719609wrr.44.2019.10.31.03.08.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Oct 2019 03:08:57 -0700 (PDT) From: Sheetal Tigadoli To: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Greg Kroah-Hartman , Michal Simek , Rajan Vaja , Scott Branden , Ray Jui , Vikram Prakash , Jens Wiklander , Michael Chan , "David S. Miller" , Vikas Gupta , Vasundhara Volam Cc: Linux Kernel Mailing List , tee-dev@lists.linaro.org, bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org, Sheetal Tigadoli Subject: [PATCH net-next V5 2/3] bnxt_en: Add support to invoke OP-TEE API to reset firmware Date: Thu, 31 Oct 2019 15:38:51 +0530 Message-Id: <1572516532-5977-3-git-send-email-sheetal.tigadoli@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1572516532-5977-1-git-send-email-sheetal.tigadoli@broadcom.com> References: <1572516532-5977-1-git-send-email-sheetal.tigadoli@broadcom.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vasundhara Volam In error recovery process when firmware indicates that it is completely down, initiate a firmware reset by calling OP-TEE API. Cc: Michael Chan Signed-off-by: Vasundhara Volam Signed-off-by: Sheetal Tigadoli --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +++++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 8cdf71f8824d..c24caaaf05ca 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -10581,14 +10581,23 @@ static void bnxt_fw_reset_writel(struct bnxt *bp, int reg_idx) static void bnxt_reset_all(struct bnxt *bp) { struct bnxt_fw_health *fw_health = bp->fw_health; - int i; + int i, rc; + + if (bp->fw_cap & BNXT_FW_CAP_ERR_RECOVER_RELOAD) { +#ifdef CONFIG_TEE_BNXT_FW + rc = tee_bnxt_fw_load(); + if (rc) + netdev_err(bp->dev, "Unable to reset FW rc=%d\n", rc); + bp->fw_reset_timestamp = jiffies; +#endif + return; + } if (fw_health->flags & ERROR_RECOVERY_QCFG_RESP_FLAGS_HOST) { for (i = 0; i < fw_health->fw_reset_seq_cnt; i++) bnxt_fw_reset_writel(bp, i); } else if (fw_health->flags & ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU) { struct hwrm_fw_reset_input req = {0}; - int rc; bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FW_RESET, -1, -1); req.resp_addr = cpu_to_le64(bp->hwrm_cmd_kong_resp_dma_addr); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index d333589811a5..09437150f818 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -25,6 +25,9 @@ #include #include #include +#ifdef CONFIG_TEE_BNXT_FW +#include +#endif struct page_pool; -- 2.17.1