From patchwork Thu Jul 16 08:22:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 51141 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9345E22A8A for ; Thu, 16 Jul 2015 08:24:11 +0000 (UTC) Received: by lbvb1 with SMTP id b1sf16415012lbv.3 for ; Thu, 16 Jul 2015 01:24:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=5QYPHDdWHZCk4+GqnDl3r++j/RwT1Lb9FVQzNmv6Nrs=; b=dtE75+G/xtN1TfC6sVe3sl0nh5ETdbRMNhQyiQCN2E4uQfhcOHIvrRQxMNTSAQ0fKk tGeRUkOhhd2udC1nu1agB2ecv5OGOe6OUtfqrTrb5psr6MK7dYJXK6CbRu0eI/X1QYsR 7GvvxA/eXZvPAQfUiXfXvbTJtAFc97uBo0PMP8ze4B/M7m/5TMjzdzT1UbcWrXDvoMXJ 0aujxrVqexyy0HfjvfFomIBR8hqgKAJ+VtscR+5Nxiyw1grttul6ARpBiIee4GnExj6h Kfk1d9nV3OLFVBgcRlcg4MrMO0SrGD5utccEQUfqdAzETH6ltAoXp+A6Mwi3aoKDVCyk +z8Q== X-Gm-Message-State: ALoCoQms4Q2+xEFXG0so5Vn/RBfOJVoxTBfQmfkcBEvDhZ19ZIogLn1Hj0q5P9UJNo7q2rF42cyD X-Received: by 10.194.175.36 with SMTP id bx4mr4292290wjc.1.1437035050037; Thu, 16 Jul 2015 01:24:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.194 with SMTP id v2ls373147lag.59.gmail; Thu, 16 Jul 2015 01:24:09 -0700 (PDT) X-Received: by 10.152.21.227 with SMTP id y3mr1913582lae.24.1437035049849; Thu, 16 Jul 2015 01:24:09 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id k9si6287851lah.119.2015.07.16.01.24.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 01:24:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbyj8 with SMTP id yj8so39273115lbb.0 for ; Thu, 16 Jul 2015 01:24:09 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr8375275lal.35.1437035049699; Thu, 16 Jul 2015 01:24:09 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp93878lbb; Thu, 16 Jul 2015 01:24:08 -0700 (PDT) X-Received: by 10.107.153.206 with SMTP id b197mr9700549ioe.71.1437035047937; Thu, 16 Jul 2015 01:24:07 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id f16si1079864igo.41.2015.07.16.01.24.07 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 16 Jul 2015 01:24:07 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZFeSV-000779-F3; Thu, 16 Jul 2015 08:23:59 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZFeSU-000772-Bc for edk2-devel@lists.sourceforge.net; Thu, 16 Jul 2015 08:23:58 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.170 as permitted sender) client-ip=209.85.192.170; envelope-from=heyi.guo@linaro.org; helo=mail-pd0-f170.google.com; Received: from mail-pd0-f170.google.com ([209.85.192.170]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZFeSS-0002y8-Hb for edk2-devel@lists.sourceforge.net; Thu, 16 Jul 2015 08:23:58 +0000 Received: by pdrg1 with SMTP id g1so40337859pdr.2 for ; Thu, 16 Jul 2015 01:23:51 -0700 (PDT) X-Received: by 10.68.136.201 with SMTP id qc9mr16485721pbb.66.1437035030922; Thu, 16 Jul 2015 01:23:50 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by smtp.gmail.com with ESMTPSA id pc5sm7063946pbc.15.2015.07.16.01.23.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jul 2015 01:23:50 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.sourceforge.net Date: Thu, 16 Jul 2015 16:22:00 +0800 Message-Id: <1437034922-18361-4-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437034922-18361-1-git-send-email-heyi.guo@linaro.org> References: <1437034922-18361-1-git-send-email-heyi.guo@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1ZFeSS-0002y8-Hb Subject: [edk2] [PATCH V4 3/5] ArmVirtPkg: Make terminal type consistent X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: heyi.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Change default terminal type to be consistent with default ConIn/ConOut device path, which is now determined by TTY_TERMINAL flag, TTYTERM or VT100. I can't say this is a bug, as we can pass the whole console device path to ConnectController, and TerminalDxe driver will pick up the terminal in the remaining device path. However, in rare circumstances, the console devices may be disconnected with the driver, and they will be ignored by ConPlatformDxe until we pass the device path explicitly just as BDS. Changing default terminal type to be the same with console device path could help serial terminal be reconnected with normal connect controller operation. Cc: Laszlo Ersek Cc: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Heyi Guo Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirtQemu.dsc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 0d4f4b0..be2b984 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -140,9 +140,17 @@ !if $(TTY_TERMINAL) == TRUE gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)" gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)" + ## Terminal Type - TTYTERM, consistent with ConOut/ConIn Device Path. + ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 !else gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()" gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()" + ## Terminal Type - VT100, consistent with ConOut/ConIn Device Path. + ## When Intel BDS is enabled, the above ConOut/ConIn device path is useless, + ## but we still use VT100 terminal type when TTY_TERMINAL is not TRUE. + ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1 !endif gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3