Skip to contentSkip to conversation

net: phy: micrel: Fixes FIELD_GET assertion

PATCH RESEND Applied Divya Koppera 3 participants 3 messages Oct 11, 2022 – Oct 13, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 net: phy: micrel: Fixes FIELD_GET assertion

FIELD_GET() must only be used with a mask that is a compile-time constant. Mark the functions as __always_inline to avoid the problem.

Fixes 21b688dabecb6a ("net: phy: micrel: Cable Diag feature for lan8814 phy")
---
 drivers/net/phy/micrel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/phy/micrel.c +5 -4
index 3757e069c486..54a17b576eac 100644
@@ -1838,7 +1838,7 @@ static int ksz886x_cable_test_start(struct phy_device *phydev)
 	return phy_clear_bits(phydev, MII_BMCR, BMCR_ANENABLE | BMCR_SPEED100);
 }
 
-static int ksz886x_cable_test_result_trans(u16 status, u16 mask)
+static __always_inline int ksz886x_cable_test_result_trans(u16 status, u16 mask)
 {
 	switch (FIELD_GET(mask, status)) {
 	case KSZ8081_LMD_STAT_NORMAL:
@@ -1854,13 +1854,13 @@ static int ksz886x_cable_test_result_trans(u16 status, u16 mask)
 	}
 }
 
-static bool ksz886x_cable_test_failed(u16 status, u16 mask)
+static __always_inline bool ksz886x_cable_test_failed(u16 status, u16 mask)
 {
 	return FIELD_GET(mask, status) ==
 		KSZ8081_LMD_STAT_FAIL;
 }
 
-static bool ksz886x_cable_test_fault_length_valid(u16 status, u16 mask)
+static __always_inline bool ksz886x_cable_test_fault_length_valid(u16 status, u16 mask)
 {
 	switch (FIELD_GET(mask, status)) {
 	case KSZ8081_LMD_STAT_OPEN:
@@ -1871,7 +1871,8 @@ static bool ksz886x_cable_test_fault_length_valid(u16 status, u16 mask)
 	return false;
 }
 
-static int ksz886x_cable_test_fault_length(struct phy_device *phydev, u16 status, u16 data_mask)
+static __always_inline int ksz886x_cable_test_fault_length(struct phy_device *phydev,
+							   u16 status, u16 data_mask)
 {
 	int dt;
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 15 lines · Divya Koppera

FIELD_GET() must only be used with a mask that is a compile-time constant. Mark the functions as __always_inline to avoid the problem.

Fixes 21b688dabecb6a ("net: phy: micrel: Cable Diag feature for lan8814 phy")
---
 drivers/net/phy/micrel.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/phy/micrel.c +0 -0
index 3757e069c486..54a17b576eac 100644

drivers/net/phy/micrel.c static int ksz886x_cable_test_start(struct phy_device *phydev) · line 1841

Quoted 5 lines
drivers/net/phy/micrel.c +1 -1
@@ -1838,7 +1838,7 @@ static int ksz886x_cable_test_start(struct phy_device *phydev)
 	return phy_clear_bits(phydev, MII_BMCR, BMCR_ANENABLE | BMCR_SPEED100);
 }
 
-static int ksz886x_cable_test_result_trans(u16 status, u16 mask)
+static __always_inline int ksz886x_cable_test_result_trans(u16 status, u16 mask)

I don't think that this is valid workaround. You are adding inline function to C-files.

Please find another solution. For example, adding new field_get function to bitfield.h that accepts dynamic fields.

Thanks

#2 lore raw
In reply to Divya Koppera
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Tue, 11 Oct 2022 15:24:37 +0530 you wrote:

FIELD_GET() must only be used with a mask that is a compile-time constant. Mark the functions as __always_inline to avoid the problem.

Fixes 21b688dabecb6a ("net: phy: micrel: Cable Diag feature for lan8814 phy")

[...]

Here is the summary with links:
- [RESEND,net] net: phy: micrel: Fixes FIELD_GET assertion

    https://git.kernel.org/netdev/net/c/fa182ea26ff0

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html