Skip to content

Commit

Permalink
ibm_newemac: Add support for 460EX/GT-type MAL rx-channel handling
Browse files Browse the repository at this point in the history
On some 4xx PPC's (e.g. 460EX/GT), the rx channel number is a multiple
of 8 (e.g. 8 for EMAC1, 16 for EMAC2), but enabling in MAL_RXCASR needs
the divided by 8 value for the bitmask.

Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Stefan Roese authored and Jeff Garzik committed Apr 25, 2008
1 parent f34ebab commit afd1dee
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions drivers/net/ibm_newemac/mal.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,14 @@ void mal_enable_rx_channel(struct mal_instance *mal, int channel)
{
unsigned long flags;

/*
* On some 4xx PPC's (e.g. 460EX/GT), the rx channel is a multiple
* of 8, but enabling in MAL_RXCASR needs the divided by 8 value
* for the bitmask
*/
if (!(channel % 8))
channel >>= 3;

spin_lock_irqsave(&mal->lock, flags);

MAL_DBG(mal, "enable_rx(%d)" NL, channel);
Expand All @@ -148,6 +156,14 @@ void mal_enable_rx_channel(struct mal_instance *mal, int channel)

void mal_disable_rx_channel(struct mal_instance *mal, int channel)
{
/*
* On some 4xx PPC's (e.g. 460EX/GT), the rx channel is a multiple
* of 8, but enabling in MAL_RXCASR needs the divided by 8 value
* for the bitmask
*/
if (!(channel % 8))
channel >>= 3;

set_mal_dcrn(mal, MAL_RXCARR, MAL_CHAN_MASK(channel));

MAL_DBG(mal, "disable_rx(%d)" NL, channel);
Expand Down

0 comments on commit afd1dee

Please sign in to comment.