From patchwork Fri Jun 23 18:30:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106279 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp345851qgd; Fri, 23 Jun 2017 11:31:20 -0700 (PDT) X-Received: by 10.55.70.69 with SMTP id t66mr10987245qka.147.1498242680153; Fri, 23 Jun 2017 11:31:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242680; cv=none; d=google.com; s=arc-20160816; b=g1SAGrLdtds+Xig08Fs2SXtmBSYquULn5zicRSV4fp2uoMWW+Er77kc1UKmc/nJXYe Qvi77V2zB9Ua4uBMPHZ4BPJdlm2MiavwYb66/c5nxDfJfxRJMGdWJbjtcZSIRdAg16jh Abjhbe4eneABcBYTUVqbFh41DzfEDbfyokUdm7AfG3PMlbtZB8YAfjvWwkU3PGsa9REw GsTIz903rMQRiCnx/wGDnxg9xjPGB3GjKOkdmnXDsGdoefl7mXuG0G70PWZvW6uXS/xF Z4NnB3HqYqQpxDB9YpghxkUQH6BhXED5mXlCaHk5XEnbzSkh3RxlL/9dDKZkReFxAAiG R2hg== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=bnF8BM/A3BPxh6Oe+tOUAXOq/TgrcLHI8xweJbqA3I4=; b=MECKdSkIkLtu4WrEIA5NIAiUKb7+6OHzOoPe08UOMtaw/E12Ep8YwIpqR7U3PUX45+ 0mMfy4KIr4suRIaZh6vmo7wz35ow+5RpF87OhdNdjbC8bBlqbJyQUzOoKwTh8nhJTKC9 JYA0ilC2dy0bs5KPUHVELN3bkzjfCj3X4jKJMLR8ZUFc+3CONQ+xLy1/QVENoNcwTKmK qCA/1zRNqWNxYFDvXiijUyG7ClpYyZVpASqEOJpiqX8KlNjJRTCpfJsk0+MLreGpIfPo EiMdUWKOz5c4wQBSL3LxtnU3bLpH2S1hWJWCPYKH2Jn9SMu7X3unCAy17cnw7E2RTqVg ZxUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m3si4518010qkd.257.2017.06.23.11.31.19; Fri, 23 Jun 2017 11:31:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C9B2A60C34; Fri, 23 Jun 2017 18:31:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C432D60C39; Fri, 23 Jun 2017 18:31:06 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2404B60C2E; Fri, 23 Jun 2017 18:31:00 +0000 (UTC) Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by lists.linaro.org (Postfix) with ESMTPS id 11DDF60C12 for ; Fri, 23 Jun 2017 18:30:59 +0000 (UTC) Received: by mail-wr0-f174.google.com with SMTP id 77so76644867wrb.1 for ; Fri, 23 Jun 2017 11:30:59 -0700 (PDT) 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=usQ5WTkCobnYF8CeIHGAFym8ub4eUm2XdAlmsPG0a0k=; b=AzgzhRbWsUcMy2eoD+Um4iTUN1224fnPf9EnGev5wpEwwNU9wSQkPvSil37TjvWlXs i8aXETvrdfSawTKwVT20YFjjUesJt/BeQ2Oj/aJrRrnVz2IUHWJTyrfBRFLZ20MM9NX0 ac+p7kpL2TXTDLyByN217alf2lZDVlA76g1tGr2xqf65fVOaGYNBKixIw/Xt1zDV/OmK d9Vsv2dFUsQ3RvvJZaDGeoP4w0lMtoMrCOSaNPSrR/Fm3Nr5sMt+t6L1whnFYP7bsdth DptwopFCzw8ytfjZbMSBgU0IlrupNVpXKhseduOpEahOZygoH3VtDpmL4WPCXWfjQVHw ko+w== X-Gm-Message-State: AKS2vOxBfzhnzT2Wuxwl6oLFuZlFDoguCbh4/YL4f9cbTnnrx2xZEEE9 gjMzDHUK/6tXcC68PV6trYka X-Received: by 10.28.17.4 with SMTP id 4mr1742288wmr.63.1498242657909; Fri, 23 Jun 2017 11:30:57 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.30.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:30:57 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:40 +0000 Message-Id: <20170623183045.21494-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 1/6] Platforms/AMD/Styx: remove incorrect timer frequency X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" The ARM generic timer needs to be programmed with the actual frequency of the input clock, but this can only be done from the most privileged execution mode implemented by the hardware. UEFI on AArch64 usually executes in EL2, which is not the most privileged execution mode in most cases, and so the timer driver is set up to deal with this: no attempt is made to program the PCD value PcdArmArchTimerFreqInHz into the frequency register. However, a non-zero PCD value is still treated as an override for the register value, in case the programmed value is known to be incorrect. However, on the various Styx based platforms, the PCD value is set to an incorrect non-zero value, and so the routines that convert time delays into cycle counts are off by 33% (187.5 MHz vs 250 MHz). This may affect timeouts related to SATA link training, and other low level routines that rely on accurate timekeeping. So remove the explicit PCD settings, so they default to 0, letting the driver use the programmed value instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 5 ----- Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 5 ----- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 5 ----- 3 files changed, 15 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index f068713bf0b8..ddb944d0beb4 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -400,11 +400,6 @@ DEFINE DO_KCS = 0 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xE112F000 # - # ARM Architectual Timer Frequency - # - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 - - # # Cello has 2 SATA ports on the first controller. # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|2 diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index b1a7cfd4c4a8..f6d2d37014dd 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -402,11 +402,6 @@ DEFINE DO_KCS = 1 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xE112F000 # - # ARM Architectual Timer Frequency - # - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 - - # # 2 ports active on Overdrive 1000 # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|2 diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 98f5c9452dcd..7ac3ce3760fa 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -409,11 +409,6 @@ DEFINE DO_KCS = 1 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xE112F000 # - # ARM Architectual Timer Frequency - # - gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 - - # # Overdrive B1 has 14 SATA ports across 2 controllers. # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|8 From patchwork Fri Jun 23 18:30:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106280 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp345955qgd; Fri, 23 Jun 2017 11:31:37 -0700 (PDT) X-Received: by 10.55.1.65 with SMTP id 62mr10228929qkb.210.1498242697475; Fri, 23 Jun 2017 11:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242697; cv=none; d=google.com; s=arc-20160816; b=IFKFV0F0KZDnYwl/CsOAbsLc9G/M9Mo5bYvk/vHiAEPLuwtJRFVE7/XTWQ24ZnhBWO oVLGdyRXAyZU30q+8RjK0ONDnfOR4Jd86mjJLNDyyGNm+FEsljagLocV8AsfP5D1q82Y vg/kX0f/SDDT1YqO36pP0wLRORWjCnfHca0Hv1Mj4SJc0zKeVbpkQ8vjVELDKghMyrjb rwhGZDPArkMSP9uxs6DmQ+1WvINVm+IOeT0CDfdVXkgs8ub6b9KI/6HtzQP0R211Hk6D AGnJyTKucXLrGW0IAcYpGu2xs+iOOj9sT26W3fLr5s0SRBUD/dPXQ9jGuaBmOc+Kc+8H u1Mg== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=TC5M/RdS5THXfei8lUNDKtmlpKP4pRxkJp8oGb8oDGw=; b=zVbJQ+CPNQkulfxVIpkDzzwbhA+kc6AGTh135WLlj5cTvRJmfnil3rPuir4WtoybeW aN5Hc4tEnUb42A03U0uAiZeJeVUFiA7HIIpnFF4Q2xSTXctUScsEkFEPclGFV8lra4s0 /37zahhANhCIM/flGnAkYm3glXkrrQJ9+zmw61JBH99Ua/RFaKIEwr2L/evfxNbZ5dUN nqpZLAU42dYvkEOQ/6rjt21+lDrEvYKkmaD6jmhg0naGTndkTIBXmtb0PvP1SPhYp0Tr D2Et8s2KaVI4tVmAiFW7vxpdWz7JnVqa3KDQ7hrLK2hiD4YLCzqki0YKaK105PlizrLA 8yTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e123si4216506qkf.341.2017.06.23.11.31.37; Fri, 23 Jun 2017 11:31:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 21BB960C35; Fri, 23 Jun 2017 18:31:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0776560C2F; Fri, 23 Jun 2017 18:31:19 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 0C42660C2F; Fri, 23 Jun 2017 18:31:15 +0000 (UTC) Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by lists.linaro.org (Postfix) with ESMTPS id E17AF60C30 for ; Fri, 23 Jun 2017 18:31:00 +0000 (UTC) Received: by mail-wr0-f169.google.com with SMTP id k67so76170519wrc.2 for ; Fri, 23 Jun 2017 11:31:00 -0700 (PDT) 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=36xuJ4ugt4e5OXUFgMdCe47UdYE6s3SrYzT5j2Zyyu4=; b=fzZ4mx8XTEBt4YWHAo6xypOgrnJLC2b/ExNXWR9oU0ChwUBR9yzrebMIdBV9Qot4Dr oiJaTu7ElhciDDUUmeM7TEDTvffnL9IIR6VNqhmvJSCk4B/X7ReGQE1pMwRMJ4oHlDlJ L9YnnqLBu9eIHkSg+J9EkL2eP76SG/z6FbVmYTTJ9as0rDlHNcv6xdnnJ1eLKLw2YNaE qsKbw4LnkkRI9jalFtOk1+s4HcuqVNYv5i1nxR1i0tkcYBKM2yVo22fvzZx69BwHHwQc /AIyaSD4hYOTFcvtG1cp3YhFyZi5QUO8iQMMjE4PsYG8P7BDJCudBReH2VR5Hnjkf/PW 4cVQ== X-Gm-Message-State: AKS2vOwDTAfQy0h5dpfhQYMWyYvTt3hG4abjJgHztl9wcfXGRigLGCbQ E+IAOews4qYK3hn2gyypG3eX X-Received: by 10.28.222.195 with SMTP id v186mr6253206wmg.88.1498242659619; Fri, 23 Jun 2017 11:30:59 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.30.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:30:59 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:41 +0000 Message-Id: <20170623183045.21494-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 2/6] Platforms/AMD/Styx: set SATA port mode to Gen3 on all ports X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" The SATA related PCDs consumed by AmdSataInitLib contain a PcdSataPortMode PCD that sets the port mode to all ports. This PCD defaults to zero, while the code in question has no default, i.e., the value 0 is not treated as either 1, 2 or 3, and so the init sequence is not carried out correctly. While observed SATA link detection issues on CelloBoard appear to be unrelated to this (i.e., this change did not improve the situation), let's set the correct values nonetheless. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 1 + Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc | 2 ++ Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 1 + 3 files changed, 4 insertions(+) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index ddb944d0beb4..d10c0901c811 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -404,6 +404,7 @@ DEFINE DO_KCS = 0 # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|2 gAmdStyxTokenSpaceGuid.PcdSata1PortCount|0 + gAmdStyxTokenSpaceGuid.PcdSataPortMode|0xf # PCIe Support gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xF0000000 diff --git a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc index f6d2d37014dd..298cf3eb1c28 100644 --- a/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platforms/AMD/Styx/Overdrive1000Board/Overdrive1000Board.dsc @@ -406,6 +406,8 @@ DEFINE DO_KCS = 1 # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|2 gAmdStyxTokenSpaceGuid.PcdSata1PortCount|0 + gAmdStyxTokenSpaceGuid.PcdSataPortMode|0xf + # PCIe Support gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xF0000000 diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 7ac3ce3760fa..d0b541f9bfa1 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -413,6 +413,7 @@ DEFINE DO_KCS = 1 # gAmdStyxTokenSpaceGuid.PcdSata0PortCount|8 gAmdStyxTokenSpaceGuid.PcdSata1PortCount|6 + gAmdStyxTokenSpaceGuid.PcdSataPortMode|0xfffffff # PCIe Support gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xF0000000 From patchwork Fri Jun 23 18:30:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106281 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp346032qgd; Fri, 23 Jun 2017 11:31:50 -0700 (PDT) X-Received: by 10.200.8.67 with SMTP id x3mr10753568qth.195.1498242710369; Fri, 23 Jun 2017 11:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242710; cv=none; d=google.com; s=arc-20160816; b=G4cfVMXcfJPEMgewYU77zQeZzRV7PfR7VFGMqFvp41PV+0j5pcC92SC61n6iXuSelg sd08cokA9Wvq1pAL/dQ4HdpQFKk9EoWMd5drcXbXwrVW1u8o6ktwYx48osATwqRwGnw2 jEYJRahHEK58EeOtCPaTNwWszV9yEO0VmNbjFRpLZGb7rYCFAZ6IJM1lvRj6Ug8WGqZY xE8PnZ08pmDbfkKllDBo7MmweXi44d0XXX/TaEXTW6eMJ8ozXmp23x6MstXHp7jVL8qB bdjf57NgYfoqDg3v/NZrIQtLx3pYzHG7O/xP9yNimMeEeU5MsaPXGrc76GmARp8NqzVb wnmw== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=gFVSm0YzeNV2C8NPw45587WUFC/7/X7wcrpnbkmOFqI=; b=JVPbkguiOMWcL95zu1HGXXqUf8mm+7yj0W/kClvyKewumT8ergiDyI/4JpvuLWG5eH 0J1hElih3/yWzsZzhQC4szV4ZF5tAlEpJeK/p/NtW3FFLVAi31VN6y4LdSqdxyjK0oCk 99RQL3Dy9VGY6/fSW7Sukd3/xxunbezUQb7Kbwih45wInE+JDm5yTvOe5U2TvY95Fz3V lQZiJIWAY7A5xl/GcYC7IDFKVbTBPbp8iv1CfqsPvcEw5ravrCzWR4cPeeSM0FsJB9bT SyETymfhXVM4jmZQr6lyHoUcXm1FYbWL8gWakKP+B2Z/k6pM8hX3cDDroMXYc08HYoAu JGAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q77si4487696qka.83.2017.06.23.11.31.50; Fri, 23 Jun 2017 11:31:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 070F760C56; Fri, 23 Jun 2017 18:31:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 34A9960C37; Fri, 23 Jun 2017 18:31:21 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1F05660C30; Fri, 23 Jun 2017 18:31:15 +0000 (UTC) Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by lists.linaro.org (Postfix) with ESMTPS id 7F09060C32 for ; Fri, 23 Jun 2017 18:31:02 +0000 (UTC) Received: by mail-wr0-f178.google.com with SMTP id c11so76545300wrc.3 for ; Fri, 23 Jun 2017 11:31:02 -0700 (PDT) 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=I0vcZsVXXapZPGiQsdSMzv5q3TFSQ0Bqj/NNJ8Q8Mko=; b=MLsjkaSVq+wtpwVx188Xf19nFPDIww4x656EEZy0rYFsy5szWWmHWjGGor5GTYQs8m FBmwQOBxjTqVlCzM85t5dQ0m4F4Di6H8Pta1IccCuuEsBZGehiQCLrgZ3TeybuQT5JoS n78PYAdqwiB44zP9O+o1hf89P1Q+KuS4rZ4qlUEVhX0ZyrDR1whibEEpcwM6MZLeirVt DglA4BniH1Ac9M3HPxBRduh0ROXKMh78ViR8LHYSBb/cCmp/R2oVtE94/bhrNI+MFFf6 iJBzEiHdzUkmoVqx5otSRRnpKP22239uhHNDaoSV7UWigGnMVSib9tmIO89mkB8MaFnt 3Ddw== X-Gm-Message-State: AKS2vOyjwSNlkjnPYMHZdPfUUstbd3qPU8Xo0SdcPdRcjhUdgSZk27q4 dm1Crwhjj3V9G8vW0uZo+05W X-Received: by 10.28.87.72 with SMTP id l69mr6082297wmb.111.1498242661319; Fri, 23 Jun 2017 11:31:01 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.30.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:31:00 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:42 +0000 Message-Id: <20170623183045.21494-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 3/6] Platforms/AMD/StyxDtbLoaderLib: disable SMMUs for absent hardware X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" The logic regarding how the various SMMUs are exposed in the device tree is inverted, in the sense that they are present in the static DTB image, and are removed if no SMMU support is requested. However, the logic is flawed in the sense that it did not remove SMMUs for hardware that is not there to begin with, i.e., the XGBE network ports on Cello/Softiron 1000 or the second SATA controller on B1 silicon. So fix that. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index 093db6517c1a..0da00655396e 100644 --- a/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -261,11 +261,18 @@ SetSocIdStatus ( if (!PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommu-map", "/smb/smmu@e0a00000", "/smb/pcie@f0000000"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0200000", "/smb/sata@e0300000"); + } + + if (!PcdGetBool (PcdEnableSmmus) || !IsRevB1 || FixedPcdGet8 (PcdSata1PortCount) == 0) { DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/sata@e0d00000"); + } + #if DO_XGBE + if (!PcdGetBool (PcdEnableSmmus)) +#endif + { DisableSmmu (Fdt, "iommus", "/smb/smmu@e0600000", "/smb/xgmac@e0700000"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0800000", "/smb/xgmac@e0900000"); -#endif } } From patchwork Fri Jun 23 18:30:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106282 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp346126qgd; Fri, 23 Jun 2017 11:32:05 -0700 (PDT) X-Received: by 10.55.105.133 with SMTP id e127mr10877731qkc.19.1498242724929; Fri, 23 Jun 2017 11:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242724; cv=none; d=google.com; s=arc-20160816; b=n6yk/K4lcqyqYfkSXGb4oAbNSLTg3nO/64bW8jAeMLD2LUcKXlvZX9SsVmDnSGtmVy mXMFY3ufy7rhXniK9wm/JutbSrzaiv8aMAongPry5IkHmQ67yjD9wha6yOzKGV8WbqLj wAnKHrakSQhdhlICtL/VLcj6t5K6W/QqhzlnZ7aY3IDQl/0clrSQzh16CkalQdhQsUzn 1FNdN3ghNH2Q0U17Z31JYUJy3yxJF050Di0T/XMcw4kobg2gtmMaUyv7o2Xoi8AuKasr OYWJ8XfUDSgDHZvnrMa49noqVVh01JugFsNnw67LWRQwf60TrQi5fSnDQ7LjJL0dJdX0 cmVg== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=sW0b5DU72mMpj+8Etpprt/DSU/OcXLpyxAwRX2Dx28I=; b=uYVpE5d/frYcBnFuop7CMasKuo0sgnnnfTrAkANFqbCXMEZKXALmMZshzkHB08axsR 8sOCjJpYPmAWsXTjbcpGSTCPwmhA19QNcrWb08ezdzBEeuFakwMeUYu14j4YdTYri6qC L4DN56a1whwcb+jngT9OAqyHWwIWS+nDhBBgzzDM27T0Un1M6Lu42sVS7nRM/Al07nhI mGVryTsEs493JaALuB2t/bQpcp1G/d6FUam952fBr251l6Ajr6Xqk4yI6fUHacyXev0P xfFRrcTz4uHThArBobmV3x8YL2P6nx4p28srU9t80LzuS7KwG5xdiHEH+J8wrsImAoM7 t06Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j29si347158qta.153.2017.06.23.11.32.04; Fri, 23 Jun 2017 11:32:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 83EC960C39; Fri, 23 Jun 2017 18:32:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2 autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 649F760C48; Fri, 23 Jun 2017 18:31:24 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 31A7760C2F; Fri, 23 Jun 2017 18:31:16 +0000 (UTC) Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by lists.linaro.org (Postfix) with ESMTPS id 6AF0860C34 for ; Fri, 23 Jun 2017 18:31:04 +0000 (UTC) Received: by mail-wr0-f173.google.com with SMTP id k67so76172235wrc.2 for ; Fri, 23 Jun 2017 11:31:04 -0700 (PDT) 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=s0RsK2TREGDY3WxGMr3swwFy0jIxyMXjr7I1GRz6QnA=; b=QFWbQo7MaN3nV6qdTyyv/yqr34e/vRcrwJ4mUCDZtnWbhTDGiqtO3EeVlmgVshKpwQ z56MFZZez0KyzdVnsT2xePBo2e97YisM7EC/gpfDoeVUbpteROZDx3Sd+pfAahVEtS8m AWMrlxQTqtdc4oocbVyb+mrhWvVFJ9zLcZAkwWR3yv+ig1EyOaeyB4kwTxSy7mY0BkDl MQs7UUmQ6GeCkeCIP99pGgGroHt0ZevwTr3aAxWzQFD5les9kuab8M+FXtOgepVUyUI4 D5cAOcpTV9sCQvJrHa/WiltYYds+FD7SHCb2KPGgroLkB5006d82rol7f1UpolAi2iAK ll4A== X-Gm-Message-State: AKS2vOzuaz5L6Y25Hb4CIkXmaY1QjQ61MeF11/vBfT+g3BwVAcUBTqGX /AV3Ql5PZUmKpCC8V7c5UwXI X-Received: by 10.28.64.67 with SMTP id n64mr6396705wma.93.1498242663251; Fri, 23 Jun 2017 11:31:03 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.31.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:31:02 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:43 +0000 Message-Id: <20170623183045.21494-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 4/6] Platforms/AMD/Cello: add device tree support X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Now that we have the ability to switch between ACPI and DT support in the UEFI setup menu, let's add DT support to Cello as well. The change is trivial, and it improves the utility of this board for development. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 19 +++++++++++++++++-- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 9 +++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index d10c0901c811..2b041192c887 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -470,9 +470,11 @@ DEFINE DO_KCS = 0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0x0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0x0 -[PcdsDynamicExHii.common.DEFAULT] +[PcdsDynamicHii] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 + gAmdStyxTokenSpaceGuid.PcdEnableSmmus|L"StyxEnableSmmus"|gAmdStyxVariableGuid|0x0|FALSE + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -556,6 +558,15 @@ DEFINE DO_KCS = 0 AmdModulePkg/Iscp/IscpDxe.inf # + # FDT support + # + EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf { + + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf + DtPlatformDtbLoaderLib|OpenPlatformPkg/Platforms/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.inf + } + + # # PCI support # AmdModulePkg/Gionb/Gionb.inf @@ -608,7 +619,11 @@ DEFINE DO_KCS = 0 # # ACPI Support # - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf { + + NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf + } + OpenPlatformPkg/Platforms/AMD/Styx/AcpiTables/AcpiAml.inf OpenPlatformPkg/Platforms/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatformDxe.inf diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 29103531a224..6f7428f0c4ca 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -139,6 +139,15 @@ READ_LOCK_STATUS = TRUE INF AmdModulePkg/Iscp/IscpDxe.inf # + # FDT support + # + INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf + + FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 { + SECTION RAW = OpenPlatformPkg/Platforms/AMD/Styx/OverdriveBoard/FdtBlob/styx-overdrive.dtb + } + + # # PCI support # INF AmdModulePkg/Gionb/Gionb.inf From patchwork Fri Jun 23 18:30:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106283 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp346230qgd; Fri, 23 Jun 2017 11:32:19 -0700 (PDT) X-Received: by 10.55.39.194 with SMTP id n185mr11126388qkn.139.1498242739613; Fri, 23 Jun 2017 11:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242739; cv=none; d=google.com; s=arc-20160816; b=KrI5rF0YWQhRfUX7uHT0rlHfxZFqUw7L54LednGbJULmlJQP9jx8Mn0egvtBU0o/Iv 1UOUSRJ5aEeZ3RioYn2ZKs4QTZ20dc1EzsQ3eOq4NkXyzZTGv3eN7nPLXl9XZbnpbsNj 3NhrbPA4WYkVWzX7yonBkCEDR34QGQ+fb9aVOMg5bMoAo8++QryXdtqJaAwXKUeFwpLE nMU7fzvSYvqdLXx76a5fI8BNTINVWhhrRmC//HqCaqIqetozwqH4n1fUSKZ40+dQnaYw Kq7rVgBgQ+FCgB3vXHhBbQCdnmSibZKb3oriVu6JqG6+nV7Pawf02CU1BsPq7h8UADHO RCsA== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=jmgkXiXA/YMemojYujtgSNPvm2ikhH2Bun3xDBjgX00=; b=A/HP94f/z/+l20Co2y+1+PUT1oFehn4bc1+ixu0oNvttwioFmUFAGjX+hjlV4BkMMp 8Ryi6vlGspLCMD27sI9sjGwTkwOnOjF9YnES2E/ZrJHOC/3ZCVn8ADOaARlNBYOz/2UF V+2JcMu3/vqsTO8MaJ1/Bag0q3a8FTfJr0vUsKTOjqJcRrJ/JQuFIy+Xr69jvG+urAI2 OUsvQ8xapKP2uPT2H0gUG4rXrigt5v64+OFUVUY70lYTwTNH/tGJR6nXgIail5gyCb6I 5r2vtYMu0gskbt7rhCjaU2EiqG9MDyflywk4WFzJIkIN8K0+QDmEozyG0yuPYv7x9J4F QaFQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w7si4527748qkc.340.2017.06.23.11.32.19; Fri, 23 Jun 2017 11:32:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 45D2F60C37; Fri, 23 Jun 2017 18:32:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8E23D60C3E; Fri, 23 Jun 2017 18:31:26 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5E8BE60C37; Fri, 23 Jun 2017 18:31:19 +0000 (UTC) Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by lists.linaro.org (Postfix) with ESMTPS id 9F04260C2D for ; Fri, 23 Jun 2017 18:31:06 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id c11so76547519wrc.3 for ; Fri, 23 Jun 2017 11:31:06 -0700 (PDT) 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=7auhSRio5rOTDauo5lJJ8huYIMk+V9eZso1wYOBslZ4=; b=X4xuP7pW7tpkgK6UIgvX9C10kNT/uEl3D2V6Bq0eHYEhlpXZAFXk2JoNX6+Jd71zX6 /+eBFSv943NZfXcKCJKahqDdrNqfeatGwevjmdH7qKMS12+HhyJIEJKGtyw9hlayNd+n 115kgHfdoEgW9r8MQHqP1X6Kfpaq3hO/ZFsylf49tLTjvZU3pCNsQ3vYVg7tl8EaXtEG cUcE659MwsIUWoLVsNi1lnfUslLKU41SC1vgbO1OBHyAirCQZpzjEvfEtO4zORP+9NJ+ D/PtuqMUdWgqRKxURdiOgrmG1kvyI4KJxNiWchYFiRbhbMLqlYYm1sn/NsMEB90aqxXr 5vJA== X-Gm-Message-State: AKS2vOyiyhcm6yhcT9atAGcOr/bU19+QyTSLROvbEJvchl9vbovbo9pQ 0tqay2ELw+g+QZoium8Ef0Fl X-Received: by 10.223.160.138 with SMTP id m10mr6175813wrm.142.1498242665522; Fri, 23 Jun 2017 11:31:05 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.31.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:31:04 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:44 +0000 Message-Id: <20170623183045.21494-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 5/6] Platforms/AMD/Cello: reduce core count to 4 X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Update the NUM_CORES define to accurately reflect the core count of the SoC part used on the CelloBoard. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index 2b041192c887..f7d29a49a2dc 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -17,7 +17,7 @@ ################################################################################ [Defines] -DEFINE NUM_CORES = 8 +DEFINE NUM_CORES = 4 DEFINE DO_KCS = 0 PLATFORM_NAME = Cello From patchwork Fri Jun 23 18:30:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 106284 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp346315qgd; Fri, 23 Jun 2017 11:32:33 -0700 (PDT) X-Received: by 10.55.20.214 with SMTP id 83mr11204141qku.112.1498242753514; Fri, 23 Jun 2017 11:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498242753; cv=none; d=google.com; s=arc-20160816; b=NVLbUkdGtp2rygGOult5KsS8CmDSVpL7wPC+eJfM54eeYSZp0IOdahbuMkaaO8mX0w G4SdCz8cxkZ0E4pZyjvdgp9CVIpPWAjsjH8wqKn/SLVu2GPbWPpYNjqhGohVpUDrebqk lX/aLG8thWMsGDooAIqYdE4fJwPTQ32+x4xiXlzasTMN4KCZupMVSKcPIH7Tpkrvga8Z Je04+YopwQFEPvmR8mgI4XvFPWcj82RPIfgKQr2zSrTyfZg14CdNLpMXkX1I0pdpJPrZ MvMJ4EvgtwUuMH8yxqmCc7YBYAByiY4Xpn/3pxaqbksU/ijuMYKt4O1nTMMlZnyGSzik QZoA== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=BUDhtIFKrgDhXp2wExQ2aWGHlhPOYxKNLgez1EPRy7E=; b=K2XiCoVcy0TIHxJGvPHAMjFn51dqvjhSvJVGduVAL8zQcJ1mMYdAlhpOVd2Ej/K2Kq SQL6OhaUarqMm/rwwcq0eKpiJYfmUbyNxMZIWe87ZojgeFoLyHoTkU0X3m0tY30k0gDl UVbz7WuZjIcWf8mpXfZ/1d1kzEXqqQlQUVkYsx0OT7/q8JZzrtfzjBtAffis2/hGgLVY rc+vEsx+4SiaJu7L3uvTgp2RB599u1lGL+UHpa3hIiZqlPpK8+bpH+ToT6slT2t/a7/J h2odEV9F/almH/vd2J0tT9w3FYTTsPLZYIntI64w45INr8gCUGJWlBzEP9vKl4Dg2d+b ow3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b37si4877964qkh.267.2017.06.23.11.32.33; Fri, 23 Jun 2017 11:32:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2646D60C37; Fri, 23 Jun 2017 18:32:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CEC5860C2F; Fri, 23 Jun 2017 18:31:37 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A762860C4E; Fri, 23 Jun 2017 18:31:34 +0000 (UTC) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by lists.linaro.org (Postfix) with ESMTPS id 4827B60C35 for ; Fri, 23 Jun 2017 18:31:08 +0000 (UTC) Received: by mail-wr0-f171.google.com with SMTP id k67so76174268wrc.2 for ; Fri, 23 Jun 2017 11:31:08 -0700 (PDT) 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=72zLje9EBeP5c5pIQ9YWzZ+RommyvE7QMhAxrU9BNRk=; b=da6DkuF+i6w+9uJa1vS8Mht2YtVIbGkE4us9p+phJIpOyntbs8OrBCiGr+KeqmIUQt riflR5FZIaXaILxaAQGmv2Fi8als7mdmXrJT2s3F1nwB12CbnUNmpCYzxgNxI/X+RvfI T2K+wRInpIqACRwbPyXx4zX981cEyao3BxjJ9Y2WdAkzdDoQDc1dT0LzSEIV5X1aiLzj lUyE1GZkqMUhW+R0jFMhDAXC0iwP0tws2opgfAjtUiNlklYoAO8ePZ3PtFtXhU/jAVQY fsccw/jiejvqXPa5htQlme7uT1WWmOX+guOcd9gZBZl9O90TrLBxTHbNXITeWQ3D7cql 1UTA== X-Gm-Message-State: AKS2vOwzbGfnURUqSSKWGXBkeAMbc9Q58FNK6RRXfbaZQkyXeTSeDLgq Ef448NXJYZ/ywQAW+IxVNe6d X-Received: by 10.223.182.170 with SMTP id j42mr6797684wre.87.1498242667157; Fri, 23 Jun 2017 11:31:07 -0700 (PDT) Received: from localhost.localdomain ([160.171.41.197]) by smtp.gmail.com with ESMTPSA id l190sm5632336wmb.18.2017.06.23.11.31.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 11:31:06 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Fri, 23 Jun 2017 18:30:45 +0000 Message-Id: <20170623183045.21494-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170623183045.21494-1-ard.biesheuvel@linaro.org> References: <20170623183045.21494-1-ard.biesheuvel@linaro.org> Cc: rfranz@cavium.com, alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH 6/6] Platforms/AMD/Cello: set firmware vendor field to 'LeMaker Cello' X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Set the user visible 'firmware vendor' string to 'LeMaker Cello', which is more accurate, and could be helpful when dealing with bug reports, given that it is reported in the Linux kernel log as well. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index f7d29a49a2dc..091914c047a3 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -357,7 +357,7 @@ DEFINE DO_KCS = 0 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"AMD Seattle" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"LeMaker Cello" # Number of configured cores gArmPlatformTokenSpaceGuid.PcdCoreCount|$(NUM_CORES)