fixing errors handling during pci_driver resume stage [serial]
Subsystems (4)
PATCH 5/5 fixing errors handling during pci_driver resume stage [serial]
serial pci drivers have to return correct error code during resume stage in case of errors.
-----
drivers/parport/parport_serial.c +6 -1
@@ -392,6 +392,7 @@ static int parport_serial_pci_suspend(ststatic int parport_serial_pci_resume (struct pci_dev *dev) {struct parport_serial_private *priv =pci_get_drvdata (dev); +int err;pci_set_power_state (dev,PCI_D0 );pci_restore_state (dev);
@@ -399,7 +400,11 @@ static int parport_serial_pci_resume(str/* * The device may have been disabled. Re-enable it. */ -pci_enable_device (dev); + err =pci_enable_device (dev); +if (err) { +dev_err (&dev->dev,"Cannot enable PCI device, aborting.\n" ); +return err; + }if (priv->serial)pciserial_resume_ports (priv->serial);
drivers/serial/8250_pci.c +7 -1
@@ -1805,6 +1805,7 @@ static int pciserial_suspend_one(structstatic int pciserial_resume_one (struct pci_dev *dev) {struct serial_private *priv =pci_get_drvdata (dev); +int err;pci_set_power_state (dev,PCI_D0 );pci_restore_state (dev);
@@ -1813,7 +1814,12 @@ static int pciserial_resume_one(struct p/* * The device may have been disabled. Re-enable it. */ -pci_enable_device (dev); + err =pci_enable_device (dev); +if (err) { +dev_err (&dev->dev,"Cannot enable PCI device, " +"aborting.\n" ); +return err; + }pciserial_resume_ports (priv); }
drivers/serial/serial_txx9.c +8 -1
@@ -1132,12 +1132,19 @@ static int pciserial_txx9_suspend_one(ststatic int pciserial_txx9_resume_one (struct pci_dev *dev) {int line = (int )(long )pci_get_drvdata (dev); +int err;pci_set_power_state (dev,PCI_D0 );pci_restore_state (dev);if (line) { -pci_enable_device (dev); + err =pci_enable_device (dev); +if (err) { +dev_err (&dev->dev,"Cannot enable PCI device, " +"aborting.\n" ); +return err; + } +serial_txx9_resume_port (line); }return 0 ;
Quoted 2 lines · Dmitriy Monakhov
serial pci drivers have to return correct error code during resume stage in case of errors.
Sigh. *hate* *hate* *hate*.
Quoted 16 lines
drivers/serial/8250_pci.c +1
-0@@ -1805,6 +1805,7 @@ static int pciserial_suspend_one(structstatic int pciserial_resume_one (struct pci_dev *dev) {struct serial_private *priv =pci_get_drvdata (dev); +int err;pci_set_power_state (dev,PCI_D0 );pci_restore_state (dev);@@ -1813,7 +1814,12 @@ static int pciserial_resume_one(struct p/* * The device may have been disabled. Re-enable it. */
drivers/serial/8250_pci.c static int pciserial_resume_one(struct p · line 1825
Quoted 10 lines
drivers/serial/8250_pci.c +6
-1-pci_enable_device (dev); + err =pci_enable_device (dev); +if (err) { +dev_err (&dev->dev,"Cannot enable PCI device, " +"aborting.\n" ); +return err; + }pciserial_resume_ports (priv); }
So if pci_enable_device() fails, what do we do with the still suspended serial port? Does it clean up that state? Probably not.
Look, merely going around bunging this stupid "oh lets propagate the error" crap into the kernel doesn't actually fix _anything_. In fact it potentially _hides_ the warnings produced by __must_check which give a hint that _something_ needs to be done to _properly_ fix the problem.
And by "properly", I mean not just merely propagating the error.
In this particular case, the above may result in resources not being freed.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of:
Quoted 42 lines · Russell King
Quoted 2 lines · Dmitriy Monakhov
serial pci drivers have to return correct error code during resume stage in case of errors.
Sigh. *hate* *hate* *hate*.
Quoted 16 lines
drivers/serial/8250_pci.c +1
-0@@ -1805,6 +1805,7 @@ static int pciserial_suspend_one(structstatic int pciserial_resume_one (struct pci_dev *dev) {struct serial_private *priv =pci_get_drvdata (dev); +int err;pci_set_power_state (dev,PCI_D0 );pci_restore_state (dev);@@ -1813,7 +1814,12 @@ static int pciserial_resume_one(struct p/* * The device may have been disabled. Re-enable it. */ drivers/serial/8250_pci.c static int pciserial_resume_one(struct p · line 1825
Quoted 10 lines
drivers/serial/8250_pci.c +6
-1-pci_enable_device (dev); + err =pci_enable_device (dev); +if (err) { +dev_err (&dev->dev,"Cannot enable PCI device, " +"aborting.\n" ); +return err; + }pciserial_resume_ports (priv); }So if
pci_enable_device()fails, what do we do with the still suspended serial port? Does it clean up that state? Probably not.Look, merely going around bunging this stupid "oh lets propagate the error" crap into the kernel doesn't actually fix _anything_. In fact it potentially _hides_ the warnings produced by
__must_checkwhich give a hint that _something_ needs to be done to _properly_ fix the problem.
Quoted 4 lines
And by "properly", I mean not just merely propagating the error.
In this particular case, the above may result in resources not being freed.
Yep 100% true. But the question is _HOW_? We want shutdown not enabled device. Is it safe just call pciserial_remove_ports() for this device?
Quoted 10 lines
Signature · 9 lines
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: - 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/