Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f905f8 authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell
Browse files

virtio: console: Remove config work handler 



We're going to switch to using control messages for port hot-plug and
initial port discovery. Remove the config work handler which handled
port hot-plug so far.

Signed-off-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 69eb9a9f

drivers/char/virtio_console.c

+1 −63
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct ports_device { 
	 * notification

	 */

	struct work_struct control_work;

	struct work_struct config_work;



	struct list_head ports;
@@ -1084,10 +1083,7 @@ static void config_intr(struct virtio_device *vdev) 
	struct ports_device *portdev;



	portdev = vdev->priv;

	if (use_multiport(portdev)) {

		/* Handle port hot-add */

		schedule_work(&portdev->config_work);

	}



	/*

	 * We'll use this way of resizing only for legacy support.

	 * For newer userspace (VIRTIO_CONSOLE_F_MULTPORT+), use
@@ -1230,62 +1226,6 @@ static int add_port(struct ports_device *portdev, u32 id) 
	return err;

}



/*

 * The workhandler for config-space updates.

 *

 * This is called when ports are hot-added.

 */

static void config_work_handler(struct work_struct *work)

{

	struct virtio_console_config virtconconf;

	struct ports_device *portdev;

	struct virtio_device *vdev;

	int err;



	portdev = container_of(work, struct ports_device, config_work);



	vdev = portdev->vdev;

	vdev->config->get(vdev,

			  offsetof(struct virtio_console_config, nr_ports),

			  &virtconconf.nr_ports,

			  sizeof(virtconconf.nr_ports));



	if (portdev->config.nr_ports == virtconconf.nr_ports) {

		/*

		 * Port 0 got hot-added.  Since we already did all the

		 * other initialisation for it, just tell the Host

		 * that the port is ready if we find the port.  In

		 * case the port was hot-removed earlier, we call

		 * add_port to add the port.

		 */

		struct port *port;



		port = find_port_by_id(portdev, 0);

		if (!port)

			add_port(portdev, 0);

		else

			send_control_msg(port, VIRTIO_CONSOLE_PORT_READY, 1);

		return;

	}

	if (virtconconf.nr_ports > portdev->config.max_nr_ports) {

		dev_warn(&vdev->dev,

			 "More ports specified (%u) than allowed (%u)",

			 portdev->config.nr_ports + 1,

			 portdev->config.max_nr_ports);

		return;

	}

	if (virtconconf.nr_ports < portdev->config.nr_ports)

		return;



	/* Hot-add ports */

	while (virtconconf.nr_ports - portdev->config.nr_ports) {

		err = add_port(portdev, portdev->config.nr_ports);

		if (err)

			break;

		portdev->config.nr_ports++;

	}

}



static int init_vqs(struct ports_device *portdev)

{

	vq_callback_t **io_callbacks;
@@ -1478,7 +1418,6 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) 


		spin_lock_init(&portdev->cvq_lock);

		INIT_WORK(&portdev->control_work, &control_work_handler);

		INIT_WORK(&portdev->config_work, &config_work_handler);



		nr_added_bufs = fill_queue(portdev->c_ivq, &portdev->cvq_lock);

		if (!nr_added_bufs) {
@@ -1521,7 +1460,6 @@ static void virtcons_remove(struct virtio_device *vdev) 
	portdev = vdev->priv;



	cancel_work_sync(&portdev->control_work);

	cancel_work_sync(&portdev->config_work);



	list_for_each_entry_safe(port, port2, &portdev->ports, list)

		remove_port(port);