From patchwork Fri Jul 13 08:15:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141853 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511361ljj; Fri, 13 Jul 2018 01:15:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcvzUqT+hawbw3Cpnsg3RR3A+RvCuNiLhjeHIt/bed1acQWjQqegitdoqE0nrCoa/8gpII1 X-Received: by 2002:a65:6110:: with SMTP id z16-v6mr5228892pgu.412.1531469753137; Fri, 13 Jul 2018 01:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469753; cv=none; d=google.com; s=arc-20160816; b=OAdBWTuU5u72JjGuAmCBGrvJ6ZqGfH0DN+EzEbTX1RFw9JOTRfkdyKc+cdTNV1BeI0 zsSmdg/YejUATaJQtwMgKGC3/Too2Mj5N09zyhi0W0ARpNJ7Axwah4cYUF01WtvxtK2w Qnq+9K49FKMH/MrDBOXQZvtSxDNuQPj3p+OhYSPwOIJ8gaFKxf/RPN2lYgp1wdBz9zCy OsjYuDNDg6XrhvGT9CCXU8cemmeJ0Kf0hUh20gdzb6p1a5A0xden/pl5LwCm/doBSbeN 6aaq2VpAf8tKaebYI9zmPSSllyPfXWt8ntDt17rsHQ21tMo4Ex2W41B4SIMBuvaw8P3R QaSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=4V/UXgKjTmeGjSxFGR54TUQYKHadcS1MLCioGGCTqKE=; b=u8VMH2tHj4AdTYTOAJhEv72Jd9dfoJ7cuPuBWqdw5XR5swJrk9fN2SFBBg+6FxZFFk NH0cu2SpUfItAJ7Hp7U4TL9eoepKvi+GqNvcUNptpUpDWSeovLMqT+F3cUaIK4K5fFDW cOEr0Rgdm2kWNqt4lBABPR8+uJnH2gD71lOynTyo3RuV/fKLiM2GSaHqqWWWjBwWDLUt MrtSAQ+LHEcYZhpPtpgbO1L8PdNnhKrVZ6zyMSIBrJLehFURrd+oJILOxF0FVIriegHf c1sT6LlGEM2Y4vAxwLar0Tb+nXtLC/Se6V7IlEPHGqREegI5D26uYA8KKIH0C8N0pMmi miXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Q9BotF7D; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 3-v6si23060275plc.415.2018.07.13.01.15.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:15:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Q9BotF7D; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C2E7320986AA2; Fri, 13 Jul 2018 01:15:52 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 69F2120985997 for ; Fri, 13 Jul 2018 01:15:51 -0700 (PDT) Received: by mail-pf0-x241.google.com with SMTP id i26-v6so10803931pfo.12 for ; Fri, 13 Jul 2018 01:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lO0o17UU6tLjZ5kJmP8rZrlzcGusHssMHmj+tepitPE=; b=Q9BotF7DR5u+jXlAHdmYfL7FWnaIsQ1JmxH7A7BogsQNxE8Przk4ENllFoHICdYEiQ vWB6DIIrMRF+qcexq6W8mxUn+//l089buWeq5eaNCp0k9dK1m54GP3RKy0tH7CIuDFjc c/dXAJE6y5OD1tMayrDuZK3X0q7w4cRsgdECM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lO0o17UU6tLjZ5kJmP8rZrlzcGusHssMHmj+tepitPE=; b=pfBm9aR71cAQenRgMteA1JuiBu1l+epdxcgcXH2sdIibgTU1EOq2SlVzQizDMmikJ7 PzQjLmbqi8OmKvZBNy/TgZ2VUbWAtjV5qj5m7RnzL4VFKTZ2f3XSXtm8tgLK8UMkz2WV Pn9ta7cI7JQD+tD3HmTrDt7GXvJzQGIzYNtlfXUqMH04+nZm9Me2aTsrW92DWsvXibkD gM/mWAss0YNcM0QuSezrcqhnJ/6S4qkK3vJavPQfEozr8Q2qqzglmiKNAtUTYF5is8q2 aF8JUSrdmQ/t+aPKJPtVhiL0NBGYBBvTDY7Q8wWiE1UpCGiTET55NNP14wuusSV05DFB zKnQ== X-Gm-Message-State: AOUpUlHAp0py3p9JwBMGJIQ+CUo3XcDqYDTyNWSTwDup5BQa0Xl5YvtU VaQKD+PlCmXrmndAxCQcBDHVbQ== X-Received: by 2002:a62:8d16:: with SMTP id z22-v6mr6018997pfd.181.1531469751056; Fri, 13 Jul 2018 01:15:51 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.15.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:15:50 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:35 +0800 Message-Id: <20180713081540.8414-2-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 1/6] Hisilicon/D0x: Fix invoke SetMemorySpaceAttributes error bug X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The edk2 commit bacfd6e let CpuDxe running latter. CpuDxe is needed by gDS->SetMemorySpaceAttributes, and gDS->SetMemorySpaceAttributes is invoked by some drivers. This issue can solve by adding Depex on gEfiCpuArchProtocolGuid to RealTimeClockLib. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf | 2 ++ 1 file changed, 2 insertions(+) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf index 319c35c724..ae7116dc31 100644 --- a/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf +++ b/Platform/Hisilicon/D03/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf @@ -46,3 +46,5 @@ [Pcd] +[Depex] + gEfiCpuArchProtocolGuid From patchwork Fri Jul 13 08:15:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141854 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511405ljj; Fri, 13 Jul 2018 01:15:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcJCjoenFkXwpQdKzCNlae8BuZY3AOH5ghQN4oDoZzqu9RFC9lkvUl1zX58ezrq10MOV3ta X-Received: by 2002:a17:902:3343:: with SMTP id a61-v6mr5277143plc.241.1531469756316; Fri, 13 Jul 2018 01:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469756; cv=none; d=google.com; s=arc-20160816; b=0jYqT5iyyaJ88cOOwFud+hqiJ1YsEeC7x1g6awMLiMkTuvY4trcURiAAH1mPZzcw0Q sIRx8fTt3B+j68B3pYCFzxoOI/f5F1VABlL2KgpSwL+18dRCTuCmhGDgUVoHSz/bHX2Y n2N+tZDVf2K/SHE7g7NmEx463HDkwYPirv5BJDmfYaSlKHEDBqxjyCYdEQrBRvXci33J pk3B1pZBELIUlNzzDlUKjoE2Eap+ewKZZ2+PSNIX8zA/fSygi55T6H+J38/ntqiyEIGS pib990sfGjKL58SuCBemBL1ZV3vKDFUEwiWdqmlYRD+4/C4M7wJjMWqNpIDrz3loswat qXNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=3SzEOy3RU/mF1NU3LvVBJqPubNYObohh8XdBV+JpBTY=; b=qBqOahnikfaiDkhRx/vahwI8Qr/yHub41VcQJOzW2m1KvD8v0scmvvPjogDA1fv8xO v9TRbieFycDufic3u61vVu10Jt2SBWh2blUoCcbjvYYNby16gAGYhoL5wXM+Bouxgjdw aNd5uE1DI+HQZbEx8TiVj/rYW9yALS5DHbSSy0k/DTRWAI/tY8IdSAZNhZiql/9wswmL WHzAKixu6WBIZJhMyDz8ln5ISKs9qTjUn1kEefI9JetEsfqLHYbTjf6WVXnYHqMIhpT+ AQS4htGXKAd7FjF/vJsgoVYzFjNR9OSUh5luj1diZkk2meHVw9Kpc+TPk9Ftx1QkrB4X EvHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ULRMtdhs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y12-v6si20432510plt.302.2018.07.13.01.15.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:15:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ULRMtdhs; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EDD8A20986AB5; Fri, 13 Jul 2018 01:15:55 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::244; helo=mail-pl0-x244.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x244.google.com (mail-pl0-x244.google.com [IPv6:2607:f8b0:400e:c01::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5EF5E20986AAD for ; Fri, 13 Jul 2018 01:15:54 -0700 (PDT) Received: by mail-pl0-x244.google.com with SMTP id p23-v6so620406plo.6 for ; Fri, 13 Jul 2018 01:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eVWucS/j26op3zbHs7QzFX1SIKxDy2ASWOJkY2smFgk=; b=ULRMtdhsM/KYlce3gRlRpylY3znm8+Z+RsBrlSLeY2uBnreUwDesrpboCHnJcHKqiq 1vd8mV9f9zvQZivklv20LS69y88330VUGLxitUMfbfQzUNy29q0itkjI9AxkqG5ng98s TmLC3Hpt+vDhCvhghmR7FtdhsoplHMSXk/nns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eVWucS/j26op3zbHs7QzFX1SIKxDy2ASWOJkY2smFgk=; b=eBGL6mvs0k9KicT1AdLz7om8DbXZTSy81EeikAziHRj3myg1BPljqj9YFFAnFRNrn/ UZZtq3KFPDNZkuw6ETXNOx1uZdUo2UEFmujApU5FuZIirgXi5OfHm66tY/2ltASQEsZu CA6e0EX6GJEI/642j2uK7VfgsNLdC8eQAU9Ds2WY+uCUEMN79UyYxoMLPSiBN6fHavad Q8KwxRr13ngSzQ0TbTESAMH1g23x1H+ZdJ9flbOUcTKil9SdKOeGngV5fUg8kMZiXJaY C4X/j+9Gu0t9KSaGPdOMYISLTr6ZQnYcl4WMSegYEaNwUCo1u83vVhmdPEroXy79ZF3l 0IPQ== X-Gm-Message-State: AOUpUlHFg145F+FAFr8KR9Xxh7s/6YkMCZ2u0F78MbhKJO4j9cETLkNw fZsecL2niDa+gbg3sekamYo1Gw== X-Received: by 2002:a17:902:22e:: with SMTP id 43-v6mr5536969plc.82.1531469754105; Fri, 13 Jul 2018 01:15:54 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.15.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:15:53 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:36 +0800 Message-Id: <20180713081540.8414-3-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 2/6] Hisilicon/D03/D05: Correct ATU Cfg0/Cfg1 base address X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Jason Zhang 1. During test PCIe mcs9922 UART card, the card can't work because the IO ATU config is overlap by Cfg0/Cfg1 ATU address. 2. After adjust the ATU windows, Cfg0/Cfg1 config as below: Cfg0 is equal to "ECAM + (BusBase, 0, 0)" Cfg1 is equal to "ECAM + (BusBase + 2, 0, 0)" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jason Zhang Signed-off-by: Heyi Guo Signed-off-by: Ming Huang --- Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c index 55b80aa4e4..e5f66eaa4a 100644 --- a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c +++ b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c @@ -640,11 +640,12 @@ void SetAtuConfig0RW ( { UINTN RbPciBase = Private->RbPciBar; UINT64 MemLimit = GetPcieCfgAddress (Private->Ecam, Private->BusBase + 1, 1, 0, 0) - 1; + UINT64 Cfg0Base = GetPcieCfgAddress (Private->Ecam, Private->BusBase, 0, 0, 0); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_VIEW_POINT, Index); - MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LOW, (UINT32)(Private->Ecam)); - MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_HIGH, (UINT32)((UINT64)(Private->Ecam) >> 32)); + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LOW, (UINT32)(Cfg0Base)); + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_HIGH, (UINT32)(Cfg0Base >> 32)); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LIMIT, (UINT32) MemLimit); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_TARGET_LOW, 0); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_TARGET_HIGH, 0); @@ -666,12 +667,12 @@ void SetAtuConfig1RW ( { UINTN RbPciBase = Private->RbPciBar; UINT64 MemLimit = GetPcieCfgAddress (Private->Ecam, Private->BusLimit + 1, 0, 0, 0) - 1; - + UINT64 Cfg1Base = GetPcieCfgAddress (Private->Ecam, Private->BusBase + 2, 0, 0, 0); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_VIEW_POINT, Index); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_CTRL1, IATU_CTRL1_TYPE_CONFIG1); - MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LOW, (UINT32)(Private->Ecam)); - MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_HIGH, (UINT32)((UINT64)(Private->Ecam) >> 32)); + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LOW, (UINT32)(Cfg1Base)); + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_HIGH, (UINT32)(Cfg1Base >> 32)); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LIMIT, (UINT32) MemLimit); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_TARGET_LOW, 0); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_TARGET_HIGH, 0); From patchwork Fri Jul 13 08:15:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141855 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511435ljj; Fri, 13 Jul 2018 01:15:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfC18bWkAt1JwCY1mCix6mw3dxoJvXtcFNZstSk9d48/+KUNz4GIbl02CjYiuGBypAkwog3 X-Received: by 2002:a62:f50b:: with SMTP id n11-v6mr5974849pfh.120.1531469758513; Fri, 13 Jul 2018 01:15:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469758; cv=none; d=google.com; s=arc-20160816; b=PlKlFvZkDev6Wmt2p5H/ym6/vnDY7JY9yZA370af6TxNg7mysNKU028x0OdxCTPsir aQbs6v/7vBJmQZEHEWYku+JJGWOEWaX2YaxAFqOPjTb5sYC4NYd5vEpQUqnKQWgqIjFY 5A2FkS/0r5MrHoLjCdjXViqISSaiVAblQQoGEOJ65Mitkd6spndA44yA6UzxWax34fF+ MRmOac2doFBdXm5Hb1OZV/F2YgquP3EjQfKWRyd0igsVDPqQAOoTPtmbJv5b5KnE0Sxt 0SyrEThBNlDwhL25jWtpNbo9oxpR8oUz9EAgrlDsgnSi2l8yIW04KCyPMRtVWF85opEJ 7JcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1WImzD11H6Gk60bK2v08yYBSiZjc5Td+wgiz/+WKy7g=; b=kzNtVL14F5nQ9qb9MjIFtRyNysm/iz5kSi16QhfwdyUV3eVcC6MhITM+LaYZFPfUVG 2ZYe0cXLzNGmuYJrv5HGo55Asi9de13I4BbPmjda4JZt6QUUR/kxGX6Px0TS7aP64KTF lKREi5pHQTJV5x2l4mFwRcf2SVsrE4/HfeLGBH9PnJKrBTtXjS4bThVBcSIb1NxZQIn9 ivcfkkKzXEEOXx/kgPiBfURY2+hwagZzhP9Hu3d9aSh44VavV+udi+0UZm2YXn9uUNUr bFuxFj3Bepy+hkssDpnqlNb0ByPXJc3pPFnjqzbGRiPpLC65EoW++G77bN9LF7odznlU jpMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IVWYf7pN; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id c18-v6si21677481pgp.467.2018.07.13.01.15.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:15:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IVWYf7pN; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2792920986AB4; Fri, 13 Jul 2018 01:15:58 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 55F9920986AB7 for ; Fri, 13 Jul 2018 01:15:57 -0700 (PDT) Received: by mail-pf0-x241.google.com with SMTP id c21-v6so17611272pfn.8 for ; Fri, 13 Jul 2018 01:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=buApLzbytp/eU+y5SkiUgXplzV/QuA5DH7Tx2BdUVg4=; b=IVWYf7pNg4QEGZPwusIrXRgq0WQptMZnVHQfoTofxS4xIN0jc3ONMldjO+PMhw1w+3 AUl9M9ca5XEJzNoK9W7x4LRaaJpqo1P/LCOzZIzMbWiOv0IFqRNd8Lgvmo7JqKz7dRFe hX4VtbJai1P8JkQHeu9KW0hB9P1yALK3CwHJM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=buApLzbytp/eU+y5SkiUgXplzV/QuA5DH7Tx2BdUVg4=; b=PgL3IRhA4cXzVe9vDeubxIuYVmhnKY5pUIuy5bdOENL8Ga9GOTZEWay5tLfFV3cqLG 4Px6XQUngcDzHKfrl2OdWOpCkwqmI/ogKXziEItBUjKVcKxERdaksZu/74Tw7C6iQJdx Q+8RpBE8k71wnjMXy8M/w5rS8swum77swVh6oRvWHk11FoiU0XXKXCvWmdFebLizeXwT 2oLpepPfTiM6Yg9SmlacvHBnaENEj9Fi42GXa2hUGFivVKMJEDWjYlmTIOTanI0WKeNa ILu4QnSGgtw0K2lsOff8smPQRChLXExDJWTHNmf5k3+rexOg5iAQpUFqxQ3wMJOFjz7u qW6Q== X-Gm-Message-State: AOUpUlFzNQkU5ohe7CjGkYp4FCuImkIZvCtaaIRgpboBsKUmrdd/dxOy /SVmYc8/Q2cBpEnlt4uldN5DOw== X-Received: by 2002:a63:aa44:: with SMTP id x4-v6mr5275701pgo.120.1531469757125; Fri, 13 Jul 2018 01:15:57 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.15.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:15:56 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:37 +0800 Message-Id: <20180713081540.8414-4-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 3/6] Hisilicon/D0x: Fix SetAtuConfig1RW bug X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The MemLimit is wrong when the Private->BusLimit equal 0xFF. This patch fix enumerating device plug in switch cart failed issue. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c index e5f66eaa4a..3f894e8eec 100644 --- a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c +++ b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c @@ -666,7 +666,7 @@ void SetAtuConfig1RW ( ) { UINTN RbPciBase = Private->RbPciBar; - UINT64 MemLimit = GetPcieCfgAddress (Private->Ecam, Private->BusLimit + 1, 0, 0, 0) - 1; + UINT64 MemLimit = GetPcieCfgAddress (Private->Ecam, Private->BusLimit, 0x1F, 0x07, 0xFFF); UINT64 Cfg1Base = GetPcieCfgAddress (Private->Ecam, Private->BusBase + 2, 0, 0, 0); MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_VIEW_POINT, Index); From patchwork Fri Jul 13 08:15:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141856 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511499ljj; Fri, 13 Jul 2018 01:16:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeOO27lc+O2O+2XZENOSQM8vXtykhDpyCON7aM/I2SBrSVedaJkm0sGHuNLj6x2JZV26M97 X-Received: by 2002:a63:d613:: with SMTP id q19-v6mr5103829pgg.327.1531469762690; Fri, 13 Jul 2018 01:16:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469762; cv=none; d=google.com; s=arc-20160816; b=wRxMfuqMuOiBC88DBU3fSVxMhxx5IMMbX9844YLhHt0eg1SI0cDAWvMFlYBkg63DqX J8PYaHERnNmOW4Pj5cN6lHGvMWNcEhwey29NleqqrX4sH/gMjRAcPEP7wRNR1Ww0OUpG o9miZeN7zazP6ZDmOXpsMVcJtiePTZFFs/ZiH04W8rnQkA+6rJZxT0s9yEBoKOQn469C mnnsp3edlncFS4JKRx12X1GcVGEL3BsK/BgIxfM3tPx2HKd71x9x5glA2roCD+bg7WWV 5JQVDamula6+UHBBeKOq2urc2nAqw7XnG9YVhbNPrICh7JpSiA4LS4G4KD5+3gZUBDv1 PBLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=anecy8izmLdkWxcMLEsvYswgmLqoKK1yXtC29N5YLvU=; b=L3b2tHYkPYpC61OgQc1HQbHKJo9fN1WO2BFNcxPt5eNtj7zpZdwViuyCK7SNbOrVDf j5Z9mhVHiRSzrLCqiimF/ZpcrWFS5HdIAVlRGuLuzj9mEvTKmrazl01nfwU+bf8HrWUT HlQU8YdJR/meiiZwO2PIJlggjAJyVJEg3J7Y8M43RPBAB2LXV5J4eFfuqw6qzoMGYpbn TUaUUoiyMQ833p0NDHc6uhTshzOEr5ExajZqbDApfmqRa2tNk6S1q46QrgxnA7JUZxKK V3UXR0Ptce/rFfOYaVahzdt54nhSrUbF5oIekVBwN+OWXgkyNe1DSiiye9kbCddwQkst b7tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XG6e6KbQ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id w7-v6si22282605pgf.231.2018.07.13.01.16.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:16:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XG6e6KbQ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 543C820986AC7; Fri, 13 Jul 2018 01:16:02 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F24420986ABC for ; Fri, 13 Jul 2018 01:16:00 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id m19-v6so4759810pgv.3 for ; Fri, 13 Jul 2018 01:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0sRNz9lxXBn4Ds0xXco2Q9Ksha2Xik1Bw4rce6YWnMg=; b=XG6e6KbQyYAY1dYt2neo1CCSF7IFNiw1f3GKhlxmVKBfi5YV26uZZs9xzQ1HWSGhpG ytJUgOLRyEnA8ILmyHvLQaBGXbv9EW1bK1xh5qs+sVGGj3Tpns2h+3s4rnRM8cRS+AcE cuLhLRCIYSyP0wLoPcoYNQJKrNtfw2srS2Ojg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0sRNz9lxXBn4Ds0xXco2Q9Ksha2Xik1Bw4rce6YWnMg=; b=H47nr22d1AN/SG+YHJGJ4Q/frSmMyUEIb7laUy5hEyI4rKlGjea2EnPdZnn8FU4oDJ 793aWCCdV6mUkVHFwi9KWVDs2sN0lNY241hL+MXUkcym7fBJW+hVr4szjgNzCNekdocu widwLX2pXRdiAuIJVn7VtSFexlaOLpiikJXtUNWA+3mTKiwnUsdN1NKhEWx66W3aguUC 87lNtAPcIDDSZaURTKOBonFYf0ffyjwMWWBnCkW7nH207gJk7f7uz304SljNe6X2pSuv O42565OgyyXezZG3FSnEmwn08VQbTJBhchBUVRXGGpwcfB5JvtbUKsXo8rHcSvafka7n f9FA== X-Gm-Message-State: AOUpUlEifr9Z4E1wlgqwK8HLUcl1wQwyLbjBuji3g87lcP2iuvSyE3J7 RUutfx8NfstwJ3SvK3f0YKkmIw== X-Received: by 2002:a65:4888:: with SMTP id n8-v6mr5224895pgs.149.1531469760178; Fri, 13 Jul 2018 01:16:00 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.15.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:15:59 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:38 +0800 Message-Id: <20180713081540.8414-5-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 4/6] Hisilicon/D05: Add PlatformMiscDxe driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Fix the issue of onboard Nic not work kerenl with AMD GPU and NVME SSD in board. The GPU don't support 64 MSI, so need to allocate INTx, but the default interrupt number 255 is invalid, so Change all the PCI Device interrupt number to 0. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Platform/Hisilicon/D05/D05.dsc | 1 + Platform/Hisilicon/D05/D05.fdf | 1 + Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.c | 99 ++++++++++++++++++++ Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf | 47 ++++++++++ 4 files changed, 148 insertions(+) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index b6e1a9d98a..0e6d5912a0 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -629,6 +629,7 @@ Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf + Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf # # Memory test diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf index 4503776d63..61e8d907f9 100644 --- a/Platform/Hisilicon/D05/D05.fdf +++ b/Platform/Hisilicon/D05/D05.fdf @@ -354,6 +354,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf INF Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf + INF Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf diff --git a/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.c b/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.c new file mode 100644 index 0000000000..8519b7139d --- /dev/null +++ b/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.c @@ -0,0 +1,99 @@ +/** @file +* +* Copyright (c) 2018, Hisilicon Limited. All rights reserved. +* Copyright (c) 2016, Linaro Limited. All rights reserved. +* +* This program and the accompanying materials +* are licensed and made available under the terms and conditions of the BSD License +* which accompanies this distribution. The full text of the license may be found at +* http://opensource.org/licenses/bsd-license.php +* +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* +**/ + +#include +#include +#include +#include +#include + +VOID +SetIntLine ( + ) +{ + EFI_STATUS Status; + UINTN HandleIndex; + EFI_HANDLE *HandleBuffer; + UINTN HandleCount; + EFI_PCI_IO_PROTOCOL *PciIo; + UINT8 INTLine; + UINTN Segment; + UINTN Bus; + UINTN Device; + UINTN Fun; + + Status = gBS->LocateHandleBuffer ( + ByProtocol, + &gEfiPciIoProtocolGuid, + NULL, + &HandleCount, + &HandleBuffer + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, " Locate gEfiPciIoProtocol Failed.\n")); + gBS->FreePool ((VOID *)HandleBuffer); + return; + } + + for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) { + Status = gBS->HandleProtocol ( + HandleBuffer[HandleIndex], + &gEfiPciIoProtocolGuid, + (VOID **)&PciIo + ); + if (EFI_ERROR (Status)) { + continue; + } + + INTLine = 0; + (VOID)PciIo->Pci.Write ( + PciIo, + EfiPciIoWidthUint8, + PCI_INT_LINE_OFFSET, + 1, + &INTLine); + (VOID)PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Fun); + DEBUG ((DEBUG_INFO, "Set BDF(%x-%x-%x) IntLine to 0\n", Bus, Device, Fun)); + } + + gBS->FreePool ((VOID *)HandleBuffer); + return; +} + +EFI_STATUS +EFIAPI +PlatformMiscDxeEntry ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_EVENT Event; + + Status = gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + SetIntLine, + NULL, + &gEfiEventReadyToBootGuid, + &Event + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Create event for SetIntLine, %r!\n", Status)); + } + + return EFI_SUCCESS; +} + diff --git a/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf b/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf new file mode 100644 index 0000000000..0b365e7a53 --- /dev/null +++ b/Platform/Hisilicon/D05/Drivers/PlatformMiscDxe/PlatformMiscDxe.inf @@ -0,0 +1,47 @@ +#/** @file +# +# Copyright (c) 2018, Hisilicon Limited. All rights reserved. +# Copyright (c) 2016, Linaro Limited. All rights reserved. +# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the BSD License +# which accompanies this distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +#**/ + +[Defines] + INF_VERSION = 0x0001001A + BASE_NAME = PlatformMiscDxe + FILE_GUID = a48f7a09-253f-468b-87c6-caf78baf47bb + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + ENTRY_POINT = PlatformMiscDxeEntry + +[Sources.common] + PlatformMiscDxe.c + +[Packages] + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + Silicon/Hisilicon/HisiPkg.dec + +[Guids] + gEfiEventReadyToBootGuid + +[Protocols] + gEfiPciIoProtocolGuid + +[LibraryClasses] + BaseLib + DebugLib + UefiBootServicesTableLib + UefiDriverEntryPoint + +[FixedPcd] + +[Depex] + TRUE From patchwork Fri Jul 13 08:15:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141857 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511552ljj; Fri, 13 Jul 2018 01:16:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeTCWEWabDi5fZsvCxExQPZLzGbcnS5M4wARD3aRgJVnNagALRAw6QYlTWZUN8XFRpwRYj/ X-Received: by 2002:a17:902:8f82:: with SMTP id z2-v6mr5422499plo.203.1531469765908; Fri, 13 Jul 2018 01:16:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469765; cv=none; d=google.com; s=arc-20160816; b=TcSdeanp4EgWUaNC8l4DF5YKxqwe23Z8y7w9Sw1z3a50unbIfrxHrWhShT1tJ1atg4 Zd6HYOK8+iGWldv+nsvx8vYvMThpOxrd/eoQb4t974xE+ALmkogaGFtb8aWEXsVopGtt zp3O/D3WfGbsuOG9P0KfY3UHkjVX75+/10G5yW0nlhozlrCToluFBJh4kPVZxiVeu58c Lb3EWCzNeMOe2eO8bxNeVJe1ATSTiB5dvV1ZfR55UL5iBX+CFtt6df9J8YdFfFvwOweQ 7+XJEJufORsyd+P62vgXSW5oPq0RCVhN5P6+Rt8Q3A999mrmA+ubCoCCTFtmcDV97X34 GjmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=X4NWRTzCoKf5gHorEzHWWkUeZgjQpfnMOLoX9sccH+M=; b=WdUxGFxYBi+Pl+YOwuV8lFiHn6T4o6TJDCx9RspEsfLCmmQwgXp3YFYk1jhpIuzG6c jY9K5WSc4T92zaW2qjtL5nanB4XvtcRZ6vkO4zRStpbiFi9O3zQUu17eRHpVgMbMH5Gz ZWk0a5k/tEYqaZ4O5cOaB9uVUwKN+BYG6ignvCpRszKXEHONvRNrf2mrvPXenqpIhtHG e2K6lWlC1AteF9XqM5fq87MXrQnfMVuqplLq7sSEF6K6nz3m+gkwdVviWq1OXwzbwTZs T/aqqRvdBAUivgCn0MS/u0z49FCBybe9RtTDFdU5bssqAOu8EIeCsp55Ww1xeM0Fy4GA bcMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=S8pKPFLh; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id k84-v6si8783645pfb.309.2018.07.13.01.16.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:16:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=S8pKPFLh; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8047020986ACF; Fri, 13 Jul 2018 01:16:05 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BD8EA20986ABC for ; Fri, 13 Jul 2018 01:16:03 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id p23-v6so4611548pgv.13 for ; Fri, 13 Jul 2018 01:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A+M5+sAEB/cNqK92kBnSQlZCLUxo1R5kCvkAL13vgDY=; b=S8pKPFLhEu9ZvEUOrRCBTRrSoqd3xmcg8s09Zg5ei2kJx9sq7b95Kvq90ztBJ5Pgb2 VZutEBIqEdM9La1bhrWS5H6zsKn3RLUFOne3aRL/fzh+bvW+IUQBJm60ogBxH1IaiEGF agqmXEXmCHSRu6x4mKf+TB0wUBbDd0TggZ0+g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A+M5+sAEB/cNqK92kBnSQlZCLUxo1R5kCvkAL13vgDY=; b=LnbEJUQg71uJ7U0UFTYMRtHxwpNLHevq8PxZ7uccb84ZgMcnsdw1GqA4JlLDFXkiuA 9fm+nZRlHb01aQRbt3+SGTiVGLlEnBqtqTMiHrik2yHgeacDPCA3vSC3cJaQ5fsdFogt E7AzTi2faJNFy4lQ5dOP668z+cVd+ifRsFwnIr5KY5cmmymgmsIoIoshdvS2Q9h2YSoD W5whXqnA4x9ifn5ZWfvd5pwb9kol3/VC4VIJNRE1NF3S0HBEljsxGmLq2MOc2e5bL0vj uZzR1/uHVA/sQhymmGVWYrYl38ChQq7MbwKCAZv04RTP2V52g1ELpxOQSAnBkv4PJHvD IVTg== X-Gm-Message-State: AOUpUlGsuYAoNmoHSJmhOKYSz3yD3kLaht7hemA2ALQ9pW3hnWf13DEx 4NjBtaoODEBcA6I/P0mY4yODug== X-Received: by 2002:a62:384:: with SMTP id 126-v6mr5940662pfd.11.1531469763276; Fri, 13 Jul 2018 01:16:03 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.16.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:16:02 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:39 +0800 Message-Id: <20180713081540.8414-6-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 5/6] Hisilicon/D05/Pcie: optimize two pcie ports space X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Optimize pcie space for promoting usage rate.Change regions order of NA-Pcie2 and NB-Pcie1 to MEM-ECAM-IO in DAW,so MemoryRegion can satisfy the requirement of larger address alignment. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Platform/Hisilicon/D05/D05.dsc | 12 ++++---- Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c | 8 ++--- Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl | 8 ++--- Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc | 8 ++--- Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl | 32 ++++++++++---------- 5 files changed, 34 insertions(+), 34 deletions(-) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 0e6d5912a0..ab7c5caf86 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -305,13 +305,13 @@ gHisiTokenSpaceGuid.PcdHb0Rb0PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb1PciRegionBaseAddress|0xa9400000 gHisiTokenSpaceGuid.PcdHb0Rb1PciRegionSize|0xbf0000 - gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionBaseAddress|0xa8800000 + gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionBaseAddress|0xa8000000 gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionSize|0x77f0000 gHisiTokenSpaceGuid.PcdHb0Rb3PciRegionBaseAddress|0xab400000 gHisiTokenSpaceGuid.PcdHb0Rb3PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb4PciRegionBaseAddress|0xa9000000 gHisiTokenSpaceGuid.PcdHb0Rb4PciRegionSize|0x2ff0000 - gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionBaseAddress|0xb0800000 + gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionBaseAddress|0xb0000000 gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionSize|0x77f0000 gHisiTokenSpaceGuid.PcdHb0Rb6PciRegionBaseAddress|0xac900000 gHisiTokenSpaceGuid.PcdHb0Rb6PciRegionSize|0x36f0000 @@ -336,10 +336,10 @@ gHisiTokenSpaceGuid.PcdHb0Rb0CpuMemRegionBase|0xA8400000 gHisiTokenSpaceGuid.PcdHb0Rb1CpuMemRegionBase|0xA9400000 - gHisiTokenSpaceGuid.PcdHb0Rb2CpuMemRegionBase|0xA8800000 + gHisiTokenSpaceGuid.PcdHb0Rb2CpuMemRegionBase|0xA8000000 gHisiTokenSpaceGuid.PcdHb0Rb3CpuMemRegionBase|0xAB400000 gHisiTokenSpaceGuid.PcdHb0Rb4CpuMemRegionBase|0x8A9000000 - gHisiTokenSpaceGuid.PcdHb0Rb5CpuMemRegionBase|0x8B0800000 + gHisiTokenSpaceGuid.PcdHb0Rb5CpuMemRegionBase|0x8B0000000 gHisiTokenSpaceGuid.PcdHb0Rb6CpuMemRegionBase|0x8AC900000 gHisiTokenSpaceGuid.PcdHb0Rb7CpuMemRegionBase|0x8B9800000 gHisiTokenSpaceGuid.PcdHb1Rb0CpuMemRegionBase|0x400A8400000 @@ -353,10 +353,10 @@ gHisiTokenSpaceGuid.PcdHb0Rb0CpuIoRegionBase|0xa8ff0000 gHisiTokenSpaceGuid.PcdHb0Rb1CpuIoRegionBase|0xa9ff0000 - gHisiTokenSpaceGuid.PcdHb0Rb2CpuIoRegionBase|0xafff0000 + gHisiTokenSpaceGuid.PcdHb0Rb2CpuIoRegionBase|0xaf7f0000 gHisiTokenSpaceGuid.PcdHb0Rb3CpuIoRegionBase|0xabff0000 gHisiTokenSpaceGuid.PcdHb0Rb4CpuIoRegionBase|0x8abff0000 - gHisiTokenSpaceGuid.PcdHb0Rb5CpuIoRegionBase|0x8b7ff0000 + gHisiTokenSpaceGuid.PcdHb0Rb5CpuIoRegionBase|0x8b77f0000 gHisiTokenSpaceGuid.PcdHb0Rb6CpuIoRegionBase|0x8afff0000 gHisiTokenSpaceGuid.PcdHb0Rb7CpuIoRegionBase|0x8bfff0000 gHisiTokenSpaceGuid.PcdHb1Rb0CpuIoRegionBase|0x400a8ff0000 diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c index 57283a1053..ed6c4ac321 100644 --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.c @@ -60,8 +60,8 @@ PCI_ROOT_BRIDGE_RESOURCE_APPETURE mResAppeture[PCIE_MAX_HOSTBRIDGE][PCIE_MAX_RO /* Port 2 */ { PCI_HB0RB2_ECAM_BASE, - 0x80, //BusBase - 0x87, //BusLimit + 0xF8, //BusBase + 0xFF, //BusLimit PCI_HB0RB2_CPUMEMREGIONBASE ,//MemBase PCI_HB0RB2_CPUMEMREGIONBASE + PCI_HB0RB2_PCIREGION_SIZE - 1, //MemLimit (PCI_HB0RB2_IO_BASE), //IOBase @@ -106,8 +106,8 @@ PCI_ROOT_BRIDGE_RESOURCE_APPETURE mResAppeture[PCIE_MAX_HOSTBRIDGE][PCIE_MAX_RO /* Port 5 */ { PCI_HB0RB5_ECAM_BASE,//ecam - 0x0, //BusBase - 0x7, //BusLimit + 0x78, //BusBase + 0x7F, //BusLimit PCI_HB0RB5_CPUMEMREGIONBASE, //Membase PCI_HB0RB5_CPUMEMREGIONBASE + PCI_HB0RB5_PCIREGION_SIZE - 1, //MemLimit (PCI_HB0RB5_IO_BASE), //IoBase diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl index 50ccac1b06..9955f6dbeb 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Iort.asl @@ -412,9 +412,9 @@ [0004] ATS Attribute : 00000000 [0004] PCI Segment Number : 00000002 -[0004] Input base : 00008000 +[0004] Input base : 0000f800 [0004] ID Count : 00000800 -[0004] Output Base : 00008000 +[0004] Output Base : 0000f800 [0004] Output Reference : 00000064 [0004] Flags (decoded below) : 00000000 Single Mapping : 0 @@ -469,9 +469,9 @@ [0004] ATS Attribute : 00000000 [0004] PCI Segment Number : 00000005 -[0004] Input base : 00000000 +[0004] Input base : 00007800 [0004] ID Count : 00000800 -[0004] Output Base : 00000000 +[0004] Output Base : 00007800 [0004] Output Reference : 0000007c [0004] Flags (decoded below) : 00000000 Single Mapping : 0 diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc index b47cfec7bd..64807b1714 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/D05Mcfg.aslc @@ -57,8 +57,8 @@ EFI_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_TABLE Mcfg= { 0xa0000000, //Base Address 0x2, //Segment Group Number - 0x80, //Start Bus Number - 0x87, //End Bus Number + 0xF8, //Start Bus Number + 0xFF, //End Bus Number 0x00000000, //Reserved }, //1p NB PCIe0 @@ -73,8 +73,8 @@ EFI_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_TABLE Mcfg= { 0x8b0000000, //Base Address 0x5, //Segment Group Number - 0x0, //Start Bus Number - 0x7, //End Bus Number + 0x78, //Start Bus Number + 0x7F, //End Bus Number 0x00000000, //Reserved }, //1p NB PCIe2 diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl index 122e4f072c..3f09e5e568 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl @@ -89,15 +89,15 @@ Scope(_SB) Name (_HID, "PNP0A08") // PCI Express Root Bridge Name (_CID, "PNP0A03") // Compatible PCI Root Bridge Name(_SEG, 2) // Segment of this Root complex - Name(_BBN, 0x80) // Base Bus Number + Name(_BBN, 0xF8) // Base Bus Number Name(_CCA, 1) Method (_CRS, 0, Serialized) { // Root complex resources Name (RBUF, ResourceTemplate () { WordBusNumber ( // Bus numbers assigned to this root ResourceProducer, MinFixed, MaxFixed, PosDecode, 0, // AddressGranularity - 0x80, // AddressMinimum - Minimum Bus Number - 0x87, // AddressMaximum - Maximum Bus Number + 0xF8, // AddressMinimum - Minimum Bus Number + 0xFF, // AddressMaximum - Maximum Bus Number 0, // AddressTranslation - Set to 0 0x8 // RangeLength - Number of Busses ) @@ -109,8 +109,8 @@ Scope(_SB) Cacheable, ReadWrite, 0x0, // Granularity - 0xa8800000, // Min Base Address - 0xaffeffff, // Max Base Address + 0xa8000000, // Min Base Address + 0xaf7effff, // Max Base Address 0x0, // Translate 0x77f0000 // Length ) @@ -123,7 +123,7 @@ Scope(_SB) 0x0, // Granularity 0x0, // Min Base Address 0xffff, // Max Base Address - 0xafff0000, // Translate + 0xaf7f0000, // Translate 0x10000 // Length ) }) // Name(RBUF) @@ -165,7 +165,7 @@ Scope(_SB) { Name (_HID, "PNP0C02") // Motherboard reserved resource Name (_CRS, ResourceTemplate (){ - Memory32Fixed (ReadWrite, 0xa8000000 , 0x800000) //ECAM space for [bus 80-87] + Memory32Fixed (ReadWrite, 0xaf800000 , 0x800000) //ECAM space for [bus f8-ff] }) Method (_STA, 0x0, NotSerialized) { @@ -280,15 +280,15 @@ Scope(_SB) Name (_HID, "PNP0A08") // PCI Express Root Bridge Name (_CID, "PNP0A03") // Compatible PCI Root Bridge Name(_SEG, 5) // Segment of this Root complex - Name(_BBN, 0x0) // Base Bus Number + Name(_BBN, 0x78) // Base Bus Number Name(_CCA, 1) Method (_CRS, 0, Serialized) { // Root complex resources Name (RBUF, ResourceTemplate () { WordBusNumber ( // Bus numbers assigned to this root ResourceProducer, MinFixed, MaxFixed, PosDecode, 0, // AddressGranularity - 0x0, // AddressMinimum - Minimum Bus Number - 0x7, // AddressMaximum - Maximum Bus Number + 0x78, // AddressMinimum - Minimum Bus Number + 0x7f, // AddressMaximum - Maximum Bus Number 0, // AddressTranslation - Set to 0 0x8 // RangeLength - Number of Busses ) @@ -300,8 +300,8 @@ Scope(_SB) Cacheable, ReadWrite, 0x0, // Granularity - 0xb0800000, // Min Base Address - 0xb7feffff, // Max Base Address + 0xb0000000, // Min Base Address + 0xb77effff, // Max Base Address 0x800000000, // Translate 0x77f0000 // Length ) @@ -314,7 +314,7 @@ Scope(_SB) 0x0, // Granularity 0x0, // Min Base Address 0xffff, // Max Base Address - 0x8b7ff0000, // Translate + 0x8b77f0000, // Translate 0x10000 // Length ) }) // Name(RBUF) @@ -593,7 +593,7 @@ Scope(_SB) 0x0, // Translate 0x800000 // Length ) - QwordMemory ( //ECAM space for [bus 0-7] + QwordMemory ( //ECAM space for [bus 78-7f] ResourceConsumer, PosDecode, MinFixed, @@ -601,8 +601,8 @@ Scope(_SB) NonCacheable, ReadWrite, 0x0, // Granularity - 0x8b0000000, // Min Base Address - 0x8b07fffff, // Max Base Address + 0x8b7800000, // Min Base Address + 0x8b7ffffff, // Max Base Address 0x0, // Translate 0x800000 // Length ) From patchwork Fri Jul 13 08:15:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 141858 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp511609ljj; Fri, 13 Jul 2018 01:16:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe+vJCiVd2C52XYBfodBNu0bF9cff3xpjlau+7qt6S80FJDntcnVLBqy/cPp2zBxI+wcbbT X-Received: by 2002:a17:902:20ca:: with SMTP id v10-v6mr5329854plg.255.1531469769292; Fri, 13 Jul 2018 01:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531469769; cv=none; d=google.com; s=arc-20160816; b=WFCFH81XADEHDOO988XKXW5+yTyN8X4f3E07BChaJfoTE9oumf7xbhcTfbjzB5fAtY 2R96kjuOkGiYIAvRFWGRkgkQPjXJPSJDlDDj9UE8NndRX/NAxN/VqtTgr6QsQ359Y01D w0P2ZxcV9JZdsg5OqgBlJuD9OmX7Tl3+CcmNRNjwkEBUEQMHWyld1MU+k2q1sJRogbBB t9KEqWToM/a82ZUn4wtN+weyruna1oYsu+/art16I9MV6jj/GH24atgzQXdY/gmCpG4K OkYWnTs36SpZlyN0XIdUIut8RT3AMUzodi3+RFxOs84rOcsazUupG4jLhYR53ev2CKFX RDJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=FGeLksboXOCjYBzn2ojOL7D5kDRbzXSQWr+BpVxHRA8=; b=NrgHeIvoJQ73DTqHBl2ZYN+x1WD12KIKJ71x5ofs7N+TtGnTtNfLx7B1+tEmxl6TkH UTIHcxXKaritkYXilktbdS7p4MNVeHGo1qoLspfVwEOFW/kFmPNowTR2ISMdlhNsbbXr B3lxuSZc0O2uyLXKqn85QrrCYL+G0wc8o3vA+3wRe8JqBo7C/mvols2DOxmMC8yakS7f UaueSgjyqITuS+CJfgDo3KLSkqcqVqX5ju3gI2p+2Rzu9ehHGewqLA88+4CaezGvYQdx Uwjt9LW8kwPHhqnqTgW7R2Ev87VHZvQvlWfktxhOEy41flPaloxLyYZJ5Edd2wVeHgdh kEDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QlCIttWg; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id w13-v6si22950565plp.51.2018.07.13.01.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:16:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QlCIttWg; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A5AF120986AD3; Fri, 13 Jul 2018 01:16:07 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8E18020986ABC for ; Fri, 13 Jul 2018 01:16:06 -0700 (PDT) Received: by mail-pf0-x241.google.com with SMTP id l9-v6so10590439pff.9 for ; Fri, 13 Jul 2018 01:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xWLk29EGw3s9NQWq/MONaz7B4FkrWLi4cB3eyEnsuv8=; b=QlCIttWgvncTGO7DmngSZX0yaWUhdOZfXzQmtGmM/KLwJw6hJCOeAKRh+vJNBuJJX2 tHn1fYn0CCuoLQ4wSlCVTpBE1Olwg9fuApGeVQOISXboYo3riWog21TMVey94qmVthoz rN10RyeRufUUHq6UnoOogfBNj3Ikx0ZXdTgpI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xWLk29EGw3s9NQWq/MONaz7B4FkrWLi4cB3eyEnsuv8=; b=cEqiF7bmeQRy2UyMuCS1/ma0nEp06LuF+gJJTbMNtWrYeaMCNiHqGZEBhTRNafq56E 8AF9vPZhUBVzX2AAaVabGfbaK6CgI/fqIVpsD59v0TU5XrImsFOj96RBQ4ph64qDca8m xwML9n8pRosV7ToO+Ooluxtvul/q6D/lyWyEbHHtnYIH8TwBLURML7yUJHVKH8uyCA9i 0moAkjJ1GgCTywcxGNg8d5KXKx+++W3KDV1JZr/SlPOq3GHXhVWbJhmerWfgYP2ueI6n 8mv9jLZPgppLcThPipV7lbAHXIIbLeWkaW7ODa11O69k2mkKbbdxvdFtF+Gujpyk952+ zQQQ== X-Gm-Message-State: AOUpUlEOe6iiXc8gjy1+DlUfPB0TLfdu40sxiWlsvPGLq5k5HolCa49P 2lJBbGd/PI86u0p2pVmD/NZ/GA== X-Received: by 2002:a62:49cf:: with SMTP id r76-v6mr5850931pfi.235.1531469766314; Fri, 13 Jul 2018 01:16:06 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id e7-v6sm24400196pgc.55.2018.07.13.01.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jul 2018 01:16:05 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Fri, 13 Jul 2018 16:15:40 +0800 Message-Id: <20180713081540.8414-7-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180713081540.8414-1-ming.huang@linaro.org> References: <20180713081540.8414-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 6/6] Hisilicon/D0x: Correct smbios product name X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The product name getting from BMC is not suitable. It may cause ambiguity. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 1 - 1 file changed, 1 deletion(-) -- 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c index fcefe2442c..5e965c996c 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c @@ -86,7 +86,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) TokenToUpdate = STRING_TOKEN (STR_MISC_SYSTEM_VERSION); HiiSetString (mHiiHandle, TokenToUpdate, pVersion, NULL); } - UpdateSmbiosInfo(mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_PRODUCT_NAME), ProductNameType01); UpdateSmbiosInfo(mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_SERIAL_NUMBER), SerialNumType01); UpdateSmbiosInfo(mHiiHandle, STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER), SystemManufacturerType01);