From nobody Sat Nov 2 16:21:01 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1487887468209172.39349223263628; Thu, 23 Feb 2017 14:04:28 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E6E368219C; Thu, 23 Feb 2017 14:04:20 -0800 (PST) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 96D7E82195 for ; Thu, 23 Feb 2017 14:04:19 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7AB69C7A; Thu, 23 Feb 2017 14:04:19 -0800 (PST) Received: from u200856.usa.arm.com (u201426.usa.arm.com [10.118.28.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1CE503F483; Thu, 23 Feb 2017 14:04:19 -0800 (PST) X-Original-To: edk2-devel@lists.01.org From: Jeremy Linton To: edk2-devel@lists.01.org Date: Thu, 23 Feb 2017 16:04:03 -0600 Message-Id: <20170223220405.1954-7-jeremy.linton@arm.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170223220405.1954-1-jeremy.linton@arm.com> References: <20170223220405.1954-1-jeremy.linton@arm.com> Subject: [edk2] [PATCH v2 6/7] EmbeddedPkg: SiI3132: Cleanup device node creation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ard.biesheuvel@linaro.org, Steve.Capper@arm.com, ryan.harkin@linaro.org, leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There can be either ATA or ATAPI devices connected to each SATA port. We want to detect if the device is ATA and create a SATA_DP path or a SCSI_DP for ATAPI devices. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeremy Linton --- .../Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c | 43 ++++++++++++++----= ---- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c b/Embe= ddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c index b14a8aa..8c65a73 100644 --- a/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c +++ b/EmbeddedPkg/Drivers/SataSiI3132Dxe/SiI3132AtaPassThru.c @@ -521,16 +521,19 @@ SiI3132GetNextDevice ( SataPort =3D &(SataSiI3132Instance->Ports[Port]); =20 if (*PortMultiplierPort =3D=3D 0xFFFF) { + SATA_TRACE ("SiI3132GetNextDevice() PortMultiplier"); List =3D SataPort->Devices.ForwardLink; - if (List !=3D &SataPort->Devices) { + if ((List !=3D &SataPort->Devices) && + (((SATA_SI3132_DEVICE*)List)->Atapi =3D=3D FALSE)) { // The list is not empty, return the first device *PortMultiplierPort =3D ((SATA_SI3132_DEVICE*)List)->Index; } else { Status =3D EFI_NOT_FOUND; } } else { + SATA_TRACE ("SiI3132GetNextDevice()"); SataDevice =3D GetSataDevice (SataSiI3132Instance, Port, *PortMultipli= erPort); - if (SataDevice !=3D NULL) { + if ((SataDevice !=3D NULL) && (SataDevice->Atapi =3D=3D FALSE)) { // We have found the previous port multiplier, return the next one List =3D SataDevice->Link.ForwardLink; if (List !=3D &SataPort->Devices) { @@ -601,20 +604,30 @@ SiI3132BuildDevicePath ( return EFI_NOT_FOUND; } =20 - SiI3132DevicePath =3D CreateDeviceNode (MESSAGING_DEVICE_PATH, MSG_SATA_= DP, sizeof (SATA_DEVICE_PATH)); - if (SiI3132DevicePath =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; - } + if (SataDevice->Atapi) { + SiI3132DevicePath =3D CreateDeviceNode (MESSAGING_DEVICE_PATH, MSG_SCS= I_DP, sizeof (SCSI_DEVICE_PATH)); + if (SiI3132DevicePath =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + ((SCSI_DEVICE_PATH*)SiI3132DevicePath)->Pun =3D Port; + ((SCSI_DEVICE_PATH*)SiI3132DevicePath)->Lun =3D 0; =20 - ((SATA_DEVICE_PATH*)SiI3132DevicePath)->HBAPortNumber =3D Port; - if (FeaturePcdGet (PcdSataSiI3132FeaturePMPSupport)) { - ((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortNumber =3D P= ortMultiplierPort; - } else { - //Temp:((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortNumbe= r =3D SATA_HBA_DIRECT_CONNECT_FLAG; - ((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortNumber =3D 0; } - ((SATA_DEVICE_PATH*)SiI3132DevicePath)->Lun =3D Port; //TODO: Search inf= ormation how to define properly LUN (Logical Unit Number) + else { + SiI3132DevicePath =3D CreateDeviceNode (MESSAGING_DEVICE_PATH, MSG_SAT= A_DP, sizeof (SATA_DEVICE_PATH)); + if (SiI3132DevicePath =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } =20 + ((SATA_DEVICE_PATH*)SiI3132DevicePath)->HBAPortNumber =3D Port; + if (FeaturePcdGet (PcdSataSiI3132FeaturePMPSupport)) { + ((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortNumber =3D= PortMultiplierPort; + } else { + //Temp:((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortN= umber =3D SATA_HBA_DIRECT_CONNECT_FLAG; + ((SATA_DEVICE_PATH*)SiI3132DevicePath)->PortMultiplierPortNumber =3D= 0; + } + ((SATA_DEVICE_PATH*)SiI3132DevicePath)->Lun =3D 0; // Only support lun= 0 on ATA + } *DevicePath =3D SiI3132DevicePath; return EFI_SUCCESS; } @@ -680,7 +693,7 @@ SiI3132GetDevice ( return EFI_INVALID_PARAMETER; } =20 - if (((SATA_DEVICE_PATH*)DevicePath)->Lun >=3D SATA_SII3132_MAXPORT) { + if (((SATA_DEVICE_PATH*)DevicePath)->HBAPortNumber >=3D SATA_SII3132_MAX= PORT) { return EFI_NOT_FOUND; } =20 @@ -688,7 +701,7 @@ SiI3132GetDevice ( ASSERT (0); //TODO: Implement me! return EFI_UNSUPPORTED; } else { - *Port =3D ((SATA_DEVICE_PATH*)DevicePath)->Lun; + *Port =3D ((SATA_DEVICE_PATH*)DevicePath)->HBAPortNumber; // Return the first Sata Sevice as there should be only one directly c= onnected *PortMultiplierPort =3D ((SATA_SI3132_DEVICE*)SataSiI3132Instance->Por= ts[*Port].Devices.ForwardLink)->Index; return EFI_SUCCESS; --=20 2.9.3 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel