From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [62.140.7.102]) by mx.groups.io with SMTP id smtpd.web11.5975.1594966323868420234 for ; Thu, 16 Jul 2020 23:12:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=L5pG0Z2h; spf=pass (domain: suse.com, ip: 62.140.7.102, mailfrom: glin@suse.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1594966322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xSgK0Fjk+tnKsEq9rlJX62AK+SLbXV/+LEkFq7pd4CI=; b=L5pG0Z2hChMFLqBFlxLwcWWq8x3M96wTSBzWNdBQN8vqoT8OebGKT7+0GbmrZZ9+ozJ2BM Q4EG6Cgz3/hfh14ZiaWHrejQTgNAkVIrVsQYE/Ohqhr8wbXyVfX9KG5phiVmbpS1Fkc9Qm fZ1vVIj8dZBky7J0kdKd76TemCeYVFY= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-20-rgyag10kOjiHp-AFEmIeCw-1; Fri, 17 Jul 2020 08:12:00 +0200 X-MC-Unique: rgyag10kOjiHp-AFEmIeCw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UIBuuk/smEApRh+PR8oZJBSFljXwwsaOtWsa4GfV+Xsc3/yR4nU5H2UBKa3dVIXIpD1vNR6qRs4TPpTfcUrQg2eUEd0Q2aI3FfVQiAVq8PavXuh04EmXrPwmVf9CadpgY9zt+m61oajugKsisBlX/lx+rANRC2yJ5qRwcCWYF7XJD0Ss0uOEMiY5TmMi4ZXFlIM8UBAebEMK3zQFEtC6uGLGVog8awrt2IzPd4Q4gico+TUnW7Ysl6jlzbv4p8+C+bAJX462JgMTPOdzZmS2dxcVZsP9z3fNohcRuNSzZXjwc7AsfH30vZo/PM6dMRP9Q4DZfoJhez3pn7uAy7mhCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xSgK0Fjk+tnKsEq9rlJX62AK+SLbXV/+LEkFq7pd4CI=; b=ICd9oDHRuBpzGE3dqGN0AqZzLPv24q+O8g1OR+9tiU7FsjQqZU3qkOPJQYhN2YeWr1dHQPrcCsqHMF21jI4APmqz3Dy9GjGvOD7iPGu1tl5yPryCdRt7SVwK9ZbuvFcEcsyD1yv0OcvhCO5Gk1/WTIneN1v15HOugrS9TlPf3FhyJEMDMUh5B5uHTZecO6/M2mBgoSd7gxZIv64kNtYgPQ0jzI1BoTvgcEU0ibCqthpBOzxcmA/bm+7qhtURUhChcdDmlQnNdSFzuxewgeN2AFI4WIgQqdIt3w1OBZTIQueEwJyZ2uAoadDxAxDQEVEvwHi/UUOdRzUIVZGY6EZYmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=suse.com; Received: from AM0PR0402MB3809.eurprd04.prod.outlook.com (2603:10a6:208:10::30) by AM0PR04MB4740.eurprd04.prod.outlook.com (2603:10a6:208:c8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Fri, 17 Jul 2020 06:11:59 +0000 Received: from AM0PR0402MB3809.eurprd04.prod.outlook.com ([fe80::a14c:d441:c8a9:77ba]) by AM0PR0402MB3809.eurprd04.prod.outlook.com ([fe80::a14c:d441:c8a9:77ba%6]) with mapi id 15.20.3174.026; Fri, 17 Jul 2020 06:11:59 +0000 From: "Gary Lin" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v3 05/11] OvmfPkg/LsiScsiDxe: Install stubbed EXT_SCSI_PASS_THRU Date: Fri, 17 Jul 2020 14:11:24 +0800 Message-Id: <20200717061130.8881-6-glin@suse.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717061130.8881-1-glin@suse.com> References: <20200717061130.8881-1-glin@suse.com> X-ClientProxiedBy: AM0PR04CA0138.eurprd04.prod.outlook.com (2603:10a6:208:55::43) To AM0PR0402MB3809.eurprd04.prod.outlook.com (2603:10a6:208:10::30) Return-Path: glin@suse.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from GaryWorkstation.suse.cz (60.251.47.115) by AM0PR04CA0138.eurprd04.prod.outlook.com (2603:10a6:208:55::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Fri, 17 Jul 2020 06:11:57 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [60.251.47.115] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78527c6d-99af-4a03-471c-08d82a18506a X-MS-TrafficTypeDiagnostic: AM0PR04MB4740: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jiZ8AabMzw41sr9rCA3ci2D1dORZSIvS4aHL69WpJ28+AIlomaqiD+j7d1sMTcydAmieuBPsWM7eO8aRg16jiVd7lOgl6OnkuHuVSr2Wg4OX5xTl+hjDhbNgx4AOq/+lUkJQALjt3BsJ5VEjtR1L0SWywVqDfRQwFpOnwPJvvi90xpTlWKUBLKbIEWE9fmeJVaeiqZhGj13EJl2RoYQ36aIIZVVnHhmdD6s2ZELPNipAYaekiy/8+EeKkDVbrRycCJ+WduovHL3QmV22cu2Q9aRig/REt+rH+hJFhtYCo1T/GUiVPZ3WCMNkbkB+fYvdiwHpVN+QWRFou005HGWVUQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR0402MB3809.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39860400002)(136003)(396003)(376002)(346002)(366004)(55236004)(2906002)(186003)(1076003)(16526019)(66556008)(6506007)(66946007)(6486002)(8936002)(66476007)(54906003)(86362001)(6916009)(8676002)(26005)(83380400001)(5660300002)(6512007)(316002)(6666004)(52116002)(478600001)(956004)(36756003)(2616005)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9xfJvm/NUtYFyQAN8y2/AD7EgWDIQSROTpCXugsd6/3JTFVjqZlG/FXzkRYrGi3uJr/cvqsd5+1bDCIDTuCh1vGm29w5Z1lM87eZK/vSBU/1ZbHQunTecMYEC90Av4kuM7N0GIeiTivi9AzG4QPuGLylC7xcZ01f6+Z8GcuYoLJQHARr937i2klQopMn7gILIDKWozogBdD3QUIi15BoVoqFZId4DCfx+Fd0O+eE9/kmscKfc3J/l13JKg4EVaOYj979Pk3S16YTRdKETNfFCc01e7MBYsieHgJ7xRfRr1oaodxoX8EYD1gl05Zsb1nbL6lAkfWSIF/H/UEnmWTvJG46EQdTVJ6x3aIbCQj6fXjLiQtQiFFAxVkHBVOUngXifTXwFzFV/t9F/cfJQjfnMvSmhEN1y8InV6Sd/5ANLEJ8pr4ToJadScLFu5HH6n81fiEjzaz6A3ZTQqSrJ3Gf3fIcQjoUhwQnS7Tzlr3WLZQ= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78527c6d-99af-4a03-471c-08d82a18506a X-MS-Exchange-CrossTenant-AuthSource: AM0PR0402MB3809.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2020 06:11:59.3327 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +fFapWvHMf/efHW3kWB8yh6rS+7xxtEw4+7ZaTeC7vqovx9o5YanLVHFt5SPrnFT X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4740 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Partially implement LsiScsiControllerStart() and LsiScsiControllerStop() to insert the scaffolding of EXT_SCSI_PASS_THRU functions. v3: Squash the newline below the declaration of LSI_SCSI_FROM_PASS_THRU v2: Remove the closing of PciIo protocol from LsiScsiControllerStop(). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Gary Lin Reviewed-by: Laszlo Ersek --- OvmfPkg/LsiScsiDxe/LsiScsi.c | 164 +++++++++++++++++++++++++++++- OvmfPkg/LsiScsiDxe/LsiScsi.h | 78 ++++++++++++++ OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf | 3 + 3 files changed, 244 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.c b/OvmfPkg/LsiScsiDxe/LsiScsi.c index 5bca85bd75eb..67fadb411e85 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.c +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.c @@ -11,14 +11,105 @@ =0D #include =0D #include =0D +#include =0D +#include =0D +#include =0D +#include =0D #include =0D #include =0D #include =0D #include =0D +#include =0D #include =0D =0D #include "LsiScsi.h"=0D =0D +//=0D +// The next seven functions implement EFI_EXT_SCSI_PASS_THRU_PROTOCOL=0D +// for the LSI 53C895A SCSI Controller. Refer to UEFI Spec 2.3.1 + Errata = C,=0D +// sections=0D +// - 14.1 SCSI Driver Model Overview,=0D +// - 14.7 Extended SCSI Pass Thru Protocol.=0D +//=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiPassThru (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun,=0D + IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,=0D + IN EFI_EVENT Event OPTIONAL=0D + )=0D +{=0D + return EFI_UNSUPPORTED;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetNextTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN OUT UINT8 **TargetPointer,=0D + IN OUT UINT64 *Lun=0D + )=0D +{=0D + return EFI_NOT_FOUND;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiBuildDevicePath (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun,=0D + IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath=0D + )=0D +{=0D + return EFI_NOT_FOUND;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,=0D + OUT UINT8 **TargetPointer,=0D + OUT UINT64 *Lun=0D + )=0D +{=0D + return EFI_UNSUPPORTED;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiResetChannel (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This=0D + )=0D +{=0D + return EFI_UNSUPPORTED;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiResetTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun=0D + )=0D +{=0D + return EFI_UNSUPPORTED;=0D +}=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetNextTarget (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN OUT UINT8 **TargetPointer=0D + )=0D +{=0D + return EFI_NOT_FOUND;=0D +}=0D +=0D //=0D // Probe, start and stop functions of this driver, called by the DXE core = for=0D // specific devices.=0D @@ -88,7 +179,49 @@ LsiScsiControllerStart ( IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL=0D )=0D {=0D + EFI_STATUS Status;=0D + LSI_SCSI_DEV *Dev;=0D +=0D + Dev =3D AllocateZeroPool (sizeof (*Dev));=0D + if (Dev =3D=3D NULL) {=0D + return EFI_OUT_OF_RESOURCES;=0D + }=0D +=0D + Dev->Signature =3D LSI_SCSI_DEV_SIGNATURE;=0D +=0D + //=0D + // Host adapter channel, doesn't exist=0D + //=0D + Dev->PassThruMode.AdapterId =3D MAX_UINT32;=0D + Dev->PassThruMode.Attributes =3D=0D + EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_PHYSICAL |=0D + EFI_EXT_SCSI_PASS_THRU_ATTRIBUTES_LOGICAL;=0D +=0D + Dev->PassThru.Mode =3D &Dev->PassThruMode;=0D + Dev->PassThru.PassThru =3D &LsiScsiPassThru;=0D + Dev->PassThru.GetNextTargetLun =3D &LsiScsiGetNextTargetLun;=0D + Dev->PassThru.BuildDevicePath =3D &LsiScsiBuildDevicePath;=0D + Dev->PassThru.GetTargetLun =3D &LsiScsiGetTargetLun;=0D + Dev->PassThru.ResetChannel =3D &LsiScsiResetChannel;=0D + Dev->PassThru.ResetTargetLun =3D &LsiScsiResetTargetLun;=0D + Dev->PassThru.GetNextTarget =3D &LsiScsiGetNextTarget;=0D +=0D + Status =3D gBS->InstallProtocolInterface (=0D + &ControllerHandle,=0D + &gEfiExtScsiPassThruProtocolGuid,=0D + EFI_NATIVE_INTERFACE,=0D + &Dev->PassThru=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto FreePool;=0D + }=0D +=0D return EFI_SUCCESS;=0D +=0D +FreePool:=0D + FreePool (Dev);=0D +=0D + return Status;=0D }=0D =0D EFI_STATUS=0D @@ -100,7 +233,36 @@ LsiScsiControllerStop ( IN EFI_HANDLE *ChildHandleBuffer=0D )=0D {=0D - return EFI_SUCCESS;=0D + EFI_STATUS Status;=0D + EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;=0D + LSI_SCSI_DEV *Dev;=0D +=0D + Status =3D gBS->OpenProtocol (=0D + ControllerHandle,=0D + &gEfiExtScsiPassThruProtocolGuid,=0D + (VOID **)&PassThru,=0D + This->DriverBindingHandle,=0D + ControllerHandle,=0D + EFI_OPEN_PROTOCOL_GET_PROTOCOL // Lookup only=0D + );=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D +=0D + Dev =3D LSI_SCSI_FROM_PASS_THRU (PassThru);=0D +=0D + Status =3D gBS->UninstallProtocolInterface (=0D + ControllerHandle,=0D + &gEfiExtScsiPassThruProtocolGuid,=0D + &Dev->PassThru=0D + );=0D + if (EFI_ERROR (Status)) {=0D + return Status;=0D + }=0D +=0D + FreePool (Dev);=0D +=0D + return Status;=0D }=0D =0D //=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.h b/OvmfPkg/LsiScsiDxe/LsiScsi.h index 6c8dcbd70a0a..751d5b193b51 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.h +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.h @@ -12,6 +12,18 @@ #ifndef _LSI_SCSI_DXE_H_=0D #define _LSI_SCSI_DXE_H_=0D =0D +typedef struct {=0D + UINT32 Signature;=0D + EFI_EXT_SCSI_PASS_THRU_MODE PassThruMode;=0D + EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;=0D +} LSI_SCSI_DEV;=0D +=0D +#define LSI_SCSI_DEV_SIGNATURE SIGNATURE_32 ('L','S','I','S')=0D +=0D +#define LSI_SCSI_FROM_PASS_THRU(PassThruPtr) \=0D + CR (PassThruPtr, LSI_SCSI_DEV, PassThru, LSI_SCSI_DEV_SIGNATURE)=0D +=0D +=0D //=0D // Probe, start and stop functions of this driver, called by the DXE core = for=0D // specific devices.=0D @@ -47,6 +59,72 @@ LsiScsiControllerStop ( );=0D =0D =0D +//=0D +// The next seven functions implement EFI_EXT_SCSI_PASS_THRU_PROTOCOL=0D +// for the LSI 53C895A SCSI Controller. Refer to UEFI Spec 2.3.1 + Errata = C,=0D +// sections=0D +// - 14.1 SCSI Driver Model Overview,=0D +// - 14.7 Extended SCSI Pass Thru Protocol.=0D +//=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiPassThru (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun,=0D + IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,=0D + IN EFI_EVENT Event OPTIONAL=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetNextTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN OUT UINT8 **TargetPointer,=0D + IN OUT UINT64 *Lun=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiBuildDevicePath (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun,=0D + IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,=0D + OUT UINT8 **TargetPointer,=0D + OUT UINT64 *Lun=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiResetChannel (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiResetTargetLun (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN UINT8 *Target,=0D + IN UINT64 Lun=0D + );=0D +=0D +EFI_STATUS=0D +EFIAPI=0D +LsiScsiGetNextTarget (=0D + IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL *This,=0D + IN OUT UINT8 **TargetPointer=0D + );=0D +=0D +=0D //=0D // The purpose of the following scaffolding (EFI_COMPONENT_NAME_PROTOCOL a= nd=0D // EFI_COMPONENT_NAME2_PROTOCOL implementation) is to format the driver's = name=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf b/OvmfPkg/LsiScsiDxe/LsiScsi= Dxe.inf index 7ce11fcc6a03..14f9c68308cc 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf +++ b/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf @@ -26,9 +26,12 @@ [Packages] =0D [LibraryClasses]=0D BaseLib=0D + BaseMemoryLib=0D + MemoryAllocationLib=0D UefiBootServicesTableLib=0D UefiDriverEntryPoint=0D UefiLib=0D =0D [Protocols]=0D + gEfiExtScsiPassThruProtocolGuid ## BY_START=0D gEfiPciIoProtocolGuid ## TO_START=0D --=20 2.25.1