From nobody Tue Feb 10 12:40:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56396+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56396+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1585223619; cv=none; d=zohomail.com; s=zohoarc; b=cBafe+BlOUR53PYp9SYp4BgLLFAfeX5xVVXpmOD8bIPJ9red2kCdR8EJQVb7bRspkjqzYl6YnseUQ0sW4WFEwr9HXyMCPOrMppVCQCMxNpP+2096AzyVuMKadBiUO6cCmIe+Qn1bdY1CAD3YroqWorJ1iz66Y47wpk192u/Qv4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585223619; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=n9rsN/RxWEnVy0pDN6AY8iDYAuhabeOQ8Yrr//zh08k=; b=ixfFvs4rjmeuiz2TrvcROL8XEexm00ijqocobaBgcibzoSEqxIvoDWxS0wdHSsa+5wrLAqKXJVwlDwX3LvBq/qyV0t08yGh6X4lzRxmVuQ1Ejz9SRLbZLUAil9gmJCjJvPZPbYpyKd0O6zr4dIdYO9caIhs0Uh3QgZuDntcgTyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56396+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1585223619476741.8017831381378; Thu, 26 Mar 2020 04:53:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id PCE0YY1788612x6W0ME28vO4; Thu, 26 Mar 2020 04:53:39 -0700 X-Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by mx.groups.io with SMTP id smtpd.web12.35116.1585223618327229480 for ; Thu, 26 Mar 2020 04:53:38 -0700 X-Received: by mail-ed1-f66.google.com with SMTP id bd14so6426954edb.10 for ; Thu, 26 Mar 2020 04:53:38 -0700 (PDT) X-Gm-Message-State: EX5KCld7JRrzwgcRI7XIM4gkx1787277AA= X-Google-Smtp-Source: ADFU+vt7swgsmqaKaBdFaZixRqRpPAUZzGnJatJNI/aIGf24Y5oeHcCdaOB92ctbU/SNJy8i7wx6zA== X-Received: by 2002:a17:906:2443:: with SMTP id a3mr7207756ejb.291.1585223616256; Thu, 26 Mar 2020 04:53:36 -0700 (PDT) X-Received: from localhost.localdomain ([84.203.78.33]) by smtp.gmail.com with ESMTPSA id bs8sm240534ejb.92.2020.03.26.04.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 04:53:35 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@linaro.org, leif@nuviainc.com, philmd@redhat.com, awarkentin@vmware.com Subject: [edk2-devel] [edk2-platforms][PATCH 2/6] Platform/RPi/AcpiTables: Replace VendorLong () blobs with PinFunction () Date: Thu, 26 Mar 2020 11:53:18 +0000 Message-Id: <20200326115322.2880-3-pete@akeo.ie> In-Reply-To: <20200326115322.2880-1-pete@akeo.ie> References: <20200326115322.2880-1-pete@akeo.ie> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,pete@akeo.ie Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585223619; bh=3hnlICQ1JahHkz3pSXCx9lDBeBQlgEQfHo65eMKNdx8=; h=Cc:Date:From:Reply-To:Subject:To; b=V7hlaRM1XFwlRWj7SLLMB7GO6u3OqsSbcmUvQv25ATY1kx7ZvJLE0BqKM4IqadaGMbU //Aau2UoBembSZLxwzVJgqJ5FGnjrEKqyjsnGTS1NNhTYhaVZw9DbrOc/HeFFK+dwliiF Xk9PsffdHNLF7i9dO5HDceimx5sXRNzD5es= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Andrei Warkentin Per https://github.com/MicrosoftDocs/windows-uwp/issues/1751, MsftFunctionConfig () calls can be replaced by PinFunction () calls. Since these had been converted to VendorLong () blobs due to lack of implementation of MsftFunctionConfig (), we replace them back now that PinFunction () is available. Signed-off-by: Pete Batard --- Platform/RaspberryPi/AcpiTables/Dsdt.asl | 94 ++------------------ Platform/RaspberryPi/AcpiTables/Uart.asl | 16 +--- 2 files changed, 7 insertions(+), 103 deletions(-) diff --git a/Platform/RaspberryPi/AcpiTables/Dsdt.asl b/Platform/RaspberryP= i/AcpiTables/Dsdt.asl index 2aa7d10bd40c..2e63091cdba0 100644 --- a/Platform/RaspberryPi/AcpiTables/Dsdt.asl +++ b/Platform/RaspberryPi/AcpiTables/Dsdt.asl @@ -338,22 +338,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2"= , 2) { MEMORY32FIXED (ReadWrite, 0, BCM2836_I2C1_LENGTH, RMEM) Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_= I2C1_INTERRUPT } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", = 0, ResourceConsumer,) {2, 3} - // - VendorLong () // Length =3D 0x31 - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1D, 0x00, 0x01, 0x10, 0x00, 0x01, // = /....... - /* 0018 */ 0x04, 0x00, 0x12, 0x00, 0x00, 0x16, 0x00, 0x20, // = ........ - /* 0020 */ 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x5C, // = ........ - /* 0028 */ 0x5F, 0x53, 0x42, 0x2E, 0x47, 0x50, 0x49, 0x30, // = _SB.GPI0 - /* 0030 */ 0x00 // . - } + PinFunction (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", 0, Resourc= eConsumer, , ) { 2, 3 } }) Method (_CRS, 0x0, Serialized) { @@ -401,49 +386,9 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2"= , 2) { MEMORY32FIXED (ReadWrite, 0, BCM2836_SPI0_LENGTH, RMEM) Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_= SPI0_INTERRUPT } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig (Exclusive, PullDown, BCM_ALT0, "\\_SB.GPI0"= , 0, ResourceConsumer, ) {9, 10, 11} // MISO, MOSI, SCLK - VendorLong () // Length =3D 0x33 - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1F, 0x00, 0x01, 0x10, 0x00, 0x02, // = /....... - /* 0018 */ 0x04, 0x00, 0x12, 0x00, 0x00, 0x18, 0x00, 0x22, // = ......." - /* 0020 */ 0x00, 0x00, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, // = ........ - /* 0028 */ 0x00, 0x5C, 0x5F, 0x53, 0x42, 0x2E, 0x47, 0x50, // = .\_SB.GP - /* 0030 */ 0x49, 0x30, 0x00 // = I0. - } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", = 0, ResourceConsumer, ) {8} // CE0 - VendorLong () // Length =3D 0x2F - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1B, 0x00, 0x01, 0x10, 0x00, 0x01, // = /....... - /* 0018 */ 0x04, 0x00, 0x12, 0x00, 0x00, 0x14, 0x00, 0x1E, // = ........ - /* 0020 */ 0x00, 0x00, 0x00, 0x08, 0x00, 0x5C, 0x5F, 0x53, // = .....\_S - /* 0028 */ 0x42, 0x2E, 0x47, 0x50, 0x49, 0x30, 0x00 // = B.GPI0. - } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", = 0, ResourceConsumer, ) {7} // CE1 - VendorLong () // Length =3D 0x2F - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1B, 0x00, 0x01, 0x10, 0x00, 0x01, // = /....... - /* 0018 */ 0x04, 0x00, 0x12, 0x00, 0x00, 0x14, 0x00, 0x1E, // = ........ - /* 0020 */ 0x00, 0x00, 0x00, 0x07, 0x00, 0x5C, 0x5F, 0x53, // = .....\_S - /* 0028 */ 0x42, 0x2E, 0x47, 0x50, 0x49, 0x30, 0x00 // = B.GPI0. - } + PinFunction (Exclusive, PullDown, BCM_ALT0, "\\_SB.GPI0", 0, Resou= rceConsumer, , ) { 9, 10, 11 } // MISO, MOSI, SCLK + PinFunction (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", 0, Resourc= eConsumer, , ) { 8 } // CE0 + PinFunction (Exclusive, PullUp, BCM_ALT0, "\\_SB.GPI0", 0, Resourc= eConsumer, , ) { 7 } // CE1 }) =20 Method (_CRS, 0x0, Serialized) @@ -468,35 +413,8 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2"= , 2) { MEMORY32FIXED (ReadWrite, 0, BCM2836_SPI1_LENGTH, RMEM) Interrupt (ResourceConsumer, Level, ActiveHigh, Shared,) { BCM2836= _SPI1_INTERRUPT } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig(Exclusive, PullDown, BCM_ALT4, "\\_SB.GPI0",= 0, ResourceConsumer, ) {19, 20, 21} // MISO, MOSI, SCLK - VendorLong () // Length =3D 0x33 - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1F, 0x00, 0x01, 0x10, 0x00, 0x02, // = /....... - /* 0018 */ 0x03, 0x00, 0x12, 0x00, 0x00, 0x18, 0x00, 0x22, // = ......." - /* 0020 */ 0x00, 0x00, 0x00, 0x13, 0x00, 0x14, 0x00, 0x15, // = ........ - /* 0028 */ 0x00, 0x5C, 0x5F, 0x53, 0x42, 0x2E, 0x47, 0x50, // = .\_SB.GP - /* 0030 */ 0x49, 0x30, 0x00 // = I0. - } - - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig(Exclusive, PullDown, BCM_ALT4, "\\_SB.GPI0",= 0, ResourceConsumer, ) {16} // CE2 - VendorLong () // Length =3D 0x2F - { - /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // = .`D....` - /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // = J...-#0. - /* 0010 */ 0x2F, 0x8D, 0x1B, 0x00, 0x01, 0x10, 0x00, 0x02, // = /....... - /* 0018 */ 0x03, 0x00, 0x12, 0x00, 0x00, 0x14, 0x00, 0x1E, // = ........ - /* 0020 */ 0x00, 0x00, 0x00, 0x10, 0x00, 0x5C, 0x5F, 0x53, // = .....\_S - /* 0028 */ 0x42, 0x2E, 0x47, 0x50, 0x49, 0x30, 0x00 // = B.GPI0. - } + PinFunction (Exclusive, PullDown, BCM_ALT4, "\\_SB.GPI0", 0, Resou= rceConsumer, , ) { 19, 20, 21 } // MISO, MOSI, SCLK + PinFunction (Exclusive, PullDown, BCM_ALT4, "\\_SB.GPI0", 0, Resou= rceConsumer, , ) { 16 } // CE2 }) =20 Method (_CRS, 0x0, Serialized) diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/RaspberryP= i/AcpiTables/Uart.asl index c466247bb33b..f6a14d6fd069 100644 --- a/Platform/RaspberryPi/AcpiTables/Uart.asl +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl @@ -77,21 +77,7 @@ Device (URTM) // the kernel debugger is enabled to prevent another client // from muxing the pins away. =20 - // - // MsftFunctionConfig is encoded as the VendorLong. - // - // MsftFunctionConfig(Exclusive, PullDown, BCM_ALT5, "\\_SB.GPI0", 0, = ResourceConsumer, ) {14, 15} - // VendorLong () // Length =3D 0x31 - // { - // /* 0000 */ 0x00, 0x60, 0x44, 0xD5, 0xF3, 0x1F, 0x11, 0x60, // .= `D....` - // /* 0008 */ 0x4A, 0xB8, 0xB0, 0x9C, 0x2D, 0x23, 0x30, 0xDD, // J= ...-#0. - // /* 0010 */ 0x2F, 0x8D, 0x1D, 0x00, 0x01, 0x10, 0x00, 0x02, // /= ....... - // /* 0018 */ 0x02, 0x00, 0x12, 0x00, 0x00, 0x16, 0x00, 0x20, // .= ...... - // /* 0020 */ 0x00, 0x00, 0x00, 0x0E, 0x00, 0x0F, 0x00, 0x5C, // .= ......\ - // /* 0028 */ 0x5F, 0x53, 0x42, 0x2E, 0x47, 0x50, 0x49, 0x30, // _= SB.GPI0 - // /* 0030 */ 0x00 // . - //} - + // PinFunction (Exclusive, PullDown, BCM_ALT5, "\\_SB.GPI0", 0, Resour= ceConsumer, , ) { 14, 15 } }) Method (_CRS, 0x0, Serialized) { --=20 2.21.0.windows.1 -=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 (#56396): https://edk2.groups.io/g/devel/message/56396 Mute This Topic: https://groups.io/mt/72561824/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-