Commit 675bf8ef authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: virtio: drop virtio_cons_early_init() 



The last user of virtio_cons_early_init() was dropped in commit
7fb2b2d5 ("s390/virtio: remove the old KVM virtio transport").

So now, drop virtio_cons_early_init() and the logic and headers behind
too.

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Amit Shah <amit@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: linux-alpha@vger.kernel.org
Cc: virtualization@lists.linux.dev
Link: https://lore.kernel.org/r/20231130113001.29154-1-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78d60dae

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -23018,7 +23018,6 @@ M: Amit Shah <amit@kernel.org> 
L:	virtualization@lists.linux.dev

S:	Maintained

F:	drivers/char/virtio_console.c

F:	include/linux/virtio_console.h

F:	include/uapi/linux/virtio_console.h









VIRTIO CORE AND NET DRIVERS

























drivers/char/virtio_console.c



+0
−48






























Original line number
Diff line number
Diff line







@@ -230,9 +230,6 @@ struct port {







	bool guest_connected;









};



















/* This is the very early arch-specified put chars function. */









static int (*early_put_chars)(u32, const char *, int);



















static struct port *find_port_by_vtermno(u32 vtermno)









{









	struct port *port;








@@ -1114,9 +1111,6 @@ static int put_chars(u32 vtermno, const char *buf, int count)







	void *data;









	int ret;



















	if (unlikely(early_put_chars))









		return early_put_chars(vtermno, buf, count);



















	port = find_port_by_vtermno(vtermno);









	if (!port)









		return -EPIPE;








@@ -1142,10 +1136,6 @@ static int get_chars(u32 vtermno, char *buf, int count)







{









	struct port *port;



















	/* If we've not set up the port yet, we have no input to give. */









	if (unlikely(early_put_chars))









		return 0;



















	port = find_port_by_vtermno(vtermno);









	if (!port)









		return -EPIPE;








@@ -1201,21 +1191,6 @@ static const struct hv_ops hv_ops = {







	.notifier_hangup = notifier_del_vio,









};



















/*









 * Console drivers are initialized very early so boot messages can go









 * out, so we do things slightly differently from the generic virtio









 * initialization of the net and block drivers.









 *









 * At this stage, the console is output-only.  It's too early to set









 * up a virtqueue, so we let the drivers do some boutique early-output









 * thing.









 */









int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))









{









	early_put_chars = put_chars;









	return hvc_instantiate(0, 0, &hv_ops);









}



















static int init_port_console(struct port *port)









{









	int ret;








@@ -1256,13 +1231,6 @@ static int init_port_console(struct port *port)







	spin_unlock_irq(&pdrvdata_lock);









	port->guest_connected = true;



















	/*









	 * Start using the new console output if this is the first









	 * console to come up.









	 */









	if (early_put_chars)









		early_put_chars = NULL;



















	/* Notify host of port being opened */









	send_control_msg(port, VIRTIO_CONSOLE_PORT_OPEN, 1);


















@@ -1999,7 +1967,6 @@ static int virtcons_probe(struct virtio_device *vdev)







	struct ports_device *portdev;









	int err;









	bool multiport;









	bool early = early_put_chars != NULL;



















	/* We only need a config space if features are offered */









	if (!vdev->config->get &&








@@ -2010,9 +1977,6 @@ static int virtcons_probe(struct virtio_device *vdev)







		return -EINVAL;









	}



















	/* Ensure to read early_put_chars now */









	barrier();



















	portdev = kmalloc(sizeof(*portdev), GFP_KERNEL);









	if (!portdev) {









		err = -ENOMEM;








@@ -2100,18 +2064,6 @@ static int virtcons_probe(struct virtio_device *vdev)







	__send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,









			   VIRTIO_CONSOLE_DEVICE_READY, 1);



















	/*









	 * If there was an early virtio console, assume that there are no









	 * other consoles. We need to wait until the hvc_alloc matches the









	 * hvc_instantiate, otherwise tty_open will complain, resulting in









	 * a "Warning: unable to open an initial console" boot failure.









	 * Without multiport this is done in add_port above. With multiport









	 * this might take some host<->guest communication - thus we have to









	 * wait.









	 */









	if (multiport && early)









		wait_for_completion(&early_console_added);



















	return 0;



















free_chrdev:
































include/linux/virtio_console.h
deleted100644 → 0



+0
−38






























Original line number
Diff line number
Diff line









/*









 * This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so









 * anyone can use the definitions to implement compatible drivers/servers:









 *









 *









 * Redistribution and use in source and binary forms, with or without









 * modification, are permitted provided that the following conditions









 * are met:









 * 1. Redistributions of source code must retain the above copyright









 *    notice, this list of conditions and the following disclaimer.









 * 2. Redistributions in binary form must reproduce the above copyright









 *    notice, this list of conditions and the following disclaimer in the









 *    documentation and/or other materials provided with the distribution.









 * 3. Neither the name of IBM nor the names of its contributors









 *    may be used to endorse or promote products derived from this software









 *    without specific prior written permission.









 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND









 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE









 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE









 * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE









 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL









 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS









 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)









 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT









 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY









 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF









 * SUCH DAMAGE.









 *









 * Copyright (C) Red Hat, Inc., 2009, 2010, 2011









 * Copyright (C) Amit Shah <amit.shah@redhat.com>, 2009, 2010, 2011









 */









#ifndef _LINUX_VIRTIO_CONSOLE_H









#define _LINUX_VIRTIO_CONSOLE_H



















#include <uapi/linux/virtio_console.h>



















int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int));









#endif /* _LINUX_VIRTIO_CONSOLE_H */