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 CBFB2A00BE; Mon, 27 Apr 2020 07:43:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 988DA1BF0B; Mon, 27 Apr 2020 07:43:13 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760058.outbound.protection.outlook.com [40.107.76.58]) by dpdk.org (Postfix) with ESMTP id 7479F1BED9 for ; Mon, 27 Apr 2020 07:43:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tm/NS6jecx44UvA8uBwxpSjgRj4oVMU8dswPWN1+HMQY3WgZJJzRkbGzwv32NxHjJtxDvlr+V93SgRzZMMg8rW2ly6TkDbMJv371Qm2vA6vH4zKo7kBEU3NTV9jEmxwYbWcLNJMqfbDzWXC6oNehEDRC+GazP7RJ+zIigXdRjP2I2izNNl3GAdIlVTUd0abmYRLyCxsXsabW/zASkojN4J3ca7P1y/KizPl6jUNw8du2viNn/FLE8YbiBEEeSBiGXtmX+16cJtHfaO5wvHfllewzYP8EWV+jvXw3KlYfCqyDF/EbCnYXa726ZtylTuTUiXuFS9Z9wpO7v7xwZXcmkw== 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=dVSKU9W99HNvEa1VYpoqxy4cQQqX+YFzRk/SUTwiavSEf2BrDfkbH9AXfCdE0gZIMuaUXSf1aNaqv3/A/e2CnlUiMx4Y2U9veIAPWwEmF3sTdLukG35xk0Sr9gp1lCRtPP39xJMSFs7VwKg1smQ/rYD9W/k/wbQ/HD0Nmy1NwEfYAqOFaC4GyhExjVkJZXzWmHO6LyOXZyTtLIATIRDFcPWZTNASouTQjqFBOyeDfWIfkUDfaBdXaE5SC2bCf6r0l72sQrq0n7qc6iPriE6SSQEifOKz/+cVN+w57DDEwvlpDmhPMwEm/9T64687WmQ8ocvna+rJUjTiWVSXzNkbBQ== 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=RppBxRD26Be7Y+L2C8pSF99fAMxlBWWRdkN4Do6UpjVmgxs63qVph2j4NUOR4YAWRRYBESUPu88IXHmMWL0rx1hZWOXzJgktt6f+Qp5UtrNwRe3qpmrn7XHXO6FBU8KFp+EcR3Vgu7Kos08eknnKb15gD7rMYWl17AO23rJki08= 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 MN2PR12MB4157.namprd12.prod.outlook.com (2603:10b6:208:1db::13) 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:43:10 +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:43:10 +0000 From: asomalap@amd.com To: dev@dpdk.org Cc: Ravi1.Kumar@amd.com Date: Mon, 27 Apr 2020 11:12:48 +0530 Message-Id: <20200427054248.14104-1-asomalap@amd.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: MAXPR0101CA0026.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::12) 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 MAXPR0101CA0026.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:d::12) 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:43:09 +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: 3ecaadbe-ee42-4d97-64c3-08d7ea6dde91 X-MS-TrafficTypeDiagnostic: MN2PR12MB4157:|MN2PR12MB4157: X-MS-Exchange-Transport-Forked: True 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)(346002)(39860400002)(376002)(396003)(136003)(366004)(4326008)(316002)(2616005)(9686003)(478600001)(6666004)(6916009)(956004)(16526019)(8936002)(1076003)(36756003)(81156014)(2906002)(7696005)(52116002)(6486002)(8676002)(5660300002)(66946007)(66476007)(26005)(66556008)(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: c/m4CGCR2vulh2DUSoMSaBFOfh3llE4QH6H2hWdcH1RPmhTnUbPUaLxcsNuSdXaO9K1gtfDlGLYrla0cgQXWQMxgkINJQ7BrdcxpEC/9VCh4y8NIPb4M4kUWtincQjsVZO48WGQWkwwiowpUkFqrg2pPLizWo6quRvvKJ/pQ2yMMn7NCVEtRyb2Xch/LjTxyZ7y2GlSTMRqSWwMIIqYqsGDGdVVZ8eGgVmhArmREdFNmw5o9sj1/NXFTSLK+5PV2QovUIynmtMkM2y1OPzUmHTCzBAQfkh35YJG1wjoQWux+PS+Da40hH2ZiejhOP8xRTeSADNbPVjAp4HuogWPcePgAfZCe5RSUhKRSAKAmiluOqBMg1VtRxYuJTZ+jk+6oKzvMc/gxnr12HkueG7/mL8IZfsMLRPO1cgARA7U1FHfT71AwRFPFf01aic7syV/7 X-MS-Exchange-AntiSpam-MessageData: +H5T/Xsrn4AGofCp6203+AVDyXW00zWHTk7fuZaoZYOYhq3HmVwS9y6MqT0sHq3Bd8iHhp99tnZ4+8TaIc3K47ITY9fGRZrss/EaNB4PLEdKEgNJ+eN6LI4fR7EE4q4SVOCeopU4BsvFsgikKuzZJfaw2MhtnqKjjZFDvQgyi+Et9plYl6Uc+uzxPc2ZSvCjlNwECHX1nvViIrCFngN2gMLFVl0750ijaoWSZKHpFzGoK/6MnvZpUiC83bxQIH1ETXVN677u0/MlezkT4GmGpyUTntpkphWDP4dV1D9F0Mtvuj9YbKrW0FPnI1lbQ16JCUIcX6cojGdy9OZXdkq/AGsBbyRMOQzreeXv/tY8V2PBnFxwz199OiX+2tK2O/60DAPnqI4kB4Kla01vP27p6BlXA4TSne5pF0GkZ/etJ+oJLNzqMBFVT8sIPC3V81g2AvULcqWqjplLQbP6UlSd2xAuDKc0hYHqIzjQiym2ydLlnmouWL+1RRNHJj7Z0w8JnDB+8/WFXjzAJh2nFYZLFvNrhrgiMMMtOVJY3ex2rTY6IsuAs/4LJniJby9aw7EyP5VamgQ/nqZg+p+48MTgqZXPuXeQnivxmB8/Chp85Q+yJczHiBO2NlL8TgnH/9fs4uTC903cKLwL1tA6S9lo4YTnCw/JBWOrV8PGFX8/3IBmtSJsQNOwEfuQR0ark/oeXWGYPn8KRHHz6w8KttzpSZMKCFeztXT3k+1vsjdy9MAEhFk9atvWwXzwewi0+Md2mO0lkyn0/scfpoXSDRT/TlMp0ztXhsYvKqrvMdsgvvEmGyjms9MIHirkX9Hhea4C X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ecaadbe-ee42-4d97-64c3-08d7ea6dde91 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2020 05:43:10.4798 (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: h7+FreN7jqkqMMbH6ch8tl9mYH/LsnusUb8KLAkXxZajQTNITyy8EVXbsj7Npbv5nwK1wOlMkEk/LcZk3F1kcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4157 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