ibm_newemac: Add support for 460EX/GT-type MAL rx-channel handling
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>
This commit is contained in:
parent
f34ebab68a
commit
afd1dee896
1 changed files with 16 additions and 0 deletions
|
@ -136,6 +136,14 @@ void mal_enable_rx_channel(struct mal_instance *mal, int channel)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
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);
|
spin_lock_irqsave(&mal->lock, flags);
|
||||||
|
|
||||||
MAL_DBG(mal, "enable_rx(%d)" NL, channel);
|
MAL_DBG(mal, "enable_rx(%d)" NL, channel);
|
||||||
|
@ -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)
|
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));
|
set_mal_dcrn(mal, MAL_RXCARR, MAL_CHAN_MASK(channel));
|
||||||
|
|
||||||
MAL_DBG(mal, "disable_rx(%d)" NL, channel);
|
MAL_DBG(mal, "disable_rx(%d)" NL, channel);
|
||||||
|
|
Loading…
Add table
Reference in a new issue