Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1544618

[PATCH v3] usb: musb: debugfs: allow forcing host mode together with speed in testmode

From Pali Rohár <pali.rohar@gmail.com>
Newsgroups linux.kernel
Subject [PATCH v3] usb: musb: debugfs: allow forcing host mode together with speed in testmode
Date 2016-12-19 16:30 +0100
Message-ID <sQ830-1eW-29@gated-at.bofh.it> (permalink)
References <sPxd8-8pt-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Based on the musb ug, force_host bit is allowed to be set along with
force_hs or force_fs bit.

It could help to implement forced host mode via testmode on Nokia N900.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
Changes in v2:
* Use == instead of & for comparison of testmode
Changes in v3:
* Increase buf[] to 24 bytes
---
 drivers/usb/musb/musb_debugfs.c |   46 ++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 9b22d94..4d6c505 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -147,28 +147,34 @@ static int musb_test_mode_show(struct seq_file *s, void *unused)
 
 	test = musb_readb(musb->mregs, MUSB_TESTMODE);
 
-	if (test & MUSB_TEST_FORCE_HOST)
+	if (test == (MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS))
+		seq_printf(s, "force host full-speed\n");
+
+	else if (test == (MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS))
+		seq_printf(s, "force host high-speed\n");
+
+	else if (test == MUSB_TEST_FORCE_HOST)
 		seq_printf(s, "force host\n");
 
-	if (test & MUSB_TEST_FIFO_ACCESS)
+	else if (test == MUSB_TEST_FIFO_ACCESS)
 		seq_printf(s, "fifo access\n");
 
-	if (test & MUSB_TEST_FORCE_FS)
+	else if (test == MUSB_TEST_FORCE_FS)
 		seq_printf(s, "force full-speed\n");
 
-	if (test & MUSB_TEST_FORCE_HS)
+	else if (test == MUSB_TEST_FORCE_HS)
 		seq_printf(s, "force high-speed\n");
 
-	if (test & MUSB_TEST_PACKET)
+	else if (test == MUSB_TEST_PACKET)
 		seq_printf(s, "test packet\n");
 
-	if (test & MUSB_TEST_K)
+	else if (test == MUSB_TEST_K)
 		seq_printf(s, "test K\n");
 
-	if (test & MUSB_TEST_J)
+	else if (test == MUSB_TEST_J)
 		seq_printf(s, "test J\n");
 
-	if (test & MUSB_TEST_SE0_NAK)
+	else if (test == MUSB_TEST_SE0_NAK)
 		seq_printf(s, "test SE0 NAK\n");
 
 	return 0;
@@ -192,7 +198,7 @@ static ssize_t musb_test_mode_write(struct file *file,
 	struct seq_file		*s = file->private_data;
 	struct musb		*musb = s->private;
 	u8			test;
-	char			buf[18];
+	char			buf[24];
 
 	test = musb_readb(musb->mregs, MUSB_TESTMODE);
 	if (test) {
@@ -206,30 +212,36 @@ static ssize_t musb_test_mode_write(struct file *file,
 	if (copy_from_user(buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
 		return -EFAULT;
 
-	if (strstarts(buf, "force host"))
+	if (strstarts(buf, "force host full-speed"))
+		test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_FS;
+
+	else if (strstarts(buf, "force host high-speed"))
+		test = MUSB_TEST_FORCE_HOST | MUSB_TEST_FORCE_HS;
+
+	else if (strstarts(buf, "force host"))
 		test = MUSB_TEST_FORCE_HOST;
 
-	if (strstarts(buf, "fifo access"))
+	else if (strstarts(buf, "fifo access"))
 		test = MUSB_TEST_FIFO_ACCESS;
 
-	if (strstarts(buf, "force full-speed"))
+	else if (strstarts(buf, "force full-speed"))
 		test = MUSB_TEST_FORCE_FS;
 
-	if (strstarts(buf, "force high-speed"))
+	else if (strstarts(buf, "force high-speed"))
 		test = MUSB_TEST_FORCE_HS;
 
-	if (strstarts(buf, "test packet")) {
+	else if (strstarts(buf, "test packet")) {
 		test = MUSB_TEST_PACKET;
 		musb_load_testpacket(musb);
 	}
 
-	if (strstarts(buf, "test K"))
+	else if (strstarts(buf, "test K"))
 		test = MUSB_TEST_K;
 
-	if (strstarts(buf, "test J"))
+	else if (strstarts(buf, "test J"))
 		test = MUSB_TEST_J;
 
-	if (strstarts(buf, "test SE0 NAK"))
+	else if (strstarts(buf, "test SE0 NAK"))
 		test = MUSB_TEST_SE0_NAK;
 
 	musb_writeb(musb->mregs, MUSB_TESTMODE, test);
-- 
1.7.9.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] usb: musb: debugfs: allow forcing host mode together with speed in testmode Pali Rohár <pali.rohar@gmail.com> - 2016-12-14 16:00 +0100
  Re: [PATCH] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Tony Lindgren <tony@atomide.com> - 2016-12-14 16:40 +0100
    Re: [PATCH] usb: musb: debugfs: allow forcing host mode together with speed in testmode Pali Rohár <pali.rohar@gmail.com> - 2016-12-14 16:50 +0100
      Re: [PATCH] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Tony Lindgren <tony@atomide.com> - 2016-12-14 17:00 +0100
  Re: [PATCH] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-12-14 18:00 +0100
  [PATCH] usb: musb: debugfs: allow forcing host mode together with speed in testmode Pali Rohár <pali.rohar@gmail.com> - 2016-12-14 20:30 +0100
    Re: [PATCH] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Bin Liu <b-liu@ti.com> - 2016-12-16 05:10 +0100
      [PATCH v2] usb: musb: debugfs: allow forcing host mode together with speed in testmode Pali Rohár <pali.rohar@gmail.com> - 2016-12-18 01:10 +0100
        Re: [PATCH v2] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Bin Liu <b-liu@ti.com> - 2016-12-19 16:20 +0100
        [PATCH v3] usb: musb: debugfs: allow forcing host mode together with speed in testmode Pali Rohár <pali.rohar@gmail.com> - 2016-12-19 16:30 +0100
          Re: [PATCH v3] usb: musb: debugfs: allow forcing host mode together  with speed in testmode Bin Liu <b-liu@ti.com> - 2016-12-19 21:50 +0100

csiph-web