From nobody Mon May 25 08:11:31 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB25D3E1CE7 for ; Sat, 16 May 2026 13:54:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778939691; cv=none; b=GYywA2s5bNg+6Z73dGL1fGKmm5HhSNkchQ2z68An8xlFRrJrPeVCRVFWZD6QTQZh+tkYJFKQFi6dJRkyF7XNE9cZrnQz/OazL/Df+KebFBzdqCU3ilMPtnruhbAcXDAE8B7TIcipKXPmTa0dEzOANK/xxBrk13i703OiE1CJML8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778939691; c=relaxed/simple; bh=VpoQujZ9GQMnf5nQHTEp2Qyqm03Jlz6XjLvYPy3uE5A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=blIGvd2Kp6IpyG1993i/9qMBUeBZ5H/eQEmjfcKjgj/zJMyF5AneRDehAsBAJHXYKJtoTphWaPp9zVH+Uc9n1KjBPIgzpHioN9NcWEH6vLRptfQ4wT3q9zT4n37Njvfi5Lf20BhLw/X+rio8rSRhuKWkXcBOBIn5uIb5MDgijZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lOSKGSXT; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lOSKGSXT" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso4116895e9.0 for ; Sat, 16 May 2026 06:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778939688; x=1779544488; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dIrvNnWJICom0gFogZEpaj6AR2Yk4bcfuHPYqmXxhME=; b=lOSKGSXT2SXGXiLWWQI/9SlV6wS+20MbZt3iKHpOFZbM04s9URdNu5GlXYVZFqLUYd 3GgsEf3zzmPdxH/NCDu3HqSYAx4F/q48JhzUT1/8U2rZ3bMB+ppStkh7A2SkzrsgxKHf jfSfJhcsdVPOWQBE90u2geodLM0MJXpwgCd02ZpUyNXZ07lKoyJuvnG9wU76syhqm9Ik CLgFR4Bh5BBRaS4WPtV6Zd2/TdEAmF9N7jeh5CXrh5y6vAT6cpE7R/hShYH5CNL7fQbi Xlry6e3SqiekDHB1gDefJb2B2PFs2RsNz0SnX7JguQpaebR6AYhcwe5jx/EMpKD1G5fp cgyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778939688; x=1779544488; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dIrvNnWJICom0gFogZEpaj6AR2Yk4bcfuHPYqmXxhME=; b=HCQQdNPo/kv+OOTCO44CmhSwu6yIV019sQl8zSN3IRCznLALRzViCjQKg93vkqtUqW HsF9Ptq4+Tnzmu/XGrsLbnN/mhTvRh2EvB4SBYrFzzr4drsJaPpprkdyW6ywp8XKdUXi UStXmCIeBv/TbIA5ElEHsr9rmWZzs7PRlyj9YgzjLGULyicuK9H1kuh9zhCehZqgH1by OCdcS14PwOcSDQKFUEYZ+iZXkqlzkwyVW6/fMhfpv/pkQ4ur9YuLeUh5BkRlxcodsQ7M DfsU7ktPVvKkolF4/pylJatOoaVGhqJcDdDTkaeTMGYKT5B+1L2MhyU0ebudacImVhF9 NN7A== X-Forwarded-Encrypted: i=1; AFNElJ+vivFYgV4FXWRwfUMxrhHUSG6nmLzIwSfsLKoICjb8LclpKL/5BqXBS+eDoAuCjTVAsJAS7yZiQ6aqiWQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yys3xa5Hq4zNX+nhAOKD42415jLnCRF8Q2bqmm+RY/FUJIUplwU MLmITYq2miDOzhfNKj9JGs0vXSnLiTkS2EPZ60Vrw8iqUO2SInh/DewW X-Gm-Gg: Acq92OFtFqSvLMG1WaLWATUh1RDwzDZWoQU0AM8L3mpTH66ldkxZVQNxraSIG3yRMZX +5WaaQW2BWUUaTcrVnx0Lp68VdyVD/d1Rvr6//JCkLknzoxhAEIbEA2aNSzRjh/AfMMmI4rP6+n Y0UrNywPo0YbvzbkLtNdxjIGoe3e7Dy8Uh04nTUpPsBOUNZZUUPdamCaT76ijML+LvkrEus1zzt geZofXhRScqBHcu4sXlvC1HKlUCj+t2bH+ZZtIySK4EpnoLq/BlRamkWoPS765aogRU2OET12M5 bkoBiQyHNnmO933z6ZBLxmMhqRq4B2N/MoN09LmwJnhM+TIeKyRcGFwmDJ/EIjnb8WjqFHuwXUx 4esTIooaTtA3A3Adz6wIT5/K22rP2PO3DAI9pgK9eD7EcdSSQ05JQwh3UKOJbh0gIWTumo5b9ed TilkHJ8n6NHEdJZ6oKhExGP4GOTQ== X-Received: by 2002:a05:600c:4685:b0:48e:5d91:cfe3 with SMTP id 5b1f17b1804b1-48fe5fd494dmr113773895e9.1.1778939687859; Sat, 16 May 2026 06:54:47 -0700 (PDT) Received: from builder ([2001:9e8:f136:a916:be24:11ff:fe30:5d85]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe537c788sm123360645e9.12.2026.05.16.06.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2026 06:54:47 -0700 (PDT) From: Jonas Jelonek To: Russell King , Andrew Lunn , Heiner Kallweit , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Chevallier Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= , Simon Horman , Jonas Jelonek Subject: [PATCH net-next v8 1/2] net: sfp: apply I2C adapter quirks to limit block size Date: Sat, 16 May 2026 13:54:41 +0000 Message-ID: <20260516135442.2234729-2-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260516135442.2234729-1-jelonek.jonas@gmail.com> References: <20260516135442.2234729-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The SFP driver assumes all I2C adapters support reading and writing the pre-defined block size SFP_EEPROM_BLOCK_SIZE of 16 bytes. This constant was probably chosen based on good guesses and known limitations of a range of I2C adapters and SFP modules. However, I2C adapters may even support less and usually need to specify this via I2C quirks. Theoretically, such an adapter may provide full functionality but only support a read and write length of e.g. 8 bytes. Currently, the SFP driver doesn't account for that. Add handling for I2C quirks in SFP I2C configuration taking the fields max_read_len and max_write_len in struct i2c_adapter_quirks into account to further limit the maximum block size if needed. Signed-off-by: Jonas Jelonek --- drivers/net/phy/sfp.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index bd970f753beb..e58e29a1e8d2 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -807,21 +807,29 @@ static int sfp_smbus_byte_write(struct sfp *sfp, bool= a2, u8 dev_addr, =20 static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c) { + size_t max_block_size; + sfp->i2c =3D i2c; =20 if (i2c_check_functionality(i2c, I2C_FUNC_I2C)) { sfp->read =3D sfp_i2c_read; sfp->write =3D sfp_i2c_write; - sfp->i2c_max_block_size =3D SFP_EEPROM_BLOCK_SIZE; + max_block_size =3D SFP_EEPROM_BLOCK_SIZE; } else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA)) { sfp->read =3D sfp_smbus_byte_read; sfp->write =3D sfp_smbus_byte_write; - sfp->i2c_max_block_size =3D 1; + max_block_size =3D 1; } else { sfp->i2c =3D NULL; return -EINVAL; } =20 + if (i2c->quirks && i2c->quirks->max_read_len) + max_block_size =3D min(max_block_size, i2c->quirks->max_read_len); + if (i2c->quirks && i2c->quirks->max_write_len) + max_block_size =3D min(max_block_size, i2c->quirks->max_write_len); + + sfp->i2c_max_block_size =3D max_block_size; return 0; } =20 --=20 2.51.0 From nobody Mon May 25 08:11:31 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8ECC3E2AAC for ; Sat, 16 May 2026 13:54:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778939693; cv=none; b=rwPPh9o43ZLC1alWRhYwQWmC1X/CxUtmApF9zEC2PCtwBb7bp8oZ2SjVLFFJ3jYbq/08AfiaXklj//cs6cK6oRmJiw7upBdt+VBsgn5wsyEisHSbnvWp5ukA9D4nd0UdrmZ+yMzhH6/zAuBD8IpY2zLILQP80+4Ei3EJ+nzIX3s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778939693; c=relaxed/simple; bh=cnhT4qn1KiUSUAuiqhBJuA86uG3HBcvERfR5PFDKC+Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeMxlJWTpyZhIEq56ollT8kO/4biV7nmVEpJ2MEvfUxPQO1wU1c295OXcZfR0ClB2jzvIaBx9ONr4f7tp7GEPBNfvc1sUTaQQCkTLRPDEYSU8filF0KZ9mO5FtatrS6SqqBqVlU3NMP4iNpVZjrdYT9Dy8f/RffPtOyKmSSZZ5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NTn8J0aq; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NTn8J0aq" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso4116985e9.0 for ; Sat, 16 May 2026 06:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778939689; x=1779544489; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iuj4ct1xzoMLr4ZRvpa1THeHUoUBgunyxhAAeDfF2OI=; b=NTn8J0aqxIlBK4QKEaoE2CxIcf3oWiW2YZRJ+wXp586+j0JR+Jg2OIxHzfbm8pJBZq lH6opdASeR5bhHu/jzVkpli3mXqV4t6jvnKuhEyYKgKNOovng6TWyfDDYmI0i2RF9d8l XUlufXUi5V+hsBTAUmuLQuEJlF4Qw/PngpNhLeSXilgCFGGlDDBys64rnCyDJXz8X/Ha DtURwqX/WSFUR9POKjI4jfC6CBB4xNskTgyby9M6RVMQd8l640RVwHasAxJleo9PGiAh UPP9YFYWN5Eip5KwXmtTsiz9u3CkAEqXH7Fp3syTeLINFoSybGdtB3lIRYw5i8bclHjT c0EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778939689; x=1779544489; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iuj4ct1xzoMLr4ZRvpa1THeHUoUBgunyxhAAeDfF2OI=; b=pvhc2lYwlZoPHvzwBlLigKv8eQKez6QZWrwGVy1NR7kSH1gZnlgPWwsAfyyIolAu57 tFqH2lXNYviS+1br5scScBT9E5P00Ny6Op4WK2aCVk/b9hoXYtS296t0MDT30UpWRwa3 Y0LjYGltX8CCHrhMC9D9A5CNJJhDKEx/Wc2i5Dx32YIu8VDSNpDGrAsqvEd5EMUZQsJl Y5JdlZ0q47skNDkMfLEq2XXkWILs4yOHAYKfcwLzMviiaHz1/QNsNmVLgrwrkV/vLjzd 30cFSJKjo6TzHGAneibUhgL+kPZ47CpC7MSzF9onoSXUggloE67CFtryvSEk+G/sdhvw Oh1w== X-Forwarded-Encrypted: i=1; AFNElJ8cOPshtlsy8DC0XndPY9wz/nb75JYaiAu72d2jCnrNleeEC2Fz8RUI2pAD0XNh5Wrr0xXtSNi1AUy5bVQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyX8ju+ZdopL50cBE4r8hznCAmSyWgG2CDVRn+91QUbA3xntwPC qmEAfs7oqrxmOcf5jI1uJ1VU/VfyiFZZ7OQW0ZdwPIfv9l8SLh5aMMmI X-Gm-Gg: Acq92OH/UGhfS4tOZL3rU7UpqyunJKWlKaxCo+GQucaQ80x843gijQq7bM5qe5TCTkf m5S0CSqqOywXF1HbVd+OFRmHzPoKw6hAVrS7h9XREx5QErmn4mrfOSaQIx1niBAFiI1ESta98ge jddl3wacFN0tafPs6Xq65R3gzJuej6wRP5eakZhcts72bKroUL74cAJl93v2GjPWj90bcIiYanP zcYJDcZ/4X206vRTCFVlhcMRWcsjqE1O93HzZWIU5PhUfhWbDJiIckZUliEvuq4rjZH9nE15mN5 ImyhTrE+UEhBHlIWDODrHA+nNdZyUC06DRwXIFezwzAhj9mW34QyZOfzMpga4DFxv0xSSQtMPHa VjqXjwCv0dumiqeOIx1Sv9VL5LJ3LfMWt1QtE0TUGXi4jJ/mHlxp3Hx5wMi9fQ6PYvASK7O2ECB PqSZ8dGEfoEbhLqrhnhLGmthE7Tw== X-Received: by 2002:a05:600c:1593:b0:48f:f199:79f7 with SMTP id 5b1f17b1804b1-48ff1997aaemr31744375e9.27.1778939689258; Sat, 16 May 2026 06:54:49 -0700 (PDT) Received: from builder ([2001:9e8:f136:a916:be24:11ff:fe30:5d85]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe537c788sm123360645e9.12.2026.05.16.06.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 May 2026 06:54:48 -0700 (PDT) From: Jonas Jelonek To: Russell King , Andrew Lunn , Heiner Kallweit , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Chevallier Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= , Simon Horman , Jonas Jelonek Subject: [PATCH net-next v8 2/2] net: sfp: extend SMBus support Date: Sat, 16 May 2026 13:54:42 +0000 Message-ID: <20260516135442.2234729-3-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260516135442.2234729-1-jelonek.jonas@gmail.com> References: <20260516135442.2234729-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 7662abf4db94 ("net: phy: sfp: Add support for SMBus module access") added SMBus access for SFP modules, but limited it to single-byte transfers. As a side effect, hwmon is disabled (16-bit reads cannot be guaranteed atomic) and a warning is printed. Many SMBus-only I2C controllers in the wild support more than just byte access, and SFP cages are often wired to such controllers rather than to a full-featured I2C controller -- e.g. the SMBus controllers in the Realtek longan and mango SoCs, which advertise word access and I2C block reads. Today, they cannot drive an SFP at all without falling back to the byte-only path. Extend sfp_smbus_read()/sfp_smbus_write() so that, in addition to the existing byte access, they also use SMBus word access and SMBus I2C block access whenever the adapter advertises them. Both directions are handled in a single read and a single write helper that pick the largest supported transfer per chunk and fall back as needed. I2C-block is preferred unconditionally when available: the protocol carries any length 1..32, so it can serve every chunk -- including the 1- and 2-byte tails -- without help from word or byte access. Note that this requires I2C_FUNC_SMBUS_I2C_BLOCK, which reads a caller-specified number of bytes. This deviates from the official SMBus Block Read (length is supplied by the slave) but is widely supported by Linux I2C controllers/drivers. Capability matrix this implementation supports: - BYTE only: works (unchanged behaviour); 1-byte xfers, hwmon disabled. - BYTE + WORD: word for >=3D2-byte chunks, byte for trailing odd byte. - I2C_BLOCK present (with or without BYTE/WORD): block as the universal transport for every chunk. - WORD only (no BYTE/BLOCK): accepted with WARN_ONCE. Even-length transfers work; odd-length transfers (e.g. the 3-byte cotsworks fixup write) hit the BYTE branch which the adapter does not implement, so the xfer returns an error and the operation is aborted. No mainline I2C driver was found to advertise WORD without BYTE; the warning lets us learn about it if it ever shows up. Adapters with asymmetric R/W capabilities (e.g. only READ_I2C_BLOCK but not WRITE_I2C_BLOCK) remain functionally correct -- the per-iteration fallback uses the direction-specific bits -- but the shared i2c_max_block_size is sized by the all-bits-set check, so a transfer in the better-supported direction is not upgraded. None of the mainline I2C bus drivers surveyed during review advertise such asymmetry; promoting i2c_max_block_size to per-direction sizes can be revisited if needed. Signed-off-by: Jonas Jelonek Reviewed-by: Maxime Chevallier --- drivers/net/phy/sfp.c | 136 +++++++++++++++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 28 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index e58e29a1e8d2..85eb13cf5df2 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -14,6 +14,7 @@ #include #include #include +#include #include =20 #include "sfp.h" @@ -756,50 +757,110 @@ static int sfp_i2c_write(struct sfp *sfp, bool a2, u= 8 dev_addr, void *buf, return ret =3D=3D ARRAY_SIZE(msgs) ? len : 0; } =20 -static int sfp_smbus_byte_read(struct sfp *sfp, bool a2, u8 dev_addr, - void *buf, size_t len) +static int sfp_smbus_read(struct sfp *sfp, bool a2, u8 dev_addr, void *buf, + size_t len) { - union i2c_smbus_data smbus_data; + union i2c_smbus_data smbus_data =3D {0}; u8 bus_addr =3D a2 ? 0x51 : 0x50; + size_t this_len, transferred; + u32 functionality; u8 *data =3D buf; int ret; =20 - while (len) { - ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, - I2C_SMBUS_READ, dev_addr, - I2C_SMBUS_BYTE_DATA, &smbus_data); - if (ret < 0) - return ret; + functionality =3D i2c_get_functionality(sfp->i2c); =20 - *data =3D smbus_data.byte; + while (len) { + this_len =3D min(len, sfp->i2c_block_size); + + if (functionality & I2C_FUNC_SMBUS_READ_I2C_BLOCK) { + smbus_data.block[0] =3D this_len; + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_READ, dev_addr, + I2C_SMBUS_I2C_BLOCK_DATA, &smbus_data); + if (ret < 0) + return ret; + + memcpy(data, &smbus_data.block[1], this_len); + transferred =3D this_len; + } else if (this_len >=3D 2 && + (functionality & I2C_FUNC_SMBUS_READ_WORD_DATA)) { + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_READ, dev_addr, + I2C_SMBUS_WORD_DATA, &smbus_data); + if (ret < 0) + return ret; + + put_unaligned_le16(smbus_data.word, data); + transferred =3D 2; + } else { + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_READ, dev_addr, + I2C_SMBUS_BYTE_DATA, &smbus_data); + if (ret < 0) + return ret; + + *data =3D smbus_data.byte; + transferred =3D 1; + } =20 - len--; - data++; - dev_addr++; + data +=3D transferred; + len -=3D transferred; + dev_addr +=3D transferred; } =20 return data - (u8 *)buf; } =20 -static int sfp_smbus_byte_write(struct sfp *sfp, bool a2, u8 dev_addr, - void *buf, size_t len) +static int sfp_smbus_write(struct sfp *sfp, bool a2, u8 dev_addr, void *bu= f, + size_t len) { union i2c_smbus_data smbus_data; u8 bus_addr =3D a2 ? 0x51 : 0x50; + size_t this_len, transferred; + u32 functionality; u8 *data =3D buf; int ret; =20 + functionality =3D i2c_get_functionality(sfp->i2c); + while (len) { - smbus_data.byte =3D *data; - ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, - I2C_SMBUS_WRITE, dev_addr, - I2C_SMBUS_BYTE_DATA, &smbus_data); - if (ret) - return ret; + this_len =3D min(len, sfp->i2c_block_size); + + if (functionality & I2C_FUNC_SMBUS_WRITE_I2C_BLOCK) { + smbus_data.block[0] =3D this_len; + memcpy(&smbus_data.block[1], data, this_len); + + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_WRITE, dev_addr, + I2C_SMBUS_I2C_BLOCK_DATA, &smbus_data); + if (ret < 0) + return ret; + + transferred =3D this_len; + } else if (this_len >=3D 2 && + (functionality & I2C_FUNC_SMBUS_WRITE_WORD_DATA)) { + smbus_data.word =3D get_unaligned_le16(data); + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_WRITE, dev_addr, + I2C_SMBUS_WORD_DATA, &smbus_data); + if (ret < 0) + return ret; + + transferred =3D 2; + } else { + smbus_data.byte =3D *data; + ret =3D i2c_smbus_xfer(sfp->i2c, bus_addr, 0, + I2C_SMBUS_WRITE, dev_addr, + I2C_SMBUS_BYTE_DATA, &smbus_data); + if (ret < 0) + return ret; + + transferred =3D 1; + } =20 - len--; - data++; - dev_addr++; + data +=3D transferred; + len -=3D transferred; + dev_addr +=3D transferred; } =20 return data - (u8 *)buf; @@ -815,10 +876,29 @@ static int sfp_i2c_configure(struct sfp *sfp, struct = i2c_adapter *i2c) sfp->read =3D sfp_i2c_read; sfp->write =3D sfp_i2c_write; max_block_size =3D SFP_EEPROM_BLOCK_SIZE; - } else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA)) { - sfp->read =3D sfp_smbus_byte_read; - sfp->write =3D sfp_smbus_byte_write; - max_block_size =3D 1; + } else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA) || + i2c_check_functionality(i2c, I2C_FUNC_SMBUS_I2C_BLOCK)) { + /* Either protocol alone covers any length: I2C-block carries + * 1..32 bytes per xfer, byte iterates one byte at a time. + */ + sfp->read =3D sfp_smbus_read; + sfp->write =3D sfp_smbus_write; + + if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_I2C_BLOCK)) + max_block_size =3D SFP_EEPROM_BLOCK_SIZE; + else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_WORD_DATA)) + max_block_size =3D 2; + else + max_block_size =3D 1; + } else if (WARN_ONCE(i2c_check_functionality(i2c, I2C_FUNC_SMBUS_WORD_DAT= A), + "SMBus word-only adapter; odd-length transfers will fail\n")) { + /* Word-only: even-length xfers work; odd-length xfers fall + * to BYTE, which the adapter does not advertise and will + * likely fail. + */ + sfp->read =3D sfp_smbus_read; + sfp->write =3D sfp_smbus_write; + max_block_size =3D 2; } else { sfp->i2c =3D NULL; return -EINVAL; --=20 2.51.0