From patchwork Sat Dec 17 23:54:40 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: 9479135 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 287DD60830 for ; Sun, 18 Dec 2016 00:03:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 143DD2845D for ; Sun, 18 Dec 2016 00:03:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0682428497; Sun, 18 Dec 2016 00:03:24 +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 9EEF22845D for ; Sun, 18 Dec 2016 00:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753624AbcLRADH (ORCPT ); Sat, 17 Dec 2016 19:03:07 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34620 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752357AbcLRADG (ORCPT ); Sat, 17 Dec 2016 19:03:06 -0500 Received: by mail-wm0-f66.google.com with SMTP id g23so12153215wme.1; Sat, 17 Dec 2016 16:03: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=6CEYKWujy6p68jtSMBM4iB2hD6N2j/3SyhpAo1VEPLg=; b=BzM3z3pdJSb9FPlJF8xUWRBz2OTw77MIKM3oRtxsQOFPd1cspvR+6EPz9ny+BPhfPe qV/ekGMynKYwCEKjJlkc6lN4xauPTcCnNq7ZCaKcmjG5RkDE3jGgN6Ipgc1Vwyg4PpWH pZ++U7DkuDHee4MCDb+5miuvOyO/ZdSjaiVTujjyqgd68vu8q0aXfgQF9C6X/ttz1cP+ Xg6tEqxRHcDpINA/gOhtbQjm0U2iTIGry7Md2GeuSVw4SmNr000n5JIOukMBhNCEonhp M9CznAFJ/gSDQFT4ZO3hQgditFR2coXZZeSBN6eES8vViZEvmEyodWUQrMHFHomITBI+ 5MMw== 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=6CEYKWujy6p68jtSMBM4iB2hD6N2j/3SyhpAo1VEPLg=; b=BtS9J8ySetVo6kxiFyxzxLgia5NmHF3WbDY9b5DL7geMQUg5sFw6yKXnmfL4Jqd19T pjTLQl9wkiKzAfk/XXbhwbGBkDxAHdrQqpQUQDzx5wG7XhyXKSgmFj5Z5cKnxyip0Dvs UXtHE/y5wvExLIcbPC7ltzJZxkIDtWlGHoYYhQOOIYMbNSC7pSxzFOqJ5eyhbVHzI/Ao KaeUnx6m15iH4f2yQXW8vqRxCWC+9oPOQvMqDOItITHnWAtsXW0283EjKAYgGM47uAOM EW9/GqN/ZjgiLIyvnejDj5JfqIGqwk2p2e/VOOT2s1ZPXZJ5DpbqarfybfX2ItEs6X5n Bamw== X-Gm-Message-State: AIkVDXIE+A7jX3ncakVGTwC7n+Qjcg5enzxKbYgIYXqSF19QYoKVbbeOzVwlNj9UCMpbbw== X-Received: by 10.28.113.197 with SMTP id d66mr7983604wmi.77.1482018902823; Sat, 17 Dec 2016 15:55:02 -0800 (PST) Received: from Pali-Latitude.lan (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id di9sm13433992wjc.37.2016.12.17.15.55.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 17 Dec 2016 15:55:01 -0800 (PST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Bin Liu , "Greg Kroah-Hartman" , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Lindgren , joerg Reisenweber , linux-omap@vger.kernel.org, Ivaylo Dimitrov , Sebastian Reichel , Aaro Koskinen , Pavel Machek , Nishanth Menon , Felipe Balbi Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH v2] usb: musb: debugfs: allow forcing host mode together with speed in testmode Date: Sun, 18 Dec 2016 00:54:40 +0100 Message-Id: <1482018880-1740-1-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <20161216040319.GA18350@uda0271908> References: <20161216040319.GA18350@uda0271908> 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 --- drivers/usb/musb/musb_debugfs.c | 44 +++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index 9b22d94..5308cea 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; @@ -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);