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

Commit fee02f80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/tg3-2.6

parents 4f58802f ed7fce6c

drivers/net/tg3.c

+18 −4
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.30"

#define DRV_MODULE_RELDATE	"June 6, 2005"

#define DRV_MODULE_VERSION	"3.31"

#define DRV_MODULE_RELDATE	"June 8, 2005"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -9695,10 +9695,24 @@ static int __devinit tg3_test_dma(struct tg3 *tp) 
	}

	if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) !=

	    DMA_RWCTRL_WRITE_BNDRY_16) {

		static struct pci_device_id dma_wait_state_chipsets[] = {

			{ PCI_DEVICE(PCI_VENDOR_ID_APPLE,

				     PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },

			{ },

		};



		/* DMA test passed without adjusting DMA boundary,

		 * just restore the calculated DMA boundary

		 * now look for chipsets that are known to expose the

		 * DMA bug without failing the test.

		 */

		if (pci_dev_present(dma_wait_state_chipsets)) {

			tp->dma_rwctrl &= ~DMA_RWCTRL_WRITE_BNDRY_MASK;

			tp->dma_rwctrl |= DMA_RWCTRL_WRITE_BNDRY_16;

		}

		else

			/* Safe to use the calculated DMA boundary. */

			tp->dma_rwctrl = saved_dma_rwctrl;



		tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);

	}

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ 
#define PCI_DEVICE_ID_APPLE_KL_USB_P	0x0026

#define PCI_DEVICE_ID_APPLE_UNI_N_AGP_P	0x0027

#define PCI_DEVICE_ID_APPLE_UNI_N_AGP15	0x002d

#define PCI_DEVICE_ID_APPLE_UNI_N_PCI15	0x002e

#define PCI_DEVICE_ID_APPLE_UNI_N_FW2	0x0030

#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC2	0x0032

#define PCI_DEVIEC_ID_APPLE_UNI_N_ATA	0x0033