qed: VFs to try utilizing the doorbell bar

VFs are currently not mapping their doorbell bar, instead relying
on the small doorbell window they have in their limited regview bar.

In order to increase the number of possible Tx connections [queues]
employeed by VF past 16, we need to start using the doorbell bar if
one such is exposed - VF would communicate this fact to PF which would
return the size-bar internally configured into chip, according to
which the VF would decide whether to actually utilize the doorbell
bar.

Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index 6ac10ce14e5b..9877d3e762fe 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -122,7 +122,7 @@ static void qed_free_pci(struct qed_dev *cdev)
 {
         struct pci_dev *pdev = cdev->pdev;
 
-        if (cdev->doorbells)
+        if (cdev->doorbells && cdev->db_size)
                 iounmap(cdev->doorbells);
         if (cdev->regview)
                 iounmap(cdev->regview);
@@ -206,16 +206,24 @@ static int qed_init_pci(struct qed_dev *cdev, struct pci_dev *pdev)
                 goto err2;
         }
 
-        if (IS_PF(cdev)) {
-                cdev->db_phys_addr = pci_resource_start(cdev->pdev, 2);
-                cdev->db_size = pci_resource_len(cdev->pdev, 2);
-                cdev->doorbells = ioremap_wc(cdev->db_phys_addr, cdev->db_size);
-                if (!cdev->doorbells) {
-                        DP_NOTICE(cdev, "Cannot map doorbell space\n");
-                        return -ENOMEM;
+        cdev->db_phys_addr = pci_resource_start(cdev->pdev, 2);
+        cdev->db_size = pci_resource_len(cdev->pdev, 2);
+        if (!cdev->db_size) {
+                if (IS_PF(cdev)) {
+                        DP_NOTICE(cdev, "No Doorbell bar available\n");
+                        return -EINVAL;
+                } else {
+                        return 0;
                 }
         }
 
+        cdev->doorbells = ioremap_wc(cdev->db_phys_addr, cdev->db_size);
+
+        if (!cdev->doorbells) {
+                DP_NOTICE(cdev, "Cannot map doorbell space\n");
+                return -ENOMEM;
+        }
+
         return 0;
 
 err2: