From patchwork Sat Sep 17 02:51:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 12978982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7564FECAAA1 for ; Sat, 17 Sep 2022 02:55:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.408255.651042 (Exim 4.92) (envelope-from ) id 1oZNz2-0000sO-Ga; Sat, 17 Sep 2022 02:55:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 408255.651042; Sat, 17 Sep 2022 02:55:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oZNz2-0000sG-DM; Sat, 17 Sep 2022 02:55:08 +0000 Received: by outflank-mailman (input) for mailman id 408255; Sat, 17 Sep 2022 02:55:07 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oZNw2-0002wS-3w for xen-devel@lists.xenproject.org; Sat, 17 Sep 2022 02:52:02 +0000 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b2f6f342-3633-11ed-9761-273f2230c3a0; Sat, 17 Sep 2022 04:51:59 +0200 (CEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0D4AB5C00A9; Fri, 16 Sep 2022 22:51:59 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 16 Sep 2022 22:51:59 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Sep 2022 22:51:57 -0400 (EDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b2f6f342-3633-11ed-9761-273f2230c3a0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1663383119; x=1663469519; bh=IOSjuCul4w NhkTi/wMpmUnl0G6R+XqWCZmHQlR92CgM=; b=qiyCpUjq+YPAbKEg+TibaXgOFr KJk2VQViikzQS2hZcUWFZjbb0BdDjTHcWXrcXiokaEJU02Rs5RFq8scf4E0XMNFw g+Mnqj8jz8MHM3PS8kEJw3+YqL+5ya4HHnQpel+tO2AN8Z7Z0BUDCOzOEKw4qqyV Egva0vf2N4UAGXOzg/zt/tVYHm5szmxsD4BX5rY95MwrEuccZMx2AP+XQD8i+z1o jlJymD7FBp8IkyVwKivpyKi/DzhqVfjxIhwwAZxOx6v8CMx8Sx+V+lIq0ifbyse9 LgoEIrmvpr0YWgQh/UVIVUuPHe+bdieKQ1kAjdErkz18WlZTwDFtpTFUYzNQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1663383119; x= 1663469519; bh=IOSjuCul4wNhkTi/wMpmUnl0G6R+XqWCZmHQlR92CgM=; b=h b9tVyw/6wwWYFb8YC5xfiNup5lirrUJRu8AJJqCF/z9Prl0B4bWiw6iOaHyN/rVC XT+VT5d4d6R0BvhVtK8mgk9DtYjAOX/yRjzYJ26zx0ZqIotNGdvAfZGB5s7XGR1R mFbS8zL2TB21GgcuYkOdEQdPnKORlzDdHe6hHjuoNQp7Jn35d5xdIMcpPApb2b6g YsgX9H1XFzG3ztUTrPf1IJiti3PEt/ac4bv6dChHbXoa94kWvNsVCzaS+qPueMZV ftmGW+Wcbo71r0+VG2WCTHegVLW6R+7/xmOem5Z8/3gARPBsTTicZzr5rXjkosJU G5o06IIMozrQTfA5tV8jA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedvuddgieegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Jan Beulich , Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH v7 11/11] drivers/char: add console=ehci as an alias for console=dbgp Date: Sat, 17 Sep 2022 04:51:30 +0200 Message-Id: <6832b5dd97a1cd09ea8060e64fe1e8c8310e4974.1663383053.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Make it consistent with console=xhci. Suggested-by: Jan Beulich Signed-off-by: Marek Marczykowski-Górecki Acked-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 4 ++-- xen/drivers/char/serial.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 1c755563c40d..74b519f0c5bd 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -409,7 +409,7 @@ The following are examples of correct specifications: Specify the size of the console ring buffer. ### console -> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | xhci | none ]` +> `= List of [ vga | com1[H,L] | com2[H,L] | pv | dbgp | ehci | xhci | none ]` > Default: `console=com1,vga` @@ -428,7 +428,7 @@ cleared. This allows a single port to be shared by two subsystems `pv` indicates that Xen should use Xen's PV console. This option is only available when used together with `pv-in-pvh`. -`dbgp` indicates that Xen should use a USB2 debug port. +`dbgp` or `ehci` indicates that Xen should use a USB2 debug port. `xhci` indicates that Xen should use a USB3 debug port. diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 9d9445039232..00efe69574f3 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -311,6 +311,12 @@ int __init serial_parse_handle(const char *conf) goto common; } + if ( !strncmp(conf, "ehci", 4) && (!conf[4] || conf[4] == ',') ) + { + handle = SERHND_DBGP; + goto common; + } + if ( !strncmp(conf, "xhci", 4) && (!conf[4] || conf[4] == ',') ) { handle = SERHND_XHCI;