From patchwork Mon Apr 24 14:47:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Brugger X-Patchwork-Id: 754294 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wBThZ2N2xz9sN7 for ; Tue, 25 Apr 2017 00:47:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T80Em0PW"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1172892AbdDXOrY (ORCPT ); Mon, 24 Apr 2017 10:47:24 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36071 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1172803AbdDXOrV (ORCPT ); Mon, 24 Apr 2017 10:47:21 -0400 Received: by mail-pg0-f66.google.com with SMTP id 34so4767738pgx.3 for ; Mon, 24 Apr 2017 07:47:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=y59tene+7dJ5hM5cK3rNbRNIbh8NDof9OC4j+TkLbRQ=; b=T80Em0PWijtnhrfeKcQec60ihKH6qhwyy2DKlkp9DK0ZHKGAkAEGmQRdgEbAkoLwSK wKHHXa3JLT5A5IHpF23LWYIKJ1xDX94Bi0BtkmaXaaDjI3K/bz5ZHCdtUZusMl2LePnz dELT7E/bLUnXc1/pgz8ZALzfMh5Jv49JZsvnezF1JnBcFU3usPOi53gf3LNU6nT8IjnE 9AH5zb+IEp9yZYF8upttGC8YkwbvyQvG/SG9vpmMH/chb5mL4TfdsTkGN3TyOt0aFqbg puCDKHPWduZnvmG96n1679rdtBurI+h0aZHZYnprucHBDZAOqm4Gi0z/ZY+CnQEcH2/S RioQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=y59tene+7dJ5hM5cK3rNbRNIbh8NDof9OC4j+TkLbRQ=; b=fKqnYetOQAa8X/VfvhQlI9gGQ3xUW9An8ulYZk1DeDyPtRsSy/T5ZlODNM0TCtq6pK CbwzBlJC9Wb57bvgeaK7Lplc6I4DHpX6y2H/CJx21eLP/5gZSmvkmJ8zXnt8/IzfAWfR VyZpqs+M8TYI4uBG+pT2OhuUZ6++T2OPN43uyF3QPCB947P/upl51ATr5/9kzT1F5LDM PwhuFbdft9qizAdga1U9gwY+zuEbCiEuvTnFZcMICOAsoox7/xoB9LaCRV8jeQXnD1Zk e1zxFP4FV8muTSehOR3m9nCJSQzRL97Zh+vKBCY87vBd5I+xN4hgA6JlJFSrTFzjacrl l1vA== X-Gm-Message-State: AN3rC/5bTnZIy/UD5VzUEcx9TpLvml8LlFTwnbtKYJNN8K4Ga6ptRVhg ENuX+j8UxV1Un4ulp8E= X-Received: by 10.99.113.78 with SMTP id b14mr18005946pgn.223.1493045240651; Mon, 24 Apr 2017 07:47:20 -0700 (PDT) Received: from linux-gy6r.site (static.16.53.0.81.ibercom.com. [81.0.53.16]) by smtp.gmail.com with ESMTPSA id r86sm6332582pfb.24.2017.04.24.07.47.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 07:47:20 -0700 (PDT) Subject: Re: [PATCH net v2 1/3] net: hns: support deferred probe when can not obtain irq To: "lipeng (Y)" , Yankejian , davem@davemloft.net, salil.mehta@huawei.com, yisen.zhuang@huawei.com, huangdaode@hisilicon.com, zhouhuiru@huawei.com References: <1492760684-117205-1-git-send-email-yankejian@huawei.com> <1492760684-117205-2-git-send-email-yankejian@huawei.com> Cc: netdev@vger.kernel.org, charles.chenxin@huawei.com, linuxarm@huawei.com From: Matthias Brugger Message-ID: <377d3197-9b88-b95a-ae79-4348d1448f92@gmail.com> Date: Mon, 24 Apr 2017 16:47:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 24/04/17 13:43, lipeng (Y) wrote: > > > On 2017/4/24 18:28, Matthias Brugger wrote: >> On 21/04/17 09:44, Yankejian wrote: >>> From: lipeng >>> >>> 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. >>> >> >> Why? This looks like a hack. >> From what I see, we can handle EPROBE_DEFER easily inside hns_ppe_init >> checking the return value of hns_rcb_get_cfg. Like you do in 2/3 of >> this series. >> >> Regards, >> Matthias > Hi Matthias, > > mdio && phy is not necessary condition, and port can work well for port > + SFP (without mdio &&phy). > > BUT irq is the necessary condition, port can not work well without irq. > > So, I check IRQ first,and do not probe dsaf if can't obtain irq(1/3 of > this series), and check mdio only when there is phy(2/3 of this series). > > And thanks for your review. I think I didn't explained myself good enough. I was suggesting the following (not even compile tested): u32 i; @@ -517,10 +517,18 @@ 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; } /** Regards, Matthias > > lipeng > >> >>> Signed-off-by: lipeng >>> Reviewed-by: Yisen Zhuang >>> --- >>> drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 12 ++++++++++++ >>> 1 file changed, 12 insertions(+) >>> >>> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c >>> b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c >>> index 403ea9d..2da5b42 100644 >>> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c >>> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c >>> @@ -2971,6 +2971,18 @@ static int hns_dsaf_probe(struct >>> platform_device *pdev) >>> struct dsaf_device *dsaf_dev; >>> int ret; >>> >>> + /* >>> + * Check if we should defer the probe before we probe the >>> + * dsaf, as it's hard to defer later on. >>> + */ >>> + ret = platform_get_irq(pdev, 0); >>> + if (ret < 0) { >>> + if (ret != -EPROBE_DEFER) >>> + dev_err(&pdev->dev, "Cannot obtain irq\n"); >>> + >>> + return ret; >>> + } >>> + >>> dsaf_dev = hns_dsaf_alloc_dev(&pdev->dev, sizeof(struct >>> dsaf_drv_priv)); >>> if (IS_ERR(dsaf_dev)) { >>> ret = PTR_ERR(dsaf_dev); >>> >> >> . >> > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c index eba406bea52f..be38d47bc399 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 (reg < 0) + goto get_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 c20a0f4f8f02..c7e801d0c3b7 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c @@ -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 *@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;