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

Commit 2658a79a authored by Amit Shah's avatar Amit Shah Committed by Rusty Russell
Browse files

virtio: console: Separate out find_vqs operation into a different function 



With support for multiple ports, each port will have its own input and
output vqs. Prepare the probe function for this change.

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

drivers/char/virtio_console.c

+86 −12
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ struct console { 
 * ports for that device (vdev->priv).

 */

struct ports_device {

	struct virtqueue *in_vq, *out_vq;

	/* Array of per-port IO virtqueues */

	struct virtqueue **in_vqs, **out_vqs;



	struct virtio_device *vdev;

};
@@ -395,8 +397,8 @@ static int __devinit add_port(struct ports_device *portdev) 
	}



	port->portdev = portdev;

	port->in_vq = portdev->in_vq;

	port->out_vq = portdev->out_vq;

	port->in_vq = portdev->in_vqs[0];

	port->out_vq = portdev->out_vqs[0];



	port->inbuf = alloc_buf(PAGE_SIZE);

	if (!port->inbuf) {
@@ -421,15 +423,87 @@ static int __devinit add_port(struct ports_device *portdev) 
	return err;

}



static int init_vqs(struct ports_device *portdev)

{

	vq_callback_t **io_callbacks;

	char **io_names;

	struct virtqueue **vqs;

	u32 nr_ports, nr_queues;

	int err;



	/* We currently only have one port and two queues for that port */

	nr_ports = 1;

	nr_queues = 2;



	vqs = kmalloc(nr_queues * sizeof(struct virtqueue *), GFP_KERNEL);

	if (!vqs) {

		err = -ENOMEM;

		goto fail;

	}

	io_callbacks = kmalloc(nr_queues * sizeof(vq_callback_t *), GFP_KERNEL);

	if (!io_callbacks) {

		err = -ENOMEM;

		goto free_vqs;

	}

	io_names = kmalloc(nr_queues * sizeof(char *), GFP_KERNEL);

	if (!io_names) {

		err = -ENOMEM;

		goto free_callbacks;

	}

	portdev->in_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *),

				  GFP_KERNEL);

	if (!portdev->in_vqs) {

		err = -ENOMEM;

		goto free_names;

	}

	portdev->out_vqs = kmalloc(nr_ports * sizeof(struct virtqueue *),

				   GFP_KERNEL);

	if (!portdev->out_vqs) {

		err = -ENOMEM;

		goto free_invqs;

	}



	io_callbacks[0] = hvc_handle_input;

	io_callbacks[1] = NULL;

	io_names[0] = "input";

	io_names[1] = "output";



	/* Find the queues. */

	err = portdev->vdev->config->find_vqs(portdev->vdev, nr_queues, vqs,

					      io_callbacks,

					      (const char **)io_names);

	if (err)

		goto free_outvqs;



	portdev->in_vqs[0] = vqs[0];

	portdev->out_vqs[0] = vqs[1];



	kfree(io_callbacks);

	kfree(io_names);

	kfree(vqs);



	return 0;



free_names:

	kfree(io_names);

free_callbacks:

	kfree(io_callbacks);

free_outvqs:

	kfree(portdev->out_vqs);

free_invqs:

	kfree(portdev->in_vqs);

free_vqs:

	kfree(vqs);

fail:

	return err;

}



/*

 * Once we're further in boot, we get probed like any other virtio

 * device.

 */

static int __devinit virtcons_probe(struct virtio_device *vdev)

{

	vq_callback_t *callbacks[] = { hvc_handle_input, NULL};

	const char *names[] = { "input", "output" };

	struct virtqueue *vqs[2];

	struct ports_device *portdev;

	int err;
@@ -443,13 +517,11 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) 
	portdev->vdev = vdev;

	vdev->priv = portdev;



	/* Find the queues. */

	err = vdev->config->find_vqs(vdev, 2, vqs, callbacks, names);

	if (err)

	err = init_vqs(portdev);

	if (err < 0) {

		dev_err(&vdev->dev, "Error %d initializing vqs\n", err);

		goto free;



	portdev->in_vq = vqs[0];

	portdev->out_vq = vqs[1];

	}



	/* We only have one port. */

	err = add_port(portdev);
@@ -462,6 +534,8 @@ static int __devinit virtcons_probe(struct virtio_device *vdev) 


free_vqs:

	vdev->config->del_vqs(vdev);

	kfree(portdev->in_vqs);

	kfree(portdev->out_vqs);

free:

	kfree(portdev);

fail: