On Thu, 1 Jun 2006 21:02:00 +0100 (BST) Daniel Drake wrote:
> I've produced this patch which should allow the r8169 driver to work with the
> new Realtek 8168 chips. These are found in PCI-Express form and onboard some
> newer motherboards.
>
> Does anyone own this hardware? I'm looking for someone to test it before I
> send it on.
>
> Signed-off-by: Daniel Drake <[EMAIL PROTECTED]>
>
> Index: linux/drivers/net/r8169.c
> ===================================================================
> --- linux.orig/drivers/net/r8169.c
> +++ linux/drivers/net/r8169.c
> @@ -184,6 +184,7 @@ static const struct {
>
> static struct pci_device_id rtl8169_pci_tbl[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), },
> + { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), },
> { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), },
> { PCI_DEVICE(0x16ec, 0x0116), },
> { PCI_VENDOR_ID_LINKSYS, 0x1032, PCI_ANY_ID, 0x0024, },
The (GPL) RealTek driver (from
http://www.realtek.com.tw/downloads/downloads1-3.aspx?lineid=1&famid=4&series=2003072&Software=True)
contains this PCI device table:
static struct pci_device_id r1000_pci_tbl[] __devinitdata = {
{ 0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x10ec, 0x8167, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x10ec, 0x8168, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x10ec, 0x8136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{0,}
};
Any reason not to include all of those?
Conversely, any reason to use the RealTek r1000 driver?
> @@ -1398,6 +1399,7 @@ rtl8169_init_board(struct pci_dev *pdev,
> struct net_device *dev;
> struct rtl8169_private *tp;
> int rc = -ENOMEM, i, acpi_idle_state = 0, pm_cap;
> + u32 mmio_base = 0;
>
> assert(ioaddr_out != NULL);
>
> @@ -1442,20 +1444,24 @@ rtl8169_init_board(struct pci_dev *pdev,
> }
> }
>
> - /* make sure PCI base addr 1 is MMIO */
> - if (!(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
> - if (netif_msg_probe(tp)) {
> - printk(KERN_ERR PFX
> - "region #1 not an MMIO resource, aborting\n");
> - }
> - rc = -ENODEV;
> - goto err_out_mwi;
> + /* find MMIO resource: this varies between 8168 and 8169 */
> + for (i = 0; i < 5; i++) {
> + /* check resource type */
> + if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM))
> + continue;
> +
> + /* check for weird/broken PCI region reporting */
> + if (pci_resource_len(pdev, i) < R8169_REGS_SIZE)
> + continue;
> +
> + mmio_base = pci_resource_start(pdev, i);
> + break;
> }
> - /* check for weird/broken PCI region reporting */
> - if (pci_resource_len(pdev, 1) < R8169_REGS_SIZE) {
> +
> + if (mmio_base == 0) {
> if (netif_msg_probe(tp)) {
> printk(KERN_ERR PFX
> - "Invalid PCI region size(s), aborting\n");
> + "couldn't find valid MMIO resource, aborting\n");
> }
> rc = -ENODEV;
> goto err_out_mwi;
> @@ -1490,7 +1496,7 @@ rtl8169_init_board(struct pci_dev *pdev,
> pci_set_master(pdev);
>
> /* ioremap MMIO region */
> - ioaddr = ioremap(pci_resource_start(pdev, 1), R8169_REGS_SIZE);
> + ioaddr = ioremap(mmio_base, R8169_REGS_SIZE);
> if (ioaddr == NULL) {
> if (netif_msg_probe(tp))
> printk(KERN_ERR PFX "cannot remap MMIO, aborting\n");
> -
---
~Randy
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
