2011-04-20 08:55:54

by Andrea Galbusera

Subject: [PATCH 1/1] powerpc: Fix multicast problem in fs_enet driver

mac-fec.c was setting individual UDP address registers instead of multicast
group address registers when joining a multicast group.
This prevented from correctly receiving UDP multicast packets.
According to datasheet, replaced hash_table_high and hash_table_low
with grp_hash_table_high and grp_hash_table_low respectively.

Tested on a MPC5121 based board.

Signed-off-by: Andrea Galbusera <[email protected]>
---
drivers/net/fs_enet/mac-fec.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 61035fc..b9fbc83 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -226,8 +226,8 @@ static void set_multicast_finish(struct net_device *dev)
}

FC(fecp, r_cntrl, FEC_RCNTRL_PROM);
- FW(fecp, hash_table_high, fep->fec.hthi);
- FW(fecp, hash_table_low, fep->fec.htlo);
+ FW(fecp, grp_hash_table_high, fep->fec.hthi);
+ FW(fecp, grp_hash_table_low, fep->fec.htlo);
}

static void set_multicast_list(struct net_device *dev)
@@ -273,8 +273,8 @@ static void restart(struct net_device *dev)
/*
* Reset all multicast.
*/
- FW(fecp, hash_table_high, fep->fec.hthi);
- FW(fecp, hash_table_low, fep->fec.htlo);
+ FW(fecp, grp_hash_table_high, fep->fec.hthi);
+ FW(fecp, grp_hash_table_low, fep->fec.htlo);

/*
* Set maximum receive buffer size.
--
1.7.0.4

2011-04-20 16:23:51

by Scott Wood

Subject: Re: [PATCH 1/1] powerpc: Fix multicast problem in fs_enet driver

On Wed, 20 Apr 2011 10:55:19 +0200
Andrea Galbusera <[email protected]> wrote:

> mac-fec.c was setting individual UDP address registers instead of multicast
> group address registers when joining a multicast group.
> This prevented from correctly receiving UDP multicast packets.
> According to datasheet, replaced hash_table_high and hash_table_low
> with grp_hash_table_high and grp_hash_table_low respectively.
>
> Tested on a MPC5121 based board.
>
> Signed-off-by: Andrea Galbusera <[email protected]>
> ---
> drivers/net/fs_enet/mac-fec.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
> index 61035fc..b9fbc83 100644
> --- a/drivers/net/fs_enet/mac-fec.c
> +++ b/drivers/net/fs_enet/mac-fec.c
> @@ -226,8 +226,8 @@ static void set_multicast_finish(struct net_device *dev)
> }
>
> FC(fecp, r_cntrl, FEC_RCNTRL_PROM);
> - FW(fecp, hash_table_high, fep->fec.hthi);
> - FW(fecp, hash_table_low, fep->fec.htlo);
> + FW(fecp, grp_hash_table_high, fep->fec.hthi);
> + FW(fecp, grp_hash_table_low, fep->fec.htlo);
> }
>
> static void set_multicast_list(struct net_device *dev)
> @@ -273,8 +273,8 @@ static void restart(struct net_device *dev)
> /*
> * Reset all multicast.
> */
> - FW(fecp, hash_table_high, fep->fec.hthi);
> - FW(fecp, hash_table_low, fep->fec.htlo);
> + FW(fecp, grp_hash_table_high, fep->fec.hthi);
> + FW(fecp, grp_hash_table_low, fep->fec.htlo);
>
> /*
> * Set maximum receive buffer size.

This will break on 8xx which does not have grp_hash_table_*. It has only
one set of hash table registers which are used only for multicast -- so
8xx should have fec_hash_table_* renamed to fec_grp_hash_table_* in struct
fec.

-Scott