From patchwork Wed Mar 22 09:19:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veerasenareddy Burru X-Patchwork-Id: 73306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2243942wrt; Wed, 22 Mar 2023 02:31:47 -0700 (PDT) X-Google-Smtp-Source: AK7set+B/GIBY9RisDx0DIn3c+v+aZ4JAOq60Ip7aNyHs2bbZm6mFsnE7hJKp9mse0B8VJVYezL6 X-Received: by 2002:a17:907:77d3:b0:932:29a7:56ee with SMTP id kz19-20020a17090777d300b0093229a756eemr1455236ejc.12.1679477507771; Wed, 22 Mar 2023 02:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679477507; cv=none; d=google.com; s=arc-20160816; b=TzgKHzRZDCywIHBxIOG+TeXrIqbxO+DyiHeP9Z1iyn8NC6llYAWZbezHawq9UjqCLn syzJqfoOmrQ9FUEg8/sfTdhC8aeWGqe4jowNtzkw5EAdCbWaHnIN9uM8yDIa1BIlD+xJ XJvXbrtzQa14SbqBrcPJOfMuxa0WwmSZbOm8rFcBCmdhN9eR/iGQuYdv7NSlz3gT7Put I66utFtWzoRwamqgf0ImcZ/cWJSF/+ivNMLemAxz6yZFDMLFNwT3JKBeWXbV/K1oS2uP rJbhgeKPH5blfXUtA0GDVs5POskr8NrL85vNbpssJ6YlNm33fu4UaWuxb1JWBtQ73Qd6 uJbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gwdIhPJepSWbraCIQ4kjZL2eELNF5fGWgjj88Mk05JI=; b=A9TWhJKMijlOCznqIu+xEP2GPdOC5AJdRRt84JheKXz61UHn7UGHjUPsSTeGXL0Usp dyJ5hOJLovTnPTwtFUh47/dawD3OG1J+lAbyNkcw3J9Ae2NTfr2nW4+5hp8fX+O411Wk xRH4wXEMRK9NN8wrSIuQKNuyNgmkwabP4asshkxIdO0JnmRIUEzIypyWPdLnkKPyoHbu HgSqcyZo9tJG5jlmu3cDvdIsI+BVszyt7fGg31yK+CPs/qhVb59w3awD2b8BfM+Q5Fmv 2DSnLWQevO8wg612ifFZBtAsxGNmJ1noNbVanmS+DMIWxXzgL7BN0jjWdtoEkCVqUYoW ksVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Cpc4IRIO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dt12-20020a170906b78c00b009287477c339si16347735ejb.538.2023.03.22.02.31.24; Wed, 22 Mar 2023 02:31:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=Cpc4IRIO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230401AbjCVJUT (ORCPT + 99 others); Wed, 22 Mar 2023 05:20:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbjCVJUN (ORCPT ); Wed, 22 Mar 2023 05:20:13 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC490231F8; Wed, 22 Mar 2023 02:20:12 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32M3vqnH020844; Wed, 22 Mar 2023 02:20:07 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=gwdIhPJepSWbraCIQ4kjZL2eELNF5fGWgjj88Mk05JI=; b=Cpc4IRIOAMl9FuzszFdZFAPcUcaHuPc6JD+C+HiQYFx11/vTepLLT3L8i2pCM+byfDUS kemCOf0WQdEm01xd5gOgv+Av5aW+x/QwAiUGqxE7Yvd0oDX/+kIjgki5Zc8dx3B5iJpg R/lqNXiSuzv6328kTEWQ5GYAOnMJToDz6lfJzvVNeZ3W3CYtj0qAiAjW5CW7iGpmaJBt VLOD70tkUvJJrMu24GA0O7E6OnHjbqsQIB5hq04vslRcpTQ4+Jq/9XpL+/CsiCMWFCHp 0jK5gjI/a5BYnxmeJbw7GvtHL285J7hduCOAhA3wtDbXvOZxYZ3uOGPLFP4glpjRXPov mA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3pft7uh1rx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 22 Mar 2023 02:20:07 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 22 Mar 2023 02:20:05 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 22 Mar 2023 02:20:05 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 7B2C25B6936; Wed, 22 Mar 2023 02:20:05 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v4 1/8] octeon_ep: defer probe if firmware not ready Date: Wed, 22 Mar 2023 02:19:50 -0700 Message-ID: <20230322091958.13103-2-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230322091958.13103-1-vburru@marvell.com> References: <20230322091958.13103-1-vburru@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: OaJr-6FqEos8C7UoFA_z1-x1X-aZPur3 X-Proofpoint-ORIG-GUID: OaJr-6FqEos8C7UoFA_z1-x1X-aZPur3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-22_06,2023-03-21_01,2023-02-09_01 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761059807172748235?= X-GMAIL-MSGID: =?utf-8?q?1761059807172748235?= Defer probe if firmware is not ready for device usage. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar Signed-off-by: Satananda Burla --- v3 -> v4: * address review comments https://lore.kernel.org/all/Y+vFlfakHj33DEkt@boxer/ - fix return statement for get_fw_ready_status(). v2 -> v3: * fix review comments https://lore.kernel.org/all/Y4chWyR6qTlptkTE@unreal/ - change get_fw_ready_status() to return bool - fix the success oriented flow while looking for PCI extended capability v1 -> v2: * was scheduling workqueue task to wait for firmware ready, to probe/initialize the device. * now, removed the workqueue task; the probe returns EPROBE_DEFER, if firmware is not ready. * removed device status oct->status, as it is not required with the modified implementation. .../ethernet/marvell/octeon_ep/octep_main.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index fdce78ceea87..0a50da52dc27 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -1016,6 +1016,26 @@ static void octep_device_cleanup(struct octep_device *oct) oct->conf = NULL; } +static bool get_fw_ready_status(struct pci_dev *pdev) +{ + u32 pos = 0; + u16 vsec_id; + u8 status; + + while ((pos = pci_find_next_ext_capability(pdev, pos, + PCI_EXT_CAP_ID_VNDR))) { + pci_read_config_word(pdev, pos + 4, &vsec_id); +#define FW_STATUS_VSEC_ID 0xA3 + if (vsec_id != FW_STATUS_VSEC_ID) + continue; + + pci_read_config_byte(pdev, (pos + 8), &status); + dev_info(&pdev->dev, "Firmware ready status = %u\n", status); + return status; + } + return false; +} + /** * octep_probe() - Octeon PCI device probe handler. * @@ -1051,6 +1071,12 @@ static int octep_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_master(pdev); + if (!get_fw_ready_status(pdev)) { + dev_notice(&pdev->dev, "Firmware not ready; defer probe.\n"); + err = -EPROBE_DEFER; + goto err_alloc_netdev; + } + netdev = alloc_etherdev_mq(sizeof(struct octep_device), OCTEP_MAX_QUEUES); if (!netdev) {