* [PATCH 2/3] Char: stallion, alloc tty before pci devices init
2007-06-05 21:20 [PATCH 1/3] Char: stallion, don't fail with less than max panels Jiri Slaby
@ 2007-06-05 21:21 ` Jiri Slaby
2007-06-05 21:22 ` [PATCH 3/3] Char: stallion, proper fail return values Jiri Slaby
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2007-06-05 21:21 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Ingo Korb
stallion, alloc tty before pci devices init
this causes oops, because pci prboe function calls tty_register_device for
each device found. Thanks to Ingo.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: "Ingo Korb" <ingo@akana.de>
---
commit e7488128b7b4f61c82b6e323067d221c9397c43b
tree 70ea5eb90ca649e3bf6b04db30006afec873fb28
parent aa7cfc04f92ec2b20a07b29a89527d836a93d00f
author Jiri Slaby <jirislaby@gmail.com> Mon, 04 Jun 2007 10:39:41 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 05 Jun 2007 23:14:34 +0200
drivers/char/stallion.c | 73 ++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 265abad..23ea4c8 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -4710,6 +4710,29 @@ static int __init stallion_module_init(void)
spin_lock_init(&stallion_lock);
spin_lock_init(&brd_lock);
+ stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);
+ if (!stl_serial) {
+ retval = -ENOMEM;
+ goto err;
+ }
+
+ stl_serial->owner = THIS_MODULE;
+ stl_serial->driver_name = stl_drvname;
+ stl_serial->name = "ttyE";
+ stl_serial->major = STL_SERIALMAJOR;
+ stl_serial->minor_start = 0;
+ stl_serial->type = TTY_DRIVER_TYPE_SERIAL;
+ stl_serial->subtype = SERIAL_TYPE_NORMAL;
+ stl_serial->init_termios = stl_deftermios;
+ stl_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+ tty_set_operations(stl_serial, &stl_ops);
+
+ retval = tty_register_driver(stl_serial);
+ if (retval) {
+ printk("STALLION: failed to register serial driver\n");
+ goto err_frtty;
+ }
+
/*
* Find any dynamically supported boards. That is via module load
* line options.
@@ -4739,13 +4762,9 @@ static int __init stallion_module_init(void)
/* this has to be _after_ isa finding because of locking */
retval = pci_register_driver(&stl_pcidriver);
- if (retval && stl_nrbrds == 0)
- goto err;
-
- stl_serial = alloc_tty_driver(STL_MAXBRDS * STL_MAXPORTS);
- if (!stl_serial) {
- retval = -ENOMEM;
- goto err_pcidr;
+ if (retval && stl_nrbrds == 0) {
+ printk(KERN_ERR "STALLION: can't register pci driver\n");
+ goto err_unrtty;
}
/*
@@ -4756,43 +4775,18 @@ static int __init stallion_module_init(void)
printk("STALLION: failed to register serial board device\n");
stallion_class = class_create(THIS_MODULE, "staliomem");
- if (IS_ERR(stallion_class)) {
- retval = PTR_ERR(stallion_class);
- goto err_reg;
- }
+ if (IS_ERR(stallion_class))
+ printk("STALLION: failed to create class\n");
for (i = 0; i < 4; i++)
class_device_create(stallion_class, NULL,
MKDEV(STL_SIOMEMMAJOR, i), NULL,
"staliomem%d", i);
- stl_serial->owner = THIS_MODULE;
- stl_serial->driver_name = stl_drvname;
- stl_serial->name = "ttyE";
- stl_serial->major = STL_SERIALMAJOR;
- stl_serial->minor_start = 0;
- stl_serial->type = TTY_DRIVER_TYPE_SERIAL;
- stl_serial->subtype = SERIAL_TYPE_NORMAL;
- stl_serial->init_termios = stl_deftermios;
- stl_serial->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
- tty_set_operations(stl_serial, &stl_ops);
-
- retval = tty_register_driver(stl_serial);
- if (retval) {
- printk("STALLION: failed to register serial driver\n");
- goto err_clsdev;
- }
-
return 0;
-err_clsdev:
- for (i = 0; i < 4; i++)
- class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
- class_destroy(stallion_class);
-err_reg:
- unregister_chrdev(STL_SIOMEMMAJOR, "staliomem");
+err_unrtty:
+ tty_unregister_driver(stl_serial);
+err_frtty:
put_tty_driver(stl_serial);
-err_pcidr:
- pci_unregister_driver(&stl_pcidriver);
- stl_free_isabrds();
err:
return retval;
}
@@ -4821,8 +4815,6 @@ static void __exit stallion_module_exit(void)
tty_unregister_device(stl_serial,
brdp->brdnr * STL_MAXPORTS + j);
}
- tty_unregister_driver(stl_serial);
- put_tty_driver(stl_serial);
for (i = 0; i < 4; i++)
class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i));
@@ -4834,6 +4826,9 @@ static void __exit stallion_module_exit(void)
pci_unregister_driver(&stl_pcidriver);
stl_free_isabrds();
+
+ tty_unregister_driver(stl_serial);
+ put_tty_driver(stl_serial);
}
module_init(stallion_module_init);
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] Char: stallion, proper fail return values
2007-06-05 21:20 [PATCH 1/3] Char: stallion, don't fail with less than max panels Jiri Slaby
2007-06-05 21:21 ` [PATCH 2/3] Char: stallion, alloc tty before pci devices init Jiri Slaby
@ 2007-06-05 21:22 ` Jiri Slaby
2007-06-05 21:27 ` [PATCH 4/3] Char: stallion, remove user class report request Jiri Slaby
2007-06-06 0:17 ` [PATCH 1/3] Char: stallion, don't fail with less than max panels Andrew Morton
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2007-06-05 21:22 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
stallion, proper fail return values
do not return 0 in one case and return proper values in other 2.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
commit d62c04c8fe3271ab2089f442e04ad522a158bf8f
tree 31beaaee84ef718acc5401b3cb07a7f2e340f0fe
parent e7488128b7b4f61c82b6e323067d221c9397c43b
author Jiri Slaby <jirislaby@gmail.com> Mon, 04 Jun 2007 00:07:20 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 05 Jun 2007 23:14:45 +0200
drivers/char/stallion.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 23ea4c8..45bf2a2 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -2177,6 +2177,7 @@ static int __devinit stl_initech(struct stlbrd *brdp)
if (!panelp) {
printk("STALLION: failed to allocate memory "
"(size=%Zd)\n", sizeof(struct stlpanel));
+ retval = -ENOMEM;
goto err_fr;
}
panelp->magic = STL_PANELMAGIC;
@@ -2223,8 +2224,10 @@ static int __devinit stl_initech(struct stlbrd *brdp)
brdp->nrports += panelp->nrports;
brdp->panels[panelnr++] = panelp;
if ((brdp->brdtype != BRD_ECHPCI) &&
- (ioaddr >= (brdp->ioaddr2 + brdp->iosize2)))
+ (ioaddr >= (brdp->ioaddr2 + brdp->iosize2))) {
+ retval = -EINVAL;
goto err_fr;
+ }
}
brdp->nrpanels = panelnr;
@@ -2371,6 +2374,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev,
dev_err(&pdev->dev, "too many boards found, "
"maximum supported %d\n", STL_MAXBRDS);
mutex_unlock(&stl_brdslock);
+ retval = -ENODEV;
goto err_fr;
}
brdp->brdnr = (unsigned int)brdnr;
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/3] Char: stallion, remove user class report request
2007-06-05 21:20 [PATCH 1/3] Char: stallion, don't fail with less than max panels Jiri Slaby
2007-06-05 21:21 ` [PATCH 2/3] Char: stallion, alloc tty before pci devices init Jiri Slaby
2007-06-05 21:22 ` [PATCH 3/3] Char: stallion, proper fail return values Jiri Slaby
@ 2007-06-05 21:27 ` Jiri Slaby
2007-06-06 0:17 ` [PATCH 1/3] Char: stallion, don't fail with less than max panels Andrew Morton
3 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2007-06-05 21:27 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
Ok, one more.
--
stallion, remove user class report request
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
commit 400de8dd765298a11daec2a4a936a70798f428aa
tree 81675ba379783ad98f5c0387620a59b2ff2247a7
parent d62c04c8fe3271ab2089f442e04ad522a158bf8f
author Jiri Slaby <jirislaby@gmail.com> Tue, 05 Jun 2007 23:26:16 +0200
committer Jiri Slaby <jirislaby@gmail.com> Tue, 05 Jun 2007 23:26:16 +0200
drivers/char/stallion.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 45bf2a2..eeb6200 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -2357,9 +2357,6 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev,
if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE)
goto err;
- dev_info(&pdev->dev, "please, report this to LKML: %x/%x/%x\n",
- pdev->vendor, pdev->device, pdev->class);
-
retval = pci_enable_device(pdev);
if (retval)
goto err;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Char: stallion, don't fail with less than max panels
2007-06-05 21:20 [PATCH 1/3] Char: stallion, don't fail with less than max panels Jiri Slaby
` (2 preceding siblings ...)
2007-06-05 21:27 ` [PATCH 4/3] Char: stallion, remove user class report request Jiri Slaby
@ 2007-06-06 0:17 ` Andrew Morton
2007-06-06 7:00 ` Jiri Slaby
3 siblings, 1 reply; 6+ messages in thread
From: Andrew Morton @ 2007-06-06 0:17 UTC (permalink / raw)
To: Jiri Slaby; +Cc: linux-kernel, Ingo Korb
On Tue, 5 Jun 2007 23:20:57 +0200 (CEST)
Jiri Slaby <jirislaby@gmail.com> wrote:
> stallion, don't fail with less than max panels
>
Why not?
What problem is this patch fixing, and how does it fix it?
What are the consequences of not having this patch in the kernel?
etc. More complete changlogs, please.
>
> diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
> index e45113a..265abad 100644
> --- a/drivers/char/stallion.c
> +++ b/drivers/char/stallion.c
> @@ -2172,7 +2172,7 @@ static int __devinit stl_initech(struct stlbrd *brdp)
> }
> status = inb(ioaddr + ECH_PNLSTATUS);
> if ((status & ECH_PNLIDMASK) != nxtid)
> - goto err_fr;
> + break;
> panelp = kzalloc(sizeof(struct stlpanel), GFP_KERNEL);
> if (!panelp) {
> printk("STALLION: failed to allocate memory "
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] Char: stallion, don't fail with less than max panels
2007-06-06 0:17 ` [PATCH 1/3] Char: stallion, don't fail with less than max panels Andrew Morton
@ 2007-06-06 7:00 ` Jiri Slaby
0 siblings, 0 replies; 6+ messages in thread
From: Jiri Slaby @ 2007-06-06 7:00 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, Ingo Korb
Andrew Morton napsal(a):
> On Tue, 5 Jun 2007 23:20:57 +0200 (CEST)
> Jiri Slaby <jirislaby@gmail.com> wrote:
>
>> stallion, don't fail with less than max panels
>>
>
> Why not?
>
> What problem is this patch fixing, and how does it fix it?
>
> What are the consequences of not having this patch in the kernel?
>
> etc. More complete changlogs, please.
Aah, sorry.
--
Since it's not neccesary to have MAX_PANELS on the card, don't fail to let users
use this card even in this case. Stop the testing for loop instead.
--
>
>> diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
>> index e45113a..265abad 100644
>> --- a/drivers/char/stallion.c
>> +++ b/drivers/char/stallion.c
>> @@ -2172,7 +2172,7 @@ static int __devinit stl_initech(struct stlbrd *brdp)
>> }
>> status = inb(ioaddr + ECH_PNLSTATUS);
>> if ((status & ECH_PNLIDMASK) != nxtid)
>> - goto err_fr;
>> + break;
>> panelp = kzalloc(sizeof(struct stlpanel), GFP_KERNEL);
>> if (!panelp) {
>> printk("STALLION: failed to allocate memory "
>
thanks,
--
http://www.fi.muni.cz/~xslaby/ Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
B674 9967 0407 CE62 ACC8 22A0 32CC 55C3 39D4 7A7E
^ permalink raw reply [flat|nested] 6+ messages in thread