From patchwork Thu Jul 16 02:09:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 51134 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D527D20300 for ; Thu, 16 Jul 2015 02:10:55 +0000 (UTC) Received: by lafd3 with SMTP id d3sf14999223laf.1 for ; Wed, 15 Jul 2015 19:10:54 -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=0sKjAmlHo4y+1WWuAvQVulRIC8+2YiZSn0wErYCibmE=; b=KVwWiHqn1hpT8JkB1DbqPOT8VUTPF3SQxDosJh4OA/YNDvG4t/A7Pmo4pNn6sA3b52 BkHeM2ovI1UTj+tzJkVthBnCe1h6QkYVojWx0MvVtA+pkhMiV2N8vTZ3PzHaX73Yt5e7 Ak/oAvtXITnJZVRb2gU+P8GiJpI6IpByjjcq0ES7hgm+1y/K+00EDnKNq0V8cSAuqc8N FN70yzAalz2IiVRklepzm1B6BAK29uhWvYlU8yqYwqSwwP1LeJJ1/CUB5yx68KnHgG07 kgmmoc1b3jBH2weHsxqZI63qFeFQ3Wy9nUjU2owR1VpP1H+ddUp9XrHMPCw36gRwyfB9 ykIA== X-Gm-Message-State: ALoCoQlvSxfsgnLAbjYLDeByIVFApscXLx8Ef1GUFkVbymth5y2iCRxfaEO0ySjK1UFFfT5n0kcE X-Received: by 10.112.255.66 with SMTP id ao2mr3650583lbd.15.1437012654839; Wed, 15 Jul 2015 19:10:54 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.182.228 with SMTP id eh4ls283636lac.45.gmail; Wed, 15 Jul 2015 19:10:54 -0700 (PDT) X-Received: by 10.112.124.164 with SMTP id mj4mr6970864lbb.3.1437012654673; Wed, 15 Jul 2015 19:10:54 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id mr8si5617272lbb.104.2015.07.15.19.10.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2015 19:10:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lahh5 with SMTP id h5so35125145lah.2 for ; Wed, 15 Jul 2015 19:10:54 -0700 (PDT) X-Received: by 10.152.42.177 with SMTP id p17mr7048658lal.29.1437012654566; Wed, 15 Jul 2015 19:10:54 -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 hn6csp3451458lbb; Wed, 15 Jul 2015 19:10:53 -0700 (PDT) X-Received: by 10.50.114.9 with SMTP id jc9mr296054igb.56.1437012651329; Wed, 15 Jul 2015 19:10:51 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id r22si5146165ioi.133.2015.07.15.19.10.50 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 15 Jul 2015 19:10:51 -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 1ZFYdG-0007sF-PA; Thu, 16 Jul 2015 02:10:42 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1ZFYdF-0007s4-L8 for edk2-devel@lists.sourceforge.net; Thu, 16 Jul 2015 02:10:41 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.220.43 as permitted sender) client-ip=209.85.220.43; envelope-from=heyi.guo@linaro.org; helo=mail-pa0-f43.google.com; Received: from mail-pa0-f43.google.com ([209.85.220.43]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1ZFYdE-0002R9-N5 for edk2-devel@lists.sourceforge.net; Thu, 16 Jul 2015 02:10:41 +0000 Received: by pacan13 with SMTP id an13so34043275pac.1 for ; Wed, 15 Jul 2015 19:10:35 -0700 (PDT) X-Received: by 10.68.180.131 with SMTP id do3mr13805149pbc.42.1437012635122; Wed, 15 Jul 2015 19:10:35 -0700 (PDT) Received: from localhost.localdomain ([180.150.157.4]) by smtp.gmail.com with ESMTPSA id ym6sm6023953pac.32.2015.07.15.19.10.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Jul 2015 19:10:34 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.sourceforge.net Date: Thu, 16 Jul 2015 10:09:46 +0800 Message-Id: <1437012588-24390-3-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437012588-24390-1-git-send-email-heyi.guo@linaro.org> References: <1437012588-24390-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: 1ZFYdE-0002R9-N5 Subject: [edk2] [PATCH V3 2/4] 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.46 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 | 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