Commit d7646f76 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use dev_pm_ops for class pcmcia_socket_class 



Instead of requiring PCMCIA socket drivers to call various functions
during their (bus) resume and suspend functions, register an own
dev_pm_ops for this class. This fixes several suspend/resume bugs
seen on db1xxx-ss, and probably on some other socket drivers, too.

With regard to the asymmetry with only _noirq suspend, but split up
resume, please see bug 14334 and commit 9905d1b4 .

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent e7176a37

drivers/pcmcia/at91_cf.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -361,7 +361,6 @@ static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg) 
	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);

	struct at91_cf_socket	*cf = platform_get_drvdata(pdev);

	struct at91_cf_data	*board = cf->board;

	struct at91_cf_data	*board = cf->board;





	pcmcia_socket_dev_suspend(&pdev->dev);

	if (device_may_wakeup(&pdev->dev)) {

	if (device_may_wakeup(&pdev->dev)) {

		enable_irq_wake(board->det_pin);

		enable_irq_wake(board->det_pin);

		if (board->irq_pin)

		if (board->irq_pin)
@@ -381,7 +380,6 @@ static int at91_cf_resume(struct platform_device *pdev) 
			disable_irq_wake(board->irq_pin);

			disable_irq_wake(board->irq_pin);

	}

	}





	pcmcia_socket_dev_resume(&pdev->dev);

	return 0;

	return 0;

}

}

drivers/pcmcia/au1000_generic.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -510,17 +510,6 @@ static int au1x00_drv_pcmcia_probe(struct platform_device *dev) 
	return ret;

	return ret;

}

}





static int au1x00_drv_pcmcia_suspend(struct platform_device *dev,

				     pm_message_t state)

{

	return pcmcia_socket_dev_suspend(&dev->dev);

}



static int au1x00_drv_pcmcia_resume(struct platform_device *dev)

{

	return pcmcia_socket_dev_resume(&dev->dev);

}



static struct platform_driver au1x00_pcmcia_driver = {

static struct platform_driver au1x00_pcmcia_driver = {

	.driver = {

	.driver = {

		.name		= "au1x00-pcmcia",

		.name		= "au1x00-pcmcia",
@@ -528,8 +517,6 @@ static struct platform_driver au1x00_pcmcia_driver = { 
	},

	},

	.probe		= au1x00_drv_pcmcia_probe,

	.probe		= au1x00_drv_pcmcia_probe,

	.remove		= au1x00_drv_pcmcia_remove,

	.remove		= au1x00_drv_pcmcia_remove,

	.suspend 	= au1x00_drv_pcmcia_suspend,

	.resume 	= au1x00_drv_pcmcia_resume,

};

};

drivers/pcmcia/bfin_cf_pcmcia.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -300,16 +300,6 @@ static int __devexit bfin_cf_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





static int bfin_cf_suspend(struct platform_device *pdev, pm_message_t mesg)

{

	return pcmcia_socket_dev_suspend(&pdev->dev);

}



static int bfin_cf_resume(struct platform_device *pdev)

{

	return pcmcia_socket_dev_resume(&pdev->dev);

}



static struct platform_driver bfin_cf_driver = {

static struct platform_driver bfin_cf_driver = {

	.driver = {

	.driver = {

		   .name = (char *)driver_name,

		   .name = (char *)driver_name,
@@ -317,8 +307,6 @@ static struct platform_driver bfin_cf_driver = { 
		   },

		   },

	.probe = bfin_cf_probe,

	.probe = bfin_cf_probe,

	.remove = __devexit_p(bfin_cf_remove),

	.remove = __devexit_p(bfin_cf_remove),

	.suspend = bfin_cf_suspend,

	.resume = bfin_cf_resume,

};

};





static int __init bfin_cf_init(void)

static int __init bfin_cf_init(void)

drivers/pcmcia/cs.c

+63 −61
Original line number Original line Diff line number Diff line
@@ -76,65 +76,6 @@ DECLARE_RWSEM(pcmcia_socket_list_rwsem); 
EXPORT_SYMBOL(pcmcia_socket_list_rwsem);

EXPORT_SYMBOL(pcmcia_socket_list_rwsem);









/*

 * Low-level PCMCIA socket drivers need to register with the PCCard

 * core using pcmcia_register_socket.

 *

 * socket drivers are expected to use the following callbacks in their

 * .drv struct:

 *  - pcmcia_socket_dev_suspend

 *  - pcmcia_socket_dev_resume

 * These functions check for the appropriate struct pcmcia_soket arrays,

 * and pass them to the low-level functions pcmcia_{suspend,resume}_socket

 */

static int socket_early_resume(struct pcmcia_socket *skt);

static int socket_late_resume(struct pcmcia_socket *skt);

static int socket_resume(struct pcmcia_socket *skt);

static int socket_suspend(struct pcmcia_socket *skt);



static void pcmcia_socket_dev_run(struct device *dev,

				  int (*cb)(struct pcmcia_socket *))

{

	struct pcmcia_socket *socket;



	down_read(&pcmcia_socket_list_rwsem);

	list_for_each_entry(socket, &pcmcia_socket_list, socket_list) {

		if (socket->dev.parent != dev)

			continue;

		mutex_lock(&socket->skt_mutex);

		cb(socket);

		mutex_unlock(&socket->skt_mutex);

	}

	up_read(&pcmcia_socket_list_rwsem);

}



int pcmcia_socket_dev_suspend(struct device *dev)

{

	pcmcia_socket_dev_run(dev, socket_suspend);

	return 0;

}

EXPORT_SYMBOL(pcmcia_socket_dev_suspend);



void pcmcia_socket_dev_early_resume(struct device *dev)

{

	pcmcia_socket_dev_run(dev, socket_early_resume);

}

EXPORT_SYMBOL(pcmcia_socket_dev_early_resume);



void pcmcia_socket_dev_late_resume(struct device *dev)

{

	pcmcia_socket_dev_run(dev, socket_late_resume);

}

EXPORT_SYMBOL(pcmcia_socket_dev_late_resume);



int pcmcia_socket_dev_resume(struct device *dev)

{

	pcmcia_socket_dev_run(dev, socket_resume);

	return 0;

}

EXPORT_SYMBOL(pcmcia_socket_dev_resume);





struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt)

struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt)

