From 2d273c8db95430b680e542e38cf07b97f9b57d11 Mon Sep 17 00:00:00 2001 From: Cinnamon Shia Date: Mon, 6 Jun 2016 12:07:58 +0800 Subject: [PATCH] MdeModulePkg/AtaBusDxe: Fix some ATA hard drives cannot be discovered If there is no multiplier, the DEV bit of the ATA device register would always be set. It causes that some ATA hard drives don't response the ATA identity command sent to them. Below is the description about DEV bit in ATA spec: A device is selected when the DEV bit of the Device register is equal to the device number assigned to the device by means of a Device 0/Device 1 jumper or switch, or use of the CSEL signal. Below is the description about DEV bit in SATA spec: When the DEV bit in the Device register is set to one, selecting the non-existent Device 1, the host adapter shall respond to register reads and writes as specified for a Device 0 with no Device 1 present, as defined in the ATA/ATAPI-5 standard. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Cinnamon Shia Reviewed-by: Feng Tian Reviewed-by: Hao Wu --- MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c index a3008f92d9..a3739fc80b 100644 --- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c +++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c @@ -11,6 +11,7 @@ Cylinder register. Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -413,7 +414,7 @@ DiscoverAtaDevice ( // Acb = ZeroMem (&AtaDevice->Acb, sizeof (EFI_ATA_COMMAND_BLOCK)); Acb->AtaCommand = ATA_CMD_IDENTIFY_DRIVE; - Acb->AtaDeviceHead = (UINT8) (BIT7 | BIT6 | BIT5 | (AtaDevice->PortMultiplierPort << 4)); + Acb->AtaDeviceHead = (UINT8) (BIT7 | BIT6 | BIT5 | (AtaDevice->PortMultiplierPort == 0xFFFF ? 0 : (AtaDevice->PortMultiplierPort << 4))); // // Prepare for ATA pass through packet. -- 2.39.2