From mboxrd@z Thu Jan 1 00:00:00 1970 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 77E762F1FEF for ; Thu, 28 May 2026 20:52:51 +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=1780001572; cv=none; b=qV933POkD0DVa0S7ClWEsE4YuXJlWpdVlus+0PWb5r8ktaa6RCz4hVh76h0n+Tv/nJu4dpRe9whnCwdgqAt6f1GUgA+MKC1KfcpzEmc5dpolNAmkCGp5gvkdtPwq6Vw8aswxDlh4801xKy2qd727i9/N6o06/hPaH6wdNhk9EoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001572; c=relaxed/simple; bh=1/q8glwu4s5w4FUKk4jEc8qnkNSxpoqlZxeBCfbPbdI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tg2VcAR/PapLMb//5VULdmsxAvBC2iuKXEvbch/PmG6PqUFrfyLTEeBrGJOrRIrUlYo8h+7KMcCzVLLdkD1UXJae9RssKgadLNjd/nht7Smq+fAkkQqpHNCItN35I55OKbeh4UKL8q1TUkmh5E/4Pxcmaxr7AKbNaOXNAaX1pWQ= 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=CHlJ6Vo6; 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="CHlJ6Vo6" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4906238c62eso46389495e9.3 for ; Thu, 28 May 2026 13:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780001570; x=1780606370; 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=efI/0Pq3FRsEo7Ip3A6gRAbN3ndW+5SuWmktEx7XnSs=; b=CHlJ6Vo6vL7ySZUXqEIr65KX2jCY66mmlgHnvcJU6CZurkWgSi7TEY0m0DZiwVRKP2 t/xXpVa+ADpK2LJ4n7PbYnpImI6BMpcDG4KXlS4VuOTV2Ta9Ox8+TIOyjU/ujAxmnZsF VHAQR2Png5EWHkD1zew8bBAhL4pMowA26UC5LWlLMqZcj441lPTKwJnPinQn1PPrZhGn eeHeQ+D+1rHO09rM6wKihD3smEqqO/wVXzSKbTddpOuY+CPw3560gFX87v4H7k6OvIwC s1LBCsI/L6q+HZWE2lKeGXDRVLVvQBbRpmboFMfGlawrmZ6ALULszsPpTuESIyZD9/L4 MEWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780001570; x=1780606370; 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=efI/0Pq3FRsEo7Ip3A6gRAbN3ndW+5SuWmktEx7XnSs=; b=lWK1OQBzeBrPSIiSHbx2C4mZR+AehoLXoFAxqsb0T/lcCxDAreM4jXNiI0iforPte1 R8AmMZoGy14rfxMCUiUlBbDzy33M7RoLFS9+3F0jk5aXyKBI7vknuO1KW4fpWMMRJZ9T T3TrI0RpJ5//vagWTTtRSWEiLrqzRaNzovnWy3GJUVwJyw+AaTbTaJJyM7JsffD+fsrF 3vls5909tDG4Hq/MK1L4Srq4Qlrbx8SbsO4vtzTt6GCJIz9y1h42DMZ1/M9gL1e5ijQH 505QL4nby/K6RlQfN+EaFlDoxqHmj5ByBs7t2xQRnjKjYVT2q70NPB74yUGfBsaHaYA9 O2YA== X-Gm-Message-State: AOJu0Yx7cuQnoKXMouP7gvORed39+fhksWUTA3v0dJ+0sqolY5sOyR68 nO+bxNKgpF4ozk81Hg6BVLsoqUA4C81hohL5gJhPbgNIBOF30IK/8Q6R X-Gm-Gg: Acq92OEx4qXHId1tPVyVq2q6aKV49mV3C0jQ6KoLLbR1GAmbIg7ZkMCSD4uW0NxDIP5 k6k5iDNR5+PYYf53I5Wmqqw9GWZoaiiA3myMBRpBYY9fY7z1go5o0y+qT1G71SpuyynCcgXa5lx 38Nv0FunRonzwahC0vrgLMzjLRuJKloHDEg6sa3MkwIqAbsghU8PdmckXhpELI2mJUeoZVKz/6Q msUcIMUuzJ2ZPq8pPCEyhNK9MR+Y63myUoBcoUbQg5Y2mTldCrcDAZKeiWER6puPy+6pg7+elus xAHCKKqyRGdmr8/Zalwsi0QNkdtxt0fcjXpcMP0c8JKpFz6o+CnIvr7MSfx7OSLVpqI2p4IxiEM lJBBKISXGr5bpuxdESrywN6Wdbn+ZNeTgFVa4QPjCxkL+AEZ5Wxdyr3ME3+Nat9KU1dl+ZqOE5G MI1zkLL5oU+oLrwepDZDAJxsTDNrZhh7vG72Y+ X-Received: by 2002:a05:600c:6287:b0:48a:7676:30bc with SMTP id 5b1f17b1804b1-4909c08cd89mr1988945e9.14.1780001569686; Thu, 28 May 2026 13:52:49 -0700 (PDT) Received: from builder ([2001:9e8:f104:6516:be24:11ff:fe30:5d85]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ee5a84e92sm7104028f8f.35.2026.05.28.13.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 13:52:49 -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 v9 2/3] net: sfp: apply I2C adapter quirks to limit block size Date: Thu, 28 May 2026 20:52:41 +0000 Message-ID: <20260528205242.971410-3-jelonek.jonas@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260528205242.971410-1-jelonek.jonas@gmail.com> References: <20260528205242.971410-1-jelonek.jonas@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 376f7232f9ee..60f36cba3d83 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -809,21 +809,29 @@ static int sfp_smbus_byte_write(struct sfp *sfp, bool a2, u8 dev_addr, static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c) { + size_t max_block_size; + sfp->i2c = i2c; if (i2c_check_functionality(i2c, I2C_FUNC_I2C)) { sfp->read = sfp_i2c_read; sfp->write = sfp_i2c_write; - sfp->i2c_max_block_size = SFP_EEPROM_BLOCK_SIZE; + max_block_size = SFP_EEPROM_BLOCK_SIZE; } else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA)) { sfp->read = sfp_smbus_byte_read; sfp->write = sfp_smbus_byte_write; - sfp->i2c_max_block_size = 1; + max_block_size = 1; } else { sfp->i2c = NULL; return -EINVAL; } + if (i2c->quirks && i2c->quirks->max_read_len) + max_block_size = min(max_block_size, i2c->quirks->max_read_len); + if (i2c->quirks && i2c->quirks->max_write_len) + max_block_size = min(max_block_size, i2c->quirks->max_write_len); + + sfp->i2c_max_block_size = max_block_size; sfp->i2c_block_size = sfp->i2c_max_block_size; return 0; } -- 2.51.0