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 7DB2DA00BE; Mon, 27 Apr 2020 07:48:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A00721BF75; Mon, 27 Apr 2020 07:48:38 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2081.outbound.protection.outlook.com [40.107.220.81]) by dpdk.org (Postfix) with ESMTP id 13C0C1BF74 for ; Mon, 27 Apr 2020 07:48:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f64cXb9cgOa7Wy39V3TAm+3G41urDxh0U/D1RQCCu9QXLK/1WXUXDCYKeztx4B3Ek8+9fWVcWoINjpklAOHgG5S94OigUa96AATakxdxTe1YLUBDGc53Kxs/oLVPd1xsnF0gN9tOzYvqvVLgO/+txdympYwV8e0GMzKSOvSNu4NskVuSp9FKneH9bB7KhhGaHmBY3OqMeNZB+f7OiufAc22LoTxa/a9j3jv1CRT2rMIbxVlAL58xcux51WfLCr3cjZ1GbhyMDuLRU0XJWdaUpxoUPIKQF1d71tII/Jo12yihv3g5ksRLBauaC9QV22A7s4D7zEaD92/OrK73eGoq+A== 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=jCNvitXJEV6ljl6KjzI4SiI7wkWw7YD81VTAaR6lNaE=; b=ayN0U+7hRVaJMLXiU0jiGRAmVllewAxbdyDB1FT8Cz8vnp4FcsFI+qh44djKxI9nizV+LvZr/l9NqaupoqGy2c6uWc+mbtQt+SZFADJZWrpxOVu+BgiMLyZqfwxoaj++mYMVq7Ilg54Ez52Zn2X73vT6WIhbPKVSLpyljAvs6bAoj85YUcYYZ5vSxMEHRKHoqJ/dtSfSc68jDyamvH8A+6pNmzlYK25xao5jIovO2OQ105MS9b/885WhSwRXHWG/uHJNfWy+BXXnyfGr38DwCRivQc3SlP5UfkThU4r78dJksnU2VN3AyrahU030RBIpDmKYz/D5t5GaVTYbm9vKAA== 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=jCNvitXJEV6ljl6KjzI4SiI7wkWw7YD81VTAaR6lNaE=; b=UmQPZtFxRFogmEO9/D81tP/Gsbh7pauivcIYnekYx0SwyrQvjGOn6lrYl1bN+WeUioeX9vQ3xK6RroO5T8JJ6lOxsOyIw28m8av0Qa0Mb8Psrag55Sc543LwEKu4CaKvy9Ia3jWbf3MUX8qlDQgwMA2ASQy4bPNP/o5nQuyZyv0= Received: from MN2PR12MB3504.namprd12.prod.outlook.com (2603:10b6:208:d1::10) by MN2PR12MB3229.namprd12.prod.outlook.com (2603:10b6:208:102::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Mon, 27 Apr 2020 05:48:35 +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:48:35 +0000 From: "Somalapuram, Amaranath" To: "Somalapuram, Amaranath" , "dev@dpdk.org" CC: "Kumar, Ravi1" Thread-Topic: [PATCH v2] net/axgbe: support sfp module EEPROM Thread-Index: AQHWHFa821gDfLEyKEaQGnkSVk1IRKiMdiKQ Date: Mon, 27 Apr 2020 05:48:34 +0000 Message-ID: References: <20200427054248.14104-1-asomalap@amd.com> In-Reply-To: <20200427054248.14104-1-asomalap@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ActionId=022f8190-9784-40cd-a288-0000fe8994b8; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=0; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=true; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Use Only - Unrestricted; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2020-04-27T05:48:00Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Amaranath.Somalapuram@amd.com; x-originating-ip: [2405:201:d805:fa1:e809:a844:ae07:1a42] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9e0f5be4-893a-42b3-a865-08d7ea6ea05f x-ms-traffictypediagnostic: MN2PR12MB3229:|MN2PR12MB3229: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1728; 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)(346002)(39860400002)(366004)(396003)(376002)(136003)(4326008)(316002)(9686003)(55016002)(71200400001)(110136005)(478600001)(86362001)(8936002)(66446008)(64756008)(81156014)(2906002)(7696005)(5660300002)(8676002)(76116006)(66946007)(66476007)(53546011)(6506007)(52536014)(66556008)(33656002)(186003); 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: 9aFb836fWUTCXxUO8XSubxR2oInkCZJj3rKfMI4k/6O892WHR1XafnwAGQSesTHJrh6y9THpVxMdcbtzLiCJe5cvLwerrfaPUOZraXYdD3tw882QC45xuONv3g3LQ42AM+iecjQBFfKLV+EpM22IPYNhVbKgoDvZBqh9Qy2pkBErQj65sWdxAHq5S3kkaV4+B9n9MIPDnfDpf/g9vuzx4rBJOr5h/HoUqMlTtvNyz/8FNH7ozOJ7GUMNrGvRTV+nmuSQSqJjAmGLaXgW6YUN2oNfsdJyBOe9UGpZB5+tW4gceUDjH1t2v95Mu97gaI1p4hVW+kqf16HexEZhe/g43YZVcBaPoFVVo0q8Y0iP+/ewJq1PXMbgohQAimUXExlRek7X24dDol/Szoat80o/FvC9YaKTAtwRHyiChUK9GRrIC1ZZSBesY6vkMLrBnmuV x-ms-exchange-antispam-messagedata: vmIv2FbNBnEmph7TeR9c+xSYAsaqGWhYJlLzWzwSxvJ1P+hJmYiOLZj8hEhXbRNofg3MFvvDzulKJSmCAN+YSjNcjYqXMYwhFAn1JPeAUeC0uvZh7M2EfBMoi6nVY0UPy054/bFYRvShWKMtk+jO4qbbe3Ep2G1UkvBS5QiidRvbvso3bKgpJ6JbmDkUxG8D33bKZ6DmGY7Zg64XU8Eh1+OzVfH7+G2M5s8ufEPuHzOpk+R3t5UVzBiVa5+Hq5CoZAifJa1auwBuUfJSlwNqzSOJT8QpoleHkGARF/w00MbRXQ0v4JW/dWzIRGr07AxiU2dph119FWZjp703fsroIfNebUMMRU/H5oil5x4e/LXXuIZ/awf26oBHiT0i4i3rZRtDpTqfh/eErkT61JB7WdPd61Je/4y4f1U7ShJZjfuVTO1rPqSYevTfmWolNMfwqljSOjNrpoOBBFXtsz6yET61kBoD8r5EljKs8FK6PJne9mzLf/lceWvX95/deh6BCmjjg3wr2lIZmT1b7pyDIVXC8w/RDEpO1hxnhtki6divRNHcA3uFVPF1mazO4LswuxTG0sisS8zz+bEAMCBBaizghwzwXlST6MQpGZJ2pVAPn8Dusb3KiazfokyDcfLNOSgyuVUjQnmyfkQa8MtlvkRjA7eOQQaPj0Gf9AnHxN/pZBpiinznBC9StW+h7hzpUBZhANma2ZK2kLxhaRPpbleLX1cA8jcOYRq15m+cZM/SNF24qdEfAPVuYwZoQ9Sh7UE6bedNd5K9eMPkmBD60s0KesfyzwBF8kAA96aba4ZJ2wfu98W2mTQssvbHhuFQyAt8MjqR26U/m3uVDe+H5oxgR84fn9h08ab89lTz6Hc= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e0f5be4-893a-42b3-a865-08d7ea6ea05f X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Apr 2020 05:48:35.3050 (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: btoJQN074B9xRy58bnyAR48znIB+KsPSwW6bi/9boIdtuftT5Pi5DUilhGa3A8S+lSVeLQfpOrWiX/oDRv109g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3229 Subject: Re: [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" Hi Ravi, Can you acknowledge this patch. Regards, S.Amarnath -----Original Message----- From: Somalapuram, Amaranath =20 Sent: Monday, April 27, 2020 11:13 AM To: dev@dpdk.org Cc: Kumar, Ravi1 Subject: [PATCH v2] net/axgbe: support sfp module EEPROM 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 =3D Y Linux UIO =3D Y x86-32 =3D Y x86-64 =3D Y +Module EEPROM dump =3D Y diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_eth= dev.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 =3D { .dev_supported_ptypes_get =3D axgbe_dev_supported_ptypes_get, .rx_descriptor_status =3D axgbe_dev_rx_descriptor_status, .tx_descriptor_status =3D axgbe_dev_tx_descriptor_status, + .get_module_info =3D axgbe_get_module_info, + .get_module_eeprom =3D axgbe_get_module_eeprom, }; =20 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..d9d7= fde41 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 =20 +int axgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo); int=20 +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_p= hy_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 { =20 #define AXGBE_SFP_EXTD_CC 31 =20 +#define AXGBE_SFP_EEPROM_PAGE_SIZE 256 + struct axgbe_sfp_eeprom { u8 base[64]; u8 extd[32]; u8 vendor[32]; }; =20 +struct axgbe_sfp_eeprom_module { + u8 base[256]; +}; + #define AXGBE_BEL_FUSE_VENDOR "BEL-FUSE" #define AXGBE_BEL_FUSE_PARTNO "1GBT-SFP06" =20 @@ -734,6 +740,106 @@ static int axgbe_phy_sfp_read_eeprom(struct axgbe_por= t *pdata) return ret; } =20 +int axgbe_get_module_info(struct rte_eth_dev *dev, + struct rte_eth_dev_module_info *modinfo) { + struct axgbe_port *pdata =3D dev->data->dev_private; + struct axgbe_sfp_eeprom sfp_eeprom; + uint8_t eeprom_addr; + int ret; + + ret =3D axgbe_phy_get_comm_ownership(pdata); + + if (ret) + return -EIO; + + ret =3D axgbe_phy_sfp_get_mux(pdata); + + if (ret) { + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); + return ret; + } + + eeprom_addr =3D 0; + ret =3D 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] !=3D 0xff) { + if (sfp_eeprom.extd[AXGBE_SFP_EXTD_SFF_8472] =3D=3D 0) { + modinfo->type =3D RTE_ETH_MODULE_SFF_8079; + modinfo->eeprom_len =3D RTE_ETH_MODULE_SFF_8079_LEN; + } else { + modinfo->type =3D RTE_ETH_MODULE_SFF_8472; + modinfo->eeprom_len =3D 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 =3D dev->data->dev_private; + struct axgbe_sfp_eeprom_module sfp_eeprom; + uint8_t eeprom_addr; + uint8_t *data; + uint32_t i; + int ret; + + ret =3D axgbe_phy_get_comm_ownership(pdata); + + if (ret) + return -EIO; + + if (!info || !info->length || !info->data) + return -EINVAL; + + ret =3D axgbe_phy_sfp_get_mux(pdata); + if (ret) { + PMD_DRV_LOG(ERR, "I2C error setting SFP MUX\n"); + return ret; + } + + eeprom_addr =3D 0; + ret =3D 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 =3D info->data; + + /* for AXGBE_SFP_SERIAL_ID_ADDRESS */ + for (i =3D 0; i < AXGBE_SFP_EEPROM_PAGE_SIZE; i++) + data[i] =3D sfp_eeprom.base[i]; + + eeprom_addr =3D 0; + ret =3D 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 =3D 0; i < info->length - AXGBE_SFP_EEPROM_PAGE_SIZE; i++) + data[i + AXGBE_SFP_EEPROM_PAGE_SIZE] =3D 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 =3D 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; =20 + /* Read the input port registers */ gpio_reg =3D 0; ret =3D axgbe_phy_i2c_read(pdata, phy_data->sfp_gpio_address, -- 2.17.1