[PATCH net v1] rust: net::phy fix module autoloading

[PATCH net v1] rust: net::phy fix module autoloading

[FUJITA Tomonori]

The alias symbol name was renamed by the commit 054a9cd395a7("modpost:
rename alias symbol for MODULE_DEVICE_TABLE()").

Adjust module_phy_driver macro to create the proper symbol name.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
---
 rust/kernel/net/phy.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
index b89c681d97c0..2fbfb6a94c11 100644
--- a/rust/kernel/net/phy.rs
+++ b/rust/kernel/net/phy.rs
@@ -860,7 +860,7 @@ const fn as_int(&self) -> u32 {
 /// ];
 /// #[cfg(MODULE)]
 /// #[no_mangle]
-/// static __mod_mdio__phydev_device_table: [::kernel::bindings::mdio_device_id; 2] = _DEVICE_TABLE;
+/// static __mod_device_table__mdio__phydev: [::kernel::bindings::mdio_device_id; 2] = _DEVICE_TABLE;
 /// ```
 #[macro_export]
 macro_rules! module_phy_driver {
@@ -883,7 +883,7 @@ macro_rules! module_phy_driver {
 
         #[cfg(MODULE)]
         #[no_mangle]
-        static __mod_mdio__phydev_device_table: [$crate::bindings::mdio_device_id;
+        static __mod_device_table__mdio__phydev: [$crate::bindings::mdio_device_id;
             $crate::module_phy_driver!(@count_devices $($dev),+) + 1] = _DEVICE_TABLE;
     };
 

base-commit: 51a00be6a0994da2ba6b4ace3b7a0d9373b4b25e
-- 
2.43.0

Re: [PATCH net v1] rust: net::phy fix module autoloading

[Miguel Ojeda]

On Wed, Dec 11, 2024 at 1:08 AM FUJITA Tomonori
<fujita.tomonori@gmail.com> wrote:
>
> The alias symbol name was renamed by the commit 054a9cd395a7("modpost:
> rename alias symbol for MODULE_DEVICE_TABLE()").

Should this be:

    Fixes: 054a9cd395a7 ("modpost: rename alias symbol for
MODULE_DEVICE_TABLE()")

?

I guess this will go through netdev -- thanks!

Cheers,
Miguel

Re: [PATCH net v1] rust: net::phy fix module autoloading

[Paolo Abeni]

On 12/11/24 01:06, FUJITA Tomonori wrote:
> The alias symbol name was renamed by the commit 054a9cd395a7("modpost:
> rename alias symbol for MODULE_DEVICE_TABLE()").
> 
> Adjust module_phy_driver macro to create the proper symbol name.
> 
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>

Please resubmit including the fixes tag, thanks!

Side note: the netdev CI is lamenting a linking issue on top of this
patch, but I could not reproduce the issue locally.

/P

Re: [PATCH net v1] rust: net::phy fix module autoloading

[FUJITA Tomonori]

On Thu, 12 Dec 2024 12:42:51 +0100
Paolo Abeni <pabeni@redhat.com> wrote:

> On 12/11/24 01:06, FUJITA Tomonori wrote:
>> The alias symbol name was renamed by the commit 054a9cd395a7("modpost:
>> rename alias symbol for MODULE_DEVICE_TABLE()").
>> 
>> Adjust module_phy_driver macro to create the proper symbol name.
>> 
>> Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
> 
> Please resubmit including the fixes tag, thanks!

Sure, I'll send v2 shortly.

> Side note: the netdev CI is lamenting a linking issue on top of this
> patch, but I could not reproduce the issue locally.

Hmm, I don't think this causes a compile error because it just changes
the variable name. I confirmed that this works on hardware.

I don't know what the error message means but it might be an
environment issue?

Re: [PATCH net v1] rust: net::phy fix module autoloading

[Paolo Abeni]

On 12/12/24 13:47, FUJITA Tomonori wrote:
> On Thu, 12 Dec 2024 12:42:51 +0100 Paolo Abeni <pabeni@redhat.com> wrote:
>> Side note: the netdev CI is lamenting a linking issue on top of this
>> patch, but I could not reproduce the issue locally.
> 
> Hmm, I don't think this causes a compile error because it just changes
> the variable name. I confirmed that this works on hardware.
> 
> I don't know what the error message means but it might be an
> environment issue?

I believe it's a netdev (nipa) build system issue.

Thanks,

Paolo