s390/cio: get rid of static console subchannel

Remove the static console subchannel (and friends) and use dynamic allocation for these structures. With this change the console subchanel is treated (mostly) like any other subchannel and we can remove some special cases. Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
author: Sebastian Ott <sebott@linux.vnet.ibm.com> 2013-04-13 07:01:50 -0400
committer: Martin Schwidefsky <schwidefsky@de.ibm.com> 2013-04-17 08:07:32 -0400
commit: 863fc8492734822b95671780db803cd9a4b7d923 (patch)
tree: badeeb42bc2f1d047849882aecd37fffef91ca20 /drivers/s390/cio
parent: c135ad1caffe2b35d6316758a605a2b63ca22bb3 (diff)
5 files changed, 56 insertions, 108 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 2c1d53fb2fab..ab99500604b7 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -540,13 +540,9 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
        memset(sch, 0, sizeof(struct subchannel));
        sch->schid = schid;
-        if (cio_is_console(schid)) {
+        err = cio_create_sch_lock(sch);
-                sch->lock = cio_get_console_lock();
+        if (err)
-        } else {
+                goto out;
-                err = cio_create_sch_lock(sch);
-                if (err)
-                        goto out;
-        }
        mutex_init(&sch->reg_mutex);
        /*
@@ -580,8 +576,7 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
                      sch->schid.ssid, sch->schid.sch_no, sch->st);
        return 0;
 out:
-        if (!cio_is_console(schid))
+        kfree(sch->lock);
-                kfree(sch->lock);
        sch->lock = NULL;
        return err;
 }
@@ -650,9 +645,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
 }
 #ifdef CONFIG_CCW_CONSOLE
-static struct subchannel console_subchannel;
+static struct subchannel *console_sch;
-static struct io_subchannel_private console_priv;
-static int console_subchannel_in_use;
 /*
 * Use cio_tsch to update the subchannel status and call the interrupt handler
@@ -685,119 +678,83 @@ void cio_tsch(struct subchannel *sch)
        }
 }
-void *cio_get_console_priv(void)
+static int cio_test_for_console(struct subchannel_id schid, void *data)
 {
-        return &console_priv;
+        struct schib schib;
-}
-static int
+        if (stsch_err(schid, &schib) != 0)
-cio_test_for_console(struct subchannel_id schid, void *data)
-{
-        if (stsch_err(schid, &console_subchannel.schib) != 0)
                return -ENXIO;
-        if ((console_subchannel.schib.pmcw.st == SUBCHANNEL_TYPE_IO) &&
+        if ((schib.pmcw.st == SUBCHANNEL_TYPE_IO) && schib.pmcw.dnv &&
-            console_subchannel.schib.pmcw.dnv &&
+            (schib.pmcw.dev == console_devno)) {
-            (console_subchannel.schib.pmcw.dev == console_devno)) {
                console_irq = schid.sch_no;
                return 1; /* found */
        }
        return 0;
 }
+static int cio_get_console_sch_no(void)
-static int
-cio_get_console_sch_no(void)
 {
        struct subchannel_id schid;
-        
+        struct schib schib;
        init_subchannel_id(&schid);
        if (console_irq != -1) {
                /* VM provided us with the irq number of the console. */
                schid.sch_no = console_irq;
-                if (stsch_err(schid, &console_subchannel.schib) != 0 ||
+                if (stsch_err(schid, &schib) != 0 ||
-                    (console_subchannel.schib.pmcw.st != SUBCHANNEL_TYPE_IO) ||
+                    (schib.pmcw.st != SUBCHANNEL_TYPE_IO) || !schib.pmcw.dnv)
-                    !console_subchannel.schib.pmcw.dnv)
                        return -1;
-                console_devno = console_subchannel.schib.pmcw.dev;
+                console_devno = schib.pmcw.dev;
        } else if (console_devno != -1) {
                /* At least the console device number is known. */
                for_each_subchannel(cio_test_for_console, NULL);
-                if (console_irq == -1)
-                        return -1;
-        } else {
-                /* unlike in 2.4, we cannot autoprobe here, since
-                 * the channel subsystem is not fully initialized.
-                 * With some luck, the HWC console can take over */
-                return -1;
        }
        return console_irq;
 }
