renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

[PATCH] Goramo PCI200SYN WAN driver subsystem ID patch

Browse Source 
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: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Krzysztof Halasa 2006-03-30 17:01:53 +02:00 committed by Jeff Garzik
parent b0348b90a4
commit 58a7ce6442
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/wan/pci200syn.c
View File

@ -50,10 +50,6 @@ static const char* devname = "PCI200SYN";
static int pci_clock_freq = 33000000; static int pci_clock_freq = 33000000;
#define CLOCK_BASE pci_clock_freq #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. * PLX PCI9052 local configuration and shared runtime registers.
* This structure can be used to access 9052 registers (memory mapped). * This structure can be used to access 9052 registers (memory mapped).
@ -262,7 +258,7 @@ static void pci200_pci_remove_one(struct pci_dev *pdev)
int i; int i;
card_t *card = pci_get_drvdata(pdev); card_t *card = pci_get_drvdata(pdev);
for(i = 0; i < 2; i++) for (i = 0; i < 2; i++)
if (card->ports[i].card) { if (card->ports[i].card) {
struct net_device *dev = port_to_dev(&card->ports[i]); struct net_device *dev = port_to_dev(&card->ports[i]);
unregister_hdlc_device(dev); unregister_hdlc_device(dev);
@ -385,6 +381,15 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
" %u RX packets rings\n", ramsize / 1024, ramphys, " %u RX packets rings\n", ramsize / 1024, ramphys,
pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers); 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) { if (card->tx_ring_buffers < 1) {
printk(KERN_ERR "pci200syn: RAM test failed\n"); printk(KERN_ERR "pci200syn: RAM test failed\n");
pci200_pci_remove_one(pdev); pci200_pci_remove_one(pdev);
@ -396,7 +401,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
writew(readw(p) | 0x0040, p); writew(readw(p) | 0x0040, p);
/* Allocate IRQ */ /* Allocate IRQ */
if(request_irq(pdev->irq, sca_intr, SA_SHIRQ, devname, card)) { if (request_irq(pdev->irq, sca_intr, SA_SHIRQ, devname, card)) {
printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n", printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
pdev->irq); pdev->irq);
pci200_pci_remove_one(pdev); pci200_pci_remove_one(pdev);
@ -406,7 +411,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
sca_init(card, 0); sca_init(card, 0);
for(i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
port_t *port = &card->ports[i]; port_t *port = &card->ports[i];
struct net_device *dev = port_to_dev(port); struct net_device *dev = port_to_dev(port);
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
@ -425,7 +430,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
hdlc->xmit = sca_xmit; hdlc->xmit = sca_xmit;
port->settings.clock_type = CLOCK_EXT; port->settings.clock_type = CLOCK_EXT;
port->card = card; port->card = card;
if(register_hdlc_device(dev)) { if (register_hdlc_device(dev)) {
printk(KERN_ERR "pci200syn: unable to register hdlc " printk(KERN_ERR "pci200syn: unable to register hdlc "
"device\n"); "device\n");
port->card = NULL; port->card = NULL;
@ -445,8 +450,10 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
static struct pci_device_id pci200_pci_tbl[] __devinitdata = { static struct pci_device_id pci200_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_GORAMO, PCI_DEVICE_ID_PCI200SYN, PCI_ANY_ID, { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,
PCI_ANY_ID, 0, 0, 0 }, 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, } { 0, }
}; };

1
include/linux/pci_ids.h
View File

@ -930,6 +930,7 @@
#define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151
#define PCI_DEVICE_ID_PLX_R753 0x1152 #define PCI_DEVICE_ID_PLX_R753 0x1152
#define PCI_DEVICE_ID_PLX_OLITEC 0x1187 #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_9050 0x9050
#define PCI_DEVICE_ID_PLX_9080 0x9080 #define PCI_DEVICE_ID_PLX_9080 0x9080
#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001 #define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001