From patchwork Mon Dec 19 15:23:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 9480485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9CEB660237 for ; Mon, 19 Dec 2016 15:25:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82ACE283E7 for ; Mon, 19 Dec 2016 15:25:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75FFA284C5; Mon, 19 Dec 2016 15:25:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80DBF283E7 for ; Mon, 19 Dec 2016 15:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932227AbcLSPYJ (ORCPT ); Mon, 19 Dec 2016 10:24:09 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33295 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbcLSPYG (ORCPT ); Mon, 19 Dec 2016 10:24:06 -0500 Received: by mail-wm0-f66.google.com with SMTP id u144so19208764wmu.0; Mon, 19 Dec 2016 07:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YtzwbpUUSsUKfKTamKHiHP69U+V2tEcgUTrkF6M8Row=; b=urJ0jfra4+l1qqstnoEAQA7O/PMgF/L+UQUGf6yiZH58CRMwXDPdgz7mJLbt9jodxx om/Nmnr19zTa+KF2vpa6XXBwywM8DcL4A21YJzubry0Qgh+aIXoojCtYF2RH6ptwWiTt uRvRTilFWU/MQZ8oFVFUZjadqUKBOY9qIu1xIun5Z6czDRnvWNpQ7AZimEd2uV3jaeIP /KAu74+eUKfz0f5e9qGjWrmkdKy6KQWRuv7cQj+OCwI9LCSGHiSvJVw4dHTEkPSammEI IO65ZaU3tR6i8cC9A9cnzV4g33BSs3d7FqFDb8XRvQdLmnUgHdCAdeb+kjT+va7d9I/V 934Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YtzwbpUUSsUKfKTamKHiHP69U+V2tEcgUTrkF6M8Row=; b=MtJpcfXDDA6QlOZuj6REFDfKx6fOzhaUfGfUn+qbYJcIqvDvaVlsIUglWPCZzM2KNy nKOgWHCsKXTDyqo0qm+i40x2HMQSzWdko8IL/gqxdn2c+G58LiWkekwtTz3rgV/iEQlb refiyLpwPIp6JGHvK42IlQFijF7207tR2cuf47QG/RAvrxmwnC1/lJXaf119aVsm1GEK i4bYzFRJHRJJaCIMS8rRzBvz7k/TvWY1wEAKdJ+Wj88sjrK7NIjkkRdKLnOu84bduY7b PsyPqC/FsMslGK1ZFRKmJQARL7+e76UaSQrzzoCgD4f6asLt+FGu6L5/YqUV/OP6Snjw 02ig== X-Gm-Message-State: AIkVDXLTPjV8HNou6Hx/LjyfBnqzy3lN60yPUnTts22fsuXs+DsxSVdOKxY0xjCq8s/fPw== X-Received: by 10.28.25.134 with SMTP id 128mr13214500wmz.37.1482161044788; Mon, 19 Dec 2016 07:24:04 -0800 (PST) Received: from Pali-Latitude.lan (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id c133sm17723413wme.12.2016.12.19.07.24.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 07:24:04 -0800 (PST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Bin Liu , "Greg Kroah-Hartman" , Tony Lindgren , joerg Reisenweber , Ivaylo Dimitrov , Sebastian Reichel , Aaro Koskinen , Pavel Machek , Nishanth Menon , Felipe Balbi Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH v3] usb: musb: debugfs: allow forcing host mode together with speed in testmode Date: Mon, 19 Dec 2016 16:23:47 +0100 Message-Id: <1482161027-19346-1-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1482018880-1740-1-git-send-email-pali.rohar@gmail.com> References: <1482018880-1740-1-git-send-email-pali.rohar@gmail.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);