| Message ID | 20221011095437.12580-1-Divya.Koppera@microchip.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fa182ea26ff09cbadb28bbcd6196209b3555eb1d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [RESEND,net] net: phy: micrel: Fixes FIELD_GET assertion | expand |
On Tue, Oct 11, 2022 at 03:24:37PM +0530, Divya Koppera 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") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Divya Koppera <Divya.Koppera@microchip.com> > --- > drivers/net/phy/micrel.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c > index 3757e069c486..54a17b576eac 100644 > --- a/drivers/net/phy/micrel.c > +++ b/drivers/net/phy/micrel.c > @@ -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
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: 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") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Divya Koppera <Divya.Koppera@microchip.com> > > [...] 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!
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 3757e069c486..54a17b576eac 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -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;
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") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Divya Koppera <Divya.Koppera@microchip.com> --- drivers/net/phy/micrel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)