{

{

	struct device *dev = get_device(&skt->dev);

	struct device *dev = get_device(&skt->dev);
@@ -578,12 +519,18 @@ static int socket_early_resume(struct pcmcia_socket *skt) 




static int socket_late_resume(struct pcmcia_socket *skt)

static int socket_late_resume(struct pcmcia_socket *skt)

{

{

	int ret;



	mutex_lock(&skt->ops_mutex);

	mutex_lock(&skt->ops_mutex);

	skt->state &= ~SOCKET_SUSPEND;

	skt->state &= ~SOCKET_SUSPEND;

	mutex_unlock(&skt->ops_mutex);

	mutex_unlock(&skt->ops_mutex);





	if (!(skt->state & SOCKET_PRESENT))

	if (!(skt->state & SOCKET_PRESENT)) {

		return socket_insert(skt);

		ret = socket_insert(skt);

		if (ret == -ENODEV)

			ret = 0;

		return ret;

	}





	if (skt->resume_status) {

	if (skt->resume_status) {

		socket_shutdown(skt);

		socket_shutdown(skt);
@@ -919,11 +866,66 @@ static void pcmcia_release_socket_class(struct class *data) 
}

}









#ifdef CONFIG_PM



static int __pcmcia_pm_op(struct device *dev,

			  int (*callback) (struct pcmcia_socket *skt))

{

	struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev);

	int ret;



	mutex_lock(&s->skt_mutex);

	ret = callback(s);

	mutex_unlock(&s->skt_mutex);



	return ret;

}



static int pcmcia_socket_dev_suspend_noirq(struct device *dev)

{

	return __pcmcia_pm_op(dev, socket_suspend);

}



static int pcmcia_socket_dev_resume_noirq(struct device *dev)

{

	return __pcmcia_pm_op(dev, socket_early_resume);

}



static int pcmcia_socket_dev_resume(struct device *dev)

{

	return __pcmcia_pm_op(dev, socket_late_resume);

}



static const struct dev_pm_ops pcmcia_socket_pm_ops = {

	/* dev_resume may be called with IRQs enabled */

	SET_SYSTEM_SLEEP_PM_OPS(NULL,

				pcmcia_socket_dev_resume)



	/* late suspend must be called with IRQs disabled */

	.suspend_noirq = pcmcia_socket_dev_suspend_noirq,

	.freeze_noirq = pcmcia_socket_dev_suspend_noirq,

	.poweroff_noirq = pcmcia_socket_dev_suspend_noirq,



	/* early resume must be called with IRQs disabled */

	.resume_noirq = pcmcia_socket_dev_resume_noirq,

	.thaw_noirq = pcmcia_socket_dev_resume_noirq,

	.restore_noirq = pcmcia_socket_dev_resume_noirq,

};



#define PCMCIA_SOCKET_CLASS_PM_OPS (&pcmcia_socket_pm_ops)



#else /* CONFIG_PM */



#define PCMCIA_SOCKET_CLASS_PM_OPS NULL



#endif /* CONFIG_PM */



struct class pcmcia_socket_class = {

struct class pcmcia_socket_class = {

	.name = "pcmcia_socket",

	.name = "pcmcia_socket",

	.dev_uevent = pcmcia_socket_uevent,

	.dev_uevent = pcmcia_socket_uevent,

	.dev_release = pcmcia_release_socket,

	.dev_release = pcmcia_release_socket,

	.class_release = pcmcia_release_socket_class,

	.class_release = pcmcia_release_socket_class,

	.pm = PCMCIA_SOCKET_CLASS_PM_OPS,

};

};

EXPORT_SYMBOL(pcmcia_socket_class);

EXPORT_SYMBOL(pcmcia_socket_class);

drivers/pcmcia/db1xxx_ss.c

+0 −27
Original line number Original line Diff line number Diff line
@@ -558,37 +558,10 @@ static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

static int db1x_pcmcia_suspend(struct device *dev)

{

	return pcmcia_socket_dev_suspend(dev);

}



static int db1x_pcmcia_resume(struct device *dev)

{

	return pcmcia_socket_dev_resume(dev);

}



static struct dev_pm_ops db1x_pcmcia_pmops = {

	.resume		= db1x_pcmcia_resume,

	.suspend	= db1x_pcmcia_suspend,

	.thaw		= db1x_pcmcia_resume,

	.freeze		= db1x_pcmcia_suspend,

};



#define DB1XXX_SS_PMOPS &db1x_pcmcia_pmops



#else



#define DB1XXX_SS_PMOPS NULL



#endif



static struct platform_driver db1x_pcmcia_socket_driver = {

static struct platform_driver db1x_pcmcia_socket_driver = {

	.driver	= {

	.driver	= {

		.name	= "db1xxx_pcmcia",

		.name	= "db1xxx_pcmcia",

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

		.pm	= DB1XXX_SS_PMOPS

	},

	},

	.probe		= db1x_pcmcia_socket_probe,

	.probe		= db1x_pcmcia_socket_probe,

	.remove		= __devexit_p(db1x_pcmcia_socket_remove),

	.remove		= __devexit_p(db1x_pcmcia_socket_remove),

CRA Git | Maintained and supported by SUSTech CRA and CCSE