From patchwork Tue Nov 1 15:35:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veerasenareddy Burru X-Patchwork-Id: 13748 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3053858wru; Tue, 1 Nov 2022 08:57:16 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7lMgEtzmQJljPkGNKrHWMPhtJJa3N5E0Ur/GQhi8c83P/vrOq9hZeyQxvcDaMtITkPjJz3 X-Received: by 2002:a17:906:4795:b0:794:8b93:2e33 with SMTP id cw21-20020a170906479500b007948b932e33mr19189792ejc.265.1667318236291; Tue, 01 Nov 2022 08:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667318236; cv=none; d=google.com; s=arc-20160816; b=e+2pPl/iIlFUDoIgonBwnrHLI2hxMUNJsW/BWNyY8Y9JuoP2xB0dalHf3vuKB6H/d2 6PiF2dnw9f+p4a/DrE7I+iJQxCiaebWIr+EvMMz1DKHBuIQBdfluomZaMyRtKv3NYhNI pgSwR/gkbC4ZaZPTmlJ6jBA/8pILiNaSl2YePTXmgYjiTEJMaCvGvUW8ksRPZjNWUlUZ 3aWU9NeQ5ZVdEjlgRXA/SxR9wSeali1V+xZwuRr2easDfEgQXq/nkQHp2SyeiAoNC/Lg /uQhqzM8hmm8yvXtVbXKCeFQOssO4qJXLIRMg/9uuBGXnRzR6lrt5QricNQNRgjsuCI4 Tcww== 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=75Fikn0ell3K3XFW9rWytIYn3Zx5mPG/Nu172ngiwog=; b=GjIFHLErKCGl5eteBNXTmvxWMooU8Z4FJ3AyjSN213To2RGowHAGDcjvAwfPq2j8tG 9TD8Xre/42VvC0pwn/TFB5vqhc0KpxKoyq8lSbtI6JNCoFldCl7U6W+GxiukS0rnYlzc STPnoXSJBoLvjW2bpx/8lx3UQHnBbZp7kI+P1ZG5iBpJ5Crr7d/5/b2pno3y7NzwEfnM O8TkbqkuXCCPwqTJkDUOjEvL8HnwWa7LAgi/pKIbsInT3bK4vNABt05kJUkRi631pPMS Q1Cmt7xVl+aGb2WOf1fYJZexPjf8fJtaDHivQ1DOaFJRdY5auJx0d6JmaJvXtROR0wn9 heMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=FJHvoI5j; 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 js7-20020a17090797c700b007adbeb3798asi11848250ejc.482.2022.11.01.08.56.49; Tue, 01 Nov 2022 08:57:16 -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=FJHvoI5j; 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 S230414AbiKAPgA (ORCPT + 99 others); Tue, 1 Nov 2022 11:36:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230264AbiKAPf5 (ORCPT ); Tue, 1 Nov 2022 11:35:57 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91EB618B35; Tue, 1 Nov 2022 08:35:56 -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 2A1Eh09W023397; Tue, 1 Nov 2022 08:35:44 -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=75Fikn0ell3K3XFW9rWytIYn3Zx5mPG/Nu172ngiwog=; b=FJHvoI5jX9r3xCsFxlZJtR4ctdUwTHZl2IlOkFErGspz+7fqkrwiDyWj3dGMQ1PINoFE MBGTjPdGdTKquqZ9QZEWdYcgKs5opm6aFxXyWkPI8Fb9sdefjlzxW6dijF2IkrhiImLy xj4ip3Gw4H3ltoLw1ogRHtgIiF+gdhDTtwr+6t5UCoeERgbeZ2+HA6S1fkVwT9p945Ih 8x2JgvXacG2r/4umAfTMFW4dd+D1WQqBoVPY4dcuTlFSUFsHsGY55qJ0XUqCaJsc9kq8 Wd5ee8D8it4L7e6ord5X3iKSHCJs1zp3PCDybNPFtbdV9f67NnfXq9jeq9AfRescGNXB Wg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3kk5f8r8j6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 01 Nov 2022 08:35:44 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 1 Nov 2022 08:35:42 -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 08:35:42 -0700 Received: from sburla-PowerEdge-T630.caveonetworks.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 72DD93F7053; Tue, 1 Nov 2022 08:35:42 -0700 (PDT) From: Veerasenareddy Burru To: , , , , , CC: Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH] octeon_ep: support Octeon device CNF95N Date: Tue, 1 Nov 2022 08:35:39 -0700 Message-ID: <20221101153539.22630-1-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 X-Proofpoint-GUID: XJM2dSwErgz-aoz6nJGjYg14RfyixfIT X-Proofpoint-ORIG-GUID: XJM2dSwErgz-aoz6nJGjYg14RfyixfIT 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?1748309887335933119?= 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. Signed-off-by: Veerasenareddy Burru --- .../ethernet/marvell/octeon_ep/octep_main.c | 19 ++++++++++++++++--- .../ethernet/marvell/octeon_ep/octep_main.h | 2 ++ 2 files changed, 18 insertions(+), 3 deletions(-) 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