Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fdd6baf authored by lipeng's avatar lipeng Committed by David S. Miller
Browse files

net: hns: support deferred probe when can not obtain irq 



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.

Signed-off-by: default avatarlipeng <lipeng321@huawei.com>
Reviewed-by: default avatarYisen Zhuang <yisen.zhuang@huawei.com>
Reviewed-by: default avatarMatthias Brugger <mbrugger@suse.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba1d82e6

drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -510,7 +510,9 @@ int hns_ppe_init(struct dsaf_device *dsaf_dev) 




		hns_ppe_get_cfg(dsaf_dev->ppe_common[i]);

		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_cfg_fail;

	}

	}





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

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

drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ static int hns_rcb_get_base_irq_idx(struct rcb_common_cb *rcb_common) 
 *hns_rcb_get_cfg - get rcb config

 *hns_rcb_get_cfg - get rcb config

 *@rcb_common: rcb common device

 *@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;

	struct ring_pair_cb *ring_pair_cb;

	u32 i;

	u32 i;
@@ -517,10 +517,16 @@ void hns_rcb_get_cfg(struct rcb_common_cb *rcb_common) 
		ring_pair_cb->virq[HNS_RCB_IRQ_IDX_RX] =

		ring_pair_cb->virq[HNS_RCB_IRQ_IDX_RX] =

		is_ver1 ? platform_get_irq(pdev, base_irq_idx + i * 2 + 1) :

		is_ver1 ? platform_get_irq(pdev, base_irq_idx + i * 2 + 1) :

			  platform_get_irq(pdev, base_irq_idx + i * 3);

			  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 =

		ring_pair_cb->q.phy_base =

			RCB_COMM_BASE_TO_RING_BASE(rcb_common->phy_base, i);

			RCB_COMM_BASE_TO_RING_BASE(rcb_common->phy_base, i);

		hns_rcb_ring_pair_get_cfg(ring_pair_cb);

		hns_rcb_ring_pair_get_cfg(ring_pair_cb);

	}

	}



	return 0;

}

}





/**

/**

drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ int hns_rcb_common_get_cfg(struct dsaf_device *dsaf_dev, int comm_index); 
void hns_rcb_common_free_cfg(struct dsaf_device *dsaf_dev, u32 comm_index);

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);

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_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,

void hns_rcb_get_queue_mode(enum dsaf_mode dsaf_mode,

			    u16 *max_vfn, u16 *max_q_per_vf);

			    u16 *max_vfn, u16 *max_q_per_vf);