From patchwork Tue Dec 6 13:05:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 86816 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2005529qgi; Tue, 6 Dec 2016 05:09:53 -0800 (PST) X-Received: by 10.200.41.100 with SMTP id z33mr52752530qtz.154.1481029793373; Tue, 06 Dec 2016 05:09:53 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f31si11615210qki.213.2016.12.06.05.09.53; Tue, 06 Dec 2016 05:09:53 -0800 (PST) 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 dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 72E8F60737; Tue, 6 Dec 2016 13:09:26 +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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL 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 4490260DC3; Tue, 6 Dec 2016 13:07:11 +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 25EA3608FD; Tue, 6 Dec 2016 13:06:52 +0000 (UTC) Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by lists.linaro.org (Postfix) with ESMTPS id 036F960915 for ; Tue, 6 Dec 2016 13:05:43 +0000 (UTC) Received: by mail-wm0-f46.google.com with SMTP id f82so125042010wmf.1 for ; Tue, 06 Dec 2016 05:05:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4SdvwoKzsGcc+b7R5mW7uJUkGzHVccO1tob6HY/8U8A=; b=CG5o2wYz/sImpW2I+Tu2wNZ96k/BsnHBeE8WxD+olVy4sA9dp5hkGSgAXXK/FNfROw BXxS1lz+kCURT8HyBCP1cCQzz7JIE9h89FU1jGM6efYHwX7IAW9ea55pTp3/j19vJ5qR ClGoYHhHEAeIdzwVDHNEHXr2B7lKDhZzqPTb0ryz1X3cSb7wsb9qYGdKlapNMRlv7EJ+ UK2p2f1mIkzQKRAawZI2hrmu9Tj1pU4NSuUtr41aXDNWg5R7u73FoJz4h8HmfxZUYr4C 6PAx9px0sdONntZif/ELTJQsO+KBCtyEs2ja+Th9mkf4F0n1LjtMy4fSz8uFODn5JV+a cYVw== X-Gm-Message-State: AKaTC02K+zpqdykBQ18BjzyXAhwVF+SrBSw4letOvikJGkME+0AO+20Lz4HA0A18RE91IniZc0o= X-Received: by 10.28.132.193 with SMTP id g184mr2500776wmd.130.1481029542021; Tue, 06 Dec 2016 05:05:42 -0800 (PST) Received: from localhost.localdomain ([105.144.52.243]) by smtp.gmail.com with ESMTPSA id i2sm25673450wjx.44.2016.12.06.05.05.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Dec 2016 05:05:41 -0800 (PST) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 6 Dec 2016 13:05:26 +0000 Message-Id: <1481029532-17057-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481029532-17057-1-git-send-email-ard.biesheuvel@linaro.org> References: <1481029532-17057-1-git-send-email-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH v3 2/8] Platforms/AMD/Overdrive: switch to generic AHCI driver X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: 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" Switch to the new Styx platform SATA driver, which allows the generic platform PCI I/O emulation driver and the generic AHCI driver to be used. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc | 11 +++++++---- Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc index 92721064a51f..bd91831ce71f 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.dsc @@ -217,6 +217,7 @@ DEFINE DO_KCS = 1 SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf + NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf @@ -409,10 +410,10 @@ DEFINE DO_KCS = 1 gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 # - # Bitmask for ports implemented on the SATA controller - # (enabling 4 ports by default: 00001111b) + # Overdrive B1 has 14 SATA ports across 2 controllers. # - gAmdStyxTokenSpaceGuid.PcdSataPi|0x0F + gAmdStyxTokenSpaceGuid.PcdSataPortCount|8 + gAmdStyxTokenSpaceGuid.PcdSata1PortCount|6 # PCIe Support gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xF0000000 @@ -606,7 +607,9 @@ DEFINE DO_KCS = 1 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf + OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf # # USB Support diff --git a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf index 404810f8831d..c0a12822beb9 100644 --- a/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf +++ b/Platforms/AMD/Styx/OverdriveBoard/OverdriveBoard.fdf @@ -162,7 +162,9 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/SataControllerDxe/SataControllerDxe.inf + INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf # # USB Support