From: Lu Baolu <baolu.lu@linux.intel.com>
To: Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v4 10/12] usb: xhci: dbc: add handshake between debug target and host
Date: Tue, 17 Nov 2015 14:38:56 +0800 [thread overview]
Message-ID: <1447742338-8381-11-git-send-email-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <1447742338-8381-1-git-send-email-baolu.lu@linux.intel.com>
After DbC setup, debug target needs to wait until tty driver and
application (e.g. mincom) on debug taget start. Otherwise, out
messages might be ignored.
This patch adds a ping/pong mechanism between debug target and
host. Debug target will be waiting there until user presses 'Y'
or 'y' in the tty application.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/usb/early/xhci-dbc.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index 68a7139..b75c523 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -32,6 +32,9 @@
static struct xdbc_state xdbc_stat;
static struct xdbc_state *xdbcp = &xdbc_stat;
+static int early_xdbc_read(struct console *con, char *str, unsigned n);
+static void early_xdbc_write(struct console *con, const char *str, u32 n);
+
#ifdef DBC_DEBUG
#define XDBC_DEBUG_BUF_SIZE (PAGE_SIZE * 32)
#define MSG_MAX_LINE 128
@@ -873,8 +876,12 @@ int __init early_xdbc_init(char *s)
{
u32 bus = 0, dev = 0, func = 0;
unsigned long dbgp_num = 0;
+ char *ping = "Press Y to continue...\n";
+ char pong[64];
+ size_t size;
u32 offset;
int ret;
+ int retry = 20;
if (!early_pci_allowed())
return -EPERM;
@@ -917,6 +924,21 @@ int __init early_xdbc_init(char *s)
return ret;
}
+ while (retry > 0) {
+ early_xdbc_write(NULL, ping, strlen(ping));
+ size = early_xdbc_read(NULL, pong, 64);
+ if (size > 0) {
+ xdbc_trace("%s: pong message: %s\n", __func__, pong);
+ if (pong[0] == 'Y' || pong[0] == 'y')
+ break;
+ } else {
+ xdbc_trace("%s: pong message error %d\n",
+ __func__, size);
+ }
+
+ retry--;
+ }
+
return 0;
}
@@ -1338,6 +1360,11 @@ int xdbc_bulk_write(const char *bytes, int size)
* Start a bulk-in or bulk-out transfer, wait until transfer completion
* or error. Return the count of actually transferred bytes or error.
*/
+static int early_xdbc_read(struct console *con, char *str, unsigned n)
+{
+ return xdbc_bulk_read(str, n, 0);
+}
+
static void early_xdbc_write(struct console *con, const char *str, u32 n)
{
int chunk, ret;
--
2.1.4
next prev parent reply other threads:[~2015-11-17 6:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-17 6:38 [PATCH v4 00/12] usb: early: add support for early printk through USB3 debug port Lu Baolu
2015-11-17 6:38 ` [PATCH v4 01/12] usb: xhci: add sysfs file for xHCI " Lu Baolu
2015-11-20 14:33 ` Mathias Nyman
2015-11-22 3:02 ` Lu Baolu
2015-11-17 6:38 ` [PATCH v4 02/12] x86: fixmap: add permanent fixmap for xhci " Lu Baolu
2015-11-17 6:38 ` [PATCH v4 03/12] usb: xhci: dbc: probe and setup xhci debug capability Lu Baolu
2015-11-17 6:38 ` [PATCH v4 04/12] usb: xhci: dbc: add support for Intel xHCI dbc quirk Lu Baolu
2015-11-17 6:38 ` [PATCH v4 05/12] usb: xhci: dbc: add debug buffer Lu Baolu
2015-11-17 6:38 ` [PATCH v4 06/12] usb: xhci: dbc: add bulk out and bulk in interfaces Lu Baolu
2015-11-17 6:38 ` [PATCH v4 07/12] usb: xhci: dbc: handle dbc-configured exit Lu Baolu
2015-11-17 6:38 ` [PATCH v4 08/12] usb: xhci: dbc: handle endpoint stall Lu Baolu
2015-11-17 6:38 ` [PATCH v4 09/12] x86: early_printk: add USB3 debug port earlyprintk support Lu Baolu
2015-11-17 6:38 ` Lu Baolu [this message]
2015-11-17 6:38 ` [PATCH v4 11/12] usb: serial: usb_debug: add support for dbc debug device Lu Baolu
2015-11-17 6:38 ` [PATCH v4 12/12] usb: doc: add document for xHCI DbC driver Lu Baolu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447742338-8381-11-git-send-email-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox