nfp: only use direct firmware requests

request_firmware() will fallback to user space helper and may cause
long delays when driver is loaded if udev doesn't correctly handle
FW requests.  Since we never really made use of the user space
helper functionality switch to the simpler request_firmware_direct()
call.  The side effect of this change is that no warning will be
printed when the FW image does not exists.  To help users figure
out which FW file is missing print a info message when we request
each file.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 13d056d..dd769ec 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -174,6 +174,21 @@ static int nfp_pcie_sriov_configure(struct pci_dev *pdev, int num_vfs)
                return nfp_pcie_sriov_enable(pdev, num_vfs);
 }
 
+static const struct firmware *
+nfp_net_fw_request(struct pci_dev *pdev, struct nfp_pf *pf, const char *name)
+{
+       const struct firmware *fw = NULL;
+       int err;
+
+       err = request_firmware_direct(&fw, name, &pdev->dev);
+       nfp_info(pf->cpp, "  %s: %s\n",
+                name, err ? "not found" : "found, loading...");
+       if (err)
+               return NULL;
+
+       return fw;
+}
+
 /**
  * nfp_net_fw_find() - Find the correct firmware image for netdev mode
  * @pdev:      PCI Device structure
@@ -184,29 +199,30 @@ static int nfp_pcie_sriov_configure(struct pci_dev *pdev, int num_vfs)
 static const struct firmware *
 nfp_net_fw_find(struct pci_dev *pdev, struct nfp_pf *pf)
 {
-       const struct firmware *fw = NULL;
        struct nfp_eth_table_port *port;
+       const struct firmware *fw;
        const char *fw_model;
        char fw_name[256];
        const u8 *serial;
-       int spc, err = 0;
        u16 interface;
-       int i, j;
+       int spc, i, j;
+
+       nfp_info(pf->cpp, "Looking for firmware file in order of priority:\n");
 
        /* First try to find a firmware image specific for this device */
        interface = nfp_cpp_interface(pf->cpp);
        nfp_cpp_serial(pf->cpp, &serial);
        sprintf(fw_name, "netronome/serial-%pMF-%02hhx-%02hhx.nffw",
                serial, interface >> 8, interface & 0xff);
-       err = request_firmware_direct(&fw, fw_name, &pdev->dev);
-       if (!err)
-               goto done;
+       fw = nfp_net_fw_request(pdev, pf, fw_name);
+       if (fw)
+               return fw;
 
        /* Then try the PCI name */
        sprintf(fw_name, "netronome/pci-%s.nffw", pci_name(pdev));
-       err = request_firmware_direct(&fw, fw_name, &pdev->dev);
-       if (!err)
-               goto done;
+       fw = nfp_net_fw_request(pdev, pf, fw_name);
+       if (fw)
+               return fw;
 
        /* Finally try the card type and media */
        if (!pf->eth_tbl) {
@@ -241,13 +257,7 @@ nfp_net_fw_find(struct pci_dev *pdev, struct nfp_pf *pf)
        if (spc <= 0)
                return NULL;
 
-       err = request_firmware(&fw, fw_name, &pdev->dev);
-       if (err)
-               return NULL;
-done:
-       dev_info(&pdev->dev, "Loading FW image: %s\n", fw_name);
-
-       return fw;
+       return nfp_net_fw_request(pdev, pf, fw_name);
 }
 
 /**