From patchwork Tue Nov 1 17:25:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 80392 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp738900qge; Tue, 1 Nov 2016 10:27:35 -0700 (PDT) X-Received: by 10.176.80.14 with SMTP id b14mr25485553uaa.132.1478021255567; Tue, 01 Nov 2016 10:27:35 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g98si10101262vki.109.2016.11.01.10.27.35; Tue, 01 Nov 2016 10:27:35 -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 dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 36A5F60D85; Tue, 1 Nov 2016 17:27:35 +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 EC56160DDE; Tue, 1 Nov 2016 17:26: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 95CCF60C29; Tue, 1 Nov 2016 17:26:14 +0000 (UTC) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by lists.linaro.org (Postfix) with ESMTPS id 621ED60DDF for ; Tue, 1 Nov 2016 17:25:41 +0000 (UTC) Received: by mail-wm0-f43.google.com with SMTP id n67so299134347wme.1 for ; Tue, 01 Nov 2016 10:25:41 -0700 (PDT) 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=8QOS35Nkrr9tehIG5CIN0xdVSz5dMigCVLyVjBDiPwE=; b=NWp+BTwrSnd4q1/XSRd8+8GkMdSisuX80Twq1YS0i0Hd94xrnKrto2vc2UrR7g+ph1 tr2h9ZkCiusYM+xb8pLigvKJrn2QUEhXOw6EMEPNJjDKKi4z7g/xWANbHneGQbGs+E8B sUqgDnu/nwx3lY0KXNxtrDvHN/R/v1jkt+Ocjt2QbjB4VHZLtKg6xY2Lljw8oF/5Ihzy NQA7saXr3dH8KDJZmgo7vfyyL7isFfl60FGNixCMaKAFVzJ2PwBNjRi6bdFYhRhZfpUq CuOFob30+rPQ1mkqXSbjy1b8JmJlQESyQDkYHprocPMHlIwbwlneCMTqV0mfklQdBN0M g2BQ== X-Gm-Message-State: ABUngveBzfS08XY23l0eVBPdtylZAsvxVS6l8Y0fB2CTNGBpFd+hWy+PyKJ9XTi0vwl8O/DNTZI= X-Received: by 10.194.246.3 with SMTP id xs3mr34256916wjc.87.1478021140412; Tue, 01 Nov 2016 10:25:40 -0700 (PDT) Received: from localhost.localdomain ([105.151.153.127]) by smtp.gmail.com with ESMTPSA id za1sm36816240wjb.8.2016.11.01.10.25.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Nov 2016 10:25:39 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org, leo.duran@amd.com, leif.lindholm@linaro.org, alan@softiron.co.uk Date: Tue, 1 Nov 2016 17:25:11 +0000 Message-Id: <1478021115-22781-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478021115-22781-1-git-send-email-ard.biesheuvel@linaro.org> References: <1478021115-22781-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Linaro-uefi] [PATCH 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 e668b6b06d13..22aba0be414a 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 + PlatformPciIoDeviceRegistrationLib|EmbeddedPkg/Library/PlatformPciIoDeviceRegistrationLib/PlatformPciIoDeviceRegistrationLib.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 + EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.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..7cad75856436 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 EmbeddedPkg/Drivers/PlatformPciIoDxe/PlatformPciIoDxe.inf + INF OpenPlatformPkg/Platforms/AMD/Styx/Drivers/StyxSataPlatformDxe/StyxSataPlatformDxe.inf # # USB Support