From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 78572333730 for ; Thu, 28 May 2026 20:52:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001571; cv=none; b=KMXYKkxlf1ux1SBh/sD0H3iG0xkTc3GrQ+5b6a0nfww5GHC6E3kquszgB0a0Xvs2Nad5SfGXbGhauLEqgmz70+6dmKxWT707AH4W7pdLD5d1b8KmFjOv/NIFpqWQeRx6v20kcoYKgDM1zZh+Iy4UA1qrrMcSwgJHI5kXjGv03c0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780001571; c=relaxed/simple; bh=5lXklgMxShwBwdT+Aj+Qb2oCq32nbmorVYaWfS1Wg+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NyPaVixiPebFuk7uQ1539Mu2gKlV9pWmetyrq/vy5mKzNcpOopWCBd9N/VtREhUga+VqB0OtiojbEI1z8oyGwYFBgt4Bl9dVojXR3Xk/wRR+XvI/+QCqBdiuGp/ej+uiTJ3AMWp6ti7VTDFWHi2M5V6w5Oz/o4CCDf5Y+H2XjT4= 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=BpyaJpuo; arc=none smtp.client-ip=209.85.221.52 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="BpyaJpuo" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-44dd5cb0f81so9239780f8f.0 for ; Thu, 28 May 2026 13:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780001569; x=1780606369; 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=XojjIRDhIyxrDp1Lf41UPx11rtEM/hZDetN38j+qBos=; b=BpyaJpuoEQV46HKKD2INzzbc1N463T6OJlkeTiwDtxcyxvbG/PEzliVim5oY7YgLux dnSmSrd3MwKOlbLjCMXnJ0j7xrqp4KlLBfBinRHsg/NFJrg03GQ7+uNZPAM4X5zXMri0 u8dCvC4aVhIhmF/mVN2juI80SXrkkLz4XsDNC98loVrCSjhxoiXuSCTq57fivWEbU4ey g3LeOxGjOcvmchFt+KDPv8ZkxAOcptJXh54VZkJGV9sBocwvoljriMLr8+LLdHC297Bc aiWPBNLiDTGXfjiDcLXH0+IkrzSJwysB5T/xn9Mh4SMQu6B8YhWBSQwkEu3P5xe1R0hZ f8ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780001569; x=1780606369; 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=XojjIRDhIyxrDp1Lf41UPx11rtEM/hZDetN38j+qBos=; b=XH7YvXffNSz1LLV9TbEbPf5jzBz11JRotGRTUnHBfxRdOQChE+scKUlWHfC13mQkEA al/SaM4mYJSdzo/wujvGdf0W5Nkbu3mg9jEZ863TKTAaCM3O4voDv2OURceUMSPjXpAP Kdt3rUwYugU834Yw11y6SQIAPuQ0Ae9L/5BQIc5fjj+PDtzjxxhGXDANiVNvU9nLP7HC fxCGJOubNOg7aaBfaSdTqMF3SxeujXb4jcJBMCHPROD6kaQgAIIZdgXKRjpOehZJ0VuD Kn35G5KBhu5qoVDAXiWNidjK3SphXLqMze2og6rDcTOC6FvIJRKgwBbuomDi0ON7TSJU CEnQ== X-Gm-Message-State: AOJu0YzbyMqtHCL2BNM3li52zhVB73kp3p5gPjv5eaAV8Jm6C2TfnIo2 P4TQFqYC5d2/Rt8l34KAwT2THUebC8F9+iJt+u5TazAf4SnWyQSxXQFw X-Gm-Gg: Acq92OHQY8IiqK0uvKvsspv4tiw9zPboYSObAgLnIekjmKyVMXJjyN4QJMZ16xQWs9B PND7GdCXd7cjd1E2yr6HnJEjqDaQ08l2caaNIUq9TAYUXUcxs+3RHLlLFB9+8N6BPJraknBEWRN L+e+CJoTqcilZSFMw3g+HmU5Dx2KnhelF+xNugH3dCPru1BtNakOiG0ducrBvfe+NTn3dnLQ9n9 WVQkP+N5jKYtjqgG5oJ8w8uNubGVSnIXw/Rwn+2eh+y9aWC63enznD1SHKrA80qSVHOWlQnrtld NslC/0iJskain8p7ivu1X6C0LgcSR3WV++DxvnAaCEZ73XbGuk4ICk35XUXnIB1dXmp6oWjGnLb XMHAKIpqPMV+/Sam1SviZh5K7M89ZTy24L4q4j3mzDD5uJG2BsrQmRiyU9gRkHsDfy5gWG1Vk02 vXzvDx/mWvnsIjisiopPCBf+cW75qzL/2EgQkm X-Received: by 2002:a05:6000:200f:b0:45e:89e9:348b with SMTP id ffacd0b85a97d-45ef1339797mr104379f8f.7.1780001568888; Thu, 28 May 2026 13:52:48 -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: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 , stable@vger.kernel.org Subject: [PATCH net-next v9 1/3] net: sfp: initialize i2c_block_size at adapter configure time Date: Thu, 28 May 2026 20:52:40 +0000 Message-ID: <20260528205242.971410-2-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 sfp->i2c_block_size is only assigned in sfp_sm_mod_probe(), which runs from the state machine timer after SFP_F_PRESENT has been set. Between those two points, sfp_module_eeprom() (the ethtool -m callback) gates only on SFP_F_PRESENT and can be entered with i2c_block_size still at its kzalloc'd value of 0. On a pure-I2C adapter, sfp_i2c_read() then issues an i2c_transfer() with msgs[1].len = 0 inside a loop that subtracts this_len from len each iteration; on adapters that succeed a zero-length read the loop never advances, spinning while holding rtnl_lock. This was previously addressed by initializing i2c_block_size in sfp_alloc() (commit 813c2dd78618), but the initialization was dropped when i2c_block_size was split from i2c_max_block_size. Initialize sfp->i2c_block_size from sfp->i2c_max_block_size in sfp_i2c_configure(), so the field is valid as soon as the adapter is known. sfp_sm_mod_probe() still reassigns it on each module insertion to recover from a per-module clamp to 1 (sfp_id_needs_byte_io). Fixes: 7662abf4db94 ("net: phy: sfp: Add support for SMBus module access") Cc: stable@vger.kernel.org Signed-off-by: Jonas Jelonek --- drivers/net/phy/sfp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 7a865f69a6bd..376f7232f9ee 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -824,6 +824,7 @@ static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c) return -EINVAL; } + sfp->i2c_block_size = sfp->i2c_max_block_size; return 0; } -- 2.51.0