From patchwork Mon Sep 11 07:42:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 812239 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="O3HAGlqJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xrKdj6ftkz9s7F for ; Mon, 11 Sep 2017 17:42:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751031AbdIKHmb (ORCPT ); Mon, 11 Sep 2017 03:42:31 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34557 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750937AbdIKHma (ORCPT ); Mon, 11 Sep 2017 03:42:30 -0400 Received: by mail-wm0-f67.google.com with SMTP id l19so6168299wmi.1 for ; Mon, 11 Sep 2017 00:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=5KdO36ui9bG3RSjHD5L3lFWta+n5UKgjh9wT/T57UGM=; b=O3HAGlqJgKHrIuZg7xZ8t69bzmUpb9d9V1ffwylc2vk/Ab5GMKlda6Dv788CmWwxcL b3L6xOtLz37g/AJk/Qs9BtzB9xmaGeRT9OIzN2afHTFutO8dmAqVJIPZfVIuHQpVduQq 7UOk03YdRCi2f1JOj5D+dXmJYJA53hzssRgQTh0vvV3OuTvPqpsp8rP/sWZHylLA0Hkc cwE6P2pQSXvBt7xOg4lZOch7OmbPXbK2Anu/ushFZLXtrpASu+Qa2aH7dXpMIl06S5wb Y0ptCN06QbIt/7JjA/GuPFioCBP6FZU9Ak3tCaDD7VXbXuokxNR4EAkDtXjlu3dZU2u6 rO7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5KdO36ui9bG3RSjHD5L3lFWta+n5UKgjh9wT/T57UGM=; b=tdzVvS26OI7tebyi/WHETDaGIxH2xcxFN+L6559OX/KFUWNLG2xoQQeA1GC63bPL1X +9Oxnhn6tvUKZf6nAaOl4wHsF+KpuSFiDkHDCTzdroR4lUuvh8sxjJreWv+JHpdpr/Vx P5uaR5t3jOU3vAh10FEOjcZs+qnxo1ediPFqoCu8pk8asO4zasDg23QaK2N+ahsj/eLH pvcwF3wFe988ggwKeJKnNRuMFIPfh4nuNUN3RkhX2iXU7qcVWdvKyl5R9zeSA1FLnqTv PDJCxWJI0opr4F19TH3zxjJV5WU92sWihHz03xRe6Nf2i3Rz23/hJn9up5znvpTzw3V/ Nlmw== X-Gm-Message-State: AHPjjUiyhZse/2DVw5LykRMblFbXWn0+EdwkXQ1d7wsj51aIk7M9AZRy 0ZCMwekuTHiZH8Cc5khiumJs0rXj X-Google-Smtp-Source: AOwi7QB2c7OZuAI8XkNMciyme44wdWaEteEtmduISLyfjHREHjA8SU1belCQrbUXYP7855F7aiDmQQ== X-Received: by 10.28.0.207 with SMTP id 198mr6516715wma.92.1505115748446; Mon, 11 Sep 2017 00:42:28 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id n71sm3833233wmg.20.2017.09.11.00.42.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Sep 2017 00:42:27 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, arkadis@mellanox.com, idosch@mellanox.com, flokli@flokli.de, mlxsw@mellanox.com Subject: [patch net] mlxsw: spectrum: Fix EEPROM access in case of SFP/SFP+ Date: Mon, 11 Sep 2017 09:42:26 +0200 Message-Id: <20170911074226.2020-1-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arkadi Sharshevsky The current code does not handle correctly the access to the upper page in case of SFP/SFP+ EEPROM. In that case the offset should be local and the I2C address should be changed. Fixes: 2ea109039cd3 ("mlxsw: spectrum: Add support for access cable info via ethtool") Reported-by: Florian Klink Signed-off-by: Arkadi Sharshevsky Reviewed-by: Ido Schimmel Signed-off-by: Jiri Pirko --- Dave, could you please queue this up to STABLE as well? Thanks! --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index ed7cd6c..e080459 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2545,7 +2545,9 @@ static int mlxsw_sp_flash_device(struct net_device *dev, return err; } -#define MLXSW_SP_QSFP_I2C_ADDR 0x50 +#define MLXSW_SP_I2C_ADDR_LOW 0x50 +#define MLXSW_SP_I2C_ADDR_HIGH 0x51 +#define MLXSW_SP_EEPROM_PAGE_LENGTH 256 static int mlxsw_sp_query_module_eeprom(struct mlxsw_sp_port *mlxsw_sp_port, u16 offset, u16 size, void *data, @@ -2554,12 +2556,25 @@ static int mlxsw_sp_query_module_eeprom(struct mlxsw_sp_port *mlxsw_sp_port, struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; char eeprom_tmp[MLXSW_SP_REG_MCIA_EEPROM_SIZE]; char mcia_pl[MLXSW_REG_MCIA_LEN]; + u16 i2c_addr; int status; int err; size = min_t(u16, size, MLXSW_SP_REG_MCIA_EEPROM_SIZE); + + if (offset < MLXSW_SP_EEPROM_PAGE_LENGTH && + offset + size > MLXSW_SP_EEPROM_PAGE_LENGTH) + /* Cross pages read, read until offset 256 in low page */ + size = MLXSW_SP_EEPROM_PAGE_LENGTH - offset; + + i2c_addr = MLXSW_SP_I2C_ADDR_LOW; + if (offset >= MLXSW_SP_EEPROM_PAGE_LENGTH) { + i2c_addr = MLXSW_SP_I2C_ADDR_HIGH; + offset -= MLXSW_SP_EEPROM_PAGE_LENGTH; + } + mlxsw_reg_mcia_pack(mcia_pl, mlxsw_sp_port->mapping.module, - 0, 0, offset, size, MLXSW_SP_QSFP_I2C_ADDR); + 0, 0, offset, size, i2c_addr); err = mlxsw_reg_query(mlxsw_sp->core, MLXSW_REG(mcia), mcia_pl); if (err)