sk98lin: handle pci_enable_device() return value in skge_resume() properly
Subsystems (2)
PATCH 1/1 sk98lin: handle pci_enable_device() return value in skge_resume() properly
[PATCH] sk98lin: handle pci_enable_device() return value in skge_resume() properly
Fix missing handling of pci_enable_device() return value in skge_resume()
---
drivers/net/sk98lin/skge.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/sk98lin/skge.c +5 -1
@@ -5070,7 +5070,11 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); +if ((ret =pci_enable_device (pdev))) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device during resume\n" ); +unregister_netdev (dev); +return ret; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
Signature · 1 line
Jiri Kosina
Quoted 16 lines · On Fri, 13 Oct 2006 00:17:50 +0200 (CEST) Jiri Kosina <[email protected]> wrote:
[PATCH] sk98lin: handle
pci_enable_device()return value inskge_resume()properlyFix missing handling of
pci_enable_device()return value inskge_resume()Signed-off-by Jiri Kosina <[email protected]>---
drivers/net/sk98lin/skge.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)drivers/net/sk98lin/skge.c +0
-0
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *p · line 5076
Quoted 8 lines
drivers/net/sk98lin/skge.c +3
-1@@ -5070,7 +5070,11 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); +if ((ret =pci_enable_device (pdev))) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device during resume\n" ); +unregister_netdev (dev);
Having the device unregister seems harsh.
Why put condtional on same line?
Why not print device name dev->name.
Signature · 1 line
Stephen Hemminger <[email protected]>
Quoted 8 lines · Stephen Hemminger
Review
Quoted 7 lines
(quoted diff) +3
-1pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_enable_device(pdev); + if ((ret = pci_enable_device(pdev))) { + printk(KERN_ERR "sk98lin: Cannot enable PCI device during resume\n"); + unregister_netdev(dev);Having the device unregister seems harsh.
What would be the proper way? As the initialization failed, accessing the device would not make sense any more (therefore I don't think that calling skge_remove_one() would be OK, as it issues calls to SkEventQueue() and SkEventDispatcher(), trying to send something to the card).
Quoted 1 line
Why put condtional on same line?
Pardon me?
Quoted 1 line
Why not print device name
dev->name.
Thanks.
[PATCH] fix sk98lin driver, ignoring return value from pci_enable_device()
add check of return value to _resume() function of sk98lin driver.
---
drivers/net/sk98lin/skge.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/net/sk98lin/skge.c +5 -1
@@ -5070,7 +5070,11 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); +if ((ret =pci_enable_device (pdev))) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n" , + dev->name); +return ret; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
Signature · 1 line
Jiri Kosina
Quoted 11 lines · On Fri, 13 Oct 2006 00:38:20 +0200 (CEST) Jiri Kosina <[email protected]> wrote:
Quoted 8 lines · Stephen Hemminger
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *p
Quoted 7 lines
drivers/net/sk98lin/skge.c +3
-1pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); +if ((ret =pci_enable_device (pdev))) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device during resume\n" ); +unregister_netdev (dev);Having the device unregister seems harsh.
Quoted 4 lines
What would be the proper way? As the initialization failed, accessing the device would not make sense any more (therefore I don't think that calling
skge_remove_one()would be OK, as it issues calls toSkEventQueue()andSkEventDispatcher(), trying to send something to the card).
I guess, its just not clear what the state of the machine is anyway if you can't enable the device something is hosed (or the device was hot removed).
Quoted 3 lines
Quoted 1 line
Why put condtional on same line?
Pardon me?
I prefer:
ret = pci_enable_device(pdev);
if (ret) {Quoted 34 lines
Quoted 2 lines
Why not print device name
dev->name.Thanks.
[PATCH] fix sk98lin driver, ignoring return value from
pci_enable_device()add check of return value to
_resume()function of sk98lin driver.Signed-off-by Jiri Kosina <[email protected]>---
drivers/net/sk98lin/skge.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)drivers/net/sk98lin/skge.c +5
-1@@ -5070,7 +5070,11 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); +if ((ret =pci_enable_device (pdev))) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n" , + dev->name); +return ret; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
Signature · 1 line
Stephen Hemminger <[email protected]>
Quoted 9 lines · Stephen Hemminger
Quoted 6 lines
Quoted 1 line
Having the device unregister seems harsh.
What would be the proper way? As the initialization failed, accessing the device would not make sense any more (therefore I don't think that calling
skge_remove_one()would be OK, as it issues calls toSkEventQueue()andSkEventDispatcher(), trying to send something to the card).I guess, its just not clear what the state of the machine is anyway if you can't enable the device something is hosed (or the device was hot removed).
Well, it depends on definition of 'hot'. What would for example happen in the case suspend-to-disk -> remove the card when the machine is switched off -> resume-from-disk? I guess that exactly this pci_enable_device() will fail, so we definitely have to handle this case, as it can easily happen.
Quoted 4 lines
Quoted 2 lines
Quoted 1 line
Why put condtional on same line?
Pardon me?
I prefer:
ret = pci_enable_device(pdev);
As you wish.
[PATCH] fix sk98lin driver, ignoring return value from pci_enable_device()
add check of return value to _resume() function of sk98lin driver.
---
drivers/net/sk98lin/skge.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
drivers/net/sk98lin/skge.c +7 -1
@@ -5070,7 +5070,13 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n" , + dev->name); +unregister_netdev (dev); +return ret; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
Signature · 1 line
Jiri Kosina
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *p · line 5077
Quoted 10 lines · On Fri, 13 Oct 2006 00:57:18 +0200 (CEST) Jiri Kosina <[email protected]> wrote:
drivers/net/sk98lin/skge.c +5
-1@@ -5070,7 +5070,13 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n" , + dev->name); +unregister_netdev (dev);
This looks rather wrong - skge_exit() will run unregister_netdev() again.
Look a few lines down, to where this function already handles request_irq() failure, reuse that code path. Hopefully it has been tested..
(Once we have an easy-to-use fault-injection framework we'll be able to test all these things more easily)
(But it's possible to test them already, with a bit of ad-hoc testing code)
Quoted 9 lines · Andrew Morton
Review
Quoted 8 lines
(quoted diff) +5
-1pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret) { + printk(KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n", + dev->name); + unregister_netdev(dev);This looks rather wrong -
skge_exit()will rununregister_netdev()again.
You are of course right (the problem was also spotted by Russell King). This I believe is the correct one for the sk98lin case.
[PATCH] fix sk98lin driver, ignoring return value from pci_enable_device()
add check of return value to _resume() function of sk98lin driver.
---
drivers/net/sk98lin/skge.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-)
drivers/net/sk98lin/skge.c +15 -5
@@ -5070,7 +5070,12 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_WARNING "sk98lin: unable to enable device %s in resume\n" , + dev->name); + goto out_err; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
@@ -5078,10 +5083,8 @@ static int skge_resume(struct pci_dev *p ret =request_irq (dev->irq, SkGeIsrOnePort,IRQF_SHARED ,"sk98lin" , dev);if (ret) {printk (KERN_WARNING "sk98lin: unable to acquire IRQ %d\n" , dev->irq); - pAC->AllocFlag &= ~SK_ALLOC_IRQ ; - dev->irq =0 ; -pci_disable_device (pdev); -return -EBUSY ; + ret = -EBUSY ; + goto out_err; }netif_device_attach (dev);
@@ -5098,6 +5101,13 @@ static int skge_resume(struct pci_dev *p }return 0 ; +out_err: + pAC->AllocFlag &= ~SK_ALLOC_IRQ ; + dev->irq =0 ; +pci_disable_device (pdev); + +return ret; + }#else #define skge_suspend NULL
Signature · 1 line
Jiri Kosina
PATCH 1/1 sk98lin: handle pci_enable_device() return value in skge_resume()
This thread looks dead but issue was't fixed.
Quoted 32 lines · Jiri Kosina
Quoted 7 lines
Review
Quoted 6 lines
(quoted diff) +5
-1- pci_enable_device(pdev); + ret = pci_enable_device(pdev); + if (ret) { + printk(KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n", + dev->name); + unregister_netdev(dev);This looks rather wrong -
skge_exit()will rununregister_netdev()again.You are of course right (the problem was also spotted by Russell King). This I believe is the correct one for the sk98lin case.
[PATCH] fix sk98lin driver, ignoring return value from
pci_enable_device()add check of return value to
_resume()function of sk98lin driver.Signed-off-by Jiri Kosina <[email protected]>---
drivers/net/sk98lin/skge.c +6
-1@@ -5070,7 +5070,12 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_WARNING "sk98lin: unable to enable device %s in resume\n" , + dev->name); + goto out_err; + }
[snip]
drivers/net/sk98lin/skge.c
Quoted 4 lines
drivers/net/sk98lin/skge.c +4
-0+out_err: + pAC->AllocFlag &= ~SK_ALLOC_IRQ ; + dev->irq =0 ; +pci_disable_device (pdev);
<<<<< Ok what happend if we jump here right after pci_disable_device() has
failed, but pci_disable_device() was called anyway, this is wrong and may be fatal because pdev->enable_cnt may becomes negative.
drivers/net/sk98lin/skge.c
Quoted 6 lines
drivers/net/sk98lin/skge.c +3
-0+ + return ret; + }#else #define skge_suspend NULL
This is reworked Jiri's patch:
[PATCH] sk98lin: handle pci_enable_device() return value in skge_resume()
--- drivers/net/sk98lin/skge.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-)
drivers/net/sk98lin/skge.c +15 -5
@@ -5125,7 +5125,12 @@ static int skge_resume(struct pci_dev *pdev)pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_WARNING "sk98lin: unable to enable device %s " +"in resume\n" , dev->name); + goto err_out; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);
@@ -5133,10 +5138,8 @@ static int skge_resume(struct pci_dev *pdev) ret =request_irq (dev->irq, SkGeIsrOnePort,IRQF_SHARED ,"sk98lin" , dev);if (ret) {printk (KERN_WARNING "sk98lin: unable to acquire IRQ %d\n" , dev->irq); - pAC->AllocFlag &= ~SK_ALLOC_IRQ ; - dev->irq =0 ; -pci_disable_device (pdev); -return -EBUSY ; + ret = -EBUSY ; + goto err_out_disable_pdev; }netif_device_attach (dev);
@@ -5153,6 +5156,13 @@ static int skge_resume(struct pci_dev *pdev) }return 0 ; + +err_out_disable_pdev: +pci_disable_device (pdev); +err_out: + pAC->AllocFlag &= ~SK_ALLOC_IRQ ; + dev->irq =0 ; +return ret; }#else #define skge_suspend NULL
Signature · 1 line
1.4.4.4
Re: [PATCH] sk98lin: handle pci_enable_device() return value in skge_resume()
Quoted 36 lines · Dmitriy Monakhov
This thread looks dead but issue was't fixed.
Quoted 32 lines · Jiri Kosina
Quoted 7 lines
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *pdev)
Quoted 6 lines
drivers/net/sk98lin/skge.c +5
-1-pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_ERR "sk98lin: Cannot enable PCI device %s during resume\n" , + dev->name); +unregister_netdev (dev);This looks rather wrong -
skge_exit()will rununregister_netdev()again.You are of course right (the problem was also spotted by Russell King). This I believe is the correct one for the sk98lin case.
[PATCH] fix sk98lin driver, ignoring return value from
pci_enable_device()add check of return value to
_resume()function of sk98lin driver.Signed-off-by Jiri Kosina <[email protected]>---
drivers/net/sk98lin/skge.c +6
-1@@ -5070,7 +5070,12 @@ static int skge_resume(struct pci_dev *ppci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_WARNING "sk98lin: unable to enable device %s in resume\n" , + dev->name); + goto out_err; + }[snip]
Quoted 5 lines
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *pdev)
Quoted 4 lines
drivers/net/sk98lin/skge.c +4
-0+out_err: + pAC->AllocFlag &= ~SK_ALLOC_IRQ ; + dev->irq =0 ; +pci_disable_device (pdev);<<<<< Ok what happend if we jump here right after
pci_disable_device()has
OOPs.....Of course i mean pci_enable_device() here^^^^^^^^^^^^^^^^^^^^^ I'm sorry about this. (Option complete_word not always good, some times brain work required too :) )
So correct comment looks like:
<<<<< Ok what happend if we jump here right after pci_enable_device() has
failed, but pci_disable_device() was called anyway, this is wrong and may be fatal because pdev->enable_cnt may becomes negative.
Quoted 70 lines
drivers/net/sk98lin/skge.c static int skge_resume(struct pci_dev *pdev) · line 5168
Quoted 6 lines
drivers/net/sk98lin/skge.c +3
-0+ + return ret; + }#else #define skge_suspend NULLThis is reworked Jiri's patch:
[PATCH] sk98lin: handle
pci_enable_device()return value inskge_resume()Signed-off-by Monakhov Dmitriy <[email protected]>--- drivers/net/sk98lin/skge.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-)drivers/net/sk98lin/skge.c +15
-5@@ -5125,7 +5125,12 @@ static int skge_resume(struct pci_dev *pdev)pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); -pci_enable_device (pdev); + ret =pci_enable_device (pdev); +if (ret) { +printk (KERN_WARNING "sk98lin: unable to enable device %s " +"in resume\n" , dev->name); + goto err_out; + }pci_set_master (pdev);if (pAC->GIni.GIMacsFound ==2 ) ret =request_irq (dev->irq, SkGeIsr,IRQF_SHARED ,"sk98lin" , dev);@@ -5133,10 +5138,8 @@ static int skge_resume(struct pci_dev *pdev) ret =request_irq (dev->irq, SkGeIsrOnePort,IRQF_SHARED ,"sk98lin" , dev);if (ret) {printk (KERN_WARNING "sk98lin: unable to acquire IRQ %d\n" , dev->irq); - pAC->AllocFlag &= ~SK_ALLOC_IRQ ; - dev->irq =0 ; -pci_disable_device (pdev); -return -EBUSY ; + ret = -EBUSY ; + goto err_out_disable_pdev; }netif_device_attach (dev);@@ -5153,6 +5156,13 @@ static int skge_resume(struct pci_dev *pdev) }return 0 ; + +err_out_disable_pdev: +pci_disable_device (pdev); +err_out: + pAC->AllocFlag &= ~SK_ALLOC_IRQ ; + dev->irq =0 ; +return ret; }#else #define skge_suspend NULLSignature · 9 lines
1.4.4.4 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/