From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2BF68A00BE; Mon, 27 Apr 2020 07:37:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 051381BFBD; Mon, 27 Apr 2020 07:37:46 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2082.outbound.protection.outlook.com [40.107.243.82]) by dpdk.org (Postfix) with ESMTP id 3DC0F1BED9 for ; Mon, 27 Apr 2020 07:37:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SlVBpVEBTzit3ZbL5ffa8ZbwQRmjEEpwgVTBN/am6BhTdwvy50KlhW1vGQZxnVYUOj9FG2IhUWEXuSSujoZbrnRs7mKstf+kcD6UarjEzgRghjsqH6ND62QX/NMe5/9JkjCQhqdpR4sK73OfMQIhSmiQ8wFnyEoG+Q0BJ9Ou66nnkTXZDbeoWm90ECT6PW+YsWS47act8vs+od8uziD4Jw06wtP5YMxS1wXP1+EWzmGA1q7fBEKzy5lzrVEtnSlkdwY/SswpuEALRgCbhBqaDx/bUQg3SQOIpSMk7S86Nn71OI7AwQA+Pxbna29Va6gdzpKLnE8dvQZQqb72CzDJKQ== 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=jokebXp2qjb0cN4Mzhgs0OXBETtcoI93L0lioNZo3JUT02gU5wXOylCYeYzRi7kyPjZt4iLPU2H1ljbnDYpvC/9XG//XF6Yvs75LasfY/ePMNAQqxuzMzlzLwIBi+ChdUpK5jH45xBl+E+1mYD4eCENKm4twKVhvhE2YEpQgWNyCxok0I+Z968akLVR5Yl7nNGawxTVuk+bnZHeDOcmTGBJbtv+xFg7VYV8+vE66uhmTmxxaTskh6SehfC4pAAmOMZ9tS0p6LWhl/AshVONnjEuNp3VF8ZzV8JbYY5v4GVGlJHSKjBOjM9d83zL25XQr1oXrHg6wj7cxFh/zqTP96w== 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=zDwZimqISGMczfvWvAA3Bw/p/4ElW6m7l7sNFlwqFrS8pzSwbSzNmDClTlxsztkZgSU+m3pNTqrIH47hyxwDPADkgUWJmLVh3mS/TY8mlCgAwHcJAtnN8wIt9S9FeUchLjQURo8uTo11Kh/vnG1dJHn1KH5097HC81vYG/QWAp8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Amaranath.Somalapuram@amd.com; Received: from MN2PR12MB3504.namprd12.prod.outlook.com (2603:10b6:208:d1::10) by MN2PR12MB4269.namprd12.prod.outlook.com (2603:10b6:208:1d4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Mon, 27 Apr 2020 05:37:39 +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.2937.020; Mon, 27 Apr 2020 05:37:39 +0000 From: asomalap@amd.com To: dev@dpdk.org Date: Mon, 27 Apr 2020 11:07:19 +0530 Message-Id: <20200427053719.12047-1-asomalap@amd.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: MAXPR01CA0099.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::17) 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 MAXPR01CA0099.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:5d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13 via Frontend Transport; Mon, 27 Apr 2020 05:37:38 +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: 1e6e6f10-8fbd-4f45-5691-08d7ea6d193f X-MS-TrafficTypeDiagnostic: MN2PR12MB4269: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 0386B406AA 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)(346002)(39860400002)(396003)(136003)(376002)(7696005)(6916009)(2906002)(52116002)(1076003)(6666004)(316002)(5660300002)(26005)(478600001)(6486002)(81156014)(9686003)(66946007)(956004)(66556008)(2616005)(16526019)(186003)(8676002)(8936002)(66476007)(36756003); DIR:OUT; SFP:1101; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SZwq6DqXqJ0YUOZXRen6IoVtSaArYHKw45oKyl/ELbws9WL7EzTSWT4/Ui8IzwqeTNK99vVxiLXGSkkvepPa4IYzVzTHft4LjCyrID1oOmsN6n3DeDcd4VOIONFhj0HE8ja6aughaTrtJCbQe5iWEWNmVOx6NvF1fjslexqHJ3fZZ9jmY+WaGwl1HSiFhkL8b+00Rd7AwS998sJ8shtI7kha+UHvr5ve4VgWzcCrg35Ct7zplIHfQG5BtHkHhIJrlQsuCU3UK9UtJIMqVgh7Gtyir/1MwLgSlcmDP70pnVvneeIxfTHidC9/DlbOVMHi0/P2tYAKdRvv5PhQ6S/JX6efUuPS235RgCAB+XZGZ+XPcsyQj1A46QPJV1fLQQf9KfzOG8aBhr0UfDtuR7/zhZtIfe/f9w+nuGjF3Bou7v1cNC5dJyZRrzUgGcm3WG/c X-MS-Exchange-AntiSpam-MessageData: WubhpJwZ5Z+PQndTszU5Jwas+0begPBnN3Wa3OTnIzQ808/TYLB129sqe+GeEgdtoTIn/SwPAp11yFGuJ5Tb5cxKwV8uZ1h4PZdCTB+b1aJQEQ2OkU4Add/0uj4L/bYHNPcj9oEUWA2Bdij19WPehy3c7iWq8B53+S7t1vmXIafzNQp46U/dhk2tIa1pfnRC87+RygDMvZKEr76Qlicc3jkb2FGcu5bHeGM6ArsWVZ0tv5nQ+BaZXc+4SwSC8SvjAwa07rhr+1SIPAWLyirTDTJSdp+WdkPAm+HgOmedowUIlOqTIv48xRzXh15DGNeSntwEzXhSEGAQxdODm71UhCpYlRCT8IYKVHGqAWblU07EtX5ONCi1wy76Myd9QmGXvkT9y65eaV9tB7Vz7fB0sBRjm6U7Crr/st9HvXKKFP5sDqSX7+uOHUpvt7+++MqK3mvLU/UpotNHe41KWqszlQULVHgIx8S637TbZorj6v2BN2s/8O6rByKLzL5Za1KloPOVYOafjNMNkWDGsBEv3BCi9KztUn5ipajoVov7xlIhFjxXzrNvXKoM+3XXe4VqutJh3NuVTFsh+aZ0Sf4p7HG3kJgahw8Su994cJF+qUqcuu31Mf1tQ7Pf54yDr/LIhCAWaRovd97iSvoAzrUD2/WkBS1hJGugji4dhrlQsTLvf1YZ9dCOsB9ee1rCaatujLG64ljYbyIzt90frpusatgtSBJPsdkbN+75WSH6rYt5DXcUKlFNIRVqWhXp/5+ihzFtSCG+zpwKEaMaNSpVF8sNAoRHrfu8mPEknzpuLX6Wvyq4E4fxxi8/Qw5v7pan X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e6e6f10-8fbd-4f45-5691-08d7ea6d193f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 05:37:39.4029 (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: IKUhbVN5HdF6nyWPm8fJpMsru+0REkFIb1FeYWzPxtjvddfJoxG0n7QG2WEKHzjMihMpyLc7B+fo/HyEccrFAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4269 Subject: [dpdk-dev] [PATCH v2] 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, -- 2.17.1