-struct subchannel *
+struct subchannel *cio_probe_console(void)
-cio_probe_console(void)
 {
-        int sch_no, ret;
        struct subchannel_id schid;
+        struct subchannel *sch;
+        int sch_no, ret;
-        if (xchg(&console_subchannel_in_use, 1) != 0)
-                return ERR_PTR(-EBUSY);
        sch_no = cio_get_console_sch_no();
        if (sch_no == -1) {
-                console_subchannel_in_use = 0;
                pr_warning("No CCW console was found\n");
                return ERR_PTR(-ENODEV);
        }
-        memset(&console_subchannel, 0, sizeof(struct subchannel));
        init_subchannel_id(&schid);
        schid.sch_no = sch_no;
-        ret = cio_validate_subchannel(&console_subchannel, schid);
+        sch = css_alloc_subchannel(schid);
-        if (ret) {
+        if (IS_ERR(sch))
-                console_subchannel_in_use = 0;
+                return sch;
-                return ERR_PTR(-ENODEV);
-        }
-        /*
-         * enable console I/O-interrupt subclass
-         */
        isc_register(CONSOLE_ISC);
-        console_subchannel.config.isc = CONSOLE_ISC;
+        sch->config.isc = CONSOLE_ISC;
-        console_subchannel.config.intparm = (u32)(addr_t)&console_subchannel;
+        sch->config.intparm = (u32)(addr_t)sch;
-        ret = cio_commit_config(&console_subchannel);
+        ret = cio_commit_config(sch);
        if (ret) {
                isc_unregister(CONSOLE_ISC);
-                console_subchannel_in_use = 0;
+                put_device(&sch->dev);
                return ERR_PTR(ret);
        }
-        return &console_subchannel;
+        console_sch = sch;
-}
+        return sch;
-void
-cio_release_console(void)
-{
-        console_subchannel.config.intparm = 0;
-        cio_commit_config(&console_subchannel);
-        isc_unregister(CONSOLE_ISC);
-        console_subchannel_in_use = 0;
 }
-/* Bah... hack to catch console special sausages. */
+int cio_is_console(struct subchannel_id schid)
-int
-cio_is_console(struct subchannel_id schid)
 {
-        if (!console_subchannel_in_use)
+        if (!console_sch)
                return 0;
-        return schid_equal(&schid, &console_subchannel.schid);
+        return schid_equal(&schid, &console_sch->schid);
 }
-struct subchannel *
+struct subchannel *cio_get_console_subchannel(void)
-cio_get_console_subchannel(void)
 {
-        if (!console_subchannel_in_use)
+        return console_sch;
-                return NULL;
-        return &console_subchannel;
 }
+#endif /* CONFIG_CCW_CONSOLE */
-#endif
 static int
 __disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
 {
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 3b97c8bb30e5..78975471ef28 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -128,17 +128,12 @@ void do_IRQ(struct pt_regs *);
 /* Use with care. */
 #ifdef CONFIG_CCW_CONSOLE
 extern struct subchannel *cio_probe_console(void);
-extern void cio_release_console(void);
 extern int cio_is_console(struct subchannel_id);
 extern struct subchannel *cio_get_console_subchannel(void);
-extern spinlock_t * cio_get_console_lock(void);
-extern void *cio_get_console_priv(void);
 extern void cio_tsch(struct subchannel *sch);
 #else
 #define cio_is_console(schid) 0
 #define cio_get_console_subchannel() NULL
-#define cio_get_console_lock() NULL
-#define cio_get_console_priv() NULL
 #endif
 #endif
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 8a1294b1cbaf..fb0e64f1845a 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -139,19 +139,15 @@ static void css_sch_todo(struct work_struct *work);
 static void css_subchannel_release(struct device *dev)
 {
-        struct subchannel *sch;
+        struct subchannel *sch = to_subchannel(dev);
-        sch = to_subchannel(dev);
+        sch->config.intparm = 0;
-        if (!cio_is_console(sch->schid)) {
+        cio_commit_config(sch);
-                /* Reset intparm to zeroes. */
+        kfree(sch->lock);
-                sch->config.intparm = 0;
+        kfree(sch);
-                cio_commit_config(sch);
-                kfree(sch->lock);
-                kfree(sch);
-        }
 }
-static struct subchannel *css_alloc_subchannel(struct subchannel_id schid)
+struct subchannel *css_alloc_subchannel(struct subchannel_id schid)
 {
        struct subchannel *sch;
        int ret;
@@ -326,10 +322,9 @@ int css_probe_device(struct subchannel_id schid)
                        return PTR_ERR(sch);
        }
        ret = css_register_subchannel(sch);
-        if (ret) {
+        if (ret)
-                if (!cio_is_console(schid))
+                put_device(&sch->dev);
-                        put_device(&sch->dev);
-        }
        return ret;
 }
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 4af3dfe70ef5..6ab424d753a9 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -102,6 +102,7 @@ extern void css_driver_unregister(struct css_driver *);
 extern void css_sch_device_unregister(struct subchannel *);
 extern int css_probe_device(struct subchannel_id);
+extern struct subchannel *css_alloc_subchannel(struct subchannel_id);
 extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);
 extern int css_init_done;
 extern int max_ssid;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 6ac0066d3158..25d04b7b5109 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1585,22 +1585,11 @@ static struct ccw_device console_cdev;
 static struct ccw_device_private console_private;
 static int console_cdev_in_use;
-static DEFINE_SPINLOCK(ccw_console_lock);
-spinlock_t * cio_get_console_lock(void)
-{
-        return &ccw_console_lock;
-}
 static int ccw_device_console_enable(struct ccw_device *cdev,
                                     struct subchannel *sch)
 {
-        struct io_subchannel_private *io_priv = cio_get_console_priv();
        int rc;
-        /* Attach subchannel private data. */
-        memset(io_priv, 0, sizeof(*io_priv));
-        set_io_private(sch, io_priv);
        io_subchannel_init_fields(sch);
        rc = cio_commit_config(sch);
        if (rc)
@@ -1633,6 +1622,7 @@ out_unlock:
 struct ccw_device *
 ccw_device_probe_console(void)
 {
+        struct io_subchannel_private *io_priv;
        struct subchannel *sch;
        int ret;
@@ -1648,10 +1638,20 @@ ccw_device_probe_console(void)
        console_cdev.private = &console_private;
        console_private.cdev = &console_cdev;
        console_private.int_class = IRQIO_CIO;
+        io_priv = kzalloc(sizeof(*io_priv), GFP_KERNEL | GFP_DMA);
+        if (!io_priv) {
+                put_device(&sch->dev);
+                return ERR_PTR(-ENOMEM);
+        }
+        set_io_private(sch, io_priv);
        ret = ccw_device_console_enable(&console_cdev, sch);
        if (ret) {
-                cio_release_console();
                console_cdev_in_use = 0;
+                set_io_private(sch, NULL);
+                put_device(&sch->dev);
+                kfree(io_priv);
                return ERR_PTR(ret);
        }
        console_cdev.online = 1;
author	Sebastian Ott <sebott@linux.vnet.ibm.com>	2013-04-13 07:01:50 -0400
committer	Martin Schwidefsky <schwidefsky@de.ibm.com>	2013-04-17 08:07:32 -0400
commit	863fc8492734822b95671780db803cd9a4b7d923 (patch)
tree	badeeb42bc2f1d047849882aecd37fffef91ca20 /drivers/s390/cio
parent	c135ad1caffe2b35d6316758a605a2b63ca22bb3 (diff)

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 2c1d53fb2fab..ab99500604b7 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c
@@ -540,13 +540,9 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
540	memset(sch, 0, sizeof(struct subchannel));	540	memset(sch, 0, sizeof(struct subchannel));
541		541
542	sch->schid = schid;	542	sch->schid = schid;
543	if (cio_is_console(schid)) {	543	err = cio_create_sch_lock(sch);
544	sch->lock = cio_get_console_lock();	544	if (err)
545	} else {	545	goto out;
546	err = cio_create_sch_lock(sch);
547	if (err)
548	goto out;
549	}
550	mutex_init(&sch->reg_mutex);	546	mutex_init(&sch->reg_mutex);
551		547
552	/*	548	/*
@@ -580,8 +576,7 @@ int cio_validate_subchannel(struct subchannel *sch, struct subchannel_id schid)
580	sch->schid.ssid, sch->schid.sch_no, sch->st);	576	sch->schid.ssid, sch->schid.sch_no, sch->st);
581	return 0;	577	return 0;
582	out:	578	out:
583	if (!cio_is_console(schid))	579	kfree(sch->lock);
584	kfree(sch->lock);
585	sch->lock = NULL;	580	sch->lock = NULL;
586	return err;	581	return err;
587	}	582	}
@@ -650,9 +645,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
650	}	645	}
651		646
652	#ifdef CONFIG_CCW_CONSOLE	647	#ifdef CONFIG_CCW_CONSOLE
653	static struct subchannel console_subchannel;	648	static struct subchannel *console_sch;
654	static struct io_subchannel_private console_priv;
655	static int console_subchannel_in_use;
656		649
657	/*	650	/*
658	* Use cio_tsch to update the subchannel status and call the interrupt handler	651	* Use cio_tsch to update the subchannel status and call the interrupt handler
@@ -685,119 +678,83 @@ void cio_tsch(struct subchannel *sch)
685	}	678	}
686	}	679	}
687		680
688	void *cio_get_console_priv(void)	681	static int cio_test_for_console(struct subchannel_id schid, void *data)
689	{	682	{
690	return &console_priv;	683	struct schib schib;
691	}
692		684
693	static int	685	if (stsch_err(schid, &schib) != 0)
694	cio_test_for_console(struct subchannel_id schid, void *data)
695	{
696	if (stsch_err(schid, &console_subchannel.schib) != 0)
697	return -ENXIO;	686	return -ENXIO;
698	if ((console_subchannel.schib.pmcw.st == SUBCHANNEL_TYPE_IO) &&	687	if ((schib.pmcw.st == SUBCHANNEL_TYPE_IO) && schib.pmcw.dnv &&
699	console_subchannel.schib.pmcw.dnv &&	688	(schib.pmcw.dev == console_devno)) {
700	(console_subchannel.schib.pmcw.dev == console_devno)) {
701	console_irq = schid.sch_no;	689	console_irq = schid.sch_no;
702	return 1; /* found */	690	return 1; /* found */
703	}	691	}
704	return 0;	692	return 0;
705	}	693	}
706		694
707		695	static int cio_get_console_sch_no(void)
708	static int
709	cio_get_console_sch_no(void)
710	{	696	{
711	struct subchannel_id schid;	697	struct subchannel_id schid;
712		698	struct schib schib;
		699
713	init_subchannel_id(&schid);	700	init_subchannel_id(&schid);
714	if (console_irq != -1) {	701	if (console_irq != -1) {
715	/* VM provided us with the irq number of the console. */	702	/* VM provided us with the irq number of the console. */
716	schid.sch_no = console_irq;	703	schid.sch_no = console_irq;
717	if (stsch_err(schid, &console_subchannel.schib) != 0 \|\|	704	if (stsch_err(schid, &schib) != 0 \|\|
718	(console_subchannel.schib.pmcw.st != SUBCHANNEL_TYPE_IO) \|\|	705	(schib.pmcw.st != SUBCHANNEL_TYPE_IO) \|\| !schib.pmcw.dnv)
719	!console_subchannel.schib.pmcw.dnv)
720	return -1;	706	return -1;
721	console_devno = console_subchannel.schib.pmcw.dev;	707	console_devno = schib.pmcw.dev;
722	} else if (console_devno != -1) {	708	} else if (console_devno != -1) {
723	/* At least the console device number is known. */	709	/* At least the console device number is known. */
724	for_each_subchannel(cio_test_for_console, NULL);	710	for_each_subchannel(cio_test_for_console, NULL);
725	if (console_irq == -1)
726	return -1;
727	} else {
728	/* unlike in 2.4, we cannot autoprobe here, since
729	* the channel subsystem is not fully initialized.
730	* With some luck, the HWC console can take over */
731	return -1;
732	}	711	}
733	return console_irq;	712	return console_irq;
734	}	713	}
735		714
736	struct subchannel *	715	struct subchannel *cio_probe_console(void)
737	cio_probe_console(void)
738	{	716	{
739	int sch_no, ret;
740	struct subchannel_id schid;	717	struct subchannel_id schid;
		718	struct subchannel *sch;
		719	int sch_no, ret;
741		720
742	if (xchg(&console_subchannel_in_use, 1) != 0)
743	return ERR_PTR(-EBUSY);
744	sch_no = cio_get_console_sch_no();	721	sch_no = cio_get_console_sch_no();
745	if (sch_no == -1) {	722	if (sch_no == -1) {
746	console_subchannel_in_use = 0;
747	pr_warning("No CCW console was found\n");	723	pr_warning("No CCW console was found\n");
748	return ERR_PTR(-ENODEV);	724	return ERR_PTR(-ENODEV);
749	}	725	}
750	memset(&console_subchannel, 0, sizeof(struct subchannel));
751	init_subchannel_id(&schid);	726	init_subchannel_id(&schid);
752	schid.sch_no = sch_no;	727	schid.sch_no = sch_no;
753	ret = cio_validate_subchannel(&console_subchannel, schid);	728	sch = css_alloc_subchannel(schid);
754	if (ret) {	729	if (IS_ERR(sch))
755	console_subchannel_in_use = 0;	730	return sch;
756	return ERR_PTR(-ENODEV);
757	}
758		731
759	/*
760	* enable console I/O-interrupt subclass
761	*/
762	isc_register(CONSOLE_ISC);	732	isc_register(CONSOLE_ISC);
763	console_subchannel.config.isc = CONSOLE_ISC;	733	sch->config.isc = CONSOLE_ISC;
764	console_subchannel.config.intparm = (u32)(addr_t)&console_subchannel;	734	sch->config.intparm = (u32)(addr_t)sch;
765	ret = cio_commit_config(&console_subchannel);	735	ret = cio_commit_config(sch);
766	if (ret) {	736	if (ret) {
767	isc_unregister(CONSOLE_ISC);	737	isc_unregister(CONSOLE_ISC);
768	console_subchannel_in_use = 0;	738	put_device(&sch->dev);
769	return ERR_PTR(ret);	739	return ERR_PTR(ret);
770	}	740	}
771	return &console_subchannel;	741	console_sch = sch;
772	}	742	return sch;
773
774	void
775	cio_release_console(void)
776	{
777	console_subchannel.config.intparm = 0;
778	cio_commit_config(&console_subchannel);
779	isc_unregister(CONSOLE_ISC);
780	console_subchannel_in_use = 0;
781	}	743	}
782		744
783	/* Bah... hack to catch console special sausages. */	745	int cio_is_console(struct subchannel_id schid)
784	int
785	cio_is_console(struct subchannel_id schid)
786	{	746	{
787	if (!console_subchannel_in_use)	747	if (!console_sch)
788	return 0;	748	return 0;
789	return schid_equal(&schid, &console_subchannel.schid);	749	return schid_equal(&schid, &console_sch->schid);
790	}	750	}
791		751
792	struct subchannel *	752	struct subchannel *cio_get_console_subchannel(void)
793	cio_get_console_subchannel(void)
794	{	753	{
795	if (!console_subchannel_in_use)	754	return console_sch;
796	return NULL;
797	return &console_subchannel;
798	}	755	}
		756	#endif /* CONFIG_CCW_CONSOLE */
