Merge "OPNFV KVM4NFV: Documentation"

diff --git a/kernel/arch/x86/configs/opnfv.config b/kernel/arch/x86/configs/opnfv.config
index b623b0c..95bb41d 100644 (file)
--- a/kernel/arch/x86/configs/opnfv.config
+++ b/kernel/arch/x86/configs/opnfv.config
@@ -1814,7 +1814,9 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=y
-# CONFIG_BNX2X is not set
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+# CONFIG_BNX2X_VXLAN is not set
 # CONFIG_BNXT is not set
 CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_BNA is not set

diff --git a/kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 45bd628..e680442 100644 (file)
--- a/kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -802,6 +802,47 @@ static int bnxt_flash_nvram(struct net_device *dev,
        return rc;
 }
 
+static int bnxt_firmware_reset(struct net_device *dev,
+                              u16 dir_type)
+{
+       struct bnxt *bp = netdev_priv(dev);
+       struct hwrm_fw_reset_input req = {0};
+
+       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FW_RESET, -1, -1);
+
+       /* TODO: Support ASAP ChiMP self-reset (e.g. upon PF driver unload) */
+       /* TODO: Address self-reset of APE/KONG/BONO/TANG or ungraceful reset */
+       /*       (e.g. when firmware isn't already running) */
+       switch (dir_type) {
+       case BNX_DIR_TYPE_CHIMP_PATCH:
+       case BNX_DIR_TYPE_BOOTCODE:
+       case BNX_DIR_TYPE_BOOTCODE_2:
+               req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_BOOT;
+               /* Self-reset ChiMP upon next PCIe reset: */
+               req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;
+               break;
+       case BNX_DIR_TYPE_APE_FW:
+       case BNX_DIR_TYPE_APE_PATCH:
+               req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_MGMT;
+               /* Self-reset APE upon next PCIe reset: */
+               req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;
+               break;
+       case BNX_DIR_TYPE_KONG_FW:
+       case BNX_DIR_TYPE_KONG_PATCH:
+               req.embedded_proc_type =
+                       FW_RESET_REQ_EMBEDDED_PROC_TYPE_NETCTRL;
+               break;
+       case BNX_DIR_TYPE_BONO_FW:
+       case BNX_DIR_TYPE_BONO_PATCH:
+               req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_ROCE;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+}
+
 static int bnxt_flash_firmware(struct net_device *dev,
                               u16 dir_type,
                               const u8 *fw_data,
@@ -856,10 +897,9 @@ static int bnxt_flash_firmware(struct net_device *dev,
        /* TODO: Validate digital signature (RSA-encrypted SHA-256 hash) here */
        rc = bnxt_flash_nvram(dev, dir_type, BNX_DIR_ORDINAL_FIRST,
                              0, 0, fw_data, fw_size);
-       if (rc == 0) {  /* Firmware update successful */
-               /* TODO: Notify processor it needs to reset itself
-                */
-       }
+       if (rc == 0)    /* Firmware update successful */
+               rc = bnxt_firmware_reset(dev, dir_type);
+
        return rc;
 }