Commit 472b440f authored by Geoff Levand's avatar Geoff Levand Committed by Michael Ellerman
Browse files

powerpc/ps3: Warn on PS3 device errors 



To aid debugging PS3 boot problems change the log level
of several PS3 device errors from pr_debug to pr_warn.

Signed-off-by: default avatarGeoff Levand <geoff@infradead.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/eb5c1c10da0bbdeb27c8b069187b4f58e429e837.1622746428.git.geoff@infradead.org
parent 6caebff1

arch/powerpc/platforms/ps3/system-bus.c

+5 −4
Original line number Diff line number Diff line
@@ -64,8 +64,9 @@ static int ps3_open_hv_device_sb(struct ps3_system_bus_device *dev) 
	result = lv1_open_device(dev->bus_id, dev->dev_id, 0);



	if (result) {

		pr_debug("%s:%d: lv1_open_device failed: %s\n", __func__,

			__LINE__, ps3_result(result));

		pr_warn("%s:%d: lv1_open_device dev=%u.%u(%s) failed: %s\n",

			__func__, __LINE__, dev->match_id, dev->match_sub_id,

			dev_name(&dev->core), ps3_result(result));

		result = -EPERM;

	}
@@ -120,7 +121,7 @@ static int ps3_open_hv_device_gpu(struct ps3_system_bus_device *dev) 
	result = lv1_gpu_open(0);



	if (result) {

		pr_debug("%s:%d: lv1_gpu_open failed: %s\n", __func__,

		pr_warn("%s:%d: lv1_gpu_open failed: %s\n", __func__,

			__LINE__, ps3_result(result));

			result = -EPERM;

	}

drivers/ps3/ps3-vuart.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev, 
		ps3_mm_phys_to_lpar(__pa(buf)), bytes, bytes_written);



	if (result) {

		dev_dbg(&dev->core, "%s:%d: lv1_write_virtual_uart failed: "

		dev_warn(&dev->core, "%s:%d: lv1_write_virtual_uart failed: "

			"%s\n", __func__, __LINE__, ps3_result(result));

		return result;

	}

drivers/ps3/ps3av.c

+11 −11
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf, 
	/* send pkt */

	res = ps3av_vuart_write(ps3av->dev, send_buf, write_len);

	if (res < 0) {

		dev_dbg(&ps3av->dev->core,

			"%s: ps3av_vuart_write() failed (result=%d)\n",

			__func__, res);

		dev_warn(&ps3av->dev->core,

			"%s:%d: ps3av_vuart_write() failed: %s\n", __func__,

			__LINE__, ps3_result(res));

		return res;

	}
@@ -230,9 +230,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf, 
		res = ps3av_vuart_read(ps3av->dev, recv_buf, PS3AV_HDR_SIZE,

				       timeout);

		if (res != PS3AV_HDR_SIZE) {

			dev_dbg(&ps3av->dev->core,

				"%s: ps3av_vuart_read() failed (result=%d)\n",

				__func__, res);

			dev_warn(&ps3av->dev->core,

				"%s:%d: ps3av_vuart_read() failed: %s\n", __func__,

				__LINE__, ps3_result(res));

			return res;

		}
@@ -240,9 +240,9 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf, 
		res = ps3av_vuart_read(ps3av->dev, &recv_buf->cid,

				       recv_buf->size, timeout);

		if (res < 0) {

			dev_dbg(&ps3av->dev->core,

				"%s: ps3av_vuart_read() failed (result=%d)\n",

				__func__, res);

			dev_warn(&ps3av->dev->core,

				"%s:%d: ps3av_vuart_read() failed: %s\n", __func__,

				__LINE__, ps3_result(res));

			return res;

		}

		res += PS3AV_HDR_SIZE;	/* total len */
@@ -251,8 +251,8 @@ static int ps3av_send_cmd_pkt(const struct ps3av_send_hdr *send_buf, 
	} while (event);



	if ((cmd | PS3AV_REPLY_BIT) != recv_buf->cid) {

		dev_dbg(&ps3av->dev->core, "%s: reply err (result=%x)\n",

			__func__, recv_buf->cid);

		dev_warn(&ps3av->dev->core, "%s:%d: reply err: %x\n", __func__,

			__LINE__, recv_buf->cid);

		return -EINVAL;

	}