From patchwork Tue Dec 6 09:45:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 86728 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1927690qgi; Tue, 6 Dec 2016 01:47:25 -0800 (PST) X-Received: by 10.55.73.75 with SMTP id w72mr51986455qka.321.1481017645744; Tue, 06 Dec 2016 01:47:25 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e92si11285000qtd.141.2016.12.06.01.47.25; Tue, 06 Dec 2016 01:47:25 -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 61D3D60C0E; Tue, 6 Dec 2016 09:47:25 +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_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 2E0F760C35; Tue, 6 Dec 2016 09:46:25 +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 B1EEC60BEE; Tue, 6 Dec 2016 09:46:11 +0000 (UTC) Received: from mail-wj0-f176.google.com (mail-wj0-f176.google.com [209.85.210.176]) by lists.linaro.org (Postfix) with ESMTPS id 58ACF60C05 for ; Tue, 6 Dec 2016 09:46:03 +0000 (UTC) Received: by mail-wj0-f176.google.com with SMTP id v7so313204290wjy.2 for ; Tue, 06 Dec 2016 01:46:03 -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=4fqHyb2mND6NRYQgqpZkImvwc+4zDwBlLoaZt+TVPlA=; b=e6RM6NzNe27RYZJuFXiFCXhjMocBGJ5ny4va422m9qdtpVN1gIdDHb17ET3vahZiL+ cxbY7j6RFZoAeoMGHy0J1OPVKa/pUwwrhEsUt+0IOOLy2anbMt/doxKI4KIY0DUt1esj ZHBhal5B8QQI5oCCTvjw2Natnmj+grgm5qntuOU4uYGWvpusVByF4fJ/GddwAu6hGNy2 w8w+8kcKptWPdnUegqbBLqjalRtsA+xRYj5b+A3nvfO+fFg/c6n4FA/fMrS0xBNZhNuR 6eWa96WBQNsplAMBMitjO1V42BUg1pIDkxZ/AoEpPfYNL6rmrEwkwfID1tMPHBhUPRbM cL0A== X-Gm-Message-State: AKaTC02qs40Qpg8v9kFg0CkupWqZNKPnXZ47iRhFxtPloGbg4hYpOIZpLqRiEyfkGn1s07bmnf8= X-Received: by 10.194.223.70 with SMTP id qs6mr36504372wjc.124.1481017562349; Tue, 06 Dec 2016 01:46:02 -0800 (PST) Received: from localhost.localdomain ([105.144.52.243]) by smtp.gmail.com with ESMTPSA id kq7sm24786708wjb.30.2016.12.06.01.46.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Dec 2016 01:46:01 -0800 (PST) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 6 Dec 2016 09:45:44 +0000 Message-Id: <1481017548-16050-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481017548-16050-1-git-send-email-ard.biesheuvel@linaro.org> References: <1481017548-16050-1-git-send-email-ard.biesheuvel@linaro.org> Cc: alan@softiron.co.uk Subject: [Linaro-uefi] [PATCH v2 4/8] Platforms/AMD/Cello: 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/CelloBoard/CelloBoard.dsc | 11 +++++++---- Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc index f833fe200422..0e97cb6f97b1 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.dsc @@ -210,6 +210,7 @@ DEFINE DO_KCS = 0 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 @@ -402,10 +403,10 @@ DEFINE DO_KCS = 0 gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|187500000 # - # Bitmask for ports implemented on the SATA controller - # (enabling 4 ports by default: 00001111b) + # Cello has 2 SATA ports on the first controller. # - gAmdStyxTokenSpaceGuid.PcdSataPi|0x0F + gAmdStyxTokenSpaceGuid.PcdSataPortCount|2 + gAmdStyxTokenSpaceGuid.PcdSata1PortCount|0 # PCIe Support gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xF0000000 @@ -555,7 +556,9 @@ DEFINE DO_KCS = 0 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/CelloBoard/CelloBoard.fdf b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf index 7a75197858be..29103531a224 100644 --- a/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf +++ b/Platforms/AMD/Styx/CelloBoard/CelloBoard.fdf @@ -153,7 +153,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