From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B442521E2BE36 for ; Sun, 3 Sep 2017 12:52:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56A14883B9; Sun, 3 Sep 2017 19:55:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 56A14883B9 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lersek@redhat.com Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-188.rdu2.redhat.com [10.10.120.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 146815D75C; Sun, 3 Sep 2017 19:54:58 +0000 (UTC) From: Laszlo Ersek To: edk2-devel-01 Cc: Brijesh Singh , Eric Dong , Star Zeng Date: Sun, 3 Sep 2017 21:54:49 +0200 Message-Id: <20170903195449.30261-5-lersek@redhat.com> In-Reply-To: <20170903195449.30261-1-lersek@redhat.com> References: <20170903195449.30261-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sun, 03 Sep 2017 19:55:00 +0000 (UTC) Subject: [PATCH 4/4] MdeModulePkg/AtaAtapiPassThru: unmap common buffers at ExitBootServices() X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2017 19:52:13 -0000 The AtaAtapiPassThru() driver maps three system memory regions for Bus Master Common Buffer operation on the following call path, if the controller being bound has PCI_CLASS_MASS_STORAGE_SATADPA class code: AtaAtapiPassThruStart() EnumerateAttachedDevice() AhciModeInitialization() AhciCreateTransferDescriptor() The regions are unmapped when the controller is unbound, in AtaAtapiPassThruStop(). The common buffers should also be de-programmed when we exit the boot services and the OS gains ownership of the system memory. Introduce an ExitBootServices() notification function that - resets the controller so that it forgets the device addresses for the common buffers, - unmaps the common buffers so that device-to-RAM address translations (in a potential IOMMU or another translator) are torn down. ExitBootServices() notification functions must not alter the UEFI memory map, thus call only PciIo->Unmap(), and not PciIo->FreeBuffer(). (Unlike AtaAtapiPassThruStop() does.) Cc: Brijesh Singh Cc: Eric Dong Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Laszlo Ersek --- MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h | 18 ++++++ MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h | 5 ++ MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c | 67 +++++++++++++++++++- 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h index 809bcc307fc4..d085597fbdfe 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.h @@ -367,5 +367,23 @@ AhciStopCommand ( IN UINT64 Timeout ); +/** + Do AHCI HBA reset. + + @param PciIo The PCI IO protocol instance. + @param Timeout The timeout value of reset, uses 100ns as a unit. + + @retval EFI_DEVICE_ERROR AHCI controller is failed to complete hardware + reset. + @retval EFI_TIMEOUT The reset operation is time out. + @retval EFI_SUCCESS AHCI controller is reset successfully. + +**/ +EFI_STATUS +EFIAPI +AhciReset ( + IN EFI_PCI_IO_PROTOCOL *PciIo, + IN UINT64 Timeout + ); #endif diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h index 4f327dc30b60..e51c66f392d2 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.h @@ -120,6 +120,11 @@ typedef struct { // EFI_EVENT TimerEvent; LIST_ENTRY NonBlockingTaskList; + + // + // For resetting AHCI and unmapping CommonBuffer DMA at ExitBootServices(). + // + EFI_EVENT ExitBootEvent; } ATA_ATAPI_PASS_THRU_INSTANCE; // diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c index 795443ef74f6..6972349b2b8f 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c @@ -103,7 +103,8 @@ ATA_ATAPI_PASS_THRU_INSTANCE gAtaAtapiPassThruInstanceTemplate = { { // NonBlocking TaskList NULL, NULL - } + }, + NULL, // ExitBootEvent }; ATAPI_DEVICE_PATH mAtapiDevicePathTemplate = { @@ -477,6 +478,50 @@ InitializeAtaAtapiPassThru ( return Status; } +/** + If operating in AHCI mode, then reset the HBA and unmap CommonBuffer Bus + Master DMA when exiting the boot services. + + @param[in] Event Event for which this notification function is being + called. + @param[in] Context Pointer to the ATA_ATAPI_PASS_THRU_INSTANCE that + represents the HBA. +**/ +VOID +EFIAPI +AtaPassThruExitBootServices ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + ATA_ATAPI_PASS_THRU_INSTANCE *Instance; + EFI_PCI_IO_PROTOCOL *PciIo; + EFI_AHCI_REGISTERS *AhciRegisters; + + Instance = Context; + + if (Instance->Mode == EfiAtaAhciMode) { + PciIo = Instance->PciIo; + AhciRegisters = &Instance->AhciRegisters; + // + // De-program common buffer references from the HBA by resetting the HBA. + // + AhciReset (PciIo, EFI_AHCI_BUS_RESET_TIMEOUT); + // + // Unmap long-lived common buffers. + // + if (AhciRegisters->AhciRFis != NULL) { + PciIo->Unmap (PciIo, AhciRegisters->MapRFis); + } + if (AhciRegisters->AhciCmdList != NULL) { + PciIo->Unmap (PciIo, AhciRegisters->MapCmdList); + } + if (AhciRegisters->AhciCommandTable != NULL) { + PciIo->Unmap (PciIo, AhciRegisters->MapCommandTable); + } + } +} + /** Tests to see if this driver supports a given controller. If a child device is provided, it further tests to see if this driver supports creating a handle for the specified child device. @@ -755,6 +800,17 @@ AtaAtapiPassThruStart ( InitializeListHead(&Instance->DeviceList); InitializeListHead(&Instance->NonBlockingTaskList); + Status = gBS->CreateEvent ( + EVT_SIGNAL_EXIT_BOOT_SERVICES, + TPL_CALLBACK, + AtaPassThruExitBootServices, + Instance, + &Instance->ExitBootEvent + ); + if (EFI_ERROR (Status)) { + goto ErrorExit; + } + Instance->TimerEvent = NULL; Status = gBS->CreateEvent ( @@ -808,6 +864,10 @@ ErrorExit: gBS->CloseEvent (Instance->TimerEvent); } + if ((Instance != NULL) && (Instance->ExitBootEvent != NULL)) { + gBS->CloseEvent (Instance->ExitBootEvent); + } + // // Remove all inserted ATA devices. // @@ -912,6 +972,11 @@ AtaAtapiPassThruStop ( // DestroyDeviceInfoList (Instance); + if (Instance->ExitBootEvent != NULL) { + gBS->CloseEvent (Instance->ExitBootEvent); + Instance->ExitBootEvent = NULL; + } + // // If the current working mode is AHCI mode, then pre-allocated resource // for AHCI initialization should be released. -- 2.14.1.3.gb7cf6e02401b