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

Commit 35fcf7e3 authored by Eli Billauer's avatar Eli Billauer Committed by Greg Kroah-Hartman
Browse files

staging: xillybus: Use dev_* functions instead of pr_* in xillybus_core 



Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarEli Billauer <eli.billauer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a2f9a9e

drivers/staging/xillybus/xillybus_core.c

+69 −46
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct workqueue_struct *xillybus_wq; 
 * wr_mutex -> rd_mutex -> register_mutex -> wr_spinlock -> rd_spinlock

 */



static void malformed_message(u32 *buf)

static void malformed_message(struct xilly_endpoint *endpoint, u32 *buf)

{

	int opcode;

	int msg_channel, msg_bufno, msg_data, msg_dir;
@@ -112,7 +112,8 @@ static void malformed_message(u32 *buf) 
	msg_bufno = (buf[0] >> 12) & 0x3ff;

	msg_data = buf[1] & 0xfffffff;



	pr_warn("xillybus: Malformed message (skipping): opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",

	dev_warn(endpoint->dev,

		 "Malformed message (skipping): opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",

		 opcode, msg_channel, msg_dir, msg_bufno, msg_data);

}
@@ -151,14 +152,16 @@ irqreturn_t xillybus_isr(int irq, void *data) 


	for (i = 0; i < buf_size; i += 2)

		if (((buf[i+1] >> 28) & 0xf) != ep->msg_counter) {

			malformed_message(&buf[i]);

			pr_warn("xillybus: Sending a NACK on counter %x (instead of %x) on entry %d\n",

			malformed_message(ep, &buf[i]);

			dev_warn(ep->dev,

				 "Sending a NACK on counter %x (instead of %x) on entry %d\n",

				((buf[i+1] >> 28) & 0xf),

				ep->msg_counter,

				i/2);



			if (++ep->failed_messages > 10)

				pr_err("xillybus: Lost sync with interrupt messages. Stopping.\n");

				dev_err(ep->dev,

					"Lost sync with interrupt messages. Stopping.\n");

			else {

				ep->ephw->hw_sync_sgl_for_device(

					ep,
@@ -174,7 +177,7 @@ irqreturn_t xillybus_isr(int irq, void *data) 
			break;



	if (i >= buf_size) {

		pr_err("xillybus: Bad interrupt message. Stopping.\n");

		dev_err(ep->dev, "Bad interrupt message. Stopping.\n");

		return IRQ_HANDLED;

	}
@@ -193,7 +196,7 @@ irqreturn_t xillybus_isr(int irq, void *data) 


			if ((msg_channel > ep->num_channels) ||

			    (msg_channel == 0)) {

				malformed_message(&buf[i]);

				malformed_message(ep, &buf[i]);

				break;

			}
@@ -201,7 +204,7 @@ irqreturn_t xillybus_isr(int irq, void *data) 


			if (msg_dir) { /* Write channel */

				if (msg_bufno >= channel->num_wr_buffers) {

					malformed_message(&buf[i]);

					malformed_message(ep, &buf[i]);

					break;

				}

				spin_lock(&channel->wr_spinlock);
@@ -218,7 +221,7 @@ irqreturn_t xillybus_isr(int irq, void *data) 
				/* Read channel */



				if (msg_bufno >= channel->num_rd_buffers) {

					malformed_message(&buf[i]);

					malformed_message(ep, &buf[i]);

					break;

				}
@@ -240,14 +243,14 @@ irqreturn_t xillybus_isr(int irq, void *data) 
			if ((msg_channel > ep->num_channels) ||

			    (msg_channel == 0) || (!msg_dir) ||

			    !ep->channels[msg_channel]->wr_supports_nonempty) {

				malformed_message(&buf[i]);

				malformed_message(ep, &buf[i]);

				break;

			}



			channel = ep->channels[msg_channel];



			if (msg_bufno >= channel->num_wr_buffers) {

				malformed_message(&buf[i]);

				malformed_message(ep, &buf[i]);

				break;

			}

			spin_lock(&channel->wr_spinlock);
@@ -280,10 +283,11 @@ irqreturn_t xillybus_isr(int irq, void *data) 
		case XILLYMSG_OPCODE_FATAL_ERROR:

			ep->fatal_error = 1;

			wake_up_interruptible(&ep->ep_wait); /* For select() */

			pr_err("xillybus: FPGA reported a fatal error. This means that the low-level communication with the device has failed. This hardware problem is most likely unrelated to xillybus (neither kernel module nor FPGA core), but reports are still welcome. All I/O is aborted.\n");

			dev_err(ep->dev,

				"FPGA reported a fatal error. This means that the low-level communication with the device has failed. This hardware problem is most likely unrelated to Xillybus (neither kernel module nor FPGA core), but reports are still welcome. All I/O is aborted.\n");

			break;

		default:

			malformed_message(&buf[i]);

			malformed_message(ep, &buf[i]);

			break;

		}

	}
@@ -477,7 +481,8 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, 


		if ((channelnum > ep->num_channels) ||

		    ((channelnum == 0) && !is_writebuf)) {

			pr_err("xillybus: IDT requests channel out of range. Aborting.\n");

			dev_err(ep->dev,

				"IDT requests channel out of range. Aborting.\n");

			return -ENODEV;

		}
@@ -555,7 +560,8 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, 
				 */

				if ((left_of_wr_salami < bytebufsize) &&

				    (left_of_wr_salami > 0)) {

					pr_err("xillybus: Corrupt buffer allocation in IDT. Aborting.\n");

					dev_err(ep->dev,

						"Corrupt buffer allocation in IDT. Aborting.\n");

					return -ENODEV;

				}
@@ -632,7 +638,8 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, 
				 */

				if ((left_of_rd_salami < bytebufsize) &&

				    (left_of_rd_salami > 0)) {

					pr_err("xillybus: Corrupt buffer allocation in IDT. Aborting.\n");

					dev_err(ep->dev,

						"Corrupt buffer allocation in IDT. Aborting.\n");

					return -ENODEV;

				}
@@ -692,17 +699,19 @@ static int xilly_setupchannels(struct xilly_endpoint *ep, 
	}



	if (!msg_buf_done) {

		pr_err("xillybus: Corrupt IDT: No message buffer. Aborting.\n");

		dev_err(ep->dev,

			"Corrupt IDT: No message buffer. Aborting.\n");

		return -ENODEV;

	}



	return 0;



memfail:

	pr_err("xillybus: Failed to allocate write buffer memory. Aborting.\n");

	dev_err(ep->dev,

		"Failed to allocate write buffer memory. Aborting.\n");

	return -ENOMEM;

dmafail:

	pr_err("xillybus: Failed to map DMA memory!. Aborting.\n");

	dev_err(ep->dev, "Failed to map DMA memory!. Aborting.\n");

	return -ENOMEM;

}
@@ -729,7 +738,8 @@ static void xilly_scan_idt(struct xilly_endpoint *endpoint, 
	scan++;



	if (scan > end_of_idt) {

		pr_err("xillybus: IDT device name list overflow. Aborting.\n");

		dev_err(endpoint->dev,

			"IDT device name list overflow. Aborting.\n");

		idt_handle->chandesc = NULL;

		return;

	} else
@@ -740,7 +750,8 @@ static void xilly_scan_idt(struct xilly_endpoint *endpoint, 
	if (len & 0x03) {

		idt_handle->chandesc = NULL;



		pr_err("xillybus: Corrupt IDT device name list. Aborting.\n");

		dev_err(endpoint->dev,

			"Corrupt IDT device name list. Aborting.\n");

	}



	idt_handle->entries = len >> 2;
@@ -769,7 +780,7 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint) 
					 XILLY_TIMEOUT);



	if (channel->wr_sleepy) {

		pr_err("xillybus: Failed to obtain IDT. Aborting.\n");

		dev_err(endpoint->dev, "Failed to obtain IDT. Aborting.\n");



		if (endpoint->fatal_error)

			return -EIO;
@@ -785,7 +796,8 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint) 
		DMA_FROM_DEVICE);



	if (channel->wr_buffers[0]->end_offset != endpoint->idtlen) {

		pr_err("xillybus: IDT length mismatch (%d != %d). Aborting.\n",

		dev_err(endpoint->dev,

			"IDT length mismatch (%d != %d). Aborting.\n",

		       channel->wr_buffers[0]->end_offset, endpoint->idtlen);

		rc = -ENODEV;

		return rc;
@@ -793,7 +805,7 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint) 


	if (crc32_le(~0, channel->wr_buffers[0]->addr,

		     endpoint->idtlen+1) != 0) {

		pr_err("xillybus: IDT failed CRC check. Aborting.\n");

		dev_err(endpoint->dev, "IDT failed CRC check. Aborting.\n");

		rc = -ENODEV;

		return rc;

	}
@@ -802,7 +814,8 @@ static int xilly_obtain_idt(struct xilly_endpoint *endpoint) 


	/* Check version number. Accept anything below 0x82 for now. */

	if (*version > 0x82) {

		pr_err("xillybus: No support for IDT version 0x%02x. Maybe the xillybus driver needs an upgarde. Aborting.\n",

		dev_err(endpoint->dev,

			"No support for IDT version 0x%02x. Maybe the xillybus driver needs an upgarde. Aborting.\n",

		       (int) *version);

		rc = -ENODEV;

		return rc;
@@ -1291,7 +1304,8 @@ static int xillybus_myflush(struct xilly_channel *channel, long timeout) 
				 channel->rd_wait,

				 (!channel->rd_full),

				 timeout) == 0) {

			pr_warn("xillybus: Timed out while flushing. Output data may be lost.\n");

			dev_warn(channel->endpoint->dev,

				"Timed out while flushing. Output data may be lost.\n");



			rc = -ETIMEDOUT;

			break;
@@ -1331,10 +1345,11 @@ static void xillybus_autoflush(struct work_struct *work) 
	rc = xillybus_myflush(channel, -1);



	if (rc == -EINTR)

		pr_warn("xillybus: Autoflush failed because work queue thread got a signal.\n");

		dev_warn(channel->endpoint->dev,

			 "Autoflush failed because work queue thread got a signal.\n");

	else if (rc)

		pr_err("xillybus: Autoflush failed under weird circumstances.\n");



		dev_err(channel->endpoint->dev,

			"Autoflush failed under weird circumstances.\n");

}



static ssize_t xillybus_write(struct file *filp, const char __user *userbuf,
@@ -1617,13 +1632,15 @@ static int xillybus_open(struct inode *inode, struct file *filp) 
	if ((filp->f_mode & FMODE_READ) && (filp->f_flags & O_NONBLOCK) &&

	    (channel->wr_synchronous || !channel->wr_allow_partial ||

	     !channel->wr_supports_nonempty)) {

		pr_err("xillybus: open() failed: O_NONBLOCK not allowed for read on this device\n");

		dev_err(endpoint->dev,

			"open() failed: O_NONBLOCK not allowed for read on this device\n");

		return -ENODEV;

	}



	if ((filp->f_mode & FMODE_WRITE) && (filp->f_flags & O_NONBLOCK) &&

	    (channel->rd_synchronous || !channel->rd_allow_partial)) {

		pr_err("xillybus: open() failed: O_NONBLOCK not allowed for write on this device\n");

		dev_err(endpoint->dev,

			"open() failed: O_NONBLOCK not allowed for write on this device\n");

		return -ENODEV;

	}
@@ -1738,7 +1755,8 @@ static int xillybus_release(struct inode *inode, struct file *filp) 
		rc = mutex_lock_interruptible(&channel->rd_mutex);



		if (rc) {

			pr_warn("xillybus: Failed to close file. Hardware left in messy state.\n");

			dev_warn(channel->endpoint->dev,

				 "Failed to close file. Hardware left in messy state.\n");

			return rc;

		}
@@ -1763,7 +1781,8 @@ static int xillybus_release(struct inode *inode, struct file *filp) 
	if (filp->f_mode & FMODE_READ) {

		rc = mutex_lock_interruptible(&channel->wr_mutex);

		if (rc) {

			pr_warn("xillybus: Failed to close file. Hardware left in messy state.\n");

			dev_warn(channel->endpoint->dev,

				 "Failed to close file. Hardware left in messy state.\n");

			return rc;

		}
@@ -1824,7 +1843,8 @@ static int xillybus_release(struct inode *inode, struct file *filp) 


				if (channel->wr_sleepy) {

					mutex_unlock(&channel->wr_mutex);

					pr_warn("xillybus: Hardware failed to respond to close command, therefore left in messy state.\n");

					dev_warn(channel->endpoint->dev,

						 "Hardware failed to respond to close command, therefore left in messy state.\n");

					return -EINTR;

				}

			}
@@ -1990,7 +2010,7 @@ static int xillybus_init_chrdev(struct xilly_endpoint *endpoint, 
				 xillyname);



	if (rc) {

		pr_warn("xillybus: Failed to obtain major/minors");

		dev_warn(endpoint->dev, "Failed to obtain major/minors");

		goto error1;

	}
@@ -2002,7 +2022,7 @@ static int xillybus_init_chrdev(struct xilly_endpoint *endpoint, 
	rc = cdev_add(&endpoint->cdev, MKDEV(major, minor),

		      endpoint->num_channels);

	if (rc) {

		pr_warn("xillybus: Failed to add cdev. Aborting.\n");

		dev_warn(endpoint->dev, "Failed to add cdev. Aborting.\n");

		goto error2;

	}
@@ -2025,12 +2045,14 @@ static int xillybus_init_chrdev(struct xilly_endpoint *endpoint, 
				       "%s", devname);



		if (IS_ERR(device)) {

			pr_warn("xillybus: Failed to create %s device. Aborting.\n", devname);

			dev_warn(endpoint->dev,

				 "Failed to create %s device. Aborting.\n",

				 devname);

			goto error3;

		}

	}



	pr_info("xillybus: Created %d device files.\n",

	dev_info(endpoint->dev, "Created %d device files.\n",

		 endpoint->num_channels);

	return 0; /* succeed */
@@ -2060,7 +2082,7 @@ static void xillybus_cleanup_chrdev(struct xilly_endpoint *endpoint) 
				       endpoint->lowest_minor),

				 endpoint->num_channels);



	pr_info("xillybus: Removed %d device files.\n",

	dev_info(endpoint->dev, "Removed %d device files.\n",

		 endpoint->num_channels);

}
@@ -2074,7 +2096,7 @@ struct xilly_endpoint *xillybus_init_endpoint(struct pci_dev *pdev, 


	endpoint = kzalloc(sizeof(*endpoint), GFP_KERNEL);

	if (!endpoint) {

		pr_err("xillybus: Failed to allocate memory. Aborting.\n");

		dev_err(dev, "Failed to allocate memory. Aborting.\n");

		return NULL;

	}
@@ -2108,7 +2130,8 @@ static int xilly_quiesce(struct xilly_endpoint *endpoint) 
					 XILLY_TIMEOUT);



	if (endpoint->idtlen < 0) {

		pr_err("xillybus: Failed to quiesce the device on exit. Quitting while leaving a mess.\n");

		dev_err(endpoint->dev,

			"Failed to quiesce the device on exit. Quitting while leaving a mess.\n");

		return -ENODEV;

	}

	return 0; /* Success */
@@ -2175,7 +2198,7 @@ int xillybus_endpoint_discovery(struct xilly_endpoint *endpoint) 
					 XILLY_TIMEOUT);



	if (endpoint->idtlen < 0) {

		pr_err("xillybus: No response from FPGA. Aborting.\n");

		dev_err(endpoint->dev, "No response from FPGA. Aborting.\n");

		rc = -ENODEV;

		goto failed_quiesce;

	}
@@ -2289,7 +2312,7 @@ static int __init xillybus_init(void) 
	xillybus_class = class_create(THIS_MODULE, xillyname);

	if (IS_ERR(xillybus_class)) {

		rc = PTR_ERR(xillybus_class);

		pr_warn("xillybus: Failed to register class xillybus\n");

		pr_warn("Failed to register class xillybus\n");



		return rc;

	}