bnx2: annotate bp->phy_lock functions
Subsystems (2)
PATCH 1/1 bnx2: annotate bp->phy_lock functions
It looks like the locking is OK as the locks were being taken before the various phy setup functions, add the annotations as they release and reacquire the phy_lock.
--- drivers/net/bnx2.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
drivers/net/bnx2.c +10 -0
@@ -1497,6 +1497,8 @@ static int bnx2_fw_sync(struct bnx2 *, u32, int, int);static int bnx2_setup_remote_phy (struct bnx2 *bp,u8 port) +__releases(&bp->phy_lock) +__acquires(&bp->phy_lock) {u32 speed_arg =0 , pause_adv;
@@ -1554,6 +1556,8 @@ bnx2_setup_remote_phy(struct bnx2 *bp, u8 port)static int bnx2_setup_serdes_phy (struct bnx2 *bp,u8 port) +__releases(&bp->phy_lock) +__acquires(&bp->phy_lock) {u32 adv, bmcr;u32 new_adv =0 ;
@@ -1866,6 +1870,8 @@ bnx2_set_remote_link(struct bnx2 *bp)static int bnx2_setup_copper_phy (struct bnx2 *bp) +__releases(&bp->phy_lock) +__acquires(&bp->phy_lock) {u32 bmcr;u32 new_bmcr;
@@ -1963,6 +1969,8 @@ bnx2_setup_copper_phy(struct bnx2 *bp)static int bnx2_setup_phy (struct bnx2 *bp,u8 port) +__releases(&bp->phy_lock) +__acquires(&bp->phy_lock) {if (bp->loopback ==MAC_LOOPBACK )return 0 ;
@@ -2176,6 +2184,8 @@ bnx2_init_copper_phy(struct bnx2 *bp, int reset_phy)static int bnx2_init_phy (struct bnx2 *bp,int reset_phy) +__releases(&bp->phy_lock) +__acquires(&bp->phy_lock) {u32 val;int rc =0 ;
Signature · 1 line
1.6.1.249.g455e5
Quoted 6 lines · Harvey Harrison
It looks like the locking is OK as the locks were being taken before the various phy setup functions, add the annotations as they release and reacquire the
phy_lock.Signed-off-by Harvey Harrison <[email protected]>---
Whoops, bnx2 != bnx2x....that driver needs serious help in the endianess department, but it doesn't actually lok to hard to sort out as it seems most of the warnings come about as the hardware structs are just not annotated, but the correct accessors seem to be in place in the code.
In addition, there are piles of macros in the driver that really shouldn't be. I'll have a look this afternoon at some of the low-hanging fruit.
Harvey
From: Harvey Harrison <[email protected]>
Date: Mon, 19 Jan 2009 12:11:50 -0800
Quoted 5 lines
It looks like the locking is OK as the locks were being taken before the various phy setup functions, add the annotations as they release and reacquire the
phy_lock.Signed-off-by Harvey Harrison <[email protected]>
Queued up for 2.6.30, thanks Harvey.
On Mon, 2009-01-19 at 12:29 -0800, Harvey Harrison wrote:
[...]
Quoted 9 lines
Whoops, bnx2 != bnx2x....that driver needs serious help in the endianess department, but it doesn't actually lok to hard to sort out as it seems most of the warnings come about as the hardware structs are just not annotated, but the correct accessors seem to be in place in the code.
In addition, there are piles of macros in the driver that really shouldn't be. I'll have a look this afternoon at some of the low-hanging fruit.
Harvey
Thanks Harvey, I appreciate the help
Eilon