* [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API
@ 2007-07-15 9:57 Jeff Garzik
2007-07-15 9:58 ` [PATCH 1/5] HiSax: move card setup into separate function Jeff Garzik
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Jeff Garzik @ 2007-07-15 9:57 UTC (permalink / raw)
To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar
This patch series presents a series of five patches, the end result
being a HiSax driver modularized and converted to use the standard PCI
hotplug API (and not pci_find_device).
1) HiSax: move card setup into separate function
2) HiSax: move card state alloc/setup code into separate functions
3) HiSax: modularize card setup; introduce simple hotplug API
4) HiSax netjet_s: code movement, prep for hotplug
5) HiSax netjet_s: convert to PCI hotplug API
As discussed a month or two ago when I submitted my first ISDN PCI
cleanup patch... kkeil suggested that I do a sample PCI API conversion,
from which others could model HiSax driver conversion work.
DO NOT APPLY. It is 98% upstream ready, and ready for testing/debug,
but some changes in patch #5 need to be moved to patches 1-3.
And most importantly, I do not have access to ISDN hardware, so kkeil
or somebody will need to be able to test and debug this stuff :/
This work can be found on the 'isdn-pci' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git
Jeff
P.S. "DO NOT APPLY" is only for upstream. It would be great for this to
appear in -mm.
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/5] HiSax: move card setup into separate function 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik @ 2007-07-15 9:58 ` Jeff Garzik 2007-07-15 9:59 ` [PATCH 2/5] HiSax: move card state alloc/setup code into separate functions Jeff Garzik ` (6 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 9:58 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 6704a85547f02cac2145793538f5392427ed5fae Author: Jeff Garzik <jeff@garzik.org> Date: Sat Jul 14 21:58:34 2007 -0400 [ISDN] HiSax: move card setup into separate function No behavior changes, just code movement. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/config.c | 187 +++++++++++++++++++++++--------------------- 1 file changed, 99 insertions(+), 88 deletions(-) 6704a85547f02cac2145793538f5392427ed5fae diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 8d53a7f..ce54a73 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -847,95 +847,10 @@ static int init_card(struct IsdnCardState *cs) return 3; } -static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) +static int hisax_cs_setup_card(struct IsdnCard *card) { - int ret = 0; - struct IsdnCard *card = cards + cardnr; - struct IsdnCardState *cs; - - cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC); - if (!cs) { - printk(KERN_WARNING - "HiSax: No memory for IsdnCardState(card %d)\n", - cardnr + 1); - goto out; - } - card->cs = cs; - spin_lock_init(&cs->statlock); - spin_lock_init(&cs->lock); - cs->chanlimit = 2; /* maximum B-channel number */ - cs->logecho = 0; /* No echo logging */ - cs->cardnr = cardnr; - cs->debug = L1_DEB_WARN; - cs->HW_Flags = 0; - cs->busy_flag = busy_flag; - cs->irq_flags = I4L_IRQ_FLAG; -#if TEI_PER_CARD - if (card->protocol == ISDN_PTYPE_NI1) - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#else - test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); -#endif - cs->protocol = card->protocol; - - if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) { - printk(KERN_WARNING - "HiSax: Card Type %d out of range\n", card->typ); - goto outf_cs; - } - if (!(cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC))) { - printk(KERN_WARNING - "HiSax: No memory for dlog(card %d)\n", cardnr + 1); - goto outf_cs; - } - if (!(cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC))) { - printk(KERN_WARNING - "HiSax: No memory for status_buf(card %d)\n", - cardnr + 1); - goto outf_dlog; - } - cs->stlist = NULL; - cs->status_read = cs->status_buf; - cs->status_write = cs->status_buf; - cs->status_end = cs->status_buf + HISAX_STATUS_BUFSIZE - 1; - cs->typ = card->typ; -#ifdef MODULE - cs->iif.owner = lockowner; -#endif - strcpy(cs->iif.id, id); - cs->iif.channels = 2; - cs->iif.maxbufsize = MAX_DATA_SIZE; - cs->iif.hl_hdrlen = MAX_HEADER_LEN; - cs->iif.features = - ISDN_FEATURE_L2_X75I | - ISDN_FEATURE_L2_HDLC | - ISDN_FEATURE_L2_HDLC_56K | - ISDN_FEATURE_L2_TRANS | - ISDN_FEATURE_L3_TRANS | -#ifdef CONFIG_HISAX_1TR6 - ISDN_FEATURE_P_1TR6 | -#endif -#ifdef CONFIG_HISAX_EURO - ISDN_FEATURE_P_EURO | -#endif -#ifdef CONFIG_HISAX_NI1 - ISDN_FEATURE_P_NI1 | -#endif - 0; + int ret; - cs->iif.command = HiSax_command; - cs->iif.writecmd = NULL; - cs->iif.writebuf_skb = HiSax_writebuf_skb; - cs->iif.readstat = HiSax_readstatus; - register_isdn(&cs->iif); - cs->myid = cs->iif.channels; - printk(KERN_INFO - "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1, - (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : - (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : - (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : - (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : - "NONE", cs->iif.id, cs->myid); switch (card->typ) { #if CARD_TELES0 case ISDN_CTYPE_16_0: @@ -1094,13 +1009,109 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow printk(KERN_WARNING "HiSax: Support for %s Card not selected\n", CardType[card->typ]); - ll_unload(cs); + ret = 0; + break; + } + + return ret; +} + +static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) +{ + int ret = 0; + struct IsdnCard *card = cards + cardnr; + struct IsdnCardState *cs; + + cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC); + if (!cs) { + printk(KERN_WARNING + "HiSax: No memory for IsdnCardState(card %d)\n", + cardnr + 1); + goto out; + } + card->cs = cs; + spin_lock_init(&cs->statlock); + spin_lock_init(&cs->lock); + cs->chanlimit = 2; /* maximum B-channel number */ + cs->logecho = 0; /* No echo logging */ + cs->cardnr = cardnr; + cs->debug = L1_DEB_WARN; + cs->HW_Flags = 0; + cs->busy_flag = busy_flag; + cs->irq_flags = I4L_IRQ_FLAG; +#if TEI_PER_CARD + if (card->protocol == ISDN_PTYPE_NI1) + test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); +#else + test_and_set_bit(FLG_TWO_DCHAN, &cs->HW_Flags); +#endif + cs->protocol = card->protocol; + + if (card->typ <= 0 || card->typ > ISDN_CTYPE_COUNT) { + printk(KERN_WARNING + "HiSax: Card Type %d out of range\n", card->typ); goto outf_cs; } + if (!(cs->dlog = kmalloc(MAX_DLOG_SPACE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for dlog(card %d)\n", cardnr + 1); + goto outf_cs; + } + if (!(cs->status_buf = kmalloc(HISAX_STATUS_BUFSIZE, GFP_ATOMIC))) { + printk(KERN_WARNING + "HiSax: No memory for status_buf(card %d)\n", + cardnr + 1); + goto outf_dlog; + } + cs->stlist = NULL; + cs->status_read = cs->status_buf; + cs->status_write = cs->status_buf; + cs->status_end = cs->status_buf + HISAX_STATUS_BUFSIZE - 1; + cs->typ = card->typ; +#ifdef MODULE + cs->iif.owner = lockowner; +#endif + strcpy(cs->iif.id, id); + cs->iif.channels = 2; + cs->iif.maxbufsize = MAX_DATA_SIZE; + cs->iif.hl_hdrlen = MAX_HEADER_LEN; + cs->iif.features = + ISDN_FEATURE_L2_X75I | + ISDN_FEATURE_L2_HDLC | + ISDN_FEATURE_L2_HDLC_56K | + ISDN_FEATURE_L2_TRANS | + ISDN_FEATURE_L3_TRANS | +#ifdef CONFIG_HISAX_1TR6 + ISDN_FEATURE_P_1TR6 | +#endif +#ifdef CONFIG_HISAX_EURO + ISDN_FEATURE_P_EURO | +#endif +#ifdef CONFIG_HISAX_NI1 + ISDN_FEATURE_P_NI1 | +#endif + 0; + + cs->iif.command = HiSax_command; + cs->iif.writecmd = NULL; + cs->iif.writebuf_skb = HiSax_writebuf_skb; + cs->iif.readstat = HiSax_readstatus; + register_isdn(&cs->iif); + cs->myid = cs->iif.channels; + printk(KERN_INFO + "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1, + (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : + (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : + (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : + (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : + "NONE", cs->iif.id, cs->myid); + + ret = hisax_cs_setup_card(card); if (!ret) { ll_unload(cs); goto outf_cs; } + if (!(cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC))) { printk(KERN_WARNING "HiSax: No memory for isac rcvbuf\n"); ll_unload(cs); ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/5] HiSax: move card state alloc/setup code into separate functions 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik 2007-07-15 9:58 ` [PATCH 1/5] HiSax: move card setup into separate function Jeff Garzik @ 2007-07-15 9:59 ` Jeff Garzik 2007-07-15 9:59 ` [PATCH 3/5] HiSax: modularize card setup; introduce simple hotplug API Jeff Garzik ` (5 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 9:59 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 8190a38259cebf01db250f397408787aed7c6b93 Author: Jeff Garzik <jeff@garzik.org> Date: Sat Jul 14 22:29:16 2007 -0400 [ISDN] HiSax: move card state alloc/setup code into separate functions No behavior changes, just code movement. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/config.c | 72 +++++++++++++++++++++++++++++++++----------- 1 file changed, 54 insertions(+), 18 deletions(-) 8190a38259cebf01db250f397408787aed7c6b93 diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index ce54a73..23b5412 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -1016,12 +1016,14 @@ static int hisax_cs_setup_card(struct IsdnCard *card) return ret; } -static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) +static int hisax_cs_new(int cardnr, struct IsdnCard *card, + struct IsdnCardState **cs_out, int *busy_flag, + struct module *lockowner) { - int ret = 0; - struct IsdnCard *card = cards + cardnr; struct IsdnCardState *cs; + *cs_out = NULL; + cs = kzalloc(sizeof(struct IsdnCardState), GFP_ATOMIC); if (!cs) { printk(KERN_WARNING @@ -1098,19 +1100,23 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow cs->iif.readstat = HiSax_readstatus; register_isdn(&cs->iif); cs->myid = cs->iif.channels; - printk(KERN_INFO - "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1, - (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : - (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : - (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : - (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : - "NONE", cs->iif.id, cs->myid); - ret = hisax_cs_setup_card(card); - if (!ret) { - ll_unload(cs); - goto outf_cs; - } + *cs_out = cs; + return 1; /* success */ + +outf_dlog: + kfree(cs->dlog); +outf_cs: + kfree(cs); + card->cs = NULL; +out: + return 0; /* error */ +} + +static int hisax_cs_setup(int cardnr, struct IsdnCard *card, + struct IsdnCardState *cs) +{ + int ret; if (!(cs->rcvbuf = kmalloc(MAX_DFRAME_LEN_L1, GFP_ATOMIC))) { printk(KERN_WARNING "HiSax: No memory for isac rcvbuf\n"); @@ -1154,11 +1160,41 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow if (!test_bit(HW_ISAR, &cs->HW_Flags)) ll_run(cs, 0); - ret = 1; + return 1; + +outf_cs: + kfree(cs); + card->cs = NULL; + return ret; +} + +static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) +{ + int ret; + struct IsdnCard *card = cards + cardnr; + struct IsdnCardState *cs; + + ret = hisax_cs_new(cardnr, card, &cs, busy_flag, lockowner); + if (!ret) + return 0; + + printk(KERN_INFO + "HiSax: Card %d Protocol %s Id=%s (%d)\n", cardnr + 1, + (card->protocol == ISDN_PTYPE_1TR6) ? "1TR6" : + (card->protocol == ISDN_PTYPE_EURO) ? "EDSS1" : + (card->protocol == ISDN_PTYPE_LEASED) ? "LEASED" : + (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : + "NONE", cs->iif.id, cs->myid); + + ret = hisax_cs_setup_card(card); + if (!ret) { + ll_unload(cs); + goto outf_cs; + } + + ret = hisax_cs_setup(cardnr, card, cs); goto out; - outf_dlog: - kfree(cs->dlog); outf_cs: kfree(cs); card->cs = NULL; ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/5] HiSax: modularize card setup; introduce simple hotplug API 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik 2007-07-15 9:58 ` [PATCH 1/5] HiSax: move card setup into separate function Jeff Garzik 2007-07-15 9:59 ` [PATCH 2/5] HiSax: move card state alloc/setup code into separate functions Jeff Garzik @ 2007-07-15 9:59 ` Jeff Garzik 2007-07-15 10:00 ` [PATCH 4/5] HiSax netjet_s: code movement, prep for hotplug Jeff Garzik ` (4 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 9:59 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 8571a5d1c62f5b129612bcb978827ed9e542bda2 Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 03:56:11 2007 -0400 [ISDN] HiSax: modularize card setup; introduce simple hotplug API 1) Now that the previous no-behavior-change code movement patches have occurred, we can easily replace the big per-card "call the setup function for <this card>" switch statement with a function pointer. 2) Duplicate and modify slightly the hotplug logic found in existing function hisax_init_pcmcia(), to make it easily usable by modular drivers. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/config.c | 34 +++++++++++++++++++++++++++++----- drivers/isdn/hisax/hisax_cfg.h | 3 +++ 2 files changed, 32 insertions(+), 5 deletions(-) 8571a5d1c62f5b129612bcb978827ed9e542bda2 diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 23b5412..e5c972b 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -1168,7 +1168,9 @@ outf_cs: return ret; } -static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner) +static int checkcard(int cardnr, char *id, int *busy_flag, + struct module *lockowner, + hisax_setup_func_t card_setup) { int ret; struct IsdnCard *card = cards + cardnr; @@ -1186,7 +1188,7 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow (card->protocol == ISDN_PTYPE_NI1) ? "NI1" : "NONE", cs->iif.id, cs->myid); - ret = hisax_cs_setup_card(card); + ret = card_setup(card); if (!ret) { ll_unload(cs); goto outf_cs; @@ -1240,7 +1242,8 @@ static int HiSax_inithardware(int *busy_flag) else sprintf(ids, "%s%d", id, i); } - if (checkcard(i, ids, busy_flag, THIS_MODULE)) { + if (checkcard(i, ids, busy_flag, THIS_MODULE, + hisax_cs_setup_card)) { foundcards++; i++; } else { @@ -1538,6 +1541,25 @@ static void __exit HiSax_exit(void) printk(KERN_INFO "HiSax module removed\n"); } +int hisax_init_hotplug(struct IsdnCard *card, hisax_setup_func_t card_setup) +{ + u_char ids[16]; + int ret = -1; + + cards[nrcards] = *card; + if (nrcards) + sprintf(ids, "HiSax%d", nrcards); + else + sprintf(ids, "HiSax"); + if (!checkcard(nrcards, ids, NULL, THIS_MODULE, card_setup)) + goto error; + + ret = nrcards; + nrcards++; +error: + return ret; +} + int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) { u_char ids[16]; @@ -1548,7 +1570,8 @@ int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card) sprintf(ids, "HiSax%d", nrcards); else sprintf(ids, "HiSax"); - if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE)) + if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE, + hisax_cs_setup_card)) goto error; ret = nrcards; @@ -1558,6 +1581,7 @@ error: } EXPORT_SYMBOL(hisax_init_pcmcia); +EXPORT_SYMBOL(hisax_init_hotplug); EXPORT_SYMBOL(HiSax_closecard); #include "hisax_if.h" @@ -1594,7 +1618,7 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[], cards[i].protocol = protocol; sprintf(id, "%s%d", name, i); nrcards++; - retval = checkcard(i, id, NULL, hisax_d_if->owner); + retval = checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card); if (retval == 0) { // yuck cards[i].typ = 0; nrcards--; diff --git a/drivers/isdn/hisax/hisax_cfg.h b/drivers/isdn/hisax/hisax_cfg.h index ca3fe62..ec309d4 100644 --- a/drivers/isdn/hisax/hisax_cfg.h +++ b/drivers/isdn/hisax/hisax_cfg.h @@ -60,5 +60,8 @@ struct IsdnCard { IsdnCardState_t *cs; }; +typedef int (*hisax_setup_func_t)(struct IsdnCard *card); + extern void HiSax_closecard(int); extern int hisax_init_pcmcia(void *, int *, IsdnCard_t *); +extern int hisax_init_hotplug(IsdnCard_t *, hisax_setup_func_t card_setup); ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/5] HiSax netjet_s: code movement, prep for hotplug 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik ` (2 preceding siblings ...) 2007-07-15 9:59 ` [PATCH 3/5] HiSax: modularize card setup; introduce simple hotplug API Jeff Garzik @ 2007-07-15 10:00 ` Jeff Garzik 2007-07-15 10:00 ` [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API Jeff Garzik ` (3 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 10:00 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit a60e908ca7bb2b8fe9e42e2108f4040c1d708b64 Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 04:25:35 2007 -0400 [ISDN] HiSax netjet_s: code movement, prep for hotplug 1) Remove CONFIG_PCI ifdefs. PCI is required in Kconfig. 2) Break up setup_netjet_s() into three separate internal functions. This helps facilitate upcoming use of PCI hotplug API, and in addition makes the code much easier to follow. No code is changed, just moved around. I even kept the out-of-favor "return(0)" style used in the current source code. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/nj_s.c | 194 +++++++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 86 deletions(-) a60e908ca7bb2b8fe9e42e2108f4040c1d708b64 diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index c09ffb1..fa2db87 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -148,107 +148,87 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg) return(0); } -static struct pci_dev *dev_netjet __devinitdata = NULL; - -int __devinit -setup_netjet_s(struct IsdnCard *card) +static int __devinit njs_pci_probe(struct pci_dev *dev_netjet, + struct IsdnCardState *cs) { - int bytecnt,cfg; - struct IsdnCardState *cs = card->cs; - char tmp[64]; + int cfg; -#ifdef __BIG_ENDIAN -#error "not running on big endian machines now" -#endif - strcpy(tmp, NETjet_S_revision); - printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_NETJET_S) + if (pci_enable_device(dev_netjet)) return(0); - test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + pci_set_master(dev_netjet); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); + return(0); + } + /* the TJ300 and TJ320 must be detected, the IRQ handling is different + * unfortunatly the chips use the same device ID, but the TJ320 has + * the bit20 in status PCI cfg register set + */ + pci_read_config_dword(dev_netjet, 0x04, &cfg); + if (cfg & 0x00100000) + cs->subtyp = 1; /* TJ320 */ + else + cs->subtyp = 0; /* TJ300 */ + /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ + if ((dev_netjet->subsystem_vendor == 0x55) && + (dev_netjet->subsystem_device == 0x02)) { + printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); + printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); + return(0); + } + /* end new code */ -#ifdef CONFIG_PCI + return(1); +} - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - if (pci_enable_device(dev_netjet)) - return(0); - pci_set_master(dev_netjet); - cs->irq = dev_netjet->irq; - if (!cs->irq) { - printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); - return(0); - } - cs->hw.njet.base = pci_resource_start(dev_netjet, 0); - if (!cs->hw.njet.base) { - printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); - return(0); - } - /* the TJ300 and TJ320 must be detected, the IRQ handling is different - * unfortunatly the chips use the same device ID, but the TJ320 has - * the bit20 in status PCI cfg register set - */ - pci_read_config_dword(dev_netjet, 0x04, &cfg); - if (cfg & 0x00100000) - cs->subtyp = 1; /* TJ320 */ - else - cs->subtyp = 0; /* TJ300 */ - /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ - if ((dev_netjet->subsystem_vendor == 0x55) && - (dev_netjet->subsystem_device == 0x02)) { - printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); - printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); - return(0); - } - /* end new code */ - } else { - printk(KERN_WARNING "NETjet-S: No PCI card found\n"); - return(0); - } +static int __devinit njs_cs_init(struct IsdnCard *card, + struct IsdnCardState *cs) +{ - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; - cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - mdelay(10); + cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); - cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - mdelay(10); + cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); - cs->hw.njet.auxd = 0xC0; - cs->hw.njet.dmactrl = 0; + cs->hw.njet.auxd = 0xC0; + cs->hw.njet.dmactrl = 0; - byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); - byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); - byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); + byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); + byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) ) - { - case 0 : - break; + switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) ) + { + case 0 : + return 1; /* end loop */ - case 3 : - printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); - continue; + case 3 : + printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); + return -1; /* continue looping */ - default : - printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); - return 0; - } - break; + default : + printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); + return 0; /* end loop & function */ } -#else - - printk(KERN_WARNING "NETjet-S: NO_PCI_BIOS\n"); - printk(KERN_WARNING "NETjet-S: unable to config NETJET-S PCI\n"); - return (0); - -#endif /* CONFIG_PCI */ + return 1; /* end loop */ +} - bytecnt = 256; +static int __devinit njs_cs_init_rest(struct IsdnCard *card, + struct IsdnCardState *cs) +{ + const int bytecnt = 256; printk(KERN_INFO "NETjet-S: %s card configured at %#lx IRQ %d\n", @@ -273,5 +253,47 @@ setup_netjet_s(struct IsdnCard *card) cs->irq_func = &netjet_s_interrupt; cs->irq_flags |= IRQF_SHARED; ISACVersion(cs, "NETjet-S:"); + return (1); } + +static struct pci_dev *dev_netjet __devinitdata = NULL; + +int __devinit +setup_netjet_s(struct IsdnCard *card) +{ + int ret; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + +#ifdef __BIG_ENDIAN +#error "not running on big endian machines now" +#endif + strcpy(tmp, NETjet_S_revision); + printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NETJET_S) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + ret = njs_pci_probe(dev_netjet, cs); + if (!ret) + return(0); + } else { + printk(KERN_WARNING "NETjet-S: No PCI card found\n"); + return(0); + } + + ret = njs_cs_init(card, cs); + if (!ret) + return(0); + if (ret > 0) + break; + /* otherwise, ret < 0, continue looping */ + } + + return njs_cs_init_rest(card, cs); +} ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik ` (3 preceding siblings ...) 2007-07-15 10:00 ` [PATCH 4/5] HiSax netjet_s: code movement, prep for hotplug Jeff Garzik @ 2007-07-15 10:00 ` Jeff Garzik 2007-07-15 10:08 ` Jeff Garzik 2007-07-15 21:40 ` [PATCH 1/2] HiSax netjet_u: code movement; hotplug API prep Jeff Garzik ` (2 subsequent siblings) 7 siblings, 1 reply; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 10:00 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit c5e28e9c54de0b51a0b76fccf34aeea9654ed1bc Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 05:44:08 2007 -0400 [ISDN] HiSax netjet_s: convert to PCI hotplug API [...and other stuff found during conversion... -jgarzik] Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 2 drivers/isdn/hisax/config.c | 53 ++++-------------- drivers/isdn/hisax/hisax_proto.h | 25 ++++++++ drivers/isdn/hisax/isac.c | 6 ++ drivers/isdn/hisax/isdnl1.c | 2 drivers/isdn/hisax/netjet.c | 9 +++ drivers/isdn/hisax/nj_s.c | 112 ++++++++++++++++++++++++++++----------- 8 files changed, 141 insertions(+), 70 deletions(-) c5e28e9c54de0b51a0b76fccf34aeea9654ed1bc diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 12d91fb..38601b2 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -237,7 +237,7 @@ config HISAX_MIC settings. config HISAX_NETJET - bool "NETjet card" + tristate "NETjet card" depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the NetJet from Traverse diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index c7a3794..bf57c43 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o obj-$(CONFIG_HISAX_HFCUSB) += hfc_usb.o obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o +obj-$(CONFIG_HISAX_NETJET) += nj_s.o # netjet.o isac.o arcofi.o ifdef CONFIG_HISAX_HDLC obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o @@ -47,7 +48,6 @@ hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o \ isar.o hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o isac.o arcofi.o hscx.o hisax-$(CONFIG_HISAX_MIC) += mic.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_NETJET) += nj_s.o netjet.o isac.o arcofi.o hisax-$(CONFIG_HISAX_NETJET_U) += nj_u.o netjet.o icc.o hisax-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o hisax-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index e5c972b..f9abd8a 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -19,6 +19,7 @@ #include <linux/timer.h> #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include <linux/module.h> #include <linux/kernel_stat.h> #include <linux/workqueue.h> @@ -199,13 +200,6 @@ const char *CardType[] = { #define DEFAULT_CFG {12,0x3e0,0,0} #endif -#ifdef CONFIG_HISAX_NETJET -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_NETJET_S -#define DEFAULT_CFG {0,0,0,0} -#endif - #ifdef CONFIG_HISAX_HFCS #undef DEFAULT_CARD #undef DEFAULT_CFG @@ -283,26 +277,6 @@ const char *CardType[] = { #define DEFAULT_CFG {0,0,0,0} #endif -#ifdef CONFIG_HISAX_1TR6 -#define DEFAULT_PROTO ISDN_PTYPE_1TR6 -#define DEFAULT_PROTO_NAME "1TR6" -#endif -#ifdef CONFIG_HISAX_NI1 -#undef DEFAULT_PROTO -#define DEFAULT_PROTO ISDN_PTYPE_NI1 -#undef DEFAULT_PROTO_NAME -#define DEFAULT_PROTO_NAME "NI1" -#endif -#ifdef CONFIG_HISAX_EURO -#undef DEFAULT_PROTO -#define DEFAULT_PROTO ISDN_PTYPE_EURO -#undef DEFAULT_PROTO_NAME -#define DEFAULT_PROTO_NAME "EURO" -#endif -#ifndef DEFAULT_PROTO -#define DEFAULT_PROTO ISDN_PTYPE_UNKNOWN -#define DEFAULT_PROTO_NAME "UNKNOWN" -#endif #ifndef DEFAULT_CARD #define DEFAULT_CARD 0 #define DEFAULT_CFG {0,0,0,0} @@ -521,10 +495,6 @@ extern int setup_sportster(struct IsdnCard *card); extern int setup_mic(struct IsdnCard *card); #endif -#if CARD_NETJET_S -extern int setup_netjet_s(struct IsdnCard *card); -#endif - #if CARD_HFCS extern int setup_hfcs(struct IsdnCard *card); #endif @@ -936,11 +906,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_mic(card); break; #endif -#if CARD_NETJET_S - case ISDN_CTYPE_NETJET_S: - ret = setup_netjet_s(card); - break; -#endif #if CARD_HFCS case ISDN_CTYPE_TELES3C: case ISDN_CTYPE_ACERP10: @@ -1005,6 +970,15 @@ static int hisax_cs_setup_card(struct IsdnCard *card) case ISDN_CTYPE_DYNAMIC: ret = 2; break; + + /* list of ISDN_CTYPE_xxx support moved to a modular driver */ + case ISDN_CTYPE_NETJET_S: + printk(KERN_WARNING "HiSax: Support for %s Card has moved " + "to separate PCI driver module\n", + CardType[card->typ]); + ret = 0; + break; + default: printk(KERN_WARNING "HiSax: Support for %s Card not selected\n", @@ -1016,7 +990,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) return ret; } -static int hisax_cs_new(int cardnr, struct IsdnCard *card, +static int hisax_cs_new(int cardnr, char *id, struct IsdnCard *card, struct IsdnCardState **cs_out, int *busy_flag, struct module *lockowner) { @@ -1176,7 +1150,7 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct IsdnCard *card = cards + cardnr; struct IsdnCardState *cs; - ret = hisax_cs_new(cardnr, card, &cs, busy_flag, lockowner); + ret = hisax_cs_new(cardnr, id, card, &cs, busy_flag, lockowner); if (!ret) return 0; @@ -1583,6 +1557,7 @@ error: EXPORT_SYMBOL(hisax_init_pcmcia); EXPORT_SYMBOL(hisax_init_hotplug); EXPORT_SYMBOL(HiSax_closecard); +EXPORT_SYMBOL(HiSax_getrev); #include "hisax_if.h" @@ -1952,7 +1927,7 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = { #ifdef CONFIG_HISAX_SEDLBAUER {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, PCI_ANY_ID,PCI_ANY_ID}, #endif -#if defined(CONFIG_HISAX_NETJET) || defined(CONFIG_HISAX_NETJET_U) +#if defined(CONFIG_HISAX_NETJET_U) {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, PCI_ANY_ID,PCI_ANY_ID}, #endif #if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) diff --git a/drivers/isdn/hisax/hisax_proto.h b/drivers/isdn/hisax/hisax_proto.h new file mode 100644 index 0000000..7eea361 --- /dev/null +++ b/drivers/isdn/hisax/hisax_proto.h @@ -0,0 +1,25 @@ +#ifndef __ISDN_HISAX_HISAX_PROTO_H__ +#define __ISDN_HISAX_HISAX_PROTO_H__ + +#ifdef CONFIG_HISAX_1TR6 +#define DEFAULT_PROTO ISDN_PTYPE_1TR6 +#define DEFAULT_PROTO_NAME "1TR6" +#endif +#ifdef CONFIG_HISAX_NI1 +#undef DEFAULT_PROTO +#define DEFAULT_PROTO ISDN_PTYPE_NI1 +#undef DEFAULT_PROTO_NAME +#define DEFAULT_PROTO_NAME "NI1" +#endif +#ifdef CONFIG_HISAX_EURO +#undef DEFAULT_PROTO +#define DEFAULT_PROTO ISDN_PTYPE_EURO +#undef DEFAULT_PROTO_NAME +#define DEFAULT_PROTO_NAME "EURO" +#endif +#ifndef DEFAULT_PROTO +#define DEFAULT_PROTO ISDN_PTYPE_UNKNOWN +#define DEFAULT_PROTO_NAME "UNKNOWN" +#endif + +#endif /* __ISDN_HISAX_HISAX_PROTO_H__ */ diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c index 4e9f238..b919543 100644 --- a/drivers/isdn/hisax/isac.c +++ b/drivers/isdn/hisax/isac.c @@ -681,3 +681,9 @@ setup_isac(struct IsdnCardState *cs) cs->dbusytimer.data = (long) cs; init_timer(&cs->dbusytimer); } + +EXPORT_SYMBOL(isac_interrupt); +EXPORT_SYMBOL(initisac); +EXPORT_SYMBOL(clear_pending_isac_ints); +EXPORT_SYMBOL(ISACVersion); +EXPORT_SYMBOL(setup_isac); diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c index a14204e..bcae2b0 100644 --- a/drivers/isdn/hisax/isdnl1.c +++ b/drivers/isdn/hisax/isdnl1.c @@ -933,3 +933,5 @@ setstack_l1_B(struct PStack *st) st->l1.Flags = 0; FsmInitTimer(&st->l1.l1m, &st->l1.timer); } + +EXPORT_SYMBOL(debugl1); diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c index 02c6fba..1e3e45b 100644 --- a/drivers/isdn/hisax/netjet.c +++ b/drivers/isdn/hisax/netjet.c @@ -979,3 +979,12 @@ release_io_netjet(struct IsdnCardState *cs) release_region(cs->hw.njet.base, 256); } +EXPORT_SYMBOL(NETjet_WriteICfifo); +EXPORT_SYMBOL(NETjet_ReadICfifo); +EXPORT_SYMBOL(NETjet_WriteIC); +EXPORT_SYMBOL(NETjet_ReadIC); +EXPORT_SYMBOL(write_tiger); +EXPORT_SYMBOL(read_tiger); +EXPORT_SYMBOL(inittiger); +EXPORT_SYMBOL(netjet_fill_dma); +EXPORT_SYMBOL(release_io_netjet); diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index fa2db87..3779ccc 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -7,6 +7,7 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "isac.h" #include "isdnl1.h" #include <linux/pci.h> @@ -14,6 +15,8 @@ #include <linux/ppp_defs.h> #include "netjet.h" +static int njs_protocol = 0; /* 0 == use DEFAULT_PROTO */ + static const char *NETjet_S_revision = "$Revision: 2.13.2.4 $"; static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) @@ -156,6 +159,8 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet, if (pci_enable_device(dev_netjet)) return(0); pci_set_master(dev_netjet); + + cs->hw.njet.dev = dev_netjet; cs->irq = dev_netjet->irq; if (!cs->irq) { printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); @@ -212,17 +217,17 @@ static int __devinit njs_cs_init(struct IsdnCard *card, switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) ) { case 0 : - return 1; /* end loop */ + return 1; /* found card */ case 3 : printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); - return -1; /* continue looping */ + return 0; /* no NETjet-S found */ default : printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); - return 0; /* end loop & function */ + return 0; /* no NETjet-S found */ } - return 1; /* end loop */ + return 1; /* found card */ } static int __devinit njs_cs_init_rest(struct IsdnCard *card, @@ -235,8 +240,7 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card, cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq); if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { printk(KERN_WARNING - "HiSax: %s config port %#lx-%#lx already in use\n", - CardType[card->typ], + "HiSax: NETjet-S config port %#lx-%#lx already in use\n", cs->hw.njet.base, cs->hw.njet.base + bytecnt); return (0); @@ -257,43 +261,93 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card, return (1); } -static struct pci_dev *dev_netjet __devinitdata = NULL; - -int __devinit +static int __devinit setup_netjet_s(struct IsdnCard *card) { int ret; struct IsdnCardState *cs = card->cs; char tmp[64]; + struct pci_dev *dev_netjet = (void *) card->para[0]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif strcpy(tmp, NETjet_S_revision); printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_NETJET_S) - return(0); + + WARN_ON(cs->typ != ISDN_CTYPE_NETJET_S); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - ret = njs_pci_probe(dev_netjet, cs); - if (!ret) - return(0); - } else { - printk(KERN_WARNING "NETjet-S: No PCI card found\n"); - return(0); - } + ret = njs_pci_probe(dev_netjet, cs); + if (!ret) + return(0); - ret = njs_cs_init(card, cs); - if (!ret) - return(0); - if (ret > 0) - break; - /* otherwise, ret < 0, continue looping */ - } + ret = njs_cs_init(card, cs); + if (ret <= 0) + return(0); return njs_cs_init_rest(card, cs); } + +static int __devinit njs_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_NETJET_S, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + if (!njs_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = njs_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_netjet_s); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static void __devexit njs_pci_remove_one(struct pci_dev *pdev) +{ + int cardnr = (unsigned long) pci_get_drvdata(pdev); + + HiSax_closecard(cardnr); + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); +} + +static struct pci_device_id njs_pci_table[] = { + { PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_300) }, + + { } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci, njs_pci_table); + +static struct pci_driver njs_pci_driver = { + .name = "nj_s", + .id_table = njs_pci_table, + .probe = njs_pci_init_one, + .remove = njs_pci_remove_one, +}; + +static int __init njs_mod_init(void) +{ + return pci_register_driver(&njs_pci_driver); +} + +static void __exit njs_mod_exit(void) +{ + pci_unregister_driver(&njs_pci_driver); +} + +module_init(njs_mod_init); +module_exit(njs_mod_exit); + +module_param_named(protocol, njs_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DESCRIPTION("ISDN HiSax NETjet-S PCI driver"); +MODULE_LICENSE("GPL"); ^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API 2007-07-15 10:00 ` [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API Jeff Garzik @ 2007-07-15 10:08 ` Jeff Garzik 0 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 10:08 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar Jeff Garzik wrote: > diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile > index c7a3794..bf57c43 100644 > --- a/drivers/isdn/hisax/Makefile > +++ b/drivers/isdn/hisax/Makefile > @@ -15,6 +15,7 @@ obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o > obj-$(CONFIG_HISAX_HFCUSB) += hfc_usb.o > obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o > obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o > +obj-$(CONFIG_HISAX_NETJET) += nj_s.o # netjet.o isac.o arcofi.o > > ifdef CONFIG_HISAX_HDLC > obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o > @@ -47,7 +48,6 @@ hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o \ > isar.o > hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o isac.o arcofi.o hscx.o > hisax-$(CONFIG_HISAX_MIC) += mic.o isac.o arcofi.o hscx.o > -hisax-$(CONFIG_HISAX_NETJET) += nj_s.o netjet.o isac.o arcofi.o > hisax-$(CONFIG_HISAX_NETJET_U) += nj_u.o netjet.o icc.o > hisax-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o > hisax-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o Careful observers will note this is a bit of a hack. A minor amount of addition work must be put into better defining the dependent modules. The above currently works... but it is sensitive to odd (read: non-distro kernel) configurations. Jeff ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/2] HiSax netjet_u: code movement; hotplug API prep 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik ` (4 preceding siblings ...) 2007-07-15 10:00 ` [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API Jeff Garzik @ 2007-07-15 21:40 ` Jeff Garzik 2007-07-15 21:41 ` [PATCH 2/2] HiSax netjet_u: convert to PCI hotplug API Jeff Garzik 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik 2007-07-16 7:52 ` [PATCH] HiSax telespci: " Jeff Garzik 7 siblings, 1 reply; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 21:40 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar This patch, and the one following it, are both checked into jgarzik/misc-2.6.git#isdn-pci. commit 76476624e28f2686b87f90eb106b6672e22dcc2c Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 16:59:01 2007 -0400 [ISDN] HiSax netjet_u: split setup into 3 smaller functions No behavior changes, just code movement. Prep for PCI hotplug API. Signed-off-by: Jeff Garzik <jeff@garzik.org> --- drivers/isdn/hisax/nj_u.c | 167 +++++++++++++++++++++++++--------------------- 1 file changed, 93 insertions(+), 74 deletions(-) 76476624e28f2686b87f90eb106b6672e22dcc2c diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 8202cf3..f017d38 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -128,93 +128,69 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg) return(0); } -static struct pci_dev *dev_netjet __devinitdata = NULL; - -int __devinit -setup_netjet_u(struct IsdnCard *card) +static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, + struct IsdnCardState *cs) { - int bytecnt; - struct IsdnCardState *cs = card->cs; - char tmp[64]; -#ifdef CONFIG_PCI -#endif -#ifdef __BIG_ENDIAN -#error "not running on big endian machines now" -#endif - strcpy(tmp, NETjet_U_revision); - printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_NETJET_U) + if (pci_enable_device(dev_netjet)) return(0); - test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); - -#ifdef CONFIG_PCI + pci_set_master(dev_netjet); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); + return(0); + } - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - if (pci_enable_device(dev_netjet)) - return(0); - pci_set_master(dev_netjet); - cs->irq = dev_netjet->irq; - if (!cs->irq) { - printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); - return(0); - } - cs->hw.njet.base = pci_resource_start(dev_netjet, 0); - if (!cs->hw.njet.base) { - printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); - return(0); - } - } else { - printk(KERN_WARNING "NETspider-U: No PCI card found\n"); - return(0); - } + return (1); +} - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; - mdelay(10); +static int __devinit nju_cs_init(struct IsdnCard *card, + struct IsdnCardState *cs) +{ + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base | NETJET_ISAC_OFF; + mdelay(10); - cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - mdelay(10); + cs->hw.njet.ctrl_reg = 0xff; /* Reset On */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); - cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ - byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); - mdelay(10); + cs->hw.njet.ctrl_reg = 0x00; /* Reset Off and status read clear */ + byteout(cs->hw.njet.base + NETJET_CTRL, cs->hw.njet.ctrl_reg); + mdelay(10); - cs->hw.njet.auxd = 0xC0; - cs->hw.njet.dmactrl = 0; + cs->hw.njet.auxd = 0xC0; + cs->hw.njet.dmactrl = 0; - byteout(cs->hw.njet.auxa, 0); - byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); - byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); - byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); + byteout(cs->hw.njet.auxa, 0); + byteout(cs->hw.njet.base + NETJET_AUXCTRL, ~NETJET_ISACIRQ); + byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); + byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); - switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) ) - { - case 3 : - break; + switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) ) + { + case 3 : + return 1; /* end loop */ - case 0 : - printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); - continue; + case 0 : + printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); + return -1; /* continue looping */ - default : - printk( KERN_WARNING "NETspider-U: No PCI card found\n" ); - return 0; - } - break; + default : + printk( KERN_WARNING "NETspider-U: No PCI card found\n" ); + return 0; /* end loop & function */ } -#else - - printk(KERN_WARNING "NETspider-U: NO_PCI_BIOS\n"); - printk(KERN_WARNING "NETspider-U: unable to config NETspider-U PCI\n"); - return (0); - -#endif /* CONFIG_PCI */ + return 1; /* end loop */ +} - bytecnt = 256; +static int __devinit nju_cs_init_rest(struct IsdnCard *card, + struct IsdnCardState *cs) +{ + const int bytecnt = 256; printk(KERN_INFO "NETspider-U: PCI card configured at %#lx IRQ %d\n", @@ -239,5 +215,48 @@ setup_netjet_u(struct IsdnCard *card) cs->irq_func = &netjet_u_interrupt; cs->irq_flags |= IRQF_SHARED; ICCVersion(cs, "NETspider-U:"); + return (1); } + +static struct pci_dev *dev_netjet __devinitdata = NULL; + +int __devinit +setup_netjet_u(struct IsdnCard *card) +{ + int ret; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + +#ifdef __BIG_ENDIAN +#error "not running on big endian machines now" +#endif + + strcpy(tmp, NETjet_U_revision); + printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_NETJET_U) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + ret = nju_pci_probe(dev_netjet, cs); + if (!ret) + return(0); + } else { + printk(KERN_WARNING "NETspider-U: No PCI card found\n"); + return(0); + } + + ret = nju_cs_init(card, cs); + if (!ret) + return (0); + if (ret > 0) + break; + /* ret < 0 == continue looping */ + } + + return nju_cs_init_rest(card, cs); +} ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/2] HiSax netjet_u: convert to PCI hotplug API 2007-07-15 21:40 ` [PATCH 1/2] HiSax netjet_u: code movement; hotplug API prep Jeff Garzik @ 2007-07-15 21:41 ` Jeff Garzik 0 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-15 21:41 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 6aea604ccf18368d9f9dedabfe00404c6289c8a4 Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 17:37:10 2007 -0400 [ISDN] HiSax: convert NETjet-U to PCI hotplug API; further HiSax libificatio 1) Using previous nj_u code movement, we can easily convert it to the hotplug API similar to nj_s. 2) Additional HiSax exports and cleanups found during this work, most notably the creation of a sister kernel module libhisax.ko. libhisax creation is solely managed through the Makefile. [NOTE: changes in #2 should be "moved up" in the patch series -jg] Signed-off-by: Jeff Garzik <jeff@garzik.org> --- drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 53 +++++++++++---------- drivers/isdn/hisax/config.c | 40 ++++++++-------- drivers/isdn/hisax/hisax_cfg.h | 2 drivers/isdn/hisax/isdnl1.c | 8 ++- drivers/isdn/hisax/nj_s.c | 13 ----- drivers/isdn/hisax/nj_u.c | 100 +++++++++++++++++++++++++++++------------ drivers/isdn/hisax/q931.c | 4 + 8 files changed, 137 insertions(+), 85 deletions(-) 6aea604ccf18368d9f9dedabfe00404c6289c8a4 diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 38601b2..1da3cd6 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -248,7 +248,7 @@ config HISAX_NETJET settings. config HISAX_NETJET_U - bool "NETspider U card" + tristate "NETspider U card" depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Netspider U interface ISDN card diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index bf57c43..a37e211 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -6,7 +6,7 @@ EXTRA_CFLAGS += -DHISAX_MAX_CARDS=$(CONFIG_HISAX_MAX_CARDS) -obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o +obj-$(CONFIG_ISDN_DRV_HISAX) += hisax.o libhisax.o obj-$(CONFIG_HISAX_SEDLBAUER_CS) += sedlbauer_cs.o obj-$(CONFIG_HISAX_ELSA_CS) += elsa_cs.o obj-$(CONFIG_HISAX_AVM_A1_CS) += avma1_cs.o @@ -15,7 +15,12 @@ obj-$(CONFIG_HISAX_ST5481) += hisax_st5481.o obj-$(CONFIG_HISAX_HFCUSB) += hfc_usb.o obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o -obj-$(CONFIG_HISAX_NETJET) += nj_s.o # netjet.o isac.o arcofi.o +obj-$(CONFIG_HISAX_NETJET) += netjet_s.o libhisax.o +obj-$(CONFIG_HISAX_NETJET_U) += netjet_u.o libhisax.o + +netjet_s-objs := nj_s.o +netjet_u-objs := nj_u.o icc.o +libhisax-objs := netjet.o isac.o arcofi.o ifdef CONFIG_HISAX_HDLC obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o @@ -32,32 +37,30 @@ hisax-$(CONFIG_HISAX_EURO) += l3dss1.o hisax-$(CONFIG_HISAX_NI1) += l3ni1.o hisax-$(CONFIG_HISAX_1TR6) += l3_1tr6.o -hisax-$(CONFIG_HISAX_16_0) += teles0.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_16_3) += teles3.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_TELESPCI) += telespci.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_S0BOX) += s0box.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_AVM_A1) += avm_a1.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_AVM_A1_PCMCIA) += avm_a1p.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o isac.o arcofi.o -hisax-$(CONFIG_HISAX_ELSA) += elsa.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o isac.o arcofi.o hscx.o ipacx.o -hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_TELEINT) += teleint.o isac.o arcofi.o hfc_2bs0.o -hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isac.o arcofi.o hscx.o \ - isar.o -hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_MIC) += mic.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_NETJET_U) += nj_u.o netjet.o icc.o +hisax-$(CONFIG_HISAX_16_0) += teles0.o hscx.o +hisax-$(CONFIG_HISAX_16_3) += teles3.o hscx.o +hisax-$(CONFIG_HISAX_TELESPCI) += telespci.o hscx.o +hisax-$(CONFIG_HISAX_S0BOX) += s0box.o hscx.o +hisax-$(CONFIG_HISAX_AVM_A1) += avm_a1.o hscx.o +hisax-$(CONFIG_HISAX_AVM_A1_PCMCIA) += avm_a1p.o hscx.o +hisax-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o +hisax-$(CONFIG_HISAX_ELSA) += elsa.o hscx.o +hisax-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o hscx.o +hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o hscx.o ipacx.o +hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o hscx.o +hisax-$(CONFIG_HISAX_TELEINT) += teleint.o fc_2bs0.o +hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o hscx.o isar.o +hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o hscx.o +hisax-$(CONFIG_HISAX_MIC) += mic.o hscx.o hisax-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o hisax-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o hisax-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o -hisax-$(CONFIG_HISAX_NICCY) += niccy.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_ISURF) += isurf.o isac.o arcofi.o isar.o -hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t.o isac.o arcofi.o jade.o -hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o isac.o arcofi.o hscx.o -hisax-$(CONFIG_HISAX_GAZEL) += gazel.o isac.o arcofi.o hscx.o +hisax-$(CONFIG_HISAX_NICCY) += niccy.o hscx.o +hisax-$(CONFIG_HISAX_ISURF) += isurf.o sar.o +hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o hscx.o +hisax-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t.o jade.o +hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o hscx.o +hisax-$(CONFIG_HISAX_GAZEL) += gazel.o hscx.o hisax-$(CONFIG_HISAX_W6692) += w6692.o hisax-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index f9abd8a..03c73e0 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -24,6 +24,7 @@ #include <linux/kernel_stat.h> #include <linux/workqueue.h> #include <linux/interrupt.h> +#include <linux/pci.h> #define HISAX_STATUS_BUFSIZE 4096 /* @@ -270,13 +271,6 @@ const char *CardType[] = { #define DEFAULT_CFG {0,0,0,0} #endif -#ifdef CONFIG_HISAX_NETJET_U -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_NETJET_U -#define DEFAULT_CFG {0,0,0,0} -#endif - #ifndef DEFAULT_CARD #define DEFAULT_CARD 0 #define DEFAULT_CFG {0,0,0,0} @@ -535,10 +529,6 @@ extern int setup_gazel(struct IsdnCard *card); extern int setup_w6692(struct IsdnCard *card); #endif -#if CARD_NETJET_U -extern int setup_netjet_u(struct IsdnCard *card); -#endif - #if CARD_FN_ENTERNOW_PCI extern int setup_enternow_pci(struct IsdnCard *card); #endif @@ -957,11 +947,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_w6692(card); break; #endif -#if CARD_NETJET_U - case ISDN_CTYPE_NETJET_U: - ret = setup_netjet_u(card); - break; -#endif #if CARD_FN_ENTERNOW_PCI case ISDN_CTYPE_ENTERNOW: ret = setup_enternow_pci(card); @@ -973,6 +958,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) /* list of ISDN_CTYPE_xxx support moved to a modular driver */ case ISDN_CTYPE_NETJET_S: + case ISDN_CTYPE_NETJET_U: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1433,11 +1419,15 @@ static int __init HiSax_init(void) cards[j].para[2] = mem[i]; break; case ISDN_CTYPE_ELSA_PCI: - case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_TELESPCI: case ISDN_CTYPE_W6692: + break; + + /* the following block are excluded from std HiSax init */ + case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_U: break; + case ISDN_CTYPE_BKM_A4T: break; case ISDN_CTYPE_SCT_QUADRO: @@ -1515,6 +1505,19 @@ static void __exit HiSax_exit(void) printk(KERN_INFO "HiSax module removed\n"); } +#ifdef CONFIG_PCI +void hisax_pci_remove_one(struct pci_dev *pdev) +{ + int cardnr = (unsigned long) pci_get_drvdata(pdev); + + HiSax_closecard(cardnr); + pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); +} + +EXPORT_SYMBOL(hisax_pci_remove_one); +#endif /* CONFIG_PCI */ + int hisax_init_hotplug(struct IsdnCard *card, hisax_setup_func_t card_setup) { u_char ids[16]; @@ -1927,9 +1930,6 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = { #ifdef CONFIG_HISAX_SEDLBAUER {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, PCI_ANY_ID,PCI_ANY_ID}, #endif -#if defined(CONFIG_HISAX_NETJET_U) - {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, PCI_ANY_ID,PCI_ANY_ID}, -#endif #if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, PCI_ANY_ID,PCI_ANY_ID}, #endif diff --git a/drivers/isdn/hisax/hisax_cfg.h b/drivers/isdn/hisax/hisax_cfg.h index ec309d4..dde18bf 100644 --- a/drivers/isdn/hisax/hisax_cfg.h +++ b/drivers/isdn/hisax/hisax_cfg.h @@ -65,3 +65,5 @@ typedef int (*hisax_setup_func_t)(struct IsdnCard *card); extern void HiSax_closecard(int); extern int hisax_init_pcmcia(void *, int *, IsdnCard_t *); extern int hisax_init_hotplug(IsdnCard_t *, hisax_setup_func_t card_setup); +extern void hisax_pci_remove_one(struct pci_dev *pdev); + diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c index bcae2b0..c939167 100644 --- a/drivers/isdn/hisax/isdnl1.c +++ b/drivers/isdn/hisax/isdnl1.c @@ -451,7 +451,7 @@ Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir) (dir ? "<-" : "->"), buf, l2frames(ptr), ((ptr[0] & 2) >> 1) == dir ? 'C' : 'R', ptr[0] >> 2, ptr[1] >> 1); } -#endif +#endif /* L2FRAME_DEBUG */ static void l1_reset(struct FsmInst *fi, int event, void *arg) @@ -934,4 +934,10 @@ setstack_l1_B(struct PStack *st) FsmInitTimer(&st->l1.l1m, &st->l1.timer); } +EXPORT_SYMBOL(l1_msg); EXPORT_SYMBOL(debugl1); +EXPORT_SYMBOL(DChannel_proc_rcv); +EXPORT_SYMBOL(DChannel_proc_xmt); +#ifdef L2FRAME_DEBUG +EXPORT_SYMBOL(Logl2Frame); +#endif diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index 3779ccc..f804636 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -310,27 +310,17 @@ static int __devinit njs_pci_init_one(struct pci_dev *pdev, return 0; } -static void __devexit njs_pci_remove_one(struct pci_dev *pdev) -{ - int cardnr = (unsigned long) pci_get_drvdata(pdev); - - HiSax_closecard(cardnr); - pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); -} - static struct pci_device_id njs_pci_table[] = { { PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_300) }, { } /* terminate list */ }; -MODULE_DEVICE_TABLE(pci, njs_pci_table); static struct pci_driver njs_pci_driver = { .name = "nj_s", .id_table = njs_pci_table, .probe = njs_pci_init_one, - .remove = njs_pci_remove_one, + .remove = hisax_pci_remove_one, }; static int __init njs_mod_init(void) @@ -349,5 +339,6 @@ module_exit(njs_mod_exit); module_param_named(protocol, njs_protocol, int, 0444); MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); +MODULE_DEVICE_TABLE(pci, njs_pci_table); MODULE_DESCRIPTION("ISDN HiSax NETjet-S PCI driver"); MODULE_LICENSE("GPL"); diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index f017d38..e391eae 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -7,6 +7,7 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "icc.h" #include "isdnl1.h" #include <linux/pci.h> @@ -14,6 +15,8 @@ #include <linux/ppp_defs.h> #include "netjet.h" +static int nju_protocol; /* 0 == use DEFAULT_PROTO */ + static const char *NETjet_U_revision = "$Revision: 2.14.2.3 $"; static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) @@ -133,7 +136,10 @@ static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, { if (pci_enable_device(dev_netjet)) return(0); + pci_set_master(dev_netjet); + + cs->hw.njet.dev = dev_netjet; cs->irq = dev_netjet->irq; if (!cs->irq) { printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); @@ -174,17 +180,17 @@ static int __devinit nju_cs_init(struct IsdnCard *card, switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) ) { case 3 : - return 1; /* end loop */ + return 1; /* found card */ case 0 : printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); - return -1; /* continue looping */ + return 0; /* no NETjet-U found */ default : printk( KERN_WARNING "NETspider-U: No PCI card found\n" ); - return 0; /* end loop & function */ + return 0; /* no NETjet-U found */ } - return 1; /* end loop */ + return 1; /* found card */ } static int __devinit nju_cs_init_rest(struct IsdnCard *card, @@ -197,8 +203,7 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, cs->hw.njet.base, cs->irq); if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) { printk(KERN_WARNING - "HiSax: %s config port %#lx-%#lx already in use\n", - CardType[card->typ], + "HiSax: NETjet-U config port %#lx-%#lx already in use\n", cs->hw.njet.base, cs->hw.njet.base + bytecnt); return (0); @@ -219,7 +224,6 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, return (1); } -static struct pci_dev *dev_netjet __devinitdata = NULL; int __devinit setup_netjet_u(struct IsdnCard *card) @@ -227,6 +231,7 @@ setup_netjet_u(struct IsdnCard *card) int ret; struct IsdnCardState *cs = card->cs; char tmp[64]; + struct pci_dev *dev_netjet = (void *) card->para[0]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" @@ -234,29 +239,70 @@ setup_netjet_u(struct IsdnCard *card) strcpy(tmp, NETjet_U_revision); printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_NETJET_U) - return(0); + + WARN_ON(cs->typ != ISDN_CTYPE_NETJET_U); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - ret = nju_pci_probe(dev_netjet, cs); - if (!ret) - return(0); - } else { - printk(KERN_WARNING "NETspider-U: No PCI card found\n"); - return(0); - } + ret = nju_pci_probe(dev_netjet, cs); + if (!ret) - ret = nju_cs_init(card, cs); - if (!ret) - return (0); - if (ret > 0) - break; - /* ret < 0 == continue looping */ - } + ret = nju_cs_init(card, cs); + if (!ret) + return (0); return nju_cs_init_rest(card, cs); } + +static int __devinit nju_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_NETJET_U, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + if (!nju_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = nju_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_netjet_u); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id nju_pci_table[] = { + { PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_300) }, + + { } /* terminate list */ +}; + +static struct pci_driver nju_pci_driver = { + .name = "nj_s", + .id_table = nju_pci_table, + .probe = nju_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init nju_mod_init(void) +{ + return pci_register_driver(&nju_pci_driver); +} + +static void __exit nju_mod_exit(void) +{ + pci_unregister_driver(&nju_pci_driver); +} + +module_init(nju_mod_init); +module_exit(nju_mod_exit); + +module_param_named(protocol, nju_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, nju_pci_table); +MODULE_DESCRIPTION("ISDN HiSax NETjet-U PCI driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c index aacbf0d..8a4e60b 100644 --- a/drivers/isdn/hisax/q931.c +++ b/drivers/isdn/hisax/q931.c @@ -1520,3 +1520,7 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) *dp = 0; HiSax_putstatus(cs, NULL, cs->dlog); } + +EXPORT_SYMBOL(dlogframe); +EXPORT_SYMBOL(LogFrame); +EXPORT_SYMBOL(QuickHex); ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 1/7] HiSax enternow: split setup into smaller functions 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik ` (5 preceding siblings ...) 2007-07-15 21:40 ` [PATCH 1/2] HiSax netjet_u: code movement; hotplug API prep Jeff Garzik @ 2007-07-16 5:26 ` Jeff Garzik 2007-07-16 5:27 ` [PATCH 2/7] HiSax enternow: convert to PCI hotplug API Jeff Garzik ` (5 more replies) 2007-07-16 7:52 ` [PATCH] HiSax telespci: " Jeff Garzik 7 siblings, 6 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:26 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit a95641cdd42177eb0e9a772c591ca5383ee9c8ae Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 19:25:45 2007 -0400 [ISDN] HiSax enternow: split setup into 3 smaller functions No behavior changes, just code movement. Prep for PCI hotplug API. [also: removed CONFIG_PCI tests and CardType references] Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/enternow_pci.c | 165 ++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 76 deletions(-) a95641cdd42177eb0e9a772c591ca5383ee9c8ae diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index b45de9d..b73027f 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -300,98 +300,72 @@ enpci_interrupt(int intno, void *dev_id) return IRQ_HANDLED; } - -static struct pci_dev *dev_netjet __devinitdata = NULL; - -/* called by config.c */ -int __devinit -setup_enternow_pci(struct IsdnCard *card) +static int __devinit en_pci_probe(struct pci_dev *dev_netjet, + struct IsdnCardState *cs) { - int bytecnt; - struct IsdnCardState *cs = card->cs; - char tmp[64]; - -#ifdef CONFIG_PCI -#ifdef __BIG_ENDIAN -#error "not running on big endian machines now" -#endif - strcpy(tmp, enternow_pci_rev); - printk(KERN_INFO "HiSax: Formula-n Europe AG enter:now ISDN PCI driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_ENTERNOW) + if (pci_enable_device(dev_netjet)) return(0); - test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); - - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - if (pci_enable_device(dev_netjet)) - return(0); - cs->irq = dev_netjet->irq; - if (!cs->irq) { - printk(KERN_WARNING "enter:now PCI: No IRQ for PCI card found\n"); - return(0); - } - cs->hw.njet.base = pci_resource_start(dev_netjet, 0); - if (!cs->hw.njet.base) { - printk(KERN_WARNING "enter:now PCI: No IO-Adr for PCI card found\n"); - return(0); - } - /* checks Sub-Vendor ID because system crashes with Traverse-Card */ - if ((dev_netjet->subsystem_vendor != 0x55) || - (dev_netjet->subsystem_device != 0x02)) { - printk(KERN_WARNING "enter:now: You tried to load this driver with an incompatible TigerJet-card\n"); - printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n"); - return(0); - } - } else { - printk(KERN_WARNING "enter:now PCI: No PCI card found\n"); - return(0); - } - - cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; - cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD - - /* Reset an */ - cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff - outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); - /* 20 ms Pause */ - mdelay(20); + cs->irq = dev_netjet->irq; + if (!cs->irq) { + printk(KERN_WARNING "enter:now PCI: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.njet.base = pci_resource_start(dev_netjet, 0); + if (!cs->hw.njet.base) { + printk(KERN_WARNING "enter:now PCI: No IO-Adr for PCI card found\n"); + return(0); + } + /* checks Sub-Vendor ID because system crashes with Traverse-Card */ + if ((dev_netjet->subsystem_vendor != 0x55) || + (dev_netjet->subsystem_device != 0x02)) { + printk(KERN_WARNING "enter:now: You tried to load this driver with an incompatible TigerJet-card\n"); + printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n"); + return(0); + } - cs->hw.njet.ctrl_reg = 0x30; /* Reset Off and status read clear */ - outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); - mdelay(10); + return(1); +} - cs->hw.njet.auxd = 0x00; // war 0xc0 - cs->hw.njet.dmactrl = 0; +static void __devinit en_cs_init(struct IsdnCard *card, + struct IsdnCardState *cs) +{ + cs->hw.njet.auxa = cs->hw.njet.base + NETJET_AUXDATA; + cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD - outb(~TJ_AMD_IRQ, cs->hw.njet.base + NETJET_AUXCTRL); - outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1); - outb(cs->hw.njet.auxd, cs->hw.njet.auxa); + /* Reset an */ + cs->hw.njet.ctrl_reg = 0x07; // geändert von 0xff + outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); + /* 20 ms Pause */ + mdelay(20); - break; - } -#else + cs->hw.njet.ctrl_reg = 0x30; /* Reset Off and status read clear */ + outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL); + mdelay(10); - printk(KERN_WARNING "enter:now PCI: NO_PCI_BIOS\n"); - printk(KERN_WARNING "enter:now PCI: unable to config Formula-n enter:now ISDN PCI ab\n"); - return (0); + cs->hw.njet.auxd = 0x00; // war 0xc0 + cs->hw.njet.dmactrl = 0; -#endif /* CONFIG_PCI */ + outb(~TJ_AMD_IRQ, cs->hw.njet.base + NETJET_AUXCTRL); + outb(TJ_AMD_IRQ, cs->hw.njet.base + NETJET_IRQMASK1); + outb(cs->hw.njet.auxd, cs->hw.njet.auxa); +} - bytecnt = 256; +static int __devinit en_cs_init_rest(struct IsdnCard *card, + struct IsdnCardState *cs) +{ + const int bytecnt = 256; printk(KERN_INFO "enter:now PCI: PCI card configured at 0x%lx IRQ %d\n", cs->hw.njet.base, cs->irq); if (!request_region(cs->hw.njet.base, bytecnt, "Fn_ISDN")) { printk(KERN_WARNING - "HiSax: %s config port %lx-%lx already in use\n", - CardType[card->typ], - cs->hw.njet.base, - cs->hw.njet.base + bytecnt); + "HiSax: enter:now config port %lx-%lx already in use\n", + cs->hw.njet.base, + cs->hw.njet.base + bytecnt); return (0); } + setup_Amd7930(cs); cs->hw.njet.last_is0 = 0; /* macro rByteAMD */ @@ -407,5 +381,44 @@ setup_enternow_pci(struct IsdnCard *card) cs->irq_func = &enpci_interrupt; cs->irq_flags |= IRQF_SHARED; - return (1); + return (1); +} + +static struct pci_dev *dev_netjet __devinitdata = NULL; + +/* called by config.c */ +int __devinit +setup_enternow_pci(struct IsdnCard *card) +{ + int ret; + struct IsdnCardState *cs = card->cs; + char tmp[64]; + +#ifdef __BIG_ENDIAN +#error "not running on big endian machines now" +#endif + + strcpy(tmp, enternow_pci_rev); + printk(KERN_INFO "HiSax: Formula-n Europe AG enter:now ISDN PCI driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ != ISDN_CTYPE_ENTERNOW) + return(0); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); + + for ( ;; ) + { + if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { + ret = en_pci_probe(dev_netjet, cs); + if (!ret) + return(0); + } else { + printk(KERN_WARNING "enter:now PCI: No PCI card found\n"); + return(0); + } + + en_cs_init(card, cs); + break; + } + + return en_cs_init_rest(card, cs); } ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/7] HiSax enternow: convert to PCI hotplug API 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik @ 2007-07-16 5:27 ` Jeff Garzik 2007-07-16 5:27 ` [PATCH 3/7] HiSax bkm_a4t: split setup into smaller functions Jeff Garzik ` (4 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:27 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 6c1225fd2735f698f59122209dd3c74d2e50ec28 Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 19:41:21 2007 -0400 [ISDN] HiSax enternow_pci: convert to PCI hotplug API Also, fix driver name in netjet_u. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 3 - drivers/isdn/hisax/config.c | 11 ---- drivers/isdn/hisax/enternow_pci.c | 91 +++++++++++++++++++++++++++----------- drivers/isdn/hisax/nj_u.c | 2 5 files changed, 71 insertions(+), 38 deletions(-) 6c1225fd2735f698f59122209dd3c74d2e50ec28 diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 1da3cd6..7de6fda 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -341,7 +341,7 @@ config HISAX_HFC_SX cards. This code is not finished yet. config HISAX_ENTERNOW_PCI - bool "Formula-n enter:now PCI card" + tristate "Formula-n enter:now PCI card" depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Formula-n enter:now PCI diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index a37e211..db5580b 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -17,7 +17,9 @@ obj-$(CONFIG_HISAX_HFC4S8S) += hfc4s8s_l1.o obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o obj-$(CONFIG_HISAX_NETJET) += netjet_s.o libhisax.o obj-$(CONFIG_HISAX_NETJET_U) += netjet_u.o libhisax.o +obj-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow.o libhisax.o +enternow-objs := enternow_pci.o amd7930_fn.o netjet_s-objs := nj_s.o netjet_u-objs := nj_u.o icc.o libhisax-objs := netjet.o isac.o arcofi.o @@ -62,5 +64,4 @@ hisax-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t.o jade.o hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o hscx.o hisax-$(CONFIG_HISAX_GAZEL) += gazel.o hscx.o hisax-$(CONFIG_HISAX_W6692) += w6692.o -hisax-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 03c73e0..25320dd 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -529,10 +529,6 @@ extern int setup_gazel(struct IsdnCard *card); extern int setup_w6692(struct IsdnCard *card); #endif -#if CARD_FN_ENTERNOW_PCI -extern int setup_enternow_pci(struct IsdnCard *card); -#endif - /* * Find card with given driverId */ @@ -947,11 +943,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_w6692(card); break; #endif -#if CARD_FN_ENTERNOW_PCI - case ISDN_CTYPE_ENTERNOW: - ret = setup_enternow_pci(card); - break; -#endif case ISDN_CTYPE_DYNAMIC: ret = 2; break; @@ -959,6 +950,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) /* list of ISDN_CTYPE_xxx support moved to a modular driver */ case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_U: + case ISDN_CTYPE_ENTERNOW: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1426,6 +1418,7 @@ static int __init HiSax_init(void) /* the following block are excluded from std HiSax init */ case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_U: + case ISDN_CTYPE_ENTERNOW: break; case ISDN_CTYPE_BKM_A4T: diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index b73027f..978b99a 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -61,6 +61,7 @@ #include "hisax.h" +#include "hisax_proto.h" #include "isac.h" #include "isdnl1.h" #include "amd7930_fn.h" @@ -70,7 +71,7 @@ #include <linux/init.h> #include "netjet.h" - +static int en_protocol; /* 0 == use DEFAULT_PROTO */ static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; @@ -305,6 +306,8 @@ static int __devinit en_pci_probe(struct pci_dev *dev_netjet, { if (pci_enable_device(dev_netjet)) return(0); + + cs->hw.njet.dev = dev_netjet; cs->irq = dev_netjet->irq; if (!cs->irq) { printk(KERN_WARNING "enter:now PCI: No IRQ for PCI card found\n"); @@ -315,13 +318,6 @@ static int __devinit en_pci_probe(struct pci_dev *dev_netjet, printk(KERN_WARNING "enter:now PCI: No IO-Adr for PCI card found\n"); return(0); } - /* checks Sub-Vendor ID because system crashes with Traverse-Card */ - if ((dev_netjet->subsystem_vendor != 0x55) || - (dev_netjet->subsystem_device != 0x02)) { - printk(KERN_WARNING "enter:now: You tried to load this driver with an incompatible TigerJet-card\n"); - printk(KERN_WARNING "Use type=20 for Traverse NetJet PCI Card.\n"); - return(0); - } return(1); } @@ -384,8 +380,6 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card, return (1); } -static struct pci_dev *dev_netjet __devinitdata = NULL; - /* called by config.c */ int __devinit setup_enternow_pci(struct IsdnCard *card) @@ -393,6 +387,7 @@ setup_enternow_pci(struct IsdnCard *card) int ret; struct IsdnCardState *cs = card->cs; char tmp[64]; + struct pci_dev *dev_netjet = (void *) card->para[0]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" @@ -400,25 +395,69 @@ setup_enternow_pci(struct IsdnCard *card) strcpy(tmp, enternow_pci_rev); printk(KERN_INFO "HiSax: Formula-n Europe AG enter:now ISDN PCI driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_ENTERNOW) - return(0); + + WARN_ON(cs->typ != ISDN_CTYPE_ENTERNOW); + test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); - for ( ;; ) - { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, - PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { - ret = en_pci_probe(dev_netjet, cs); - if (!ret) - return(0); - } else { - printk(KERN_WARNING "enter:now PCI: No PCI card found\n"); - return(0); - } + ret = en_pci_probe(dev_netjet, cs); + if (!ret) + return(0); - en_cs_init(card, cs); - break; - } + en_cs_init(card, cs); return en_cs_init_rest(card, cs); } + +static int __devinit en_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_ENTERNOW, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + if (!en_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = en_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_enternow_pci); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id en_pci_table[] = { + { PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, 0x55, 0x02, }, + + { } /* terminate list */ +}; + +static struct pci_driver en_pci_driver = { + .name = "enternow_pci", + .id_table = en_pci_table, + .probe = en_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init en_mod_init(void) +{ + return pci_register_driver(&en_pci_driver); +} + +static void __exit en_mod_exit(void) +{ + pci_unregister_driver(&en_pci_driver); +} + +module_init(en_mod_init); +module_exit(en_mod_exit); + +module_param_named(protocol, en_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, en_pci_table); +MODULE_DESCRIPTION("ISDN HiSax enter:now PCI driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index e391eae..370535a 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -281,7 +281,7 @@ static struct pci_device_id nju_pci_table[] = { }; static struct pci_driver nju_pci_driver = { - .name = "nj_s", + .name = "nj_u", .id_table = nju_pci_table, .probe = nju_pci_init_one, .remove = hisax_pci_remove_one, ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/7] HiSax bkm_a4t: split setup into smaller functions 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik 2007-07-16 5:27 ` [PATCH 2/7] HiSax enternow: convert to PCI hotplug API Jeff Garzik @ 2007-07-16 5:27 ` Jeff Garzik 2007-07-16 5:28 ` [PATCH 4/7] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik ` (3 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:27 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit f3068817e23a05dbeeaa7dced579c7b64045b7ea Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 19:58:24 2007 -0400 [ISDN] HiSax bkm_a4t: split setup into two smaller functions No behavior changes, just code movement. Prep for PCI hotplug API. Well, CONFIG_PCI useless ifdef was removed. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/bkm_a4t.c | 108 +++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 45 deletions(-) f3068817e23a05dbeeaa7dced579c7b64045b7ea diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 871310d..3d1bdc8 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -255,54 +255,38 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) return (0); } -static struct pci_dev *dev_a4t __devinitdata = NULL; +static int __devinit a4t_pci_probe(struct pci_dev *dev_a4t, + struct IsdnCardState *cs, + u_int *found, + u_int *pci_memaddr) +{ + u16 sub_sys; + u16 sub_vendor; + + sub_vendor = dev_a4t->subsystem_vendor; + sub_sys = dev_a4t->subsystem_device; + if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) { + if (pci_enable_device(dev_a4t)) + return (0); /* end loop & function */ + *found = 1; + *pci_memaddr = pci_resource_start(dev_a4t, 0); + cs->irq = dev_a4t->irq; + return (1); /* end loop */ + } -int __devinit -setup_bkm_a4t(struct IsdnCard *card) + return (-1); /* continue looping */ +} + +static int __devinit a4t_cs_init(struct IsdnCard *card, + struct IsdnCardState *cs, + u_int pci_memaddr) { - struct IsdnCardState *cs = card->cs; - char tmp[64]; - u_int pci_memaddr = 0, found = 0; I20_REGISTER_FILE *pI20_Regs; -#ifdef CONFIG_PCI -#endif - - strcpy(tmp, bkm_a4t_revision); - printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ == ISDN_CTYPE_BKM_A4T) { - cs->subtyp = BKM_A4T; - } else - return (0); -#ifdef CONFIG_PCI - while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, - PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { - u16 sub_sys; - u16 sub_vendor; - - sub_vendor = dev_a4t->subsystem_vendor; - sub_sys = dev_a4t->subsystem_device; - if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) { - if (pci_enable_device(dev_a4t)) - return(0); - found = 1; - pci_memaddr = pci_resource_start(dev_a4t, 0); - cs->irq = dev_a4t->irq; - break; - } - } - if (!found) { - printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); - return (0); - } if (!cs->irq) { /* IRQ range check ?? */ printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]); return (0); } - if (!pci_memaddr) { - printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); - return (0); - } cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); /* Check suspecious address */ pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); @@ -317,11 +301,7 @@ setup_bkm_a4t(struct IsdnCard *card) cs->hw.ax.jade_adr = cs->hw.ax.base + PO_OFFSET; cs->hw.ax.isac_ale = GCS_1; cs->hw.ax.jade_ale = GCS_3; -#else - printk(KERN_WARNING "HiSax: %s: NO_PCI_BIOS\n", CardType[card->typ]); - printk(KERN_WARNING "HiSax: %s: unable to configure\n", CardType[card->typ]); - return (0); -#endif /* CONFIG_PCI */ + printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", CardType[card->typ], cs->hw.ax.base, cs->irq); @@ -339,5 +319,43 @@ setup_bkm_a4t(struct IsdnCard *card) ISACVersion(cs, "Telekom A4T:"); /* Jade version */ JadeVersion(cs, "Telekom A4T:"); + return (1); } + +static struct pci_dev *dev_a4t __devinitdata = NULL; + +int __devinit +setup_bkm_a4t(struct IsdnCard *card) +{ + struct IsdnCardState *cs = card->cs; + char tmp[64]; + u_int pci_memaddr = 0, found = 0; + int ret; + + strcpy(tmp, bkm_a4t_revision); + printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp)); + if (cs->typ == ISDN_CTYPE_BKM_A4T) { + cs->subtyp = BKM_A4T; + } else + return (0); + + while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, + PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { + ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); + if (!ret) + return (0); + if (ret > 0) + break; + } + if (!found) { + printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); + return (0); + } + if (!pci_memaddr) { + printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); + return (0); + } + + return a4t_cs_init(card, cs, pci_memaddr); +} ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 4/7] HiSax bkm_a4t: convert to PCI hotplug API 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik 2007-07-16 5:27 ` [PATCH 2/7] HiSax enternow: convert to PCI hotplug API Jeff Garzik 2007-07-16 5:27 ` [PATCH 3/7] HiSax bkm_a4t: split setup into smaller functions Jeff Garzik @ 2007-07-16 5:28 ` Jeff Garzik 2007-07-16 5:28 ` [PATCH 5/7] HiSax w6692: " Jeff Garzik ` (2 subsequent siblings) 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:28 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 9e435c5da75f6edead09e1acd9b2f441e16a539d Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 20:26:37 2007 -0400 [ISDN] HiSax: convert bkm_a4t to PCI hotplug API Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 3 - drivers/isdn/hisax/bkm_a4t.c | 118 ++++++++++++++++++++++++++++--------------- drivers/isdn/hisax/config.c | 20 ------- 4 files changed, 83 insertions(+), 60 deletions(-) 9e435c5da75f6edead09e1acd9b2f441e16a539d diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 7de6fda..b04503d 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR settings. config HISAX_BKM_A4T - bool "Telekom A4T card" + tristate "Telekom A4T card" depends on PCI help This enables HiSax support for the Telekom A4T card. diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index db5580b..e63e2af 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -18,7 +18,9 @@ obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o obj-$(CONFIG_HISAX_NETJET) += netjet_s.o libhisax.o obj-$(CONFIG_HISAX_NETJET_U) += netjet_u.o libhisax.o obj-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow.o libhisax.o +obj-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t_pci.o +bkm_a4t_pci-objs := bkm_a4t.o jade.o enternow-objs := enternow_pci.o amd7930_fn.o netjet_s-objs := nj_s.o netjet_u-objs := nj_u.o icc.o @@ -60,7 +62,6 @@ hisax-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o hisax-$(CONFIG_HISAX_NICCY) += niccy.o hscx.o hisax-$(CONFIG_HISAX_ISURF) += isurf.o sar.o hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o hscx.o -hisax-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t.o jade.o hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o hscx.o hisax-$(CONFIG_HISAX_GAZEL) += gazel.o hscx.o hisax-$(CONFIG_HISAX_W6692) += w6692.o diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 3d1bdc8..918afb3 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "isac.h" #include "hscx.h" #include "jade.h" @@ -20,7 +21,7 @@ #include <linux/pci.h> #include "bkm_ax.h" -extern const char *CardType[]; +static int a4t_protocol; /* 0 == use DEFAULT_PROTO */ static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $"; @@ -257,24 +258,21 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg) static int __devinit a4t_pci_probe(struct pci_dev *dev_a4t, struct IsdnCardState *cs, - u_int *found, u_int *pci_memaddr) { - u16 sub_sys; - u16 sub_vendor; - - sub_vendor = dev_a4t->subsystem_vendor; - sub_sys = dev_a4t->subsystem_device; - if ((sub_sys == PCI_DEVICE_ID_BERKOM_A4T) && (sub_vendor == PCI_VENDOR_ID_BERKOM)) { - if (pci_enable_device(dev_a4t)) - return (0); /* end loop & function */ - *found = 1; - *pci_memaddr = pci_resource_start(dev_a4t, 0); - cs->irq = dev_a4t->irq; - return (1); /* end loop */ + if (pci_enable_device(dev_a4t)) + return (0); /* error */ + + *pci_memaddr = pci_resource_start(dev_a4t, 0); + if (!(*pci_memaddr)) { + printk(KERN_WARNING "HiSax bkm_a4t: No Memory base address\n"); + return (0); } - return (-1); /* continue looping */ + cs->irq = dev_a4t->irq; + + cs->hw.ax.dev = dev_a4t; + return (1); /* success */ } static int __devinit a4t_cs_init(struct IsdnCard *card, @@ -284,7 +282,7 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, I20_REGISTER_FILE *pI20_Regs; if (!cs->irq) { /* IRQ range check ?? */ - printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]); + printk(KERN_WARNING "HiSax: bkm_a4t: No IRQ\n"); return (0); } cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); @@ -292,7 +290,7 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { printk(KERN_WARNING "HiSax: %s address %lx-%lx suspecious\n", - CardType[card->typ], cs->hw.ax.base, cs->hw.ax.base + 4096); + "bkm_a4t", cs->hw.ax.base, cs->hw.ax.base + 4096); iounmap((void *) cs->hw.ax.base); cs->hw.ax.base = 0; return (0); @@ -303,7 +301,7 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, cs->hw.ax.jade_ale = GCS_3; printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", - CardType[card->typ], cs->hw.ax.base, cs->irq); + "bkm_a4t", cs->hw.ax.base, cs->irq); setup_isac(cs); cs->readisac = &ReadISAC; @@ -323,39 +321,79 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, return (1); } -static struct pci_dev *dev_a4t __devinitdata = NULL; - int __devinit setup_bkm_a4t(struct IsdnCard *card) { struct IsdnCardState *cs = card->cs; char tmp[64]; - u_int pci_memaddr = 0, found = 0; + u_int pci_memaddr = 0; int ret; + struct pci_dev *dev_a4t = (void *) card->para[0]; strcpy(tmp, bkm_a4t_revision); printk(KERN_INFO "HiSax: T-Berkom driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ == ISDN_CTYPE_BKM_A4T) { - cs->subtyp = BKM_A4T; - } else - return (0); - while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, - PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { - ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); - if (!ret) - return (0); - if (ret > 0) - break; - } - if (!found) { - printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); - return (0); - } - if (!pci_memaddr) { - printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); + WARN_ON(cs->typ != ISDN_CTYPE_BKM_A4T); + + cs->subtyp = BKM_A4T; + + ret = a4t_pci_probe(dev_a4t, cs, &pci_memaddr); + if (!ret) return (0); - } return a4t_cs_init(card, cs, pci_memaddr); } + +static int __devinit a4t_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_BKM_A4T, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + if (!a4t_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = a4t_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_bkm_a4t); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id a4t_pci_table[] = { + { PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, + PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A4T, }, + + { } /* terminate list */ +}; + +static struct pci_driver a4t_pci_driver = { + .name = "bkm_a4t", + .id_table = a4t_pci_table, + .probe = a4t_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init a4t_mod_init(void) +{ + return pci_register_driver(&a4t_pci_driver); +} + +static void __exit a4t_mod_exit(void) +{ + pci_unregister_driver(&a4t_pci_driver); +} + +module_init(a4t_mod_init); +module_exit(a4t_mod_exit); + +module_param_named(protocol, a4t_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, a4t_pci_table); +MODULE_DESCRIPTION("ISDN HiSax BKM A4T PCI driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 25320dd..2ba96d0 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -243,13 +243,6 @@ const char *CardType[] = { #define DEFAULT_CFG {5,0x250,0,0} #endif -#ifdef CONFIG_HISAX_BKM_A4T -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_BKM_A4T -#define DEFAULT_CFG {0,0x0,0,0} -#endif - #ifdef CONFIG_HISAX_SCT_QUADRO #undef DEFAULT_CARD #undef DEFAULT_CFG @@ -513,10 +506,6 @@ extern int setup_isurf(struct IsdnCard *card); extern int setup_saphir(struct IsdnCard *card); #endif -#if CARD_BKM_A4T -extern int setup_bkm_a4t(struct IsdnCard *card); -#endif - #if CARD_SCT_QUADRO extern int setup_sct_quadro(struct IsdnCard *card); #endif @@ -923,11 +912,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_saphir(card); break; #endif -#if CARD_BKM_A4T - case ISDN_CTYPE_BKM_A4T: - ret = setup_bkm_a4t(card); - break; -#endif #if CARD_SCT_QUADRO case ISDN_CTYPE_SCT_QUADRO: ret = setup_sct_quadro(card); @@ -951,6 +935,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_U: case ISDN_CTYPE_ENTERNOW: + case ISDN_CTYPE_BKM_A4T: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1419,10 +1404,9 @@ static int __init HiSax_init(void) case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_U: case ISDN_CTYPE_ENTERNOW: - break; - case ISDN_CTYPE_BKM_A4T: break; + case ISDN_CTYPE_SCT_QUADRO: if (irq[i]) { cards[j].para[0] = irq[i]; ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 5/7] HiSax w6692: convert to PCI hotplug API 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik ` (2 preceding siblings ...) 2007-07-16 5:28 ` [PATCH 4/7] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik @ 2007-07-16 5:28 ` Jeff Garzik 2007-07-16 5:29 ` [PATCH 6/7] HiSax hfc_pci: minor cleanups Jeff Garzik 2007-07-16 5:29 ` [PATCH 7/7] HiSax hfc_pci: convert to PCI hotplug API Jeff Garzik 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:28 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit fc1418cbccc453729296fbacaeaaa13e8b71a830 Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 21:28:34 2007 -0400 [ISDN] HiSax: Convert w6692 driver to PCI hotplug API [ed.: also, some additional EXPORT_SYMBOL and Makefile fixes] Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 4 - drivers/isdn/hisax/config.c | 23 -------- drivers/isdn/hisax/isdnl1.c | 2 drivers/isdn/hisax/lmgr.c | 2 drivers/isdn/hisax/w6692.c | 116 ++++++++++++++++++++++++++++---------------- 6 files changed, 83 insertions(+), 66 deletions(-) fc1418cbccc453729296fbacaeaaa13e8b71a830 diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index b04503d..03e4ea5 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -325,7 +325,7 @@ config HISAX_HFC_PCI <file:Documentation/isdn/README.hfc-pci>. config HISAX_W6692 - bool "Winbond W6692 based cards" + tristate "Winbond W6692 based cards" depends on PCI help This enables HiSax support for Winbond W6692 based PCI ISDN cards. diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index e63e2af..1f02120 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -18,7 +18,8 @@ obj-$(CONFIG_HISAX_FRITZ_PCIPNP) += hisax_isac.o hisax_fcpcipnp.o obj-$(CONFIG_HISAX_NETJET) += netjet_s.o libhisax.o obj-$(CONFIG_HISAX_NETJET_U) += netjet_u.o libhisax.o obj-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow.o libhisax.o -obj-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t_pci.o +obj-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t_pci.o libhisax.o +obj-$(CONFIG_HISAX_W6692) += w6692.o libhisax.o bkm_a4t_pci-objs := bkm_a4t.o jade.o enternow-objs := enternow_pci.o amd7930_fn.o @@ -64,5 +65,4 @@ hisax-$(CONFIG_HISAX_ISURF) += isurf.o sar.o hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o hscx.o hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o hscx.o hisax-$(CONFIG_HISAX_GAZEL) += gazel.o hscx.o -hisax-$(CONFIG_HISAX_W6692) += w6692.o diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 2ba96d0..163a636 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -257,13 +257,6 @@ const char *CardType[] = { #define DEFAULT_CFG {15,0x180,0,0} #endif -#ifdef CONFIG_HISAX_W6692 -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_W6692 -#define DEFAULT_CFG {0,0,0,0} -#endif - #ifndef DEFAULT_CARD #define DEFAULT_CARD 0 #define DEFAULT_CFG {0,0,0,0} @@ -514,10 +507,6 @@ extern int setup_sct_quadro(struct IsdnCard *card); extern int setup_gazel(struct IsdnCard *card); #endif -#if CARD_W6692 -extern int setup_w6692(struct IsdnCard *card); -#endif - /* * Find card with given driverId */ @@ -922,11 +911,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_gazel(card); break; #endif -#if CARD_W6692 - case ISDN_CTYPE_W6692: - ret = setup_w6692(card); - break; -#endif case ISDN_CTYPE_DYNAMIC: ret = 2; break; @@ -936,6 +920,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) case ISDN_CTYPE_NETJET_U: case ISDN_CTYPE_ENTERNOW: case ISDN_CTYPE_BKM_A4T: + case ISDN_CTYPE_W6692: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1397,7 +1382,6 @@ static int __init HiSax_init(void) break; case ISDN_CTYPE_ELSA_PCI: case ISDN_CTYPE_TELESPCI: - case ISDN_CTYPE_W6692: break; /* the following block are excluded from std HiSax init */ @@ -1405,6 +1389,7 @@ static int __init HiSax_init(void) case ISDN_CTYPE_NETJET_U: case ISDN_CTYPE_ENTERNOW: case ISDN_CTYPE_BKM_A4T: + case ISDN_CTYPE_W6692: break; case ISDN_CTYPE_SCT_QUADRO: @@ -1910,10 +1895,6 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = { #if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, PCI_ANY_ID,PCI_ANY_ID}, #endif -#ifdef CONFIG_HISAX_W6692 - {PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH, PCI_ANY_ID,PCI_ANY_ID}, - {PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, PCI_ANY_ID,PCI_ANY_ID}, -#endif #ifdef CONFIG_HISAX_HFC_PCI {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0, PCI_ANY_ID, PCI_ANY_ID}, {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000, PCI_ANY_ID, PCI_ANY_ID}, diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c index c939167..ec81b12 100644 --- a/drivers/isdn/hisax/isdnl1.c +++ b/drivers/isdn/hisax/isdnl1.c @@ -935,7 +935,9 @@ setstack_l1_B(struct PStack *st) } EXPORT_SYMBOL(l1_msg); +EXPORT_SYMBOL(l1_msg_b); EXPORT_SYMBOL(debugl1); +EXPORT_SYMBOL(setstack_l1_B); EXPORT_SYMBOL(DChannel_proc_rcv); EXPORT_SYMBOL(DChannel_proc_xmt); #ifdef L2FRAME_DEBUG diff --git a/drivers/isdn/hisax/lmgr.c b/drivers/isdn/hisax/lmgr.c index d4f86d6..5980490 100644 --- a/drivers/isdn/hisax/lmgr.c +++ b/drivers/isdn/hisax/lmgr.c @@ -48,3 +48,5 @@ setstack_manager(struct PStack *st) { st->ma.layer = hisax_manager; } + +EXPORT_SYMBOL(setstack_manager); diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 3aeceaf..07d8e1e 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -12,11 +12,14 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "w6692.h" #include "isdnl1.h" #include <linux/interrupt.h> #include <linux/pci.h> +static int w6692_protocol; /* 0 == use DEFAULT_PROTO */ + /* table entry in the PCI devices list */ typedef struct { int vendor_id; @@ -992,54 +995,29 @@ w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg) return (0); } -static int id_idx ; - -static struct pci_dev *dev_w6692 __devinitdata = NULL; - int __devinit setup_w6692(struct IsdnCard *card) { struct IsdnCardState *cs = card->cs; char tmp[64]; - u_char found = 0; u_char pci_irq = 0; u_int pci_ioaddr = 0; + struct pci_dev *dev_w6692 = (void *) card->para[0]; strcpy(tmp, w6692_revision); printk(KERN_INFO "HiSax: W6692 driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_W6692) - return (0); -#ifdef CONFIG_PCI - while (id_list[id_idx].vendor_id) { - dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, - id_list[id_idx].device_id, - dev_w6692); - if (dev_w6692) { - if (pci_enable_device(dev_w6692)) - continue; - cs->subtyp = id_idx; - break; - } - id_idx++; - } - if (dev_w6692) { - found = 1; - pci_irq = dev_w6692->irq; - /* I think address 0 is allways the configuration area */ - /* and address 1 is the real IO space KKe 03.09.99 */ - pci_ioaddr = pci_resource_start(dev_w6692, 1); - /* USR ISDN PCI card TA need some special handling */ - if (cs->subtyp == W6692_WINBOND) { - if ((W6692_SV_USR == dev_w6692->subsystem_vendor) && - (W6692_SD_USR == dev_w6692->subsystem_device)) { - cs->subtyp = W6692_USR; - } - } - } - if (!found) { - printk(KERN_WARNING "W6692: No PCI card found\n"); + WARN_ON(cs->typ != ISDN_CTYPE_W6692); + + if (pci_enable_device(dev_w6692)) return (0); - } + + cs->subtyp = card->para[1]; + + pci_irq = dev_w6692->irq; + /* I think address 0 is allways the configuration area */ + /* and address 1 is the real IO space KKe 03.09.99 */ + pci_ioaddr = pci_resource_start(dev_w6692, 1); + cs->irq = pci_irq; if (!cs->irq) { printk(KERN_WARNING "W6692: No IRQ for PCI card found\n"); @@ -1061,11 +1039,6 @@ setup_w6692(struct IsdnCard *card) cs->hw.w6692.iobase + 255); return (0); } -#else - printk(KERN_WARNING "HiSax: W6692 and NO_PCI_BIOS\n"); - printk(KERN_WARNING "HiSax: W6692 unable to config\n"); - return (0); -#endif /* CONFIG_PCI */ printk(KERN_INFO "HiSax: %s config irq:%d I/O:%x\n", @@ -1091,3 +1064,62 @@ setup_w6692(struct IsdnCard *card) printk(KERN_INFO "W6692 D_RSTA=0x%X\n", ReadW6692(cs, W_D_RSTA)); return (1); } + +static int __devinit w6692_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_W6692, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + icard.para[1] = ent->driver_data; + if (!w6692_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = w6692_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_w6692); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id w6692_pci_table[] = { + { PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, W6692_DYNALINK }, + { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, + W6692_SV_USR, W6692_SD_USR, 0, 0, W6692_USR }, + { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, W6692_WINBOND }, + + { } /* terminate list */ +}; + +static struct pci_driver w6692_pci_driver = { + .name = "w6692", + .id_table = w6692_pci_table, + .probe = w6692_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init w6692_mod_init(void) +{ + return pci_register_driver(&w6692_pci_driver); +} + +static void __exit w6692_mod_exit(void) +{ + pci_unregister_driver(&w6692_pci_driver); +} + +module_init(w6692_mod_init); +module_exit(w6692_mod_exit); + +module_param_named(protocol, w6692_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, w6692_pci_table); +MODULE_DESCRIPTION("ISDN HiSax W6692 PCI driver"); +MODULE_LICENSE("GPL"); ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 6/7] HiSax hfc_pci: minor cleanups 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik ` (3 preceding siblings ...) 2007-07-16 5:28 ` [PATCH 5/7] HiSax w6692: " Jeff Garzik @ 2007-07-16 5:29 ` Jeff Garzik 2007-07-16 5:29 ` [PATCH 7/7] HiSax hfc_pci: convert to PCI hotplug API Jeff Garzik 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:29 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 163fc2ed7352b93cedb02af8a7a766c0b9bb475f Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 21:48:07 2007 -0400 [ISDN] HiSax hfc_pci: minor cleanups * trim trailing whitespace * remove CONFIG_PCI ifdefs, this driver is always PCI (Kconfig enforced) * remove return statements at the tail of a function * remove indentation levels by returning an error code immediately. Makes the code much more readable, and easier to update to PCI hotplug API. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/hfc_pci.c | 191 ++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 98 deletions(-) 163fc2ed7352b93cedb02af8a7a766c0b9bb475f diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 8a48a3c..077080a 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c @@ -6,7 +6,7 @@ * based on existing driver for CCD hfc ISA cards * Copyright by Werner Cornelius <werner@isdn4linux.de> * by Karsten Keil <keil@isdn4linux.de> - * + * * This software may be used and distributed according to the terms * of the GNU General Public License, incorporated herein by reference. * @@ -67,8 +67,6 @@ static const PCI_ENTRY id_list[] = }; -#ifdef CONFIG_PCI - /******************************************/ /* free hardware resources used by driver */ /******************************************/ @@ -237,7 +235,7 @@ static void hfcpci_clear_fifo_rx(struct IsdnCardState *cs, int fifo) if (fifo_state) cs->hw.hfcpci.fifo_en |= fifo_state; Write_hfc(cs, HFCPCI_FIFO_EN, cs->hw.hfcpci.fifo_en); -} +} /***************************************/ /* clear the desired B-channel tx fifo */ @@ -263,7 +261,7 @@ static void hfcpci_clear_fifo_tx(struct IsdnCardState *cs, int fifo) if (fifo_state) cs->hw.hfcpci.fifo_en |= fifo_state; Write_hfc(cs, HFCPCI_FIFO_EN, cs->hw.hfcpci.fifo_en); -} +} /*********************************************/ /* read a complete B-frame out of the buffer */ @@ -511,7 +509,6 @@ main_rec_hfcpci(struct BCState *bcs) test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && receive) goto Begin; - return; } /**************************/ @@ -582,7 +579,6 @@ hfcpci_fill_dfifo(struct IsdnCardState *cs) dev_kfree_skb_any(cs->tx_skb); cs->tx_skb = NULL; - return; } /**************************/ @@ -729,7 +725,6 @@ hfcpci_fill_fifo(struct BCState *bcs) dev_kfree_skb_any(bcs->tx_skb); bcs->tx_skb = NULL; test_and_clear_bit(BC_FLG_BUSY, &bcs->Flag); - return; } /**********************************************/ @@ -924,7 +919,6 @@ receive_emsg(struct IsdnCardState *cs) test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); if (count && receive) goto Begin; - return; } /* receive_emsg */ /*********************/ @@ -1350,13 +1344,13 @@ mode_hfcpci(struct BCState *bcs, int mode, int bc) cs->hw.hfcpci.sctrl_r |= SCTRL_B1_ENA; } if (fifo2) { - cs->hw.hfcpci.last_bfifo_cnt[1] = 0; + cs->hw.hfcpci.last_bfifo_cnt[1] = 0; cs->hw.hfcpci.fifo_en |= HFCPCI_FIFOEN_B2; cs->hw.hfcpci.int_m1 |= (HFCPCI_INTS_B2TRANS + HFCPCI_INTS_B2REC); cs->hw.hfcpci.ctmt &= ~2; cs->hw.hfcpci.conn &= ~0x18; } else { - cs->hw.hfcpci.last_bfifo_cnt[0] = 0; + cs->hw.hfcpci.last_bfifo_cnt[0] = 0; cs->hw.hfcpci.fifo_en |= HFCPCI_FIFOEN_B1; cs->hw.hfcpci.int_m1 |= (HFCPCI_INTS_B1TRANS + HFCPCI_INTS_B1REC); cs->hw.hfcpci.ctmt &= ~1; @@ -1642,8 +1636,6 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg) /* this variable is used as card index when more than one cards are present */ static struct pci_dev *dev_hfcpci __devinitdata = NULL; -#endif /* CONFIG_PCI */ - int __devinit setup_hfcpci(struct IsdnCard *card) { @@ -1656,96 +1648,99 @@ setup_hfcpci(struct IsdnCard *card) #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif + strcpy(tmp, hfcpci_revision); printk(KERN_INFO "HiSax: HFC-PCI driver Rev. %s\n", HiSax_getrev(tmp)); -#ifdef CONFIG_PCI + cs->hw.hfcpci.int_s1 = 0; cs->dc.hfcpci.ph_state = 0; cs->hw.hfcpci.fifo = 255; - if (cs->typ == ISDN_CTYPE_HFC_PCI) { - i = 0; - while (id_list[i].vendor_id) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, - id_list[i].device_id, - dev_hfcpci); - i++; - if (tmp_hfcpci) { - if (pci_enable_device(tmp_hfcpci)) - continue; - pci_set_master(tmp_hfcpci); - if ((card->para[0]) && (card->para[0] != (tmp_hfcpci->resource[ 0].start & PCI_BASE_ADDRESS_IO_MASK))) - continue; - else - break; - } - } - + if (cs->typ != ISDN_CTYPE_HFC_PCI) + return(0); + + i = 0; + while (id_list[i].vendor_id) { + tmp_hfcpci = pci_find_device(id_list[i].vendor_id, + id_list[i].device_id, + dev_hfcpci); + i++; if (tmp_hfcpci) { - i--; - dev_hfcpci = tmp_hfcpci; /* old device */ - cs->hw.hfcpci.dev = dev_hfcpci; - cs->irq = dev_hfcpci->irq; - if (!cs->irq) { - printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); - return (0); - } - cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start; - printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); - } else { - printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); - return (0); - } - if (!cs->hw.hfcpci.pci_io) { - printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); - return (0); - } - /* Allocate memory for FIFOS */ - /* Because the HFC-PCI needs a 32K physical alignment, we */ - /* need to allocate the double mem and align the address */ - if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) { - printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); - return 0; + if (pci_enable_device(tmp_hfcpci)) + continue; + pci_set_master(tmp_hfcpci); + if ((card->para[0]) && (card->para[0] != (tmp_hfcpci->resource[ 0].start & PCI_BASE_ADDRESS_IO_MASK))) + continue; + else + break; } - cs->hw.hfcpci.fifos = (void *) - (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000; - pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); - cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); - printk(KERN_INFO - "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n", - cs->hw.hfcpci.pci_io, - cs->hw.hfcpci.fifos, - (u_int) virt_to_bus(cs->hw.hfcpci.fifos), - cs->irq, HZ); - spin_lock_irqsave(&cs->lock, flags); - pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO); /* enable memory mapped ports, disable busmaster */ - cs->hw.hfcpci.int_m2 = 0; /* disable alle interrupts */ - cs->hw.hfcpci.int_m1 = 0; - Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); - Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); - /* At this point the needed PCI config is done */ - /* fifos are still not enabled */ - INIT_WORK(&cs->tqueue, hfcpci_bh); - cs->setstack_d = setstack_hfcpci; - cs->BC_Send_Data = &hfcpci_send_data; - cs->readisac = NULL; - cs->writeisac = NULL; - cs->readisacfifo = NULL; - cs->writeisacfifo = NULL; - cs->BC_Read_Reg = NULL; - cs->BC_Write_Reg = NULL; - cs->irq_func = &hfcpci_interrupt; - cs->irq_flags |= IRQF_SHARED; - cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer; - cs->hw.hfcpci.timer.data = (long) cs; - init_timer(&cs->hw.hfcpci.timer); - cs->cardmsg = &hfcpci_card_msg; - cs->auxcmd = &hfcpci_auxcmd; - spin_unlock_irqrestore(&cs->lock, flags); - return (1); - } else - return (0); /* no valid card type */ -#else - printk(KERN_WARNING "HFC-PCI: NO_PCI_BIOS\n"); - return (0); -#endif /* CONFIG_PCI */ + } + + if (!tmp_hfcpci) { + printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); + return (0); + } + + i--; + dev_hfcpci = tmp_hfcpci; /* old device */ + cs->hw.hfcpci.dev = dev_hfcpci; + cs->irq = dev_hfcpci->irq; + if (!cs->irq) { + printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); + return (0); + } + cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start; + printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); + + if (!cs->hw.hfcpci.pci_io) { + printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); + return (0); + } + /* Allocate memory for FIFOS */ + /* Because the HFC-PCI needs a 32K physical alignment, we */ + /* need to allocate the double mem and align the address */ + if (!(cs->hw.hfcpci.share_start = kmalloc(65536, GFP_KERNEL))) { + printk(KERN_WARNING "HFC-PCI: Error allocating memory for FIFO!\n"); + return 0; + } + cs->hw.hfcpci.fifos = (void *) + (((ulong) cs->hw.hfcpci.share_start) & ~0x7FFF) + 0x8000; + pci_write_config_dword(cs->hw.hfcpci.dev, 0x80, (u_int) virt_to_bus(cs->hw.hfcpci.fifos)); + cs->hw.hfcpci.pci_io = ioremap((ulong) cs->hw.hfcpci.pci_io, 256); + printk(KERN_INFO + "HFC-PCI: defined at mem %p fifo %p(%#x) IRQ %d HZ %d\n", + cs->hw.hfcpci.pci_io, + cs->hw.hfcpci.fifos, + (u_int) virt_to_bus(cs->hw.hfcpci.fifos), + cs->irq, HZ); + + spin_lock_irqsave(&cs->lock, flags); + + pci_write_config_word(cs->hw.hfcpci.dev, PCI_COMMAND, PCI_ENA_MEMIO); /* enable memory mapped ports, disable busmaster */ + cs->hw.hfcpci.int_m2 = 0; /* disable alle interrupts */ + cs->hw.hfcpci.int_m1 = 0; + Write_hfc(cs, HFCPCI_INT_M1, cs->hw.hfcpci.int_m1); + Write_hfc(cs, HFCPCI_INT_M2, cs->hw.hfcpci.int_m2); + /* At this point the needed PCI config is done */ + /* fifos are still not enabled */ + + INIT_WORK(&cs->tqueue, hfcpci_bh); + cs->setstack_d = setstack_hfcpci; + cs->BC_Send_Data = &hfcpci_send_data; + cs->readisac = NULL; + cs->writeisac = NULL; + cs->readisacfifo = NULL; + cs->writeisacfifo = NULL; + cs->BC_Read_Reg = NULL; + cs->BC_Write_Reg = NULL; + cs->irq_func = &hfcpci_interrupt; + cs->irq_flags |= IRQF_SHARED; + cs->hw.hfcpci.timer.function = (void *) hfcpci_Timer; + cs->hw.hfcpci.timer.data = (long) cs; + init_timer(&cs->hw.hfcpci.timer); + cs->cardmsg = &hfcpci_card_msg; + cs->auxcmd = &hfcpci_auxcmd; + + spin_unlock_irqrestore(&cs->lock, flags); + + return (1); } ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 7/7] HiSax hfc_pci: convert to PCI hotplug API 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik ` (4 preceding siblings ...) 2007-07-16 5:29 ` [PATCH 6/7] HiSax hfc_pci: minor cleanups Jeff Garzik @ 2007-07-16 5:29 ` Jeff Garzik 5 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 5:29 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 823d1521c1059611542f60f55318422e9a47982f Author: Jeff Garzik <jeff@garzik.org> Date: Sun Jul 15 22:12:35 2007 -0400 [ISDN] HiSax: convert hfc_pci driver to PCI hotplug API Also, mark several setup functions in other already-converted drivers static. Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 2 drivers/isdn/hisax/bkm_a4t.c | 2 drivers/isdn/hisax/config.c | 44 ----------- drivers/isdn/hisax/enternow_pci.c | 2 drivers/isdn/hisax/hfc_pci.c | 142 +++++++++++++++++++++++++++++--------- drivers/isdn/hisax/nj_u.c | 2 drivers/isdn/hisax/w6692.c | 2 8 files changed, 118 insertions(+), 80 deletions(-) 823d1521c1059611542f60f55318422e9a47982f diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 03e4ea5..aa3ba1d 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -316,7 +316,7 @@ config HISAX_GAZEL settings. config HISAX_HFC_PCI - bool "HFC PCI-Bus cards" + tristate "HFC PCI-Bus cards" depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index 1f02120..d1b543c 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_HISAX_NETJET_U) += netjet_u.o libhisax.o obj-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow.o libhisax.o obj-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t_pci.o libhisax.o obj-$(CONFIG_HISAX_W6692) += w6692.o libhisax.o +obj-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o libhisax.o bkm_a4t_pci-objs := bkm_a4t.o jade.o enternow-objs := enternow_pci.o amd7930_fn.o @@ -58,7 +59,6 @@ hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o hscx.o isar.o hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o hscx.o hisax-$(CONFIG_HISAX_MIC) += mic.o hscx.o hisax-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o -hisax-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o hisax-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o hisax-$(CONFIG_HISAX_NICCY) += niccy.o hscx.o hisax-$(CONFIG_HISAX_ISURF) += isurf.o sar.o diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 918afb3..627547f 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -321,7 +321,7 @@ static int __devinit a4t_cs_init(struct IsdnCard *card, return (1); } -int __devinit +static int __devinit setup_bkm_a4t(struct IsdnCard *card) { struct IsdnCardState *cs = card->cs; diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 163a636..3960233 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -208,13 +208,6 @@ const char *CardType[] = { #define DEFAULT_CFG {5,0x500,0,0} #endif -#ifdef CONFIG_HISAX_HFC_PCI -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_HFC_PCI -#define DEFAULT_CFG {0,0,0,0} -#endif - #ifdef CONFIG_HISAX_HFC_SX #undef DEFAULT_CARD #undef DEFAULT_CFG @@ -479,10 +472,6 @@ extern int setup_mic(struct IsdnCard *card); extern int setup_hfcs(struct IsdnCard *card); #endif -#if CARD_HFC_PCI -extern int setup_hfcpci(struct IsdnCard *card); -#endif - #if CARD_HFC_SX extern int setup_hfcsx(struct IsdnCard *card); #endif @@ -876,11 +865,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_hfcs(card); break; #endif -#if CARD_HFC_PCI - case ISDN_CTYPE_HFC_PCI: - ret = setup_hfcpci(card); - break; -#endif #if CARD_HFC_SX case ISDN_CTYPE_HFC_SX: ret = setup_hfcsx(card); @@ -921,6 +905,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) case ISDN_CTYPE_ENTERNOW: case ISDN_CTYPE_BKM_A4T: case ISDN_CTYPE_W6692: + case ISDN_CTYPE_HFC_PCI: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1346,7 +1331,6 @@ static int __init HiSax_init(void) break; #endif case ISDN_CTYPE_ELSA: - case ISDN_CTYPE_HFC_PCI: cards[j].para[0] = io[i]; break; case ISDN_CTYPE_16_3: @@ -1390,6 +1374,7 @@ static int __init HiSax_init(void) case ISDN_CTYPE_ENTERNOW: case ISDN_CTYPE_BKM_A4T: case ISDN_CTYPE_W6692: + case ISDN_CTYPE_HFC_PCI: break; case ISDN_CTYPE_SCT_QUADRO: @@ -1523,6 +1508,7 @@ EXPORT_SYMBOL(hisax_init_pcmcia); EXPORT_SYMBOL(hisax_init_hotplug); EXPORT_SYMBOL(HiSax_closecard); EXPORT_SYMBOL(HiSax_getrev); +EXPORT_SYMBOL(HiSax_putstatus); #include "hisax_if.h" @@ -1895,30 +1881,6 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = { #if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, PCI_ANY_ID,PCI_ANY_ID}, #endif -#ifdef CONFIG_HISAX_HFC_PCI - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A, PCI_ANY_ID, PCI_ANY_ID}, - {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A, PCI_ANY_ID, PCI_ANY_ID}, -#endif { } /* Terminating entry */ }; diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 978b99a..b1c30b8 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -381,7 +381,7 @@ static int __devinit en_cs_init_rest(struct IsdnCard *card, } /* called by config.c */ -int __devinit +static int __devinit setup_enternow_pci(struct IsdnCard *card) { int ret; diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 077080a..17e11b4 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c @@ -17,12 +17,13 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "hfc_pci.h" #include "isdnl1.h" #include <linux/pci.h> #include <linux/interrupt.h> -extern const char *CardType[]; +static int hfc_protocol; /* 0 == use DEFAULT_PROTO */ static const char *hfcpci_revision = "$Revision: 1.48.2.4 $"; @@ -1632,18 +1633,14 @@ hfcpci_card_msg(struct IsdnCardState *cs, int mt, void *arg) return (0); } - -/* this variable is used as card index when more than one cards are present */ -static struct pci_dev *dev_hfcpci __devinitdata = NULL; - -int __devinit +static int __devinit setup_hfcpci(struct IsdnCard *card) { u_long flags; struct IsdnCardState *cs = card->cs; char tmp[64]; - int i; - struct pci_dev *tmp_hfcpci = NULL; + struct pci_dev *dev_hfcpci = (void *) card->para[0]; + unsigned int idx = card->para[1]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" @@ -1655,33 +1652,12 @@ setup_hfcpci(struct IsdnCard *card) cs->hw.hfcpci.int_s1 = 0; cs->dc.hfcpci.ph_state = 0; cs->hw.hfcpci.fifo = 255; - if (cs->typ != ISDN_CTYPE_HFC_PCI) - return(0); - - i = 0; - while (id_list[i].vendor_id) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, - id_list[i].device_id, - dev_hfcpci); - i++; - if (tmp_hfcpci) { - if (pci_enable_device(tmp_hfcpci)) - continue; - pci_set_master(tmp_hfcpci); - if ((card->para[0]) && (card->para[0] != (tmp_hfcpci->resource[ 0].start & PCI_BASE_ADDRESS_IO_MASK))) - continue; - else - break; - } - } + WARN_ON(cs->typ != ISDN_CTYPE_HFC_PCI); - if (!tmp_hfcpci) { - printk(KERN_WARNING "HFC-PCI: No PCI card found\n"); + if (pci_enable_device(dev_hfcpci)) return (0); - } + pci_set_master(dev_hfcpci); - i--; - dev_hfcpci = tmp_hfcpci; /* old device */ cs->hw.hfcpci.dev = dev_hfcpci; cs->irq = dev_hfcpci->irq; if (!cs->irq) { @@ -1689,7 +1665,8 @@ setup_hfcpci(struct IsdnCard *card) return (0); } cs->hw.hfcpci.pci_io = (char *)(unsigned long)dev_hfcpci->resource[1].start; - printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", id_list[i].vendor_name, id_list[i].card_name); + printk(KERN_INFO "HiSax: HFC-PCI card manufacturer: %s card name: %s\n", + id_list[idx].vendor_name, id_list[idx].card_name); if (!cs->hw.hfcpci.pci_io) { printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); @@ -1744,3 +1721,102 @@ setup_hfcpci(struct IsdnCard *card) return (1); } + +static int __devinit hfc_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_HFC_PCI, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + icard.para[1] = ent->driver_data; + if (!hfc_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = hfc_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_hfcpci); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id hfc_pci_table[] = { + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0, + PCI_ANY_ID, PCI_ANY_ID, 0 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000, + PCI_ANY_ID, PCI_ANY_ID, 1 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006, + PCI_ANY_ID, PCI_ANY_ID, 2 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007, + PCI_ANY_ID, PCI_ANY_ID, 3 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008, + PCI_ANY_ID, PCI_ANY_ID, 4 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009, + PCI_ANY_ID, PCI_ANY_ID, 5 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A, + PCI_ANY_ID, PCI_ANY_ID, 6 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B, + PCI_ANY_ID, PCI_ANY_ID, 7 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C, + PCI_ANY_ID, PCI_ANY_ID, 8 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100, + PCI_ANY_ID, PCI_ANY_ID, 9 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700, + PCI_ANY_ID, PCI_ANY_ID, 10 }, + { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701, + PCI_ANY_ID, PCI_ANY_ID, 11 }, + { PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1, + PCI_ANY_ID, PCI_ANY_ID, 12 }, + { PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675, + PCI_ANY_ID, PCI_ANY_ID, 13 }, + { PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT, + PCI_ANY_ID, PCI_ANY_ID, 14 }, + { PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T, + PCI_ANY_ID, PCI_ANY_ID, 15 }, + { PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575, + PCI_ANY_ID, PCI_ANY_ID, 16 }, + { PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0, + PCI_ANY_ID, PCI_ANY_ID, 17 }, + { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E, + PCI_ANY_ID, PCI_ANY_ID, 18 }, + { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E, + PCI_ANY_ID, PCI_ANY_ID, 19 }, + { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A, + PCI_ANY_ID, PCI_ANY_ID, 20 }, + { PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A, + PCI_ANY_ID, PCI_ANY_ID, 21 }, + { PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2, + PCI_ANY_ID, PCI_ANY_ID, 22 }, + + { } /* terminate list */ +}; + +static struct pci_driver hfc_pci_driver = { + .name = "hfc_pci", + .id_table = hfc_pci_table, + .probe = hfc_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init hfc_mod_init(void) +{ + return pci_register_driver(&hfc_pci_driver); +} + +static void __exit hfc_mod_exit(void) +{ + pci_unregister_driver(&hfc_pci_driver); +} + +module_init(hfc_mod_init); +module_exit(hfc_mod_exit); + +module_param_named(protocol, hfc_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, hfc_pci_table); +MODULE_DESCRIPTION("ISDN HiSax HFC PCI driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 370535a..b8a536f 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -225,7 +225,7 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, } -int __devinit +static int __devinit setup_netjet_u(struct IsdnCard *card) { int ret; diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 07d8e1e..f72c51b 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -995,7 +995,7 @@ w6692_card_msg(struct IsdnCardState *cs, int mt, void *arg) return (0); } -int __devinit +static int __devinit setup_w6692(struct IsdnCard *card) { struct IsdnCardState *cs = card->cs; ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH] HiSax telespci: convert to PCI hotplug API 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik ` (6 preceding siblings ...) 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik @ 2007-07-16 7:52 ` Jeff Garzik 7 siblings, 0 replies; 17+ messages in thread From: Jeff Garzik @ 2007-07-16 7:52 UTC (permalink / raw) To: kkeil, linux-kernel, isdn4linux; +Cc: Andrew Morton, surya.prabhakar commit 6a95b63013e6bdd316dca39053174cb1add4b555 Author: Jeff Garzik <jeff@garzik.org> Date: Mon Jul 16 03:49:25 2007 -0400 [ISDN] HiSax: convert telespci to PCI hotplug API Also, some exports needed now that arocfi and hscx are being picked up via libhisax. [like other patches, the non-telespci changes in this patch need to be moved earlier in the patch series, before pushing upstream -jg] Signed-off-by: Jeff Garzik <jeff@garzik.org> drivers/isdn/hisax/Kconfig | 2 drivers/isdn/hisax/Makefile | 36 +++++++------- drivers/isdn/hisax/arcofi.c | 4 + drivers/isdn/hisax/config.c | 21 +------- drivers/isdn/hisax/hscx.c | 7 ++ drivers/isdn/hisax/telespci.c | 106 ++++++++++++++++++++++++++++++------------ 6 files changed, 111 insertions(+), 65 deletions(-) 6a95b63013e6bdd316dca39053174cb1add4b555 diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index aa3ba1d..7dd47cc 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -109,7 +109,7 @@ config HISAX_16_3 non-standard IRQ/port settings. config HISAX_TELESPCI - bool "Teles PCI" + tristate "Teles PCI" depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Teles PCI. diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile index d1b543c..a4ca3e9 100644 --- a/drivers/isdn/hisax/Makefile +++ b/drivers/isdn/hisax/Makefile @@ -21,12 +21,13 @@ obj-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow.o libhisax.o obj-$(CONFIG_HISAX_BKM_A4T) += bkm_a4t_pci.o libhisax.o obj-$(CONFIG_HISAX_W6692) += w6692.o libhisax.o obj-$(CONFIG_HISAX_HFC_PCI) += hfc_pci.o libhisax.o +obj-$(CONFIG_HISAX_TELESPCI) += telespci.o bkm_a4t_pci-objs := bkm_a4t.o jade.o enternow-objs := enternow_pci.o amd7930_fn.o netjet_s-objs := nj_s.o netjet_u-objs := nj_u.o icc.o -libhisax-objs := netjet.o isac.o arcofi.o +libhisax-objs := netjet.o isac.o arcofi.o hscx.o ifdef CONFIG_HISAX_HDLC obj-$(CONFIG_ISDN_DRV_HISAX) += isdnhdlc.o @@ -43,26 +44,25 @@ hisax-$(CONFIG_HISAX_EURO) += l3dss1.o hisax-$(CONFIG_HISAX_NI1) += l3ni1.o hisax-$(CONFIG_HISAX_1TR6) += l3_1tr6.o -hisax-$(CONFIG_HISAX_16_0) += teles0.o hscx.o -hisax-$(CONFIG_HISAX_16_3) += teles3.o hscx.o -hisax-$(CONFIG_HISAX_TELESPCI) += telespci.o hscx.o -hisax-$(CONFIG_HISAX_S0BOX) += s0box.o hscx.o -hisax-$(CONFIG_HISAX_AVM_A1) += avm_a1.o hscx.o -hisax-$(CONFIG_HISAX_AVM_A1_PCMCIA) += avm_a1p.o hscx.o +hisax-$(CONFIG_HISAX_16_0) += teles0.o +hisax-$(CONFIG_HISAX_16_3) += teles3.o +hisax-$(CONFIG_HISAX_S0BOX) += s0box.o +hisax-$(CONFIG_HISAX_AVM_A1) += avm_a1.o +hisax-$(CONFIG_HISAX_AVM_A1_PCMCIA) += avm_a1p.o hisax-$(CONFIG_HISAX_FRITZPCI) += avm_pci.o -hisax-$(CONFIG_HISAX_ELSA) += elsa.o hscx.o -hisax-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o hscx.o -hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o hscx.o ipacx.o -hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o hscx.o +hisax-$(CONFIG_HISAX_ELSA) += elsa.o +hisax-$(CONFIG_HISAX_IX1MICROR2) += ix1_micro.o +hisax-$(CONFIG_HISAX_DIEHLDIVA) += diva.o ipacx.o +hisax-$(CONFIG_HISAX_ASUSCOM) += asuscom.o hisax-$(CONFIG_HISAX_TELEINT) += teleint.o fc_2bs0.o -hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o hscx.o isar.o -hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o hscx.o -hisax-$(CONFIG_HISAX_MIC) += mic.o hscx.o +hisax-$(CONFIG_HISAX_SEDLBAUER) += sedlbauer.o isar.o +hisax-$(CONFIG_HISAX_SPORTSTER) += sportster.o +hisax-$(CONFIG_HISAX_MIC) += mic.o hisax-$(CONFIG_HISAX_HFCS) += hfcscard.o hfc_2bds0.o hisax-$(CONFIG_HISAX_HFC_SX) += hfc_sx.o -hisax-$(CONFIG_HISAX_NICCY) += niccy.o hscx.o +hisax-$(CONFIG_HISAX_NICCY) += niccy.o hisax-$(CONFIG_HISAX_ISURF) += isurf.o sar.o -hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o hscx.o -hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o hscx.o -hisax-$(CONFIG_HISAX_GAZEL) += gazel.o hscx.o +hisax-$(CONFIG_HISAX_HSTSAPHIR) += saphir.o +hisax-$(CONFIG_HISAX_SCT_QUADRO) += bkm_a8.o +hisax-$(CONFIG_HISAX_GAZEL) += gazel.o diff --git a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c index d30ce5b..bf2e10d 100644 --- a/drivers/isdn/hisax/arcofi.c +++ b/drivers/isdn/hisax/arcofi.c @@ -132,3 +132,7 @@ init_arcofi(struct IsdnCardState *cs) { init_waitqueue_head(&cs->dc.isac.arcofi_wait); test_and_set_bit(HW_ARCOFI, &cs->HW_Flags); } + +EXPORT_SYMBOL(init_arcofi); +EXPORT_SYMBOL(clear_arcofi); +EXPORT_SYMBOL(arcofi_fsm); diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 3960233..eb754eb 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c @@ -145,13 +145,6 @@ const char *CardType[] = { #define DEFAULT_CFG {15,0xd0000,0xd80,0} #endif -#ifdef CONFIG_HISAX_TELESPCI -#undef DEFAULT_CARD -#undef DEFAULT_CFG -#define DEFAULT_CARD ISDN_CTYPE_TELESPCI -#define DEFAULT_CFG {0,0,0,0} -#endif - #ifdef CONFIG_HISAX_IX1MICROR2 #undef DEFAULT_CARD #undef DEFAULT_CFG @@ -420,10 +413,6 @@ extern int setup_teles3(struct IsdnCard *card); extern int setup_s0box(struct IsdnCard *card); #endif -#if CARD_TELESPCI -extern int setup_telespci(struct IsdnCard *card); -#endif - #if CARD_AVM_A1 extern int setup_avm_a1(struct IsdnCard *card); #endif @@ -794,11 +783,6 @@ static int hisax_cs_setup_card(struct IsdnCard *card) ret = setup_s0box(card); break; #endif -#if CARD_TELESPCI - case ISDN_CTYPE_TELESPCI: - ret = setup_telespci(card); - break; -#endif #if CARD_AVM_A1 case ISDN_CTYPE_A1: ret = setup_avm_a1(card); @@ -906,6 +890,7 @@ static int hisax_cs_setup_card(struct IsdnCard *card) case ISDN_CTYPE_BKM_A4T: case ISDN_CTYPE_W6692: case ISDN_CTYPE_HFC_PCI: + case ISDN_CTYPE_TELESPCI: printk(KERN_WARNING "HiSax: Support for %s Card has moved " "to separate PCI driver module\n", CardType[card->typ]); @@ -1365,7 +1350,6 @@ static int __init HiSax_init(void) cards[j].para[2] = mem[i]; break; case ISDN_CTYPE_ELSA_PCI: - case ISDN_CTYPE_TELESPCI: break; /* the following block are excluded from std HiSax init */ @@ -1375,6 +1359,7 @@ static int __init HiSax_init(void) case ISDN_CTYPE_BKM_A4T: case ISDN_CTYPE_W6692: case ISDN_CTYPE_HFC_PCI: + case ISDN_CTYPE_TELESPCI: break; case ISDN_CTYPE_SCT_QUADRO: @@ -1878,7 +1863,7 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = { #ifdef CONFIG_HISAX_SEDLBAUER {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, PCI_ANY_ID,PCI_ANY_ID}, #endif -#if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) +#if defined(CONFIG_HISAX_SCT_QUADRO) {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, PCI_ANY_ID,PCI_ANY_ID}, #endif { } /* Terminating entry */ diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c index c8f9951..09e1546 100644 --- a/drivers/isdn/hisax/hscx.c +++ b/drivers/isdn/hisax/hscx.c @@ -274,3 +274,10 @@ inithscxisac(struct IsdnCardState *cs, int part) cs->writeisac(cs, ISAC_CMDR, 0x41); } } + +EXPORT_SYMBOL(HscxVersion); +EXPORT_SYMBOL(inithscxisac); +EXPORT_SYMBOL(clear_pending_hscx_ints); +EXPORT_SYMBOL(hscx_l2l1); +EXPORT_SYMBOL(open_hscxstate); +EXPORT_SYMBOL(modehscx); diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index d09f6d0..ebb6716 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c @@ -14,12 +14,14 @@ #include <linux/init.h> #include "hisax.h" +#include "hisax_proto.h" #include "isac.h" #include "hscx.h" #include "isdnl1.h" #include <linux/pci.h> -extern const char *CardType[]; +static int teles_protocol; /* 0 == use DEFAULT_PROTO */ + static const char *telespci_revision = "$Revision: 2.23.2.3 $"; #define ZORAN_PO_RQ_PEN 0x02000000 @@ -284,44 +286,37 @@ TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg) return(0); } -static struct pci_dev *dev_tel __devinitdata = NULL; - -int __devinit +static int __devinit setup_telespci(struct IsdnCard *card) { struct IsdnCardState *cs = card->cs; + struct pci_dev *dev_tel = (void *) card->para[0]; char tmp[64]; #ifdef __BIG_ENDIAN #error "not running on big endian machines now" #endif + strcpy(tmp, telespci_revision); printk(KERN_INFO "HiSax: Teles/PCI driver Rev. %s\n", HiSax_getrev(tmp)); - if (cs->typ != ISDN_CTYPE_TELESPCI) - return (0); -#ifdef CONFIG_PCI - if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { - if (pci_enable_device(dev_tel)) - return(0); - cs->irq = dev_tel->irq; - if (!cs->irq) { - printk(KERN_WARNING "Teles: No IRQ for PCI card found\n"); - return(0); - } - cs->hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0), - PAGE_SIZE); - printk(KERN_INFO "Found: Zoran, base-address: 0x%llx, irq: 0x%x\n", - (unsigned long long)pci_resource_start(dev_tel, 0), - dev_tel->irq); - } else { - printk(KERN_WARNING "TelesPCI: No PCI card found\n"); + WARN_ON(cs->typ != ISDN_CTYPE_TELESPCI); + + if (pci_enable_device(dev_tel)) + return(0); + cs->irq = dev_tel->irq; + if (!cs->irq) { + printk(KERN_WARNING "Teles: No IRQ for PCI card found\n"); + return(0); + } + cs->hw.teles0.membase = ioremap(pci_resource_start(dev_tel, 0), + PAGE_SIZE); + if (!cs->hw.teles0.membase) { + printk(KERN_WARNING "Teles: ioremap failed\n"); return(0); } -#else - printk(KERN_WARNING "HiSax: Teles/PCI and NO_PCI_BIOS\n"); - printk(KERN_WARNING "HiSax: Teles/PCI unable to config\n"); - return (0); -#endif /* CONFIG_PCI */ + printk(KERN_INFO "Found: Zoran, base-address: 0x%llx, irq: 0x%x\n", + (unsigned long long)pci_resource_start(dev_tel, 0), + dev_tel->irq); /* Initialize Zoran PCI controller */ writel(0x00000000, cs->hw.teles0.membase + 0x28); @@ -334,7 +329,7 @@ setup_telespci(struct IsdnCard *card) printk(KERN_INFO "HiSax: %s config irq:%d mem:%p\n", - CardType[cs->typ], cs->irq, + "telespci", cs->irq, cs->hw.teles0.membase); setup_isac(cs); @@ -357,3 +352,58 @@ setup_telespci(struct IsdnCard *card) } return (1); } + +static int __devinit teles_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct IsdnCard icard = { ISDN_CTYPE_TELESPCI, }; + int cardnr; + + icard.para[0] = (unsigned long) pdev; + icard.para[1] = ent->driver_data; + if (!teles_protocol) + icard.protocol = DEFAULT_PROTO; + else + icard.protocol = teles_protocol; + + cardnr = hisax_init_hotplug(&icard, setup_telespci); + if (cardnr < 0) + return -ENODEV; + + pci_set_drvdata(pdev, (void *)(unsigned long) cardnr); + return 0; +} + +static struct pci_device_id teles_pci_table[] = { + { PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, + PCI_ANY_ID, PCI_ANY_ID, }, + + { } /* terminate list */ +}; + +static struct pci_driver teles_pci_driver = { + .name = "telespci", + .id_table = teles_pci_table, + .probe = teles_pci_init_one, + .remove = hisax_pci_remove_one, +}; + +static int __init teles_mod_init(void) +{ + return pci_register_driver(&teles_pci_driver); +} + +static void __exit teles_mod_exit(void) +{ + pci_unregister_driver(&teles_pci_driver); +} + +module_init(teles_mod_init); +module_exit(teles_mod_exit); + +module_param_named(protocol, teles_protocol, int, 0444); +MODULE_PARM_DESC(protocol, "Values 0 (default) through 4. See ISDN_PTYPE_xxx in linux/isdnif.h"); + +MODULE_DEVICE_TABLE(pci, teles_pci_table); +MODULE_DESCRIPTION("ISDN HiSax Teles PCI driver"); +MODULE_LICENSE("GPL"); ^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2007-07-16 7:52 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-07-15 9:57 [PATCH 0/5] Convert a HiSax driver to the PCI hotplug API Jeff Garzik 2007-07-15 9:58 ` [PATCH 1/5] HiSax: move card setup into separate function Jeff Garzik 2007-07-15 9:59 ` [PATCH 2/5] HiSax: move card state alloc/setup code into separate functions Jeff Garzik 2007-07-15 9:59 ` [PATCH 3/5] HiSax: modularize card setup; introduce simple hotplug API Jeff Garzik 2007-07-15 10:00 ` [PATCH 4/5] HiSax netjet_s: code movement, prep for hotplug Jeff Garzik 2007-07-15 10:00 ` [PATCH 5/5] HiSax netjet_s: convert to PCI hotplug API Jeff Garzik 2007-07-15 10:08 ` Jeff Garzik 2007-07-15 21:40 ` [PATCH 1/2] HiSax netjet_u: code movement; hotplug API prep Jeff Garzik 2007-07-15 21:41 ` [PATCH 2/2] HiSax netjet_u: convert to PCI hotplug API Jeff Garzik 2007-07-16 5:26 ` [PATCH 1/7] HiSax enternow: split setup into smaller functions Jeff Garzik 2007-07-16 5:27 ` [PATCH 2/7] HiSax enternow: convert to PCI hotplug API Jeff Garzik 2007-07-16 5:27 ` [PATCH 3/7] HiSax bkm_a4t: split setup into smaller functions Jeff Garzik 2007-07-16 5:28 ` [PATCH 4/7] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik 2007-07-16 5:28 ` [PATCH 5/7] HiSax w6692: " Jeff Garzik 2007-07-16 5:29 ` [PATCH 6/7] HiSax hfc_pci: minor cleanups Jeff Garzik 2007-07-16 5:29 ` [PATCH 7/7] HiSax hfc_pci: convert to PCI hotplug API Jeff Garzik 2007-07-16 7:52 ` [PATCH] HiSax telespci: " Jeff Garzik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox