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.web12.5967.1594966324982617786 for ; Thu, 16 Jul 2020 23:12:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=YEyY/5oq; 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=1594966323; 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=sraDpDjRvOEVAbpgKMGdeTzTehpd8en3JG7wfomqVGs=; b=YEyY/5oqGUwbywLwlbTAZaF4m6zavkbV0jqh0aNP/96sZkEPrgVKyNQuxJCtKEqth6BIIL XGFp93Lcm4wT7mPzZztkcnZlhEXmG3hAJizpALlF+FOXzz2zsarWtTPVrQRXr6tnuRnUhL /G/dRmuiR3wGT4ROPO+9AtkWwq2+SvU= 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-LRuPpKRsNw6dgkxxpHVafQ-2; Fri, 17 Jul 2020 08:12:02 +0200 X-MC-Unique: LRuPpKRsNw6dgkxxpHVafQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IjljVnLRIiVvPxJ3Q6GeegwWDapTQFnc0hpyFnQWL6ckYXWNMz1uFwtqtQYVeXM1g6XvtnZGZ7h/AUIaN7YS7+bOQzMPBiXQE0fBWeBFRm42KoZ6mb7uIakJ4nymtBBJeLhG/gRTpdVuXVpK+zWyu7bkXrn+PNMlMwnbmqY6MuEA9jlpIBFgGqoi8OTaq9Wh118dLZ5bP9Ks4/4DiwPWXIG0rakwt749sEfdKmnnwqs8rroAboEMoJMmL2z3J4mBzNj4Ey4mkViI0KKFqCMJXwjU324cX14zcN8YNBSkNI2NljmZr006wlXZpDTkrppaqzpEH5O7bvcDUrh8mbr5fA== 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=sraDpDjRvOEVAbpgKMGdeTzTehpd8en3JG7wfomqVGs=; b=FDz2j4Bxm+g5BpqwBkqUjQB4OcoY8Hv2VKGmUa73dFoln9FqQObhvv3mtBzMh8MgqFXrTUNuRZ5Om/SN/rvgSH0st64AgxHVYNSgAnDAsqVu/L3RMlZMxoF0uVb2FjiXxOgYdOLNfX9/BV9hKCCh7GNJRzpsAw2gc9qvfgyNQYHHt3Tml5lLSOvAP9alOdUjV4A67BeJAj7rf6wPWEZ5bzDiiETQyJLbolk9NfUJve6e+nv1wPdi4/HFYcVI7ulyquHEklDk4mC1gir+/jcPdgxBRSamtUC2K/Gh7bqsFO+0QM63LGr90Rlz667liB8x3ifu6QUy6eoDqkvQDokLZg== 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:12:01 +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:12:01 +0000 From: "Gary Lin" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v3 06/11] OvmfPkg/LsiScsiDxe: Report Targets and LUNs Date: Fri, 17 Jul 2020 14:11:25 +0800 Message-Id: <20200717061130.8881-7-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:59 +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: fb7503c8-d9c2-4c25-df3b-08d82a185194 X-MS-TrafficTypeDiagnostic: AM0PR04MB4740: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:551; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zd8OgNSrv1wg0qPWIBdQ9Y9mn6r69cz/v7V3YHQtKCA70r8aAdT2+O97x8tfLFru2MSvtUHVFwVh4mzLeVTTgqCtzqp1WUHlz625rsxiHtXeF00ml9KtfuXSsvE5vOaRodicjeccp4N6rXcplZvpE9iDbfqYA3Rp6w3gkPryVY6AHjFLYuwT6uiNlRpF/mV6kO5ap7ZMUd4UizsgaXsPnvw+pMEdmM+CkTCmgGWJeqsgxgTEI4s1Zf0o5gbSw8BP6KR+JD1HvttlkEPOK3dpRJreH3JvRhuZ/mzUxyrgK7VZEu2kR/hAiYvt17QPROM6qABYUOPZiKDvHm7uRiH1rg== 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: oc8SmAyAU3o7ylFn3w+b5d/k14ZxPToZwHQKtXqKCrWQv7Qa7N6tDcr2r34QBNkHNIWCEvwvHIZhtAV51jhTySZKZYvd0oomX0IMRwXY+zhAoGmzIMk1LsOzTWtDSDcjteSdRy17ot1Drx/L0N2H+GKylom4dW4P309IVZMMgaMaeaKnsjBnVpITcVV3oySXViINDPn6UdW5x7jeiPrETP7LHeZQcouMZTGnTaxYvMPn54G52l73RfQNENOO1VgEQboYoWHJFcmgXa5j75Kdq3c262zOtRU+Q7jnNK9AFNjfonhboEFGPRlQQMNU/PwIULBaVi0ruF7blyV3hTTKQcZcBT/Z/M5CVhI8YRn2xhhmx3Y+gETRZsNmVhfP1FvxVOTGehNdf8GXcj5WdjMJysNUZanCbVP5gqPFll+9LcFee/AGxe5THd5OTbx/dkq21PV/exj//OYIg+Jbj+63oAvKSCJSTwiu2Fz2AFZ/wEs= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb7503c8-d9c2-4c25-df3b-08d82a185194 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:12:01.3315 (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: 11u4I3AmSCnmyR9jxIJuc+KRvlqd/UfVjDnIFQ6ImK2jSlmx0soeVhm0cX5b1bb4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4740 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Implement LsiScsiGetNextTargetLun(), LsiScsiBuildDevicePath(), LsiScsiGetTargetLun(), and LsiScsiGetNextTarget() to report Targets and LUNs and build the device path. This commit also introduces two PCD value: PcdLsiScsiMaxTargetLimit and PcdLsiScsiMaxLunLimit as the limits for Targets and LUNs. v3: - Update the range of LUN in the assertioin - Squash the spurious newline into the previous commit v2: - Zero out (*Target) in LsiScsiGetTargetLun() - Use CopyMem() instead of the one-byte shortcut to copy target from ScsiDevicePath->Pun - Add asserts for PcdLsiScsiMaxTargetLimit and PcdLsiScsiMaxLunLimit Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Gary Lin --- OvmfPkg/LsiScsiDxe/LsiScsi.c | 148 +++++++++++++++++++++++++++++- OvmfPkg/LsiScsiDxe/LsiScsi.h | 2 + OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf | 6 ++ OvmfPkg/OvmfPkg.dec | 5 + 4 files changed, 159 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.c b/OvmfPkg/LsiScsiDxe/LsiScsi.c index 67fadb411e85..172779240636 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.c +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.c @@ -15,6 +15,7 @@ #include =0D #include =0D #include =0D +#include =0D #include =0D #include =0D #include =0D @@ -53,6 +54,49 @@ LsiScsiGetNextTargetLun ( IN OUT UINT64 *Lun=0D )=0D {=0D + LSI_SCSI_DEV *Dev;=0D + UINTN Idx;=0D + UINT8 *Target;=0D + UINT16 LastTarget;=0D +=0D + //=0D + // the TargetPointer input parameter is unnecessarily a pointer-to-point= er=0D + //=0D + Target =3D *TargetPointer;=0D +=0D + //=0D + // Search for first non-0xFF byte. If not found, return first target & L= UN.=0D + //=0D + for (Idx =3D 0; Idx < TARGET_MAX_BYTES && Target[Idx] =3D=3D 0xFF; ++Idx= )=0D + ;=0D + if (Idx =3D=3D TARGET_MAX_BYTES) {=0D + SetMem (Target, TARGET_MAX_BYTES, 0x00);=0D + *Lun =3D 0;=0D + return EFI_SUCCESS;=0D + }=0D +=0D + CopyMem (&LastTarget, Target, sizeof LastTarget);=0D +=0D + //=0D + // increment (target, LUN) pair if valid on input=0D + //=0D + Dev =3D LSI_SCSI_FROM_PASS_THRU (This);=0D + if (LastTarget > Dev->MaxTarget || *Lun > Dev->MaxLun) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + if (*Lun < Dev->MaxLun) {=0D + ++*Lun;=0D + return EFI_SUCCESS;=0D + }=0D +=0D + if (LastTarget < Dev->MaxTarget) {=0D + *Lun =3D 0;=0D + ++LastTarget;=0D + CopyMem (Target, &LastTarget, sizeof LastTarget);=0D + return EFI_SUCCESS;=0D + }=0D +=0D return EFI_NOT_FOUND;=0D }=0D =0D @@ -65,7 +109,34 @@ LsiScsiBuildDevicePath ( IN OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath=0D )=0D {=0D - return EFI_NOT_FOUND;=0D + UINT16 TargetValue;=0D + LSI_SCSI_DEV *Dev;=0D + SCSI_DEVICE_PATH *ScsiDevicePath;=0D +=0D + if (DevicePath =3D=3D NULL) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + CopyMem (&TargetValue, Target, sizeof TargetValue);=0D + Dev =3D LSI_SCSI_FROM_PASS_THRU (This);=0D + if (TargetValue > Dev->MaxTarget || Lun > Dev->MaxLun || Lun > 0xFFFF) {= =0D + return EFI_NOT_FOUND;=0D + }=0D +=0D + ScsiDevicePath =3D AllocatePool (sizeof *ScsiDevicePath);=0D + if (ScsiDevicePath =3D=3D NULL) {=0D + return EFI_OUT_OF_RESOURCES;=0D + }=0D +=0D + ScsiDevicePath->Header.Type =3D MESSAGING_DEVICE_PATH;=0D + ScsiDevicePath->Header.SubType =3D MSG_SCSI_DP;=0D + ScsiDevicePath->Header.Length[0] =3D (UINT8) sizeof *ScsiDevicePath;=0D + ScsiDevicePath->Header.Length[1] =3D (UINT8) (sizeof *ScsiDevicePath >> = 8);=0D + ScsiDevicePath->Pun =3D TargetValue;=0D + ScsiDevicePath->Lun =3D (UINT16) Lun;=0D +=0D + *DevicePath =3D &ScsiDevicePath->Header;=0D + return EFI_SUCCESS;=0D }=0D =0D EFI_STATUS=0D @@ -77,7 +148,33 @@ LsiScsiGetTargetLun ( OUT UINT64 *Lun=0D )=0D {=0D - return EFI_UNSUPPORTED;=0D + SCSI_DEVICE_PATH *ScsiDevicePath;=0D + LSI_SCSI_DEV *Dev;=0D + UINT8 *Target;=0D +=0D + if (DevicePath =3D=3D NULL || TargetPointer =3D=3D NULL || *TargetPointe= r =3D=3D NULL ||=0D + Lun =3D=3D NULL) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + if (DevicePath->Type !=3D MESSAGING_DEVICE_PATH ||=0D + DevicePath->SubType !=3D MSG_SCSI_DP) {=0D + return EFI_UNSUPPORTED;=0D + }=0D +=0D + ScsiDevicePath =3D (SCSI_DEVICE_PATH *) DevicePath;=0D + Dev =3D LSI_SCSI_FROM_PASS_THRU (This);=0D + if (ScsiDevicePath->Pun > Dev->MaxTarget ||=0D + ScsiDevicePath->Lun > Dev->MaxLun) {=0D + return EFI_NOT_FOUND;=0D + }=0D +=0D + Target =3D *TargetPointer;=0D + ZeroMem (Target, TARGET_MAX_BYTES);=0D + CopyMem (Target, &ScsiDevicePath->Pun, sizeof ScsiDevicePath->Pun);=0D + *Lun =3D ScsiDevicePath->Lun;=0D +=0D + return EFI_SUCCESS;=0D }=0D =0D EFI_STATUS=0D @@ -107,6 +204,42 @@ LsiScsiGetNextTarget ( IN OUT UINT8 **TargetPointer=0D )=0D {=0D + LSI_SCSI_DEV *Dev;=0D + UINTN Idx;=0D + UINT8 *Target;=0D + UINT16 LastTarget;=0D +=0D + //=0D + // the TargetPointer input parameter is unnecessarily a pointer-to-point= er=0D + //=0D + Target =3D *TargetPointer;=0D +=0D + //=0D + // Search for first non-0xFF byte. If not found, return first target.=0D + //=0D + for (Idx =3D 0; Idx < TARGET_MAX_BYTES && Target[Idx] =3D=3D 0xFF; ++Idx= )=0D + ;=0D + if (Idx =3D=3D TARGET_MAX_BYTES) {=0D + SetMem (Target, TARGET_MAX_BYTES, 0x00);=0D + return EFI_SUCCESS;=0D + }=0D +=0D + CopyMem (&LastTarget, Target, sizeof LastTarget);=0D +=0D + //=0D + // increment target if valid on input=0D + //=0D + Dev =3D LSI_SCSI_FROM_PASS_THRU (This);=0D + if (LastTarget > Dev->MaxTarget) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + if (LastTarget < Dev->MaxTarget) {=0D + ++LastTarget;=0D + CopyMem (Target, &LastTarget, sizeof LastTarget);=0D + return EFI_SUCCESS;=0D + }=0D +=0D return EFI_NOT_FOUND;=0D }=0D =0D @@ -189,6 +322,17 @@ LsiScsiControllerStart ( =0D Dev->Signature =3D LSI_SCSI_DEV_SIGNATURE;=0D =0D + STATIC_ASSERT (=0D + FixedPcdGet8 (PcdLsiScsiMaxTargetLimit) < 8,=0D + "LSI 53C895A supports targets [0..7]"=0D + );=0D + STATIC_ASSERT (=0D + FixedPcdGet8 (PcdLsiScsiMaxLunLimit) < 128,=0D + "LSI 53C895A supports LUNs [0..127]"=0D + );=0D + Dev->MaxTarget =3D PcdGet8 (PcdLsiScsiMaxTargetLimit);=0D + Dev->MaxLun =3D PcdGet8 (PcdLsiScsiMaxLunLimit);=0D +=0D //=0D // Host adapter channel, doesn't exist=0D //=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.h b/OvmfPkg/LsiScsiDxe/LsiScsi.h index 751d5b193b51..6c6ed25f1c33 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.h +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.h @@ -14,6 +14,8 @@ =0D typedef struct {=0D UINT32 Signature;=0D + UINT8 MaxTarget;=0D + UINT8 MaxLun;=0D EFI_EXT_SCSI_PASS_THRU_MODE PassThruMode;=0D EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;=0D } LSI_SCSI_DEV;=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf b/OvmfPkg/LsiScsiDxe/LsiScsi= Dxe.inf index 14f9c68308cc..6111449577a8 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf +++ b/OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf @@ -27,7 +27,9 @@ [Packages] [LibraryClasses]=0D BaseLib=0D BaseMemoryLib=0D + DebugLib=0D MemoryAllocationLib=0D + PcdLib=0D UefiBootServicesTableLib=0D UefiDriverEntryPoint=0D UefiLib=0D @@ -35,3 +37,7 @@ [LibraryClasses] [Protocols]=0D gEfiExtScsiPassThruProtocolGuid ## BY_START=0D gEfiPciIoProtocolGuid ## TO_START=0D +=0D +[FixedPcd]=0D + gUefiOvmfPkgTokenSpaceGuid.PcdLsiScsiMaxTargetLimit ## CONSUMES=0D + gUefiOvmfPkgTokenSpaceGuid.PcdLsiScsiMaxLunLimit ## CONSUMES=0D diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 2b0f137cbcce..ca13a3cb11d3 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -174,6 +174,11 @@ [PcdsFixedAtBuild] ## Microseconds to stall between polling for MptScsi request result=0D gUefiOvmfPkgTokenSpaceGuid.PcdMptScsiStallPerPollUsec|5|UINT32|0x3a=0D =0D + ## Set the *inclusive* number of targets and LUNs that LsiScsi exposes f= or=0D + # scan by ScsiBusDxe.=0D + gUefiOvmfPkgTokenSpaceGuid.PcdLsiScsiMaxTargetLimit|7|UINT8|0x3b=0D + gUefiOvmfPkgTokenSpaceGuid.PcdLsiScsiMaxLunLimit|0|UINT8|0x3c=0D +=0D gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase|0x0|UINT32|= 0x8=0D gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize|0x0|UINT32|= 0x9=0D gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize|0x0|UINT32|0xa=0D --=20 2.25.1