6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman This reverts commit f22d349940cb34e56f6e8cd86d69c36d3998b33a which is commit 6fb0a9d9071f1ff0cc5cfc0782302d9c90d642cb upstream. It was not meant to be backported before 7.1.y -- its tag said: Cc: stable@vger.kernel.org # Only 7.1.y and later (requires bindgen's raw pointer accessors). Cc: FUJITA Tomonori Cc: Jakub Kicinski Link: https://lore.kernel.org/stable/SEWP216MB9770116738884C46F156A686FAF98D2@SEWP216MB977011.KORP216.PROD.OUTLOOK.COM/ Acked-by: Chunfeng Song Signed-off-by: Miguel Ojeda Signed-off-by: Greg Kroah-Hartman --- rust/kernel/net/phy.rs | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) --- a/rust/kernel/net/phy.rs +++ b/rust/kernel/net/phy.rs @@ -123,37 +123,39 @@ impl Device { /// Gets the current link state. /// /// It returns true if the link is up. - #[inline] pub fn is_link_up(&self) -> bool { - let phydev = self.0.get().cast_const(); - // SAFETY: By the type invariant of `Device`, `phydev` points to a valid - // `struct phy_device`, and there is no concurrent write to this field. - let link = unsafe { bindings::phy_device::link_raw(phydev) }; - link == 1 + const LINK_IS_UP: u64 = 1; + // TODO: the code to access to the bit field will be replaced with automatically + // generated code by bindgen when it becomes possible. + // SAFETY: The struct invariant ensures that we may access + // this field without additional synchronization. + let bit_field = unsafe { &(*self.0.get())._bitfield_1 }; + bit_field.get(14, 1) == LINK_IS_UP } /// Gets the current auto-negotiation configuration. /// /// It returns true if auto-negotiation is enabled. - #[inline] pub fn is_autoneg_enabled(&self) -> bool { - let phydev = self.0.get().cast_const(); - // SAFETY: By the type invariant of `Device`, `phydev` points to a valid - // `struct phy_device`, and there is no concurrent write to this field. - let autoneg = unsafe { bindings::phy_device::autoneg_raw(phydev) }; - autoneg == bindings::AUTONEG_ENABLE + // TODO: the code to access to the bit field will be replaced with automatically + // generated code by bindgen when it becomes possible. + // SAFETY: The struct invariant ensures that we may access + // this field without additional synchronization. + let bit_field = unsafe { &(*self.0.get())._bitfield_1 }; + bit_field.get(13, 1) == u64::from(bindings::AUTONEG_ENABLE) } /// Gets the current auto-negotiation state. /// /// It returns true if auto-negotiation is completed. - #[inline] pub fn is_autoneg_completed(&self) -> bool { - let phydev = self.0.get().cast_const(); - // SAFETY: By the type invariant of `Device`, `phydev` points to a valid - // `struct phy_device`, and there is no concurrent write to this field. - let completed = unsafe { bindings::phy_device::autoneg_complete_raw(phydev) }; - completed == 1 + const AUTONEG_COMPLETED: u64 = 1; + // TODO: the code to access to the bit field will be replaced with automatically + // generated code by bindgen when it becomes possible. + // SAFETY: The struct invariant ensures that we may access + // this field without additional synchronization. + let bit_field = unsafe { &(*self.0.get())._bitfield_1 }; + bit_field.get(15, 1) == AUTONEG_COMPLETED } /// Sets the speed of the PHY.