From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=DGs4JgB3; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: quicinc.com, ip: 205.220.180.131, mailfrom: quic_rcran@quicinc.com) 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=scopU0MOXKEpre/Jm5IjZ1AcLsOcV/PTvYS9LLqtrE8=; b=DGs4JgB3YodAzYbRxwFQ3oLeRYUJzfu33sarRYwUvIEtJyh4QzgSfXHl47a8kj69JdXm kAtx8Gu6JnYyk1yBy4wPcrjaSsk66dScjG97XFVieyvn02N3qixFl7ss18nyplIajl0M 9mNgmj7gX2eftgd3ffW/txmPuK6m5kYeDlDjoNygSoUBiV5FO57o4HIw/7wNJWMbNSGn oPZxrGfC6d5IReHrUyGcytYnBN65yyDfU2BnukQafXj6SNdOQws+u6F4KYHgScu9K+QX xALTTWCpxcg7+7i3EgBupzR3Xjl6TD+Ib7c5hozDC2/eTibXnYFmr0ZBJE7cJ8Dhacdy /A== 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 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 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: [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> X-Mailer: git-send-email 2.30.2 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-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: 33MQTFGNeVb7QD5ot7XLLRFMWz08UZas X-Proofpoint-GUID: 33MQTFGNeVb7QD5ot7XLLRFMWz08UZas X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-20_19,2023-02-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302210008 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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 --- 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/SbsaQemu/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 == 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) != 0x16) { + CTRL &= 0x1E // Mask bit 0 (and undefined bits) } // Always allow native PME, AER (no dependencies) // Never allow SHPC (no SHPC controller in this system) - And (CTRL,0x1D,CTRL) + CTRL &= 0x1D - If (LNotEqual(Arg1,One)) { // Unknown revision - Or (CDW1,0x08,CDW1) + If (Arg1 != One) { // Unknown revision + CDW1 |= 0x08 } - If (LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked - Or (CDW1,0x10,CDW1) + If (CDW3 != CTRL) { // Capabilities bits were masked + CDW1 |= 0x10 } // Update DWORD3 in the buffer Store (CTRL,CDW3) Return (Arg3) } Else { - Or (CDW1,4,CDW1) // Unrecognized UUID + CDW1 |= 4 // Unrecognized UUID Return (Arg3) } } // End _OSC -- 2.30.2