From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.179 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794658747; b=kArnNr98WRQ8Vs5fwTlOGbjZNsdYrpUYYioKsZVJAoH+BCzwTcltA9u9cNOJEtr3Lbgq 32pcBSZI56nXtFlTjDofVVSFyLBvvTlDqyiLkp/EtPiom88Y8t94mnJIjOaAbYxrT3xrL pawfZrGbp08nJ0i5N+3SwyxSJtm6xwl6DnZdqMFkCdt78rDp4DaIdauM2Llfj/xXtt7qT BpEjaMwQnEsjBuOfHoBv0tAaKFB+P9tOK6Sv0jT0oGxqoHB7xnzcHrmEpqM4Dfvti9OjP t0yGEzZJpvsUqaZKlCm2CVqYOMwdw9gd8+MYANmhsfmB5cAbQFYfXxwkPGMbeE4rAig== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794658747; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=dyenbPZNtGuUfwVU+kdmxfuV+o4Dxas+l3oqGSTufiY=; b=ymuGJ2FmLJblLuUSCsYXYHHTtBHrjGr8tjIYEqJck4iHljmF7DJ2x+ZkwajJYYKXQX3E C29OsLOScNL7gOmiZsmio81THiMAP1/yNX5fDleQECy88QMHwfE8VbfbgaO3JW/eiRX+S cvfHlB5htFfE9XSwtdlpST1493XA8Mc51LCQn6i7SeqoLhtdtEEOvFDMo2rygcrikKRTp RObuQBABWXm8jkzrvpu6Ydjzprhzk4W0Uu0g/t1HvKtYK8Uc3HBPYHwmcqL0/4M7VecIB agUB/suM4wAnZpvR5iJMqdEngRopupH+rlg3aeLrx4POOVCbnA8IMA+Sx3iuUz88k9w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=DfAMyMoh; arc=none smtp.remote-ip=209.85.210.179 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1516E606A330 for ; Sat, 14 Nov 2026 12:19:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1516E606A330 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.a=rsa-sha256 header.s=20260707 header.b=DfAMyMoh Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-8b5c3288e6cso797680b3a.3 for ; Sat, 14 Nov 2026 04:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794658746; x=1795263546; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dyenbPZNtGuUfwVU+kdmxfuV+o4Dxas+l3oqGSTufiY=; b=DfAMyMohXe/arlvfBpEO3jQFkGWEHoEWMj+emJl2JFhd082Stg8BljsNPdaxZ7viKf LFWvIU9768f4tlulzItmBt7sl7S2vBsI8KI/6Npk9CTu9Vyji+y6kqWRY7srBtt+OaDK uivSx7NTvSjkalpZgcDN4Gs9gr5vd4uQUbm82sMWooM26njBFJvNfcySZEyliKQKtTLO DDk3i9cvtYd6cA8tn7JQQpLTZ41CexIYfPW4qhM1fqqCtV0KmIU9vNfz6zwC4b8cI2ty 9RGxRdZNaipxBSFNmEis1ujMxI+XvXN1xCjj/IXxx49vthq0UO7itVtHauZm+kEnVsnN WwtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794658746; x=1795263546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=dyenbPZNtGuUfwVU+kdmxfuV+o4Dxas+l3oqGSTufiY=; b=zfqCLmf/1SG+F8iDFI4BKvR+EiJ/UKiHl/8kRDunZqiF2WK642RvBNxHgha3d7WIWQ i+fBnyzmTWWIZf6gzB+mnskw+QlItTGdP1JW89vbmi4Toh2JKkpAsNxofSJfI3JhDuu3 UyTxkWDCmaZh6T9Om2NExHJibZtIndrDTfKrR60Sqf1w9q9A2MHgyjK1IwMOT5hKV4to PXIwi9xb/drdkt1GokqSSXWsi8+++iNtAkiHaH7mt1MAcGxohQF2y1Ozmq3esMxcdTPn QT4kLJbqmWvoGxie/EeTjx+OKVhw8LPfaPcahJjo7PFIAd4D98tUdxqegFYpZ7e2G93N 2x1Q== X-Forwarded-Encrypted: i=1; AL+hErEiTx4uBGdX4Fk1kKEj8PRcPHbi+HCSH0EPhFNUjVVMYg8+6934mD7o0v5Rvko3oeBUPQX6T4XGg9hDlSQ=@vger.kernel.org X-Gm-Message-State: APuU4Z/0A78nSvPKXzwXNB+UCYJWVCh4cGSJQx5alyZpR1dHDUrfKeQS pLq6jmo5EEGVtvppNvA3LwdDsyVeAIAt5kPtyiPsQ0kN3omieTOTlkpmQW5Tpg== X-Gm-Gg: AYBFou1vVDIxMDODaWrlUXuKRtFli9zYpIhf4ns/VjnM6Y6ZHOuib2CGmHQIYfiJOX7 reWnS+PjLdYpcECrHT7udsyHip8NZ7b2tGgQjy8MK/FwXZAbuAv9jnEFKZDIsoAyiM3V3SVUnjC tGT/BTu0fEgeDux+DjZ/+8ebFH8Da5+/HAhW3cbciNt6kye2QDqT/EX0CmIE599MagJiyqUUnYZ Er+eF6oq1sH/y+gD8NG9jDKkIrVVqdjCrcAv3Bb2t6OlS5vM8FcmHM/bq/UOgGd0LQ+AphgVdIg 2yDnA9OHYva1lMMVqSfEZZQPzSmTR35O+SJ73pMV8x7PHjwWAdERcbaUzF3GlDcx54OvhpyLgIZ L6ljrBKta5SSm181/+yqAywKnM7JEwmaCY84w74KcAJlivXafuFuq8ivzim4Bz+iQtGieZAOJGi 32Ib9ecM/Qcxw3JtfriX/ylWKVEHBBEzNh9Cih5306/GLR2/3C1pxyuEHtS17HTA+VoSFkUaMDR 8xNabKdvLHn2hCP2EvByt+dbA52sRvVdc8Hoi7Gj+oDAxQlY3SQYIwd/y4VL0Vs5cPd95OcTN1j C/KuIofiTYZfExAYRS8ubIkrb1btZH0oML3usAR9qm0yonxyVW8Pp/89Ry36fSMyCJclwiNOI4c Ncn+KyqMF7LPC+Nr30x0RLQNLRG2t4hy2RivpwSWaOMGwGa0Nd3XwPiWO X-Received: by 2002:a05:6a00:e18:b0:89e:3742:3e16 with SMTP id d2e1a72fcca58-8beb57c3e8amr4969876b3a.18.1794658746438; Sat, 14 Nov 2026 04:19:06 -0800 (PST) Received: from [169.254.3.1] ([143.248.188.96]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8bececcca19sm2094389b3a.4.2026.11.14.04.18.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 04:19:05 -0800 (PST) From: SeungJong Ha Date: Sat, 14 Nov 2026 21:18:25 +0900 Subject: [PATCH net-next v2 3/3] rust: net: phy: pass a MaybeLocked device to soft_reset X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261114-exp-phy-rs-maybelocked-v2-3-19a4dd658b6b@gmail.com> References: <20261114-exp-phy-rs-maybelocked-v2-0-19a4dd658b6b@gmail.com> In-Reply-To: <20261114-exp-phy-rs-maybelocked-v2-0-19a4dd658b6b@gmail.com> To: FUJITA Tomonori , Trevor Gross , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Andrew Lunn , Heiner Kallweit , Russell King Cc: netdev@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, SeungJong Ha X-Mailer: b4 0.15.2 phy_init_hw() calls `soft_reset` both with and without `phy_device->lock`, but `soft_reset_callback` hands the driver a `Locked` device and its SAFETY comment says the lock is held. Pass a `&mut Device` instead and correct the SAFETY comment. Update ax88796b_rust, the only implementation. Signed-off-by: SeungJong Ha --- drivers/net/phy/ax88796b_rust.rs | 8 ++++---- rust/kernel/net/phy.rs | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/phy/ax88796b_rust.rs b/drivers/net/phy/ax88796b_rust.rs index 2d24628a4e58..88e6e3c88b44 100644 --- a/drivers/net/phy/ax88796b_rust.rs +++ b/drivers/net/phy/ax88796b_rust.rs @@ -30,7 +30,7 @@ // BMCR_RESET bit and poll for the reset bit to be cleared. // Toggle BMCR_RESET bit off to accommodate broken AX8796B PHY implementation // such as used on the Individual Computers' X-Surf 100 Zorro card. -fn asix_soft_reset(dev: &mut phy::Device) -> Result { +fn asix_soft_reset(dev: &mut phy::Device) -> Result { dev.write(C22::BMCR, 0)?; dev.genphy_soft_reset() } @@ -85,7 +85,7 @@ fn resume(dev: &mut phy::Device) -> Result { dev.genphy_resume() } - fn soft_reset(dev: &mut phy::Device) -> Result { + fn soft_reset(dev: &mut phy::Device) -> Result { asix_soft_reset(dev) } @@ -115,7 +115,7 @@ fn resume(dev: &mut phy::Device) -> Result { dev.genphy_resume() } - fn soft_reset(dev: &mut phy::Device) -> Result { + fn soft_reset(dev: &mut phy::Device) -> Result { asix_soft_reset(dev) } } @@ -127,7 +127,7 @@ impl Driver for PhyAX88796B { const NAME: &'static CStr = c"Asix Electronics AX88796B"; const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_model_mask(0x003b1841); - fn soft_reset(dev: &mut phy::Device) -> Result { + fn soft_reset(dev: &mut phy::Device) -> Result { asix_soft_reset(dev) } } diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs index 105a1b727a08..46602798e8ac 100644 --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -358,9 +358,8 @@ impl Adapter { /// `phydev` must be passed by the corresponding callback in `phy_driver`. unsafe extern "C" fn soft_reset_callback(phydev: *mut bindings::phy_device) -> c_int { from_result(|| { - // SAFETY: This callback is called only in contexts - // where we hold `phy_device->lock`, so the accessors on - // `Device` are okay to call. + // SAFETY: `phydev` is valid for the callback. `phy_init_hw()` calls `soft_reset` both + // with and without `phy_device->lock`, which is the `MaybeLocked` context. let dev = unsafe { Device::from_raw(phydev) }; T::soft_reset(dev)?; Ok(0) @@ -575,7 +574,7 @@ pub trait Driver { const PHY_DEVICE_ID: DeviceId = DeviceId::new_with_custom_mask(0, 0); /// Issues a PHY software reset. - fn soft_reset(_dev: &mut Device) -> Result { + fn soft_reset(_dev: &mut Device) -> Result { build_error!(VTABLE_DEFAULT_ERROR) } -- 2.54.0