Re: [PATCH net v3 1/3] net: hns: support deferred probe when can not obtain irq

[lipeng (Y)]

On 2017/4/26 22:03, Matthias Brugger wrote:

On 26/04/17 09:00, Yankejian wrote:

From: lipeng <lipeng...@huawei.com>

In the hip06 and hip07 SoCs, the interrupt lines from the
DSAF controllers are connected to mbigen hw module.
The mbigen module is probed with module_init, and, as such,
is not guaranteed to probe before the HNS driver. So we need
to support deferred probe.

We check for probe deferral in the hw layer probe, so we not
probe into the main layer and memories, etc., to later learn
that we need to defer the probe.

This paragraph does not hold any more and should be deleted.

OK , will delete it.

Other then this:
Reviewed-by: Matthias Brugger <mbrug...@suse.com>

Thanks for your review

Signed-off-by: lipeng <lipeng...@huawei.com>
Reviewed-by: Yisen Zhuang <yisen.zhu...@huawei.com>
---
V2 -> V3:
1. Check return value when  platform_get_irq in hns_rcb_get_cfg;
---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 4 +++-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 8 +++++++-
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c

index 6ea8722..a41cf95 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
@@ -510,7 +510,9 @@ int hns_ppe_init(struct dsaf_device *dsaf_dev)

         hns_ppe_get_cfg(dsaf_dev->ppe_common[i]);

-        hns_rcb_get_cfg(dsaf_dev->rcb_common[i]);
+        ret = hns_rcb_get_cfg(dsaf_dev->rcb_common[i]);
+        if (ret)
+            goto get_rcb_cfg_fail;
     }

     for (i = 0; i < HNS_PPE_COM_NUM; i++)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

index f0ed80d6..673a5d3 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

@@ -452,7 +452,7 @@ static int hns_rcb_get_base_irq_idx(struct rcb_common_cb *rcb_common)

  *hns_rcb_get_cfg - get rcb config
  *@rcb_common: rcb common device
  */
-void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
+int hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)
 {
     struct ring_pair_cb *ring_pair_cb;
     u32 i;

@@ -477,10 +477,16 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common)

         ring_pair_cb->virq[HNS_RCB_IRQ_IDX_RX] =
         is_ver1 ? platform_get_irq(pdev, base_irq_idx + i * 2 + 1) :
               platform_get_irq(pdev, base_irq_idx + i * 3);

+ if ((ring_pair_cb->virq[HNS_RCB_IRQ_IDX_TX] == -EPROBE_DEFER) ||

+            (ring_pair_cb->virq[HNS_RCB_IRQ_IDX_RX] == -EPROBE_DEFER))
+            return -EPROBE_DEFER;
+
         ring_pair_cb->q.phy_base =
             RCB_COMM_BASE_TO_RING_BASE(rcb_common->phy_base, i);
         hns_rcb_ring_pair_get_cfg(ring_pair_cb);
     }
+
+    return 0;
 }

 /**

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h

index 99b4e1b..3d7b484 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
@@ -110,7 +110,7 @@ struct rcb_common_cb {

void hns_rcb_common_free_cfg(struct dsaf_device *dsaf_dev, u32 comm_index);

 int hns_rcb_common_init_hw(struct rcb_common_cb *rcb_common);
 void hns_rcb_start(struct hnae_queue *q, u32 val);
-void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common);
+int hns_rcb_get_cfg(struct rcb_common_cb *rcb_common);
 void hns_rcb_get_queue_mode(enum dsaf_mode dsaf_mode,
                 u16 *max_vfn, u16 *max_q_per_vf);

.