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

Commit 1a319025 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Set card 57765 card reader MRRS to 1024B 



This patch sets the Maximum Read Request Size for the card reader
function to 1024 bytes to prevent an SD controller lockup.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cea46462

drivers/net/tg3.c

+2 −0
Original line number Diff line number Diff line
@@ -7704,6 +7704,8 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) {

		val = tr32(TG3PCI_DMA_RW_CTRL) &

		      ~DMA_RWCTRL_DIS_CACHE_ALIGNMENT;

		if (tp->pci_chip_rev_id == CHIPREV_ID_57765_A0)

			val &= ~DMA_RWCTRL_CRDRDR_RDMA_MRRS_MSK;

		tw32(TG3PCI_DMA_RW_CTRL, val | tp->dma_rwctrl);

	} else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5784 &&

		   GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5761) {

drivers/net/tg3.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 
#define   METAL_REV_B2			 0x02

#define TG3PCI_DMA_RW_CTRL		0x0000006c

#define  DMA_RWCTRL_DIS_CACHE_ALIGNMENT  0x00000001

#define  DMA_RWCTRL_CRDRDR_RDMA_MRRS_MSK 0x00000380

#define  DMA_RWCTRL_READ_BNDRY_MASK	 0x00000700

#define  DMA_RWCTRL_READ_BNDRY_DISAB	 0x00000000

#define  DMA_RWCTRL_READ_BNDRY_16	 0x00000100