From patchwork Tue Nov 1 16:43:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veerasenareddy Burru X-Patchwork-Id: 13793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3084669wru; Tue, 1 Nov 2022 09:52:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6ihMUZgmkX+ywouYxVIsTZcpnGnL/8RSAFRSYwipRrpFbOO6gi2UD9JFuyyIUgvedn4ukI X-Received: by 2002:a05:6402:298d:b0:451:5fc5:d423 with SMTP id eq13-20020a056402298d00b004515fc5d423mr17852064edb.102.1667321538247; Tue, 01 Nov 2022 09:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667321538; cv=none; d=google.com; s=arc-20160816; b=NMyn4MGxJ98/FyvOiVPxd34ATpp8yJzLO4RYcg/ygB1BcAH7+06chKvOf0CypqWH2l Mu9EAFMVrUidXUF2XDPJQtxFeB7Pt0t+HPcR21T0GoNkPWAGvlr9yopmTN+hBColvz7u zHxTWaUnLR/qHrTfFK9Zhyl68UbweQySADg01LJOE7nY1s0TSMlcw70NIDAEPrBBUGq1 5sRfi65zzkvXjjagpagHBBnQMiCuhrevjt6M6kpS+Jpv9QzlAx8uKbPwIBiOWruXw38g TqQWnenG8RBZm9/6Bo1mkL4OodvpmraB4pbaXnEWtEvCeWThoYBiQyU4BkckhCVCYOzm NCyg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=acnJ5DhgTdQI/k05irS7tQ/Wq5y0TnoDE4qYe/yhqV0=; b=e370EzRLhWJAi6ZzvJSlMmgqGgXEmIX9q/+clijqHMBlrzFToX4FPCcsDAgc9jhwFm E907oVfwJ7fYl0eeZaHkh/KHCd4Vr3ujpBWhy8f5DAAJNm76NcaTADB83g45lv0DLdPf Tv5AaOwgvtDCwd66foIGo2paA7xWUv8TQg9vM0FqxsPQm/htkY3cqAxS2E5GmDNJrrzb Ca+jx+yEWpL/Lc2lMfm146oV+oH4y1v4Vx2qvtpVDpyTPKfl8s3Ts/Gtb0NK71J2SZP/ IeeSl4vP9TtB2pvU6BDg3smj84lxNOfn4IxDdO0vO8uSwp3PPEC7arDH/mkoaK/Pv7Vy dBpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=AseElIqP; 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 sb7-20020a1709076d8700b007add150c78asi8720460ejc.503.2022.11.01.09.51.53; Tue, 01 Nov 2022 09:52:18 -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=AseElIqP; 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 S230513AbiKAQnq (ORCPT + 99 others); Tue, 1 Nov 2022 12:43:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230498AbiKAQni (ORCPT ); Tue, 1 Nov 2022 12:43:38 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B720112A95; Tue, 1 Nov 2022 09:43:36 -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 2A1Eh4Tr024459; Tue, 1 Nov 2022 09:43:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=acnJ5DhgTdQI/k05irS7tQ/Wq5y0TnoDE4qYe/yhqV0=; b=AseElIqPsaxp1BYO81ebtJRtXIC7fyMuIgYDEUAkEJ5h80bvogML4VNYA5gLKSDmZn1T Idf7cYCwYJHSUZCg+FQ1k5aWih8MM6k7zNscLSNPK59UxYF0CDOmEIKCu92Ixo1lHyct F0xQcnLt57wIZpgjKO/lGMPMfcC7eila+p1r6efjATM5xgn0a6uaCSZqCnOqWi9NEnbd GXtQKfsYaVKtBWd6uL+NMrFymuymfOqVFdUInYuLe73nsclv4zI9yG9zWIxEZW/p/75R dqZqSR8aS9ovYdBqya/YiblORsxKYys38QYJCZqj3ZteIpOjnFc3PsQIYlkx7S07Wg+w fw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3kk5f8rmgd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 01 Nov 2022 09:43:30 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 1 Nov 2022 09:43:28 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Tue, 1 Nov 2022 09:43:28 -0700 Received: from sburla-PowerEdge-T630.caveonetworks.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 4E82F3F7053; Tue, 1 Nov 2022 09:43:28 -0700 (PDT) From: Veerasenareddy Burru To: , , , , , CC: Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jonathan Corbet Subject: [PATCH net-next v3] octeon_ep: support Octeon device CNF95N Date: Tue, 1 Nov 2022 09:43:20 -0700 Message-ID: <20221101164324.16343-1-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 X-Proofpoint-GUID: 2ig1qZODVmaEqXLL1QobZG40cBGJf6lD X-Proofpoint-ORIG-GUID: 2ig1qZODVmaEqXLL1QobZG40cBGJf6lD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-01_07,2022-11-01_02,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_NONE autolearn=ham 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?1748309887335933119?= X-GMAIL-MSGID: =?utf-8?q?1748313349508000762?= Add support for Octeon device CNF95N. CNF95N is a Octeon Fusion family product with same PCI NIC characteristics as CN93 which is currently supported by the driver. update supported device list in Documentation. Signed-off-by: Veerasenareddy Burru --- V2 -> V3: - fixed the prefix in subject: "net-next PATCH" to "PATCH net-next". V1 -> V2: - update supported device list in Documentation. .../ethernet/marvell/octeon_ep.rst | 1 + .../ethernet/marvell/octeon_ep/octep_main.c | 19 ++++++++++++++++--- .../ethernet/marvell/octeon_ep/octep_main.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) base-commit: 6f1a298b2e24c703bfcc643e41bc7c0604fe4830 diff --git a/Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst b/Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst index bc562c49011b..cad96c8d1f97 100644 --- a/Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst +++ b/Documentation/networking/device_drivers/ethernet/marvell/octeon_ep.rst @@ -23,6 +23,7 @@ Supported Devices ================= Currently, this driver support following devices: * Network controller: Cavium, Inc. Device b200 + * Network controller: Cavium, Inc. Device b400 Interface Control ================= diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index 9089adcb75f9..e956c1059fc8 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -23,6 +23,7 @@ struct workqueue_struct *octep_wq; /* Supported Devices */ static const struct pci_device_id octep_pci_id_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CN93_PF)}, + {PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, OCTEP_PCI_DEVICE_ID_CNF95N_PF)}, {0, }, }; MODULE_DEVICE_TABLE(pci, octep_pci_id_tbl); @@ -907,6 +908,18 @@ static void octep_ctrl_mbox_task(struct work_struct *work) } } +static const char *octep_devid_to_str(struct octep_device *oct) +{ + switch (oct->chip_id) { + case OCTEP_PCI_DEVICE_ID_CN93_PF: + return "CN93XX"; + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: + return "CNF95N"; + default: + return "Unsupported"; + } +} + /** * octep_device_setup() - Setup Octeon Device. * @@ -939,9 +952,9 @@ int octep_device_setup(struct octep_device *oct) switch (oct->chip_id) { case OCTEP_PCI_DEVICE_ID_CN93_PF: - dev_info(&pdev->dev, - "Setting up OCTEON CN93XX PF PASS%d.%d\n", - OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); + case OCTEP_PCI_DEVICE_ID_CNF95N_PF: + dev_info(&pdev->dev, "Setting up OCTEON %s PF PASS%d.%d\n", + octep_devid_to_str(oct), OCTEP_MAJOR_REV(oct), OCTEP_MINOR_REV(oct)); octep_device_setup_cn93_pf(oct); break; default: diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h index 025626a61383..123ffc13754d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h @@ -21,6 +21,8 @@ #define OCTEP_PCI_DEVICE_ID_CN93_PF 0xB200 #define OCTEP_PCI_DEVICE_ID_CN93_VF 0xB203 +#define OCTEP_PCI_DEVICE_ID_CNF95N_PF 0xB400 //95N PF + #define OCTEP_MAX_QUEUES 63 #define OCTEP_MAX_IQ OCTEP_MAX_QUEUES #define OCTEP_MAX_OQ OCTEP_MAX_QUEUES