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

Commit 58a7ce64 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by Jeff Garzik
Browse files

[PATCH] Goramo PCI200SYN WAN driver subsystem ID patch 



Goramo finally got PCI subsystem ID for their PCI200SYN card. The
attached patch adds support for it - cards with old EEPROM data
will emit a warning with URL for update tool.

Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b0348b90

drivers/net/wan/pci200syn.c

+17 −10
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ static const char* devname = "PCI200SYN"; 
static int pci_clock_freq = 33000000;

#define CLOCK_BASE pci_clock_freq



#define PCI_VENDOR_ID_GORAMO	0x10B5	/* uses PLX:9050 ID - this card	*/

#define PCI_DEVICE_ID_PCI200SYN	0x9050	/* doesn't have its own ID	*/





/*

 *      PLX PCI9052 local configuration and shared runtime registers.

 *      This structure can be used to access 9052 registers (memory mapped).
@@ -385,6 +381,15 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, 
	       " %u RX packets rings\n", ramsize / 1024, ramphys,

	       pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);



	if (pdev->subsystem_device == PCI_DEVICE_ID_PLX_9050) {

		printk(KERN_ERR "Detected PCI200SYN card with old "

		       "configuration data.\n");

		printk(KERN_ERR "See <http://www.kernel.org/pub/"

		       "linux/utils/net/hdlc/pci200syn/> for update.\n");

		printk(KERN_ERR "The card will stop working with"

		       " future versions of Linux if not updated.\n");

	}



	if (card->tx_ring_buffers < 1) {

		printk(KERN_ERR "pci200syn: RAM test failed\n");

		pci200_pci_remove_one(pdev);
@@ -445,8 +450,10 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev, 




static struct pci_device_id pci200_pci_tbl[] __devinitdata = {

	{ PCI_VENDOR_ID_GORAMO, PCI_DEVICE_ID_PCI200SYN, PCI_ANY_ID,

	  PCI_ANY_ID, 0, 0, 0 },

	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,

	  PCI_DEVICE_ID_PLX_9050, 0, 0, 0 },

	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,

	  PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },

	{ 0, }

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -930,6 +930,7 @@ 
#define PCI_DEVICE_ID_PLX_DJINN_ITOO	0x1151

#define PCI_DEVICE_ID_PLX_R753		0x1152

#define PCI_DEVICE_ID_PLX_OLITEC	0x1187

#define PCI_DEVICE_ID_PLX_PCI200SYN	0x3196

#define PCI_DEVICE_ID_PLX_9050		0x9050

#define PCI_DEVICE_ID_PLX_9080		0x9080

#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001