Commit c6e8d85f authored by Gabriel Shahrouzi's avatar Gabriel Shahrouzi Committed by Greg Kroah-Hartman
Browse files

staging: axis-fifo: Remove hardware resets for user errors 



The axis-fifo driver performs a full hardware reset (via
reset_ip_core()) in several error paths within the read and write
functions. This reset flushes both TX and RX FIFOs and resets the
AXI-Stream links.

Allow the user to handle the error without causing hardware disruption
or data loss in other FIFO paths.

Fixes: 4a965c5f ("staging: add driver for Xilinx AXI-Stream FIFO v4.1 IP core")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGabriel Shahrouzi <gshahrouzi@gmail.com>
Link: https://lore.kernel.org/r/20250419004306.669605-1-gshahrouzi@gmail.com


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

drivers/staging/axis-fifo/axis-fifo.c

+3 −8
Original line number Diff line number Diff line
@@ -393,16 +393,14 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf, 


	bytes_available = ioread32(fifo->base_addr + XLLF_RLR_OFFSET);

	if (!bytes_available) {

		dev_err(fifo->dt_device, "received a packet of length 0 - fifo core will be reset\n");

		reset_ip_core(fifo);

		dev_err(fifo->dt_device, "received a packet of length 0\n");

		ret = -EIO;

		goto end_unlock;

	}



	if (bytes_available > len) {

		dev_err(fifo->dt_device, "user read buffer too small (available bytes=%zu user buffer bytes=%zu) - fifo core will be reset\n",

		dev_err(fifo->dt_device, "user read buffer too small (available bytes=%zu user buffer bytes=%zu)\n",

			bytes_available, len);

		reset_ip_core(fifo);

		ret = -EINVAL;

		goto end_unlock;

	}
@@ -411,8 +409,7 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf, 
		/* this probably can't happen unless IP

		 * registers were previously mishandled

		 */

		dev_err(fifo->dt_device, "received a packet that isn't word-aligned - fifo core will be reset\n");

		reset_ip_core(fifo);

		dev_err(fifo->dt_device, "received a packet that isn't word-aligned\n");

		ret = -EIO;

		goto end_unlock;

	}
@@ -433,7 +430,6 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf, 


		if (copy_to_user(buf + copied * sizeof(u32), tmp_buf,

				 copy * sizeof(u32))) {

			reset_ip_core(fifo);

			ret = -EFAULT;

			goto end_unlock;

		}
@@ -542,7 +538,6 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf, 


		if (copy_from_user(tmp_buf, buf + copied * sizeof(u32),

				   copy * sizeof(u32))) {

			reset_ip_core(fifo);

			ret = -EFAULT;

			goto end_unlock;

		}