From patchwork Fri May 15 05:19:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AMARANATH SOMALAPURAM X-Patchwork-Id: 70300 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 15688A00C3; Fri, 15 May 2020 07:20:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3CDFF1D940; Fri, 15 May 2020 07:20:07 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2051.outbound.protection.outlook.com [40.107.94.51]) by dpdk.org (Postfix) with ESMTP id D95EA1D933 for ; Fri, 15 May 2020 07:20:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c+BHR+AtfaU61FTT8+Mo9FnAXUDcWiYriniPMzHBtxDcJZdT6Cm6sgeC9qL8gMzL+/ZQhiZWpt3kbwZoImyR/O9EJ4GcKuEsBy75pgOhLOulECofFhq4ZMcCm8LcLTL91ssRmONfzIsAlnbIx4r4n79pW+iKqM/ObYBez3o3CkOQXypwU6hjCNZ+CxQhTZAGTbPZisUSpDypY1dLrEZp/CWMV1ti4Hi3Gb8RB60UPlptDbdFsD4Ll3CORIHI1y0lolVwdpt4jZfflo6ZzkLE4OTibA+3tOooa6GDp/XqIm3N3ZYwmFxbbHxqoWoSkhgxwHlf7EnOT4O4BniUOrFpuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uBoSKm0sdzmQqHiqHj+M6o2p1FY0vwlXxcvSmZYJzvg=; b=IJv/TNpVMzD/NT76FA82kQkYIWGFdKW37wtJwiAGHO+9yO5Gw8ghtvxVucb/XOmzKw4QsPcOczsSdzzrgFQYHLem0R7a2Jh4MmYwMbm+/BLkxYQPJlESgA0KExfwVL/mPnGj6TXgjSc+qYpcWOWo+3YmiQeoo/TGE62ucfV8deAQ/RA3x8iozlgTRNHxLnJx8OJanPZf6ETVwMPdgmezeapTc6RhMf3rSusFkXEBGIWkNqKVQOpI/6CALlDHNL7iFV4v7lWCiuiKsqFkkqIv9VJfcAGaUXz8ZLcIcnxp4iAjzQFc3uyj+hSQ/G4NnvkFYlzBVZ2/vQbXyGR4OII9Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uBoSKm0sdzmQqHiqHj+M6o2p1FY0vwlXxcvSmZYJzvg=; b=H9FRHLWniAvlZ+GBAkp83zOPNMfg93Q7sqoIO/V4LFqPAmoD7tXQnxvJuEhYE3AxPBXC4hNhtO1GbiRpDy1yxMPJ0Z0dY7O29hlUedUk1P8yhk2tqXhMFnjeyPaZZiXNXaqEAxqT3DjMFt6aDhCcXHaLT0GgIrmdUFqFAHdJ2Nc= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=amd.com; Received: from MN2PR12MB3504.namprd12.prod.outlook.com (2603:10b6:208:d1::10) by MN2PR12MB3805.namprd12.prod.outlook.com (2603:10b6:208:15a::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.26; Fri, 15 May 2020 05:20:00 +0000 Received: from MN2PR12MB3504.namprd12.prod.outlook.com ([fe80::1031:ffa7:f772:6298]) by MN2PR12MB3504.namprd12.prod.outlook.com ([fe80::1031:ffa7:f772:6298%5]) with mapi id 15.20.3000.022; Fri, 15 May 2020 05:20:00 +0000 From: asomalap@amd.com To: dev@dpdk.org Date: Fri, 15 May 2020 10:49:37 +0530 Message-Id: <20200515051937.6858-1-asomalap@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: MA1PR01CA0089.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::29) To MN2PR12MB3504.namprd12.prod.outlook.com (2603:10b6:208:d1::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from cae-Bilby-RV1.amd.com (165.204.156.251) by MA1PR01CA0089.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.24 via Frontend Transport; Fri, 15 May 2020 05:19:59 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.156.251] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 116daace-471c-4f62-1ad9-08d7f88f9d33 X-MS-TrafficTypeDiagnostic: MN2PR12MB3805: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 04041A2886 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ambw+9cY6xpVtA+p9XuLNbuhkn5B2fOGvvT5Vju9fR901N/+OXP7JoLuNLZrr+LomAZHixaRJGpTm+CrY2Vu/Rs+KUI1hs/uOClr14MQONuso1qrJmxBRoGowL/iAZ0q+EC1zEGkpMw5e1ir8kDVy8+cI2rCjJWcWtSjhhQzuD8NRvU7op0LSC/sieuQMn/LmjdIo9hXGTOs7UtR0RMI3uqo7wJL92h8nnfSrsy2OTuuZMPlUM+elJ9IhpW7mL9+dVnxiDfgHhSi+Y4KxdgKDCYzp7oMinVAbenwhSMdfu2IHFBYH2a73i1xZP8+pSlRGHy/g5ITgj/KH5YLR0CZyFNd/iSUnim4NUT+GBa4iAeh/mgH0uFaVMnX5BlPJmMibmhHlevffAIKSq7jgYg6sd07n7YvTAfcHHI8krngXlJFd0VqiauIoH6Hgb+VmAgV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR12MB3504.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(136003)(396003)(346002)(39860400002)(2616005)(9686003)(2906002)(956004)(316002)(36756003)(66556008)(6486002)(66946007)(66476007)(478600001)(8936002)(26005)(16526019)(186003)(52116002)(7696005)(1076003)(8676002)(6916009)(5660300002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: AI3WfhhsROpeNk4oX1NRFf0Wen+/15vkOHq/iD8bzzX4dj3xieGw1D2qknXpueXTLP9aEZaa+VNS1GekSq3QQhWmY7vC4cEMu8GvZmEe6ONzm3nePeBoaZtor1BaytBsCv7hJQtrRjygtAX3SoI1sJdX2k9+tQ34gW0D0Mk0yBEe+1cXsHKvYY5mLfbkQ6HLWjVfYIf5EvxCmvYMeZpqs/+sP70KJ8kQDrUNkSK6rhtQVWJyKs+PzQ3vgOJ1F7zWplQZsEUX6Uk0kHtMwvnwQsyaPAD3zWB3PfvVe5+No0fRhRugBn4mjHVwewu5wZEkzou7YZWvGd7IR2zz23VXChPMbx7ttFwfjmRqa3+5HJDCVnfPLlChDvmNud4WabqRhOiTf4cfECcghaoEYNV8ZUigOhki65k0ZnKiuTzYDG5gPqnAu0TYxP2a6urtG2Rwa/2Epxz1X/DPuQdN+XUEZG2SLNh9dHqj61BGHV72w0sjOu2LxjqyQlEojs8FM346 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 116daace-471c-4f62-1ad9-08d7f88f9d33 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2020 05:20:00.1965 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iPfxsD/RD8MCK48BtEIrC9ZAtJGidz5TCQghTb/B9ZqSMseVpBhjco9UodhUjEVTUmh44vO7ySCwpy25efZ57A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3805 Subject: [dpdk-dev] [PATCH v3] net/axgbe: support sfp module EEPROM X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Amaranath Somalapuram Adding API for get_module_eeprom and get_module_info. Signed-off-by: Amaranath Somalapuram --- doc/guides/nics/features/axgbe.ini | 1 + drivers/net/axgbe/axgbe_ethdev.c | 2 + drivers/net/axgbe/axgbe_phy.h | 4 ++ drivers/net/axgbe/axgbe_phy_impl.c | 107 +++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/doc/guides/nics/features/axgbe.ini b/doc/guides/nics/features/axgbe.ini index 0becaa097..80a3bcee1 100644 --- a/doc/guides/nics/features/axgbe.ini +++ b/doc/guides/nics/features/axgbe.ini @@ -18,3 +18,4 @@ Basic stats = Y Linux UIO = Y x86-32 = Y x86-64 = Y +Module EEPROM dump = Y diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index 867058845..ea2f9bba1 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -214,6 +214,8 @@ static const struct eth_dev_ops axgbe_eth_dev_ops = { .dev_supported_ptypes_get = axgbe_dev_supported_ptypes_get, .rx_descriptor_status = axgbe_dev_rx_descriptor_status, .tx_descriptor_status = axgbe_dev_tx_descriptor_status, + .get_module_info = axgbe_get_module_info, + .get_module_eeprom = axgbe_get_module_eeprom, }; static int axgbe_phy_reset(struct axgbe_port *pdata) diff --git a/drivers/net/axgbe/axgbe_phy.h b/drivers/net/axgbe/axgbe_phy.h index 77ee20a31..d9d7fde41 100644 --- a/drivers/net/axgbe/axgbe_phy.h +++ b/drivers/net/axgbe/axgbe_phy.h @@ -188,5 +188,9 @@ #define DUPLEX_FULL 0x01 #define DUPLEX_UNKNOWN 0xff +int axgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo); +int axgbe_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info); #endif /* PHY */ diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c index 02236ec19..53716071f 100644 --- a/drivers/net/axgbe/axgbe_phy_impl.c +++ b/drivers/net/axgbe/axgbe_phy_impl.c @@ -141,12 +141,18 @@ enum axgbe_sfp_speed { #define AXGBE_SFP_EXTD_CC 31 +#define AXGBE_SFP_EEPROM_PAGE_SIZE 256 + struct axgbe_sfp_eeprom { u8 base[64]; u8 extd[32]; u8 vendor[32]; }; +struct axgbe_sfp_eeprom_module { + u8 base[256]; +}; + #define AXGBE_BEL_FUSE_VENDOR "BEL-FUSE" #define AXGBE_BEL_FUSE_PARTNO "1GBT-SFP06" @@ -734,6 +740,106 @@ static int axgbe_phy_sfp_read_eeprom(struct axgbe_port *pdata) return ret; } +int axgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo) +{ + struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_sfp_eeprom sfp_eeprom; + uint8_t eeprom_addr; + int ret; + + ret = axgbe_phy_get_comm_ownership(pdata); + + if (ret) + return -EIO; + + ret = axgbe_phy_sfp_get_mux(pdata); + + if (ret) { + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); + return ret; + } + + eeprom_addr = 0; + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, + &eeprom_addr, sizeof(eeprom_addr), + &sfp_eeprom, sizeof(sfp_eeprom)); + + if (ret) { + PMD_DRV_LOG(ERR, "I2C error reading SFP EEPROM\n"); + goto put; + } + + if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] != 0xff) { + if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] == 0) { + modinfo->type = RTE_ETH_MODULE_SFF_8079; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8079_LEN; + } else { + modinfo->type = RTE_ETH_MODULE_SFF_8472; + modinfo->eeprom_len = RTE_ETH_MODULE_SFF_8472_LEN; + } + } + + +put: + axgbe_phy_sfp_put_mux(pdata); + axgbe_phy_put_comm_ownership(pdata); + return 0; +} + +int axgbe_get_module_eeprom(struct rte_eth_dev *dev, + struct rte_dev_eeprom_info *info) +{ + struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_sfp_eeprom_module sfp_eeprom; + uint8_t eeprom_addr; + uint8_t *data; + uint32_t i; + int ret; + + ret = axgbe_phy_get_comm_ownership(pdata); + + if (ret) + return -EIO; + + if (!info || !info->length || !info->data) + return -EINVAL; + + ret = axgbe_phy_sfp_get_mux(pdata); + if (ret) { + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); + return ret; + } + + eeprom_addr = 0; + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_SERIAL_ID_ADDRESS, + &eeprom_addr, sizeof(eeprom_addr), + &sfp_eeprom, sizeof(sfp_eeprom)); + if (ret) { + PMD_DRV_LOG(ERR, "I2C error reading SFP EEPROM\n"); + goto put; + } + data = info->data; + + /* for AXGBE_SFP_SERIAL_ID_ADDRESS */ + for (i = 0; i < AXGBE_SFP_EEPROM_PAGE_SIZE; i++) + data[i] = sfp_eeprom.base[i]; + + eeprom_addr = 0; + ret = axgbe_phy_i2c_read(pdata, AXGBE_SFP_DIAG_INFO_ADDRESS, + &eeprom_addr, sizeof(eeprom_addr), + &sfp_eeprom, sizeof(sfp_eeprom)); + + /* for AXGBE_SFP_DIAG_INFO_ADDRESS */ + for (i = 0; i < info->length - AXGBE_SFP_EEPROM_PAGE_SIZE; i++) + data[i + AXGBE_SFP_EEPROM_PAGE_SIZE] = sfp_eeprom.base[i]; + +put: + axgbe_phy_sfp_put_mux(pdata); + axgbe_phy_put_comm_ownership(pdata); + return 0; +} + static void axgbe_phy_sfp_signals(struct axgbe_port *pdata) { struct axgbe_phy_data *phy_data = pdata->phy_data; @@ -741,6 +847,7 @@ static void axgbe_phy_sfp_signals(struct axgbe_port *pdata) u8 gpio_reg, gpio_ports[2]; int ret; + /* Read the input port registers */ gpio_reg = 0; ret = axgbe_phy_i2c_read(pdata, phy_data->sfp_gpio_address,