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

Commit d955d90b authored by Ralf Baechle's avatar Ralf Baechle Committed by Jeff Garzik
Browse files

[PATCH] IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC. 



IOC3's homegrown DMA mapping functions that are used to optimize things
a little on IP27 set the wrong bit.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent dbe1ab95

drivers/net/ioc3-eth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ static inline struct sk_buff * ioc3_alloc_skb(unsigned long length, 
static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)

static inline unsigned long ioc3_map(void *ptr, unsigned long vdev)

{

{

#ifdef CONFIG_SGI_IP27

#ifdef CONFIG_SGI_IP27

	vdev <<= 58;   /* Shift to PCI64_ATTR_VIRTUAL */

	vdev <<= 57;   /* Shift to PCI64_ATTR_VIRTUAL */





	return vdev | (0xaUL << PCI64_ATTR_TARG_SHFT) | PCI64_ATTR_PREF |

	return vdev | (0xaUL << PCI64_ATTR_TARG_SHFT) | PCI64_ATTR_PREF |

	       ((unsigned long)ptr & TO_PHYS_MASK);

	       ((unsigned long)ptr & TO_PHYS_MASK);