From nobody Sat Feb 7 21:23:47 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 9130A26C39E for ; Sun, 28 Dec 2025 21:33:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766957634; cv=none; b=twLhv8VCMAMM3++R0OCn7uwmF8bMetclrTX7avpnonvc2tDkMZ7mNOXGmZMu8mgfh6xuYt97bDdO0HfE+9RxnZhV0WTUotezGX9MHrVBDUU4OkDN8FSo7js+wBZupA4wGvxwuSwKjMmJ7Ouc0nlD91ps1a3TPedv6V2Wif06hiY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766957634; c=relaxed/simple; bh=az9tq5vkWNyI5dmkwb9SRrHDIFGiftqYFDZ7jtfIEB4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=T77YVgaiYXfDE/ttq2cI/ZwykxjBmd7zcM4mmCt6WD34QBVPqXuldI669QfU5iPLA/1pTYyh9HYi6aYuPTijmSs9lNmLJ846WHGM/5SCKL/2TUZ28JhDEsVlpUVhhDUt35AJaOOLqd9YQOriqZqJ6AqgwaYuZ70DIKsiqIfDtF0= 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=aMHPTRj1; arc=none smtp.client-ip=209.85.128.42 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="aMHPTRj1" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-47d493a9b96so8688045e9.1 for ; Sun, 28 Dec 2025 13:33:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766957631; x=1767562431; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/M4TajEatn0rrqZiK2uI6pVwpeHJFLxkhdBPtFxXjfQ=; b=aMHPTRj1FcqmCkByiuussXQftOG2mGpnILdpVcU//HDHeJMo2szDT2Z9r6WYW/lvNA JOc0LaOOHHMUy2J5qqFBN6Ye+Z/d0m14A3Eso9U6crIMtuNlenX7Gc7UMmoZw1acm0rJ rJvW7Br7uPlr+jQGveO7l/gnff8fWsLaNwUEpsJhy4F+EHtpPd7CzeXyXHyoOXEf0WM9 l5KZBfh6hkz2Ccb3vmOUo7vQ6OowiYvEKX+ciO42mkEOAGZ7c5WDq5Gho0dXGw5WCbJL rFP/sW+Qmst4jeGRkBtSS7FHCQHYJq32uFcFYXLzV+PQZwy9WL2dGwPcad/qV92KuKzC utrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766957631; x=1767562431; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/M4TajEatn0rrqZiK2uI6pVwpeHJFLxkhdBPtFxXjfQ=; b=hNbBpRQhVfRlb+w4ndU8xqNuKG7vHRev82z1R175Q5j7Gv6RuHeAP7LSY/OHEchawN 69U5f1QbGrzEntmtkfI3Q+hQe2DAHFBS3JnOUW/cL+5aUS3sAaHlOmLgD2Bpw3/sA0S6 NtKQpdH+DkIhDTcqXOKYMpVTpMY7SIIxnmteTUk5oU31Chsr+LL4ztlU7B60cO2cXNqs 4CL5LY6RNg3SBFmUTVh5ITfHYArGsl9LkUyCpuYl9WMMe0ZD9S30gIUnwhHTLwI9keU9 A2aWArAycBu+ZDJYP8Y5fiJLE4EKLNXVpboHOmGq/L1XI8TbLOPvUJ30LGm0ZQsQ1EXO TtEw== X-Forwarded-Encrypted: i=1; AJvYcCUrDK6EQjWWyI+cM+GpK17YRs43t2fhWOzIGGMZ/zVF1yOpBrKX/4OBlpHuM8vtV7+N5VzodrqpJdG0rGc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3J52g+gzg3aGm/2RlESLbRP/0VpJOTt8RcYR8LsAl4IMaCFj7 gQrAUX+ib5ZUex55+WfaPLLtcq3DU4zSsAl7zZk8VrcaesumlI4DeWQt X-Gm-Gg: AY/fxX5y+2qlHpBIJReAhpYO5s9PpKVkMgakuq0lBB97WwXA0CR8Gwv3iEZ2HrFOmP2 /8XIpNf5K5k+aOkEjGnRvMnCsB94KqYNa+D12IwhQIBPC5jyyEq3jpelZDOw0yCkgtdHqb4jCUc sRulBgWpQvQWu+MH02c3zzWOD7FwTw7HArBSVyNGNlD1QqQcC82d5BpvkbywASdWkuGl1r0l6FF XlUO7Uf975JxWx1qKL40seWV38KD4+frWtR2Or9WTVvtwNbDByFMdEZXGqA5GBKIIyIMQfo4qac yYppaShBFaZIzHwqHtyvs7pm6VQJP1C2BpbyL8H3iYMyH/vvtrteD07mL1gF2PeHPYW7fYUaTRX tj/20q1KmFMLbmAHcqq9hgfQbfwTbpDlj5ClSp/GOTX7ip8g3ILL7ukXdJS2NPMlN8QpJTYdGSW EdyjCIW+Hi/uNaFXE= X-Google-Smtp-Source: AGHT+IGYU9WnSfVG4+4SZrHi2sCZjhcjLW707xvS9JQjXa/Yl5AZ9YJeVjFk7fmGE625aLmogNrSEg== X-Received: by 2002:a05:600c:468f:b0:45c:4470:271c with SMTP id 5b1f17b1804b1-47d269c7019mr289643875e9.18.1766957630638; Sun, 28 Dec 2025 13:33:50 -0800 (PST) Received: from builder.. ([2001:9e8:f110:f516:be24:11ff:fe30:5d85]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324ea1aef7sm58706764f8f.7.2025.12.28.13.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Dec 2025 13:33:50 -0800 (PST) From: Jonas Jelonek To: Russell King , Andrew Lunn , Heiner Kallweit , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= , Jonas Jelonek Subject: [PATCH] net: sfp: add SMBus I2C block support Date: Sun, 28 Dec 2025 21:33:31 +0000 Message-ID: <20251228213331.472887-1-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.48.1 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 support for SMBus-only controllers for module access. However, this is restricted to single-byte accesses and has the implication that hwmon is disabled (due to missing atomicity of 16-bit accesses) and warnings are printed. There are probably a lot of SMBus-only I2C controllers out in the wild which support block reads. Right now, they don't work with SFP modules. This applies - amongst others - to I2C/SMBus-only controllers in Realtek longan and mango SoCs. Downstream in OpenWrt, a patch similar to the abovementioned patch is used for current LTS kernel 6.12. However, this uses byte-access for all kinds of access and thus disregards the atomicity for wider access. Introduce read/write SMBus I2C block operations to support SMBus-only controllers with appropriate support for block read/write. Those operations are used for all accesses if supported, otherwise the single-byte operations will be used. With block reads, atomicity for 16-bit reads as required by hwmon is preserved and thus, hwmon can be used. The implementation requires the I2C_FUNC_SMBUS_I2C_BLOCK to be supported as it relies on reading a pre-defined amount of bytes. This isn't intended by the official SMBus Block Read but supported by several I2C controllers/drivers. Support for word access is not implemented due to issues regarding endianness. Signed-off-by: Jonas Jelonek --- drivers/net/phy/sfp.c | 77 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 6166e9196364..c5019fb682a3 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -744,6 +744,35 @@ static int sfp_smbus_byte_read(struct sfp *sfp, bool a= 2, u8 dev_addr, return data - (u8 *)buf; } =20 +static int sfp_smbus_block_read(struct sfp *sfp, bool a2, u8 dev_addr, + void *buf, size_t len) +{ + size_t block_size =3D sfp->i2c_block_size; + union i2c_smbus_data smbus_data; + u8 bus_addr =3D a2 ? 0x51 : 0x50; + u8 *data =3D buf; + u8 this_len; + int ret; + + while (len) { + this_len =3D min(len, block_size); + + 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); + len -=3D this_len; + data +=3D this_len; + dev_addr +=3D this_len; + } + + return data - (u8 *)buf; +} + static int sfp_smbus_byte_write(struct sfp *sfp, bool a2, u8 dev_addr, void *buf, size_t len) { @@ -768,23 +797,67 @@ static int sfp_smbus_byte_write(struct sfp *sfp, bool= a2, u8 dev_addr, return 0; } =20 +static int sfp_smbus_block_write(struct sfp *sfp, bool a2, u8 dev_addr, + void *buf, size_t len) +{ + size_t block_size =3D sfp->i2c_block_size; + union i2c_smbus_data smbus_data; + u8 bus_addr =3D a2 ? 0x51 : 0x50; + u8 *data =3D buf; + u8 this_len; + int ret; + + while (len) { + this_len =3D min(len, block_size); + + 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) + return ret; + + len -=3D this_len; + data +=3D this_len; + dev_addr +=3D this_len; + } + + return 0; +} + 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_I2C_BLOCK)) { + sfp->read =3D sfp_smbus_block_read; + sfp->write =3D sfp_smbus_block_write; + + max_block_size =3D SFP_EEPROM_BLOCK_SIZE; + 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); + } 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 + sfp->i2c_max_block_size =3D max_block_size; return 0; } =20 base-commit: 3387a7ad478b46970ae8254049167d166e398aeb --=20 2.48.1