From patchwork Mon Jul 13 03:24:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 51056 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6345122916 for ; Mon, 13 Jul 2015 03:25:27 +0000 (UTC) Received: by laef2 with SMTP id f2sf3379417lae.0 for ; Sun, 12 Jul 2015 20:25:26 -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=rA4CEI5sCi3M+Lb9d6DPnG1e0MkeChDonhVSBx+8mf4=; b=dymw5phHfCUA/5j8ZZq73fFr2XFt07p5Eb9ctOZLPnN2wTXtdgMebu8qmzJx0ls+Uk uN4ooivW9Dh+qFEYIXD1fo03JZF5aOxcCaN8TIXGK5hZEbj9SSID4deDbtvmrkJGK1kV 0IxbH9tyPvX3KJaxJvJHHP1fkEklhjb6vDmK/odnnv//7wtPu/VyjVR0w5BnLgtcbdpk riZ+Xf2MzoRSpUwA88Xwgxx+ki9VNJ5n95ByrbcZ2biGzKtOD0ygiBaq3/RAfP6OT7x8 RqqmdRzKdxERNfT3MLH6WRY/66VsxteKEQ8qH6EClobYwV4fQ6E6LSTuOdTNbe2Ipt3l QN/w== X-Gm-Message-State: ALoCoQn7F3b1m7rqXXqu9t6s3yzs1QkivevFJTrvTPWQHVGlcf3SDgV3AKQL0qpdL34U/9B++ec9 X-Received: by 10.112.181.37 with SMTP id dt5mr17257038lbc.10.1436757926073; Sun, 12 Jul 2015 20:25:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.9.7 with SMTP id v7ls1383283laa.75.gmail; Sun, 12 Jul 2015 20:25:25 -0700 (PDT) X-Received: by 10.152.87.13 with SMTP id t13mr30602206laz.66.1436757925784; Sun, 12 Jul 2015 20:25:25 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id az11si13788218lab.27.2015.07.12.20.25.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Jul 2015 20:25:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagx9 with SMTP id x9so292779969lag.1 for ; Sun, 12 Jul 2015 20:25:25 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr29582143lbc.41.1436757925688; Sun, 12 Jul 2015 20:25:25 -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 hn6csp1458807lbb; Sun, 12 Jul 2015 20:25:24 -0700 (PDT) X-Received: by 10.107.39.209 with SMTP id n200mr42845860ion.59.1436757924152; Sun, 12 Jul 2015 20:25:24 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id a9si584085ioe.15.2015.07.12.20.25.23 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 12 Jul 2015 20:25:24 -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-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZEUMh-0005Vu-IW; Mon, 13 Jul 2015 03:25:11 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZEUMg-0005Vp-Df for edk2-devel@lists.sourceforge.net; Mon, 13 Jul 2015 03:25:10 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.174 as permitted sender) client-ip=209.85.192.174; envelope-from=heyi.guo@linaro.org; helo=mail-pd0-f174.google.com; Received: from mail-pd0-f174.google.com ([209.85.192.174]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZEUMe-0005mm-Lk for edk2-devel@lists.sourceforge.net; Mon, 13 Jul 2015 03:25:10 +0000 Received: by pdbqm3 with SMTP id qm3so72235873pdb.0 for ; Sun, 12 Jul 2015 20:25:03 -0700 (PDT) X-Received: by 10.70.131.73 with SMTP id ok9mr64874550pdb.109.1436757903031; Sun, 12 Jul 2015 20:25:03 -0700 (PDT) Received: from localhost.localdomain ([180.150.148.224]) by smtp.gmail.com with ESMTPSA id d7sm16586315pbu.41.2015.07.12.20.24.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jul 2015 20:25:02 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.sourceforge.net Date: Mon, 13 Jul 2015 11:24:34 +0800 Message-Id: <1436757876-29691-2-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436757876-29691-1-git-send-email-heyi.guo@linaro.org> References: <1436757876-29691-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 -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1ZEUMe-0005mm-Lk Subject: [edk2] [PATCH V2 1/3] 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.215.44 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. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Heyi Guo --- ArmVirtPkg/ArmVirtQemu.dsc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index fbc2b12..e62624f 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -141,9 +141,15 @@ !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 - TTY, consistent with ConOut/ConIn Device Path. + 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. + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1 !endif gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3