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.10942.1594885605708831113 for ; Thu, 16 Jul 2020 00:46:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=RcUR/wKU; 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=1594885604; 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=bwT6M3CiwcOGQGLhY2rUJ/yCygWTmgnYWWt6wXD58y0=; b=RcUR/wKUXRR0Nj0tDLt0PqEk5a4XjpeJkyIcmLaWgyaR7wz2jpWDBX08nWU7mdeRRjGXWE lca09qHiGwCV/1kx1e7rp+e0rKvzTv27tJ1wzHBV+7qRdtrLoG5RRO6IZ8F5DS7m+i4evR wNM94nDHLGHLLGTbtm1fxRSs32b6jO0= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2174.outbound.protection.outlook.com [104.47.17.174]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-26-pSgje2H2MrGpW1OuI73rnQ-1; Thu, 16 Jul 2020 09:46:43 +0200 X-MC-Unique: pSgje2H2MrGpW1OuI73rnQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kQHkVOnbDVAljHbQM93r0uBuFPzdCvZUZpoYTopyEKe50lyWQoE8xQbNzPNTWzSnl5eqq+AkuZ97Z8jpTySEJXMrUwTCl/QC6PM+XulhNfiyAygEGhGjvrBb+oUDUbTk+txtkFE2B9z9ltn0suCvs0TRb2h9+OgSyEp71qteRB/lJJG/I4W+gXmBd+5WI3dWT05qMqCGN9n2d9HGQ8ENPpYs7tFuXE2GRGri3wjgFg1QzOen1HqIWkiCedTIhFXQAulsh48C8yGRArfkQ9KN028AH/IsqHaIdNBewmbP7qK+SqErAIR0xJhl4ZJFtID2bs5B4kY9w6sY1RKqI2IFMg== 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=bwT6M3CiwcOGQGLhY2rUJ/yCygWTmgnYWWt6wXD58y0=; b=jTH9JmpG2ZupQa8sIYA+m4pA1OOJKwJijkBg6uX7+uzYTrC6CkUUmQbNJvtdCUJjCwOQI7qBTZWM9T51KwuxkNZQhHZBw/FXYgiGsJYd8FWfYSuAvrb7OgxZPgEMyAmcJGEpQdiHaSHyzwxd4MWG3XWZXS5kMuqoF4u3+NiPUG0l7OevvQX3qpaWrKDHYutFeMf3r/ZYDYfMGHyLIzOHlKXi8kZGOfOTmiBOkNsAvt2XsmmJQP1J74U6SWScriWetFsq9C9PcALD22Vith1y1rQ8azTevtFNGTmUMbbdUWRPAmPdnEUVn7O7Yg2ka5IUitMFo5wEPOGvKUaYs1z2sA== 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; Thu, 16 Jul 2020 07:46:42 +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; Thu, 16 Jul 2020 07:46:42 +0000 From: "Gary Lin" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v2 08/12] OvmfPkg/LsiScsiDxe: Map DMA buffer Date: Thu, 16 Jul 2020 15:46:03 +0800 Message-Id: <20200716074607.18048-9-glin@suse.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200716074607.18048-1-glin@suse.com> References: <20200716074607.18048-1-glin@suse.com> X-ClientProxiedBy: AM3PR07CA0118.eurprd07.prod.outlook.com (2603:10a6:207:7::28) 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 AM3PR07CA0118.eurprd07.prod.outlook.com (2603:10a6:207:7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Thu, 16 Jul 2020 07:46:40 +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: e94fb639-f6c3-4c1f-df2d-08d8295c6149 X-MS-TrafficTypeDiagnostic: AM0PR04MB4740: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FujPcG8K3aE9OI/t1YbtE/O9yz9NtSMD4LcU+86hg6yJZBwVvIqn47X8tIiiku8dBtPbDtmONUSfoxpiNGNOoEBts2iNjQ4+FUCoeukhA2AHkeOwQ5i2Yuxg++C18vD+5P2nekl+fBXImC4z4hMyP4B+2sTbRGNA8gqomTl8B4k1vbi3QnzQlpqyV1H3glqz3nQm6HORRwsUcmkrMjgA6+C0AU25XB463HEtC1SoAnCbvcZa9Ur37MAkB/+DlkDfKpmz3oYLu+xYwd2rFRNSSISq3QRF+hb8KwEz9AaGBroBDT8eM+jEIk09zAShd0VAiagHSrdwWbYMnmInEcuhNg== 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:(136003)(376002)(346002)(39860400002)(366004)(396003)(2616005)(956004)(26005)(478600001)(8936002)(36756003)(2906002)(54906003)(8676002)(52116002)(6916009)(316002)(6512007)(186003)(16526019)(1076003)(6486002)(5660300002)(66556008)(66476007)(66946007)(6666004)(83380400001)(86362001)(6506007)(55236004)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: PhsuasUGVgIUyNLA6HzCkyb1Fe6kSwuKt/TIt0R3sCioQ7gTHuiIh6msx1zFyO5ZZKHQ46DIBRGaJgfsaTdqpNMuGlGuDoLTe9K3JwJgE8gNDR+xe/dtYA/8wEVmLt3Jb92h2nfGQf8R/jjKR5j0OqgVg3GFciI7OVWo6Adp+zyypulf6452i6AkABHqHK+8WLe1sna4/zpLZsgYBs3j4xleg1Yhkc8DVr6KEPS94DKJvR5P371I+fj/5mla47AmH/YmfWVlR8FF0aBoZcZ5IGyHL05VeQV36qjTuErQWLMrfO6FPE+LCvB+0mHmDroUCUJSIy3VUmPEo5wlOAeBLx8vCZ1QzCFE7wo6DOVVXMV8EfrXBLQ7nkv2xUXHvfj6wWfwwGfNbdi3XgfaySUsceFj6+1eZur6PwugllZrcAiLiAHXPnhiNLzI+hUYSUGpOr5890NvZlWH/cIvVOKoJsT4FGRaTWHk88TFOoDzze4= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e94fb639-f6c3-4c1f-df2d-08d8295c6149 X-MS-Exchange-CrossTenant-AuthSource: AM0PR0402MB3809.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2020 07:46:42.2344 (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: yvewTsUxtWFqddKs2vv8csjpAHYbScoLpic0WYWcBgtJC6Oulc0avo7A1o/qJSqt X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4740 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Map DMA buffer and perpare for the implementation of LsiScsiPassThru(). v2: - Replace 0x10000 with SIZE_64KB macro for the DMA buffer data array - Remove DUAL_ADDRESS_CYCLE from PciIo since we don't really need 64-bit DMA address Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Gary Lin Reviewed-by: Laszlo Ersek --- OvmfPkg/LsiScsiDxe/LsiScsi.c | 62 +++++++++++++++++++++++++++++++++++- OvmfPkg/LsiScsiDxe/LsiScsi.h | 14 ++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.c b/OvmfPkg/LsiScsiDxe/LsiScsi.c index b21387db6e5a..4e84afa40085 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.c +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.c @@ -356,6 +356,8 @@ LsiScsiControllerStart ( {=0D EFI_STATUS Status;=0D LSI_SCSI_DEV *Dev;=0D + UINTN Pages;=0D + UINTN BytesMapped;=0D =0D Dev =3D AllocateZeroPool (sizeof (*Dev));=0D if (Dev =3D=3D NULL) {=0D @@ -411,11 +413,45 @@ LsiScsiControllerStart ( goto CloseProtocol;=0D }=0D =0D - Status =3D LsiScsiReset (Dev);=0D + //=0D + // Create buffers for data transfer=0D + //=0D + Pages =3D EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma));=0D + Status =3D Dev->PciIo->AllocateBuffer (=0D + Dev->PciIo,=0D + AllocateAnyPages,=0D + EfiBootServicesData,=0D + Pages,=0D + (VOID **)&Dev->Dma,=0D + EFI_PCI_ATTRIBUTE_MEMORY_CACHED=0D + );=0D if (EFI_ERROR (Status)) {=0D goto RestoreAttributes;=0D }=0D =0D + BytesMapped =3D EFI_PAGES_TO_SIZE (Pages);=0D + Status =3D Dev->PciIo->Map (=0D + Dev->PciIo,=0D + EfiPciIoOperationBusMasterCommonBuffer,=0D + Dev->Dma,=0D + &BytesMapped,=0D + &Dev->DmaPhysical,=0D + &Dev->DmaMapping=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto FreeBuffer;=0D + }=0D +=0D + if (BytesMapped !=3D EFI_PAGES_TO_SIZE (Pages)) {=0D + Status =3D EFI_OUT_OF_RESOURCES;=0D + goto Unmap;=0D + }=0D +=0D + Status =3D LsiScsiReset (Dev);=0D + if (EFI_ERROR (Status)) {=0D + goto Unmap;=0D + }=0D +=0D Status =3D gBS->CreateEvent (=0D EVT_SIGNAL_EXIT_BOOT_SERVICES,=0D TPL_CALLBACK,=0D @@ -462,6 +498,19 @@ CloseExitBoot: UninitDev:=0D LsiScsiReset (Dev);=0D =0D +Unmap:=0D + Dev->PciIo->Unmap (=0D + Dev->PciIo,=0D + Dev->DmaMapping=0D + );=0D +=0D +FreeBuffer:=0D + Dev->PciIo->FreeBuffer (=0D + Dev->PciIo,=0D + Pages,=0D + Dev->Dma=0D + );=0D +=0D RestoreAttributes:=0D Dev->PciIo->Attributes (=0D Dev->PciIo,=0D @@ -524,6 +573,17 @@ LsiScsiControllerStop ( =0D LsiScsiReset (Dev);=0D =0D + Dev->PciIo->Unmap (=0D + Dev->PciIo,=0D + Dev->DmaMapping=0D + );=0D +=0D + Dev->PciIo->FreeBuffer (=0D + Dev->PciIo,=0D + EFI_SIZE_TO_PAGES (sizeof (*Dev->Dma)),=0D + Dev->Dma=0D + );=0D +=0D Dev->PciIo->Attributes (=0D Dev->PciIo,=0D EfiPciIoAttributeOperationSet,=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.h b/OvmfPkg/LsiScsiDxe/LsiScsi.h index 8c2acff6e86f..9f9e5c7fed00 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.h +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.h @@ -12,6 +12,17 @@ #ifndef _LSI_SCSI_DXE_H_=0D #define _LSI_SCSI_DXE_H_=0D =0D +typedef struct {=0D + //=0D + // Allocate 64KB for read/write buffer. It seems sufficient for the comm= on=0D + // boot scenarios.=0D + //=0D + // NOTE: The number of bytes for data transmission is bounded by DMA Byt= e=0D + // Count (DBC), a 24-bit register, so the maximum is 0xFFFFFF (16M= B-1).=0D + //=0D + UINT8 Data[SIZE_64KB];=0D +} LSI_SCSI_DMA_BUFFER;=0D +=0D typedef struct {=0D UINT32 Signature;=0D UINT64 OrigPciAttrs;=0D @@ -19,6 +30,9 @@ typedef struct { EFI_PCI_IO_PROTOCOL *PciIo;=0D UINT8 MaxTarget;=0D UINT8 MaxLun;=0D + LSI_SCSI_DMA_BUFFER *Dma;=0D + EFI_PHYSICAL_ADDRESS DmaPhysical;=0D + VOID *DmaMapping;=0D EFI_EXT_SCSI_PASS_THRU_MODE PassThruMode;=0D EFI_EXT_SCSI_PASS_THRU_PROTOCOL PassThru;=0D } LSI_SCSI_DEV;=0D --=20 2.25.1