From nobody Fri May 17 05:26:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+100389+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100389+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1676941794; cv=none; d=zohomail.com; s=zohoarc; b=HBhKsmnOu16CkntPdZtgs2IPWdjcaFTnHV7RcyFQ3GNdDaQVbNlJWtFeRiSst0+dsaDRBVn7w65tpviHE4gkfhMvS6XaJW6sejiymPXSJPTrWm35sSf6DdJ7+aHxyyw6xdklLEV3fMvERLxTlxrmfJpmD1p84wm1RbUvuXEhJhE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676941794; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=shtS7nQ88uiLjed+H4nXlRTp/LKhzF9DHspHV60ixvg=; b=UyokCvHVU2XN6ZTaN6SZNsbXFtMbcXBF2KdIKbdGb2AePDMmO8YG180qA768BEwmZPm3RWhU4kEMKFIKw7uIsRK2tdAEghdthiRqlayZbaBaObkFms+3nc+FQ61Z0/xg26jYzWVJRyEswriZKlTs2EMBwlAseh0++fOSQu+4NGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100389+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1676941794790765.752112390791; Mon, 20 Feb 2023 17:09:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id MkpGYY1788612xzK9a8AScdt; Mon, 20 Feb 2023 17:09:54 -0800 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.31615.1676941793784205787 for ; Mon, 20 Feb 2023 17:09:53 -0800 X-Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31L0S2bc030137; Tue, 21 Feb 2023 01:09:53 GMT X-Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ntq2epect-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 01:09:52 +0000 X-Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 31L19pX6011754 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 01:09:51 GMT X-Received: from linbox.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 20 Feb 2023 17:09:51 -0800 From: "Rebecca Cran" To: , Ard Biesheuvel , "Leif Lindholm" , Radoslaw Biernacki CC: Rebecca Cran Subject: [edk2-devel] [PATCH edk2-platforms 1/2] Silicon/Qemu: Convert DSDT ASL from legacy to ASL 2.0 syntax Date: Mon, 20 Feb 2023 18:09:38 -0700 Message-ID: <20230221010939.1039066-2-rebecca@quicinc.com> In-Reply-To: <20230221010939.1039066-1-rebecca@quicinc.com> References: <20230221010939.1039066-1-rebecca@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: 33MQTFGNeVb7QD5ot7XLLRFMWz08UZas X-Proofpoint-GUID: 33MQTFGNeVb7QD5ot7XLLRFMWz08UZas Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,quic_rcran@quicinc.com X-Gm-Message-State: ol9KvMZiKxYffsRy7FqrOyUyx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1676941794; bh=TBcnFI0OYrfblPVylNqmMWFGZi2iT3xrxkrWnhFDtzM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=eTanRjCFf59hjhMQ3huIflkbzm8iB8h6b+ew4ZY2tJydA/n0c4hb+l9hUJngBCpH4uT YTzJ/Sr2Svfvjz/N0TwPeXXwpTVUavjhfW258hTFttX9344+F3ICvz55RxoX/ZRHWalCj E/wWrBf/n3Wd2OtalSFkZ0PYBfp+GW2pGe8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1676941795160100004 Content-Type: text/plain; charset="utf-8" From: Rebecca Cran ACPI 6.0 introduced support for ASL 2.0 includes standard operators. Convert the DSDT from legacy to ASL 2.0 syntax. Signed-off-by: Rebecca Cran Reviewed-by: Ard Biesheuvel --- Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl b/Silicon/Qemu/SbsaQ= emu/AcpiTables/Dsdt.asl index 3357916571fe..e50772fcf76d 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl @@ -449,7 +449,7 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", */ Method (_OSC,4) { // Check for proper UUID - If (LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { + If (Arg0 =3D=3D ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")) { // Create DWord-adressable fields from the Capabilities Buffer CreateDWordField (Arg3,0,CDW1) CreateDWordField (Arg3,4,CDW2) @@ -463,28 +463,28 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", // * ASPM // * Clock PM // * MSI/MSI-X - If (LNotEqual(And(SUPP, 0x16), 0x16)) { - And (CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits) + If ((SUPP & 0x16) !=3D 0x16) { + CTRL &=3D 0x1E // Mask bit 0 (and undefined bits) } =20 // Always allow native PME, AER (no dependencies) =20 // Never allow SHPC (no SHPC controller in this system) - And (CTRL,0x1D,CTRL) + CTRL &=3D 0x1D =20 - If (LNotEqual(Arg1,One)) { // Unknown revision - Or (CDW1,0x08,CDW1) + If (Arg1 !=3D One) { // Unknown revision + CDW1 |=3D 0x08 } =20 - If (LNotEqual(CDW3,CTRL)) { // Capabilities bits were mas= ked - Or (CDW1,0x10,CDW1) + If (CDW3 !=3D CTRL) { // Capabilities bits were masked + CDW1 |=3D 0x10 } =20 // Update DWORD3 in the buffer Store (CTRL,CDW3) Return (Arg3) } Else { - Or (CDW1,4,CDW1) // Unrecognized UUID + CDW1 |=3D 4 // Unrecognized UUID Return (Arg3) } } // End _OSC --=20 2.30.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100389): https://edk2.groups.io/g/devel/message/100389 Mute This Topic: https://groups.io/mt/97100096/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 05:26:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+100390+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100390+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1676941795; cv=none; d=zohomail.com; s=zohoarc; b=lqv9w6kT+ayClrBrIwgMAONW6NboWbC9oU2FjPxWD5tIRy1q91vL1MyLceogJzBH/itDIM3CEOBRlvAVrNaA3MGMsQpDdIqFTvmhwa6NbyISvy7NLLupyB8mg6VYNsd0J+E3YUjNbfaBmbPOMfyMz8GH/5qEcCzbWhXQrBI/9nM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676941795; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=DGz1VZl8l0y3iR7cX/iX9YyJrq4N+jmb4caW5K69dUg=; b=gT6a64PDvvDIK0EKAxOd8C21098ThsTHijKdSul97pIOkKlU7VYOr++lreqwPHO2I+GMF99IQbeNCrTWkcEv5nq3ez39EINym7HF1GMlq2rPs54lbOCzM6n0RUOMlN5MCDB9yPFHP8AWN8T61bPgWpRmshjDB471C/V+CI/yV/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+100390+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1676941795418853.0816396243316; Mon, 20 Feb 2023 17:09:55 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2r4FYY1788612x9WMwi10xx2; Mon, 20 Feb 2023 17:09:55 -0800 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web10.31616.1676941794341321863 for ; Mon, 20 Feb 2023 17:09:54 -0800 X-Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31L0qqjA026591; Tue, 21 Feb 2023 01:09:53 GMT X-Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3ntp98eg38-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 01:09:53 +0000 X-Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 31L19qrQ026713 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Feb 2023 01:09:52 GMT X-Received: from linbox.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 20 Feb 2023 17:09:51 -0800 From: "Rebecca Cran" To: , Ard Biesheuvel , "Leif Lindholm" , Radoslaw Biernacki CC: Rebecca Cran Subject: [edk2-devel] [PATCH edk2-platforms 2/2] Silicon/Qemu: Use the symbolic value for the SPCR table revision. Date: Mon, 20 Feb 2023 18:09:39 -0700 Message-ID: <20230221010939.1039066-3-rebecca@quicinc.com> In-Reply-To: <20230221010939.1039066-1-rebecca@quicinc.com> References: <20230221010939.1039066-1-rebecca@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-GUID: 4hUqnIKnVJC99UtBit1vxl5HyBfBlSUo X-Proofpoint-ORIG-GUID: 4hUqnIKnVJC99UtBit1vxl5HyBfBlSUo Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,quic_rcran@quicinc.com X-Gm-Message-State: 3au10oZxs5fKgBoRTxV6r9oTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1676941795; bh=QySItAIxF50OstjqNDEewNKpNHhFF4l8/dCTAjHjpwk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=eDCJtu+RfnFj9hlp1Cw6GfAFAFwoT91nPZKNhZqttF4mCWsho4lhH1fZcGJruWA8cVN LtHMbQsf4eH4fqP2off4swDp3+jQpro3fg5TaFnBfI9z7xb8JsIL7iSJi1v7bF0E9x0Dp hprYeqavXfiR2dZMYkVnBdZd4ZMhihrx+xA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1676941797116100010 Content-Type: text/plain; charset="utf-8" From: Rebecca Cran The current SPCR table revision is 2. Instead of using a hard-coded value, use the symbolic constant EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION. Signed-off-by: Rebecca Cran Reviewed-by: Ard Biesheuvel --- Silicon/Qemu/SbsaQemu/AcpiTables/Spcr.aslc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Spcr.aslc b/Silicon/Qemu/Sbsa= Qemu/AcpiTables/Spcr.aslc index 432097307f8a..435b7fe66778 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Spcr.aslc +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Spcr.aslc @@ -17,7 +17,8 @@ STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spc= r =3D { SBSAQEMU_ACPI_HEADER ( EFI_ACPI_6_0_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE, EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE, - 2), /* New MS definition for PL011 support */ + /* New MS definition for PL011 support */ + EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION), EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERFACE_TYPE_ARM_PL011_= UART, { EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE, EFI_ACPI_RESERVED_BYTE= }, { --=20 2.30.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100390): https://edk2.groups.io/g/devel/message/100390 Mute This Topic: https://groups.io/mt/97100097/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-