799		757
800	#endif
801	static int	758	static int
802	__disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)	759	__disable_subchannel_easy(struct subchannel_id schid, struct schib *schib)
803	{	760	{


diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index 3b97c8bb30e5..78975471ef28 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h
@@ -128,17 +128,12 @@ void do_IRQ(struct pt_regs *);
128	/* Use with care. */	128	/* Use with care. */
129	#ifdef CONFIG_CCW_CONSOLE	129	#ifdef CONFIG_CCW_CONSOLE
130	extern struct subchannel *cio_probe_console(void);	130	extern struct subchannel *cio_probe_console(void);
131	extern void cio_release_console(void);
132	extern int cio_is_console(struct subchannel_id);	131	extern int cio_is_console(struct subchannel_id);
133	extern struct subchannel *cio_get_console_subchannel(void);	132	extern struct subchannel *cio_get_console_subchannel(void);
134	extern spinlock_t * cio_get_console_lock(void);
135	extern void *cio_get_console_priv(void);
136	extern void cio_tsch(struct subchannel *sch);	133	extern void cio_tsch(struct subchannel *sch);
137	#else	134	#else
138	#define cio_is_console(schid) 0	135	#define cio_is_console(schid) 0
139	#define cio_get_console_subchannel() NULL	136	#define cio_get_console_subchannel() NULL
140	#define cio_get_console_lock() NULL
141	#define cio_get_console_priv() NULL
142	#endif	137	#endif
143		138
144	#endif	139	#endif


diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 8a1294b1cbaf..fb0e64f1845a 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c
@@ -139,19 +139,15 @@ static void css_sch_todo(struct work_struct *work);
139		139
140	static void css_subchannel_release(struct device *dev)	140	static void css_subchannel_release(struct device *dev)
141	{	141	{
142	struct subchannel *sch;	142	struct subchannel *sch = to_subchannel(dev);
143		143
144	sch = to_subchannel(dev);	144	sch->config.intparm = 0;
145	if (!cio_is_console(sch->schid)) {	145	cio_commit_config(sch);
146	/* Reset intparm to zeroes. */	146	kfree(sch->lock);
147	sch->config.intparm = 0;	147	kfree(sch);
148	cio_commit_config(sch);
149	kfree(sch->lock);
150	kfree(sch);
151	}
152	}	148	}
153		149
154	static struct subchannel *css_alloc_subchannel(struct subchannel_id schid)	150	struct subchannel *css_alloc_subchannel(struct subchannel_id schid)
155	{	151	{
156	struct subchannel *sch;	152	struct subchannel *sch;
157	int ret;	153	int ret;
@@ -326,10 +322,9 @@ int css_probe_device(struct subchannel_id schid)
326	return PTR_ERR(sch);	322	return PTR_ERR(sch);
327	}	323	}
328	ret = css_register_subchannel(sch);	324	ret = css_register_subchannel(sch);
329	if (ret) {	325	if (ret)
330	if (!cio_is_console(schid))	326	put_device(&sch->dev);
331	put_device(&sch->dev);	327
332	}
333	return ret;	328	return ret;
334	}	329	}
335		330


diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index 4af3dfe70ef5..6ab424d753a9 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h
@@ -102,6 +102,7 @@ extern void css_driver_unregister(struct css_driver *);
102		102
103	extern void css_sch_device_unregister(struct subchannel *);	103	extern void css_sch_device_unregister(struct subchannel *);
104	extern int css_probe_device(struct subchannel_id);	104	extern int css_probe_device(struct subchannel_id);
		105	extern struct subchannel *css_alloc_subchannel(struct subchannel_id);
105	extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);	106	extern struct subchannel *get_subchannel_by_schid(struct subchannel_id);
106	extern int css_init_done;	107	extern int css_init_done;
107	extern int max_ssid;	108	extern int max_ssid;


diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 6ac0066d3158..25d04b7b5109 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c
@@ -1585,22 +1585,11 @@ static struct ccw_device console_cdev;
1585	static struct ccw_device_private console_private;	1585	static struct ccw_device_private console_private;
1586	static int console_cdev_in_use;	1586	static int console_cdev_in_use;
1587		1587
1588	static DEFINE_SPINLOCK(ccw_console_lock);
1589
1590	spinlock_t * cio_get_console_lock(void)
1591	{
1592	return &ccw_console_lock;
1593	}
1594
1595	static int ccw_device_console_enable(struct ccw_device *cdev,	1588	static int ccw_device_console_enable(struct ccw_device *cdev,
1596	struct subchannel *sch)	1589	struct subchannel *sch)
1597	{	1590	{
1598	struct io_subchannel_private *io_priv = cio_get_console_priv();
1599	int rc;	1591	int rc;
1600		1592
1601	/* Attach subchannel private data. */
1602	memset(io_priv, 0, sizeof(*io_priv));
1603	set_io_private(sch, io_priv);
1604	io_subchannel_init_fields(sch);	1593	io_subchannel_init_fields(sch);
1605	rc = cio_commit_config(sch);	1594	rc = cio_commit_config(sch);
1606	if (rc)	1595	if (rc)
@@ -1633,6 +1622,7 @@ out_unlock:
1633	struct ccw_device *	1622	struct ccw_device *
1634	ccw_device_probe_console(void)	1623	ccw_device_probe_console(void)
1635	{	1624	{
		1625	struct io_subchannel_private *io_priv;
1636	struct subchannel *sch;	1626	struct subchannel *sch;
1637	int ret;	1627	int ret;
1638		1628
@@ -1648,10 +1638,20 @@ ccw_device_probe_console(void)
1648	console_cdev.private = &console_private;	1638	console_cdev.private = &console_private;
1649	console_private.cdev = &console_cdev;	1639	console_private.cdev = &console_cdev;
1650	console_private.int_class = IRQIO_CIO;	1640	console_private.int_class = IRQIO_CIO;
		1641
		1642	io_priv = kzalloc(sizeof(*io_priv), GFP_KERNEL \| GFP_DMA);
		1643	if (!io_priv) {
		1644	put_device(&sch->dev);
		1645	return ERR_PTR(-ENOMEM);
		1646	}
		1647	set_io_private(sch, io_priv);
		1648
1651	ret = ccw_device_console_enable(&console_cdev, sch);	1649	ret = ccw_device_console_enable(&console_cdev, sch);
1652	if (ret) {	1650	if (ret) {
1653	cio_release_console();
1654	console_cdev_in_use = 0;	1651	console_cdev_in_use = 0;
		1652	set_io_private(sch, NULL);
		1653	put_device(&sch->dev);
		1654	kfree(io_priv);
1655	return ERR_PTR(ret);	1655	return ERR_PTR(ret);
1656	}	1656	}
1657	console_cdev.online = 1;	1657	console_cdev.online = 1;