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.5977.1594966327181008047 for ; Thu, 16 Jul 2020 23:12:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=OhQoKMXq; 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=1594966325; 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=W6LAFYggAFoAldhSbGO1j8Z+th6Dl4IX3BKAqmIjCAo=; b=OhQoKMXqdgHaMZnhvEZlRKCxLccwYaDPBi2ihrw6YWxR7PH0W8BlIGP4qd84ZXCNNGBKog 5nDUzFnYIuGvbX/IQOTcdKjKRKiM+L+4LKz/Ay4ZxSdP5L1bRValXGFBgKaMhbwO/tkFTW eNZGz/a2fFmXRbL2WXIkY0C1/siHF70= 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-18-uoDmOpQjORK19TTIDs-lUQ-1; Fri, 17 Jul 2020 08:12:04 +0200 X-MC-Unique: uoDmOpQjORK19TTIDs-lUQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IADKhxqb7dk+AoNaniim4HPnS8y5/jakaMXLqT1XF1asBxUP4HI4/xcFkKhmRPqpb0Q1iLYIs288mnRYXxiudfGYMMH31CsDRgso1dwKWxl1BtV8SpfkQr4flS8E84kTGL7x7YXgQ5pd81n7O9yrZ5EUs9vq02DYVu80ucsT1wK++a24vqi2bnWHh8EYbNPpH4phNPbk5XqE/8rbtF6guPGnxSr0GFfwpVDLPtemMSVLYNl4mTARQQhRqXeBQb1jC+g40SLy5dJ4AePGUzdO9TuHsqHAwye+OtB7IDkqf1XaSUjUjfWkArvnhPzjMTHrwnjZdErmBCkw4gxXrxDZJw== 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=W6LAFYggAFoAldhSbGO1j8Z+th6Dl4IX3BKAqmIjCAo=; b=ZoQEaOG0G3PWmL/uaJW9j3df/PT6/AoXOl5mObMljXNI0+ImVXSfyNkyeYGZ8towS1ahXixXyhPRgr+gkZ9Kr3126hFuOZeA+uJ34mOO/W+SXHeBjwK27lHuyCwLdEIVai7MS+5CJDgW181fZnwddJMtDUb8dx02bGUiniLcbOyn9J8WPYDZx6hUO4Slo9c+XXIjb2nRd+vrytBM/ptNSvbWILMmEyuYLJEdx+XDfQASRbv4Wl5po5dv+VkZWk6yUryJ+YX2lKTDQJ9ddAOxkSGN8HPKfuSgp300P15YxTdPM6UHY2Thzd5m56t/qzOZMUEpMrK2qdb1ZghRICjXgg== 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:03 +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:03 +0000 From: "Gary Lin" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH v3 07/11] OvmfPkg/LsiScsiDxe: Open PciIo protocol and initialize the device Date: Fri, 17 Jul 2020 14:11:26 +0800 Message-Id: <20200717061130.8881-8-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:12:01 +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: 6fc2d020-38cb-4468-475e-08d82a1852c3 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: 9wfsP3gM57QStlqyI36Xscvrylaa5ZbTASkYzr5ZIzvCj51uqx/cX39xTXgI8HHr/jpG9ldR0ef3QZaGfQmgsrTtVdTRmrWoruLs2TTYM+t/7f7lTJFbZCD6Gi4bXRWo+dfXhtAhKoxcTYfSY2MhTKYYlvdwD+BaanNJUdqiijAW6qfRRmj8OB6iXIUFHwhXs74pduPPSKEHjbezYR2arMB1mJvxnOZJRQHPL2DvdI17e0mqpBcF2rTyjNqkqO/JiIiZcbOd6iHXFjtVPq9yMLsD0w3+yPRBCmsNf3X3JJi5ydAv0htyJR0yn8pg7GT2dE3YXygaIUMH3c2P/q9uqg== 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: tjKOZuNBUFw/1YWzHdmDMf/UHZOGnbE+/9XsZkl1cxIAQlfS2RXVwAgCDCxaUDaAqDYLedCBhARNK5oLvFetqPzc0Q6XiWtehfcT/YbrQIt+28wah9RoEyKnB/oWRofa541d1MB67M5iV4ZhMc68m5kbqDvznNiBAihNOjRJDWtQtSZi4OgTOGqf4VjHwCgcZlP9LMowO/3J8hBE/kTgJxjyUZH4YKAfdZhfLQqeesAvAZG5WA6jXg52zxgB/pgCIUjROXmn8WFAztS5rGQmmulGEQD6GJk0Z74jj+H3GLORJUSiV9VSgn88hTkzmQo9U1AvqZoaNoWL32DB52AJXFiKBFiecQo/IZ/f8E43aOei5ZCpT6AlOWgYePW6l7t7ynVkh0UUPENW+v3/a1J0L18fFJaxVbopA41rXJzvf7nokZ95+EW2QlAvdHwKCCKbH/uLVNxphKCaNXlMimfHAUQ0PzvKjjB47AhKmp6g+Jk= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fc2d020-38cb-4468-475e-08d82a1852c3 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:03.3303 (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: lC+B+8BFbQWP2Ki846QX9GulSnHxqKbgUeDtaikTW4MlPBvoBRY+5H1mNuH1paEi X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4740 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Open PciIo protocol and use it to initialize the device. The initialization of LSI 53C895A is simple: just set the SRST bit in Interrupt Status Zero register to reset the device. v2: - Use the BITx macros for the bit constants - Add the closing of PciIo protocol in LsiScsiControllerStop() Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Gary Lin --- OvmfPkg/Include/IndustryStandard/LsiScsi.h | 21 ++++ OvmfPkg/LsiScsiDxe/LsiScsi.c | 136 ++++++++++++++++++++- OvmfPkg/LsiScsiDxe/LsiScsi.h | 3 + 3 files changed, 159 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Include/IndustryStandard/LsiScsi.h b/OvmfPkg/Include/I= ndustryStandard/LsiScsi.h index c09e864a1f39..185e553c8eb4 100644 --- a/OvmfPkg/Include/IndustryStandard/LsiScsi.h +++ b/OvmfPkg/Include/IndustryStandard/LsiScsi.h @@ -17,4 +17,25 @@ #define LSI_LOGIC_PCI_VENDOR_ID 0x1000=0D #define LSI_53C895A_PCI_DEVICE_ID 0x0012=0D =0D +//=0D +// LSI 53C895A Registers=0D +//=0D +#define LSI_REG_DSTAT 0x0C=0D +#define LSI_REG_ISTAT0 0x14=0D +#define LSI_REG_DSP 0x2C=0D +#define LSI_REG_SIST0 0x42=0D +#define LSI_REG_SIST1 0x43=0D +=0D +//=0D +// The status bits for Interrupt Status Zero (ISTAT0)=0D +//=0D +#define LSI_ISTAT0_DIP BIT0=0D +#define LSI_ISTAT0_SIP BIT1=0D +#define LSI_ISTAT0_INTF BIT2=0D +#define LSI_ISTAT0_CON BIT3=0D +#define LSI_ISTAT0_SEM BIT4=0D +#define LSI_ISTAT0_SIGP BIT5=0D +#define LSI_ISTAT0_SRST BIT6=0D +#define LSI_ISTAT0_ABRT BIT7=0D +=0D #endif // _LSI_SCSI_H_=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.c b/OvmfPkg/LsiScsiDxe/LsiScsi.c index 172779240636..a9c107c04ef1 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.c +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.c @@ -25,6 +25,33 @@ =0D #include "LsiScsi.h"=0D =0D +STATIC=0D +EFI_STATUS=0D +Out8 (=0D + IN LSI_SCSI_DEV *Dev,=0D + IN UINT32 Addr,=0D + IN UINT8 Data=0D + )=0D +{=0D + return Dev->PciIo->Io.Write (=0D + Dev->PciIo,=0D + EfiPciIoWidthUint8,=0D + PCI_BAR_IDX0,=0D + Addr,=0D + 1,=0D + &Data=0D + );=0D +}=0D +=0D +STATIC=0D +EFI_STATUS=0D +LsiScsiReset (=0D + IN LSI_SCSI_DEV *Dev=0D + )=0D +{=0D + return Out8 (Dev, LSI_REG_ISTAT0, LSI_ISTAT0_SRST);=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 @@ -243,6 +270,21 @@ LsiScsiGetNextTarget ( return EFI_NOT_FOUND;=0D }=0D =0D +STATIC=0D +VOID=0D +EFIAPI=0D +LsiScsiExitBoot (=0D + IN EFI_EVENT Event,=0D + IN VOID *Context=0D + )=0D +{=0D + LSI_SCSI_DEV *Dev;=0D +=0D + Dev =3D Context;=0D + DEBUG ((DEBUG_VERBOSE, "%a: Context=3D0x%p\n", __FUNCTION__, Context));= =0D + LsiScsiReset (Dev);=0D +}=0D +=0D //=0D // Probe, start and stop functions of this driver, called by the DXE core = for=0D // specific devices.=0D @@ -333,6 +375,58 @@ LsiScsiControllerStart ( Dev->MaxTarget =3D PcdGet8 (PcdLsiScsiMaxTargetLimit);=0D Dev->MaxLun =3D PcdGet8 (PcdLsiScsiMaxLunLimit);=0D =0D + Status =3D gBS->OpenProtocol (=0D + ControllerHandle,=0D + &gEfiPciIoProtocolGuid,=0D + (VOID **)&Dev->PciIo,=0D + This->DriverBindingHandle,=0D + ControllerHandle,=0D + EFI_OPEN_PROTOCOL_BY_DRIVER=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto FreePool;=0D + }=0D +=0D + Status =3D Dev->PciIo->Attributes (=0D + Dev->PciIo,=0D + EfiPciIoAttributeOperationGet,=0D + 0,=0D + &Dev->OrigPciAttrs=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto CloseProtocol;=0D + }=0D +=0D + //=0D + // Enable I/O Space & Bus-Mastering=0D + //=0D + Status =3D Dev->PciIo->Attributes (=0D + Dev->PciIo,=0D + EfiPciIoAttributeOperationEnable,=0D + (EFI_PCI_IO_ATTRIBUTE_IO |=0D + EFI_PCI_IO_ATTRIBUTE_BUS_MASTER),=0D + NULL=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto CloseProtocol;=0D + }=0D +=0D + Status =3D LsiScsiReset (Dev);=0D + if (EFI_ERROR (Status)) {=0D + goto RestoreAttributes;=0D + }=0D +=0D + Status =3D gBS->CreateEvent (=0D + EVT_SIGNAL_EXIT_BOOT_SERVICES,=0D + TPL_CALLBACK,=0D + &LsiScsiExitBoot,=0D + Dev,=0D + &Dev->ExitBoot=0D + );=0D + if (EFI_ERROR (Status)) {=0D + goto UninitDev;=0D + }=0D +=0D //=0D // Host adapter channel, doesn't exist=0D //=0D @@ -357,11 +451,33 @@ LsiScsiControllerStart ( &Dev->PassThru=0D );=0D if (EFI_ERROR (Status)) {=0D - goto FreePool;=0D + goto CloseExitBoot;=0D }=0D =0D return EFI_SUCCESS;=0D =0D +CloseExitBoot:=0D + gBS->CloseEvent (Dev->ExitBoot);=0D +=0D +UninitDev:=0D + LsiScsiReset (Dev);=0D +=0D +RestoreAttributes:=0D + Dev->PciIo->Attributes (=0D + Dev->PciIo,=0D + EfiPciIoAttributeOperationSet,=0D + Dev->OrigPciAttrs,=0D + NULL=0D + );=0D +=0D +CloseProtocol:=0D + gBS->CloseProtocol (=0D + ControllerHandle,=0D + &gEfiPciIoProtocolGuid,=0D + This->DriverBindingHandle,=0D + ControllerHandle=0D + );=0D +=0D FreePool:=0D FreePool (Dev);=0D =0D @@ -404,6 +520,24 @@ LsiScsiControllerStop ( return Status;=0D }=0D =0D + gBS->CloseEvent (Dev->ExitBoot);=0D +=0D + LsiScsiReset (Dev);=0D +=0D + Dev->PciIo->Attributes (=0D + Dev->PciIo,=0D + EfiPciIoAttributeOperationSet,=0D + Dev->OrigPciAttrs,=0D + NULL=0D + );=0D +=0D + gBS->CloseProtocol (=0D + ControllerHandle,=0D + &gEfiPciIoProtocolGuid,=0D + This->DriverBindingHandle,=0D + ControllerHandle=0D + );=0D +=0D FreePool (Dev);=0D =0D return Status;=0D diff --git a/OvmfPkg/LsiScsiDxe/LsiScsi.h b/OvmfPkg/LsiScsiDxe/LsiScsi.h index 6c6ed25f1c33..8c2acff6e86f 100644 --- a/OvmfPkg/LsiScsiDxe/LsiScsi.h +++ b/OvmfPkg/LsiScsiDxe/LsiScsi.h @@ -14,6 +14,9 @@ =0D typedef struct {=0D UINT32 Signature;=0D + UINT64 OrigPciAttrs;=0D + EFI_EVENT ExitBoot;=0D + EFI_PCI_IO_PROTOCOL *PciIo;=0D UINT8 MaxTarget;=0D UINT8 MaxLun;=0D EFI_EXT_SCSI_PASS_THRU_MODE PassThruMode;=0D --=20 2.25.1