Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2a85aec authored by Andrea Galbusera's avatar Andrea Galbusera Committed by David S. Miller
Browse files

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.
Also renamed hash_table_* with grp_hash_table_* in struct fec declaration
for 8xx: these registers are used only for multicast there.

Tested on a MPC5121 based board.
Build tested also against mpc866_ads_defconfig.

Signed-off-by: default avatarAndrea Galbusera <gizero@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9cf73ea

arch/powerpc/include/asm/8xx_immap.h

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ typedef struct fec { 
	uint	fec_addr_low;		/* lower 32 bits of station address	*/

	ushort	fec_addr_high;		/* upper 16 bits of station address	*/

	ushort	res1;			/* reserved				*/

	uint	fec_hash_table_high;	/* upper 32-bits of hash table		*/

	uint	fec_hash_table_low;	/* lower 32-bits of hash table		*/

	uint	fec_grp_hash_table_high;	/* upper 32-bits of hash table		*/

	uint	fec_grp_hash_table_low;	/* lower 32-bits of hash table		*/

	uint	fec_r_des_start;	/* beginning of Rx descriptor ring	*/

	uint	fec_x_des_start;	/* beginning of Tx descriptor ring	*/

	uint	fec_r_buff_size;	/* Rx buffer size			*/

drivers/net/fs_enet/mac-fec.c

+4 −4
Original line number Diff line number Diff line
@@ -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.