From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from qq.com (qq.com [203.205.221.157]) by mx.groups.io with SMTP id smtpd.web11.1925.1588050560132115413 for ; Mon, 27 Apr 2020 22:09:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@qq.com header.s=s201512 header.b=JAaZVel0; spf=pass (domain: foxmail.com, ip: 203.205.221.157, mailfrom: driver1998@foxmail.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1588050556; bh=HIRW36G0Xo9+zrBnXQxuxU/0FWWqrym9KDWv2XKN2pI=; h=From:To:Cc:Subject:Date; b=JAaZVel0IbNSyj+EIR2qfsWHOEOQTrhONxNP5hpz8ful9562Msc1uNK9N67CCJH7h L1RfcfNoVJIQWpvB95lELlF5g3n8Yx3zH+r4F5kE+82Uet6SkuVxEVNRS9kdS60ozT DrHSXk5XqpsgFFZxKeW3Nyjx6bmx7aaPM74RosH8= Received: from driver1998-Laptop.localdomain ([112.96.194.138]) by newxmesmtplogicsvrsza5.qq.com (NewEsmtp) with SMTP id 24CBB054; Tue, 28 Apr 2020 13:09:12 +0800 X-QQ-mid: xmsmtpt1588050552tb1fz2zxl X-QQ-XMAILINFO: Np5Rl7qBBojv2zugS2gE0YMRc/2CoGvsPTeH+hyNi7Hu2dc4qX6TrjTY9tZ/pn ceT/muqm9Iz2S8MUoVhQUisw8yGOXeKuzEjSjw+OPorS4V82NTPYpdGdWVRLHuckdpjYFPF7jONe ApMn9kv7KByc3LGHGQAQBSRz7kvYaGBwNcJhAoNXrAV6nye0E3ruAxV3i7ldFL0bLENrMIqDPcHg Cm18l0FJKpwMxCsIMw1OI3rY/+nVemAULNTQX5J2nQ9/A4G8+vG3ua+d9ZVJrwHRKau/xeuFOx1z 2/c63aFbwp9A/lLFoxeFqTrli6tkitdseQs17CM+2dUFg3VjZjEF4CfWFi0wXYY9GELF8RlmUMJm pElcLRRfYYa+pe/SXuw9mjC1J+N1E+JfDeU+SY4B4juQaJrkC6hwkfawmQB5V+O8HsT+kq3MS2PS rpMHg8bu+YIDL7az3trkwFWPGNlMfTPKYoXEAiV0o8t33bfjT9Rk+jdPd+TcTFcCTI2Ms2ASV76q 1uX2b5jU/Uk2KUFMST+Qb2YRCPZeuzFUxm4OvhMvL6w1kudfsRGix1aMyIiyllmFdSwYw0aIdn84 UvY5XXwEzwkn2LvkLqK4P1WR09nGm/6TpmgeET8kPGQtLnBUrmfYzKXKjIKjRnzNR0ySAsrXwqDz 3ZdBz5x5rE1VB/qHIT0SCpiJUumeOOF/TvvUEPjkC8WHbRBqvvpntHXffXFCSaaZCz/w== From: "GH Cao" To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, pete@akeo.ie, GH Cao Subject: [edk2-platforms][PATCH] Platform/RaspberryPi: Update Rhpx.asl and Uart.asl to match GpuDevs.asl Date: Tue, 28 Apr 2020 13:09:07 +0800 Message-Id: <20200428050907.287-1-driver1998@foxmail.com> X-Mailer: git-send-email 2.17.1 GPU devices are in container GPV0 for DMA constraints now, but references in Rhpx.asl and Uart.asl are not updated, which breaks the rhproxy driver of Windows 10. Signed-off-by: GH Cao --- Platform/RaspberryPi/AcpiTables/Rhpx.asl | 112 +++++++++++------------ Platform/RaspberryPi/AcpiTables/Uart.asl | 6 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/Platform/RaspberryPi/AcpiTables/Rhpx.asl b/Platform/RaspberryPi/AcpiTables/Rhpx.asl index 0971e13..c8a1817 100644 --- a/Platform/RaspberryPi/AcpiTables/Rhpx.asl +++ b/Platform/RaspberryPi/AcpiTables/Rhpx.asl @@ -30,7 +30,7 @@ Device (RHPX) 4000000, // Connection speed ClockPolarityLow, // Clock polarity ClockPhaseFirst, // Clock phase - "\\_SB.SPI0", // ResourceSource: SPI bus controller name + "\\_SB.GDV0.SPI0", // ResourceSource: SPI bus controller name 0, // ResourceSourceIndex // Resource usage // DescriptorName: creates name for offset of resource descriptor @@ -49,7 +49,7 @@ Device (RHPX) 4000000, // Connection speed ClockPolarityLow, // Clock polarity ClockPhaseFirst, // Clock phase - "\\_SB.SPI0", // ResourceSource: SPI bus controller name + "\\_SB.GDV0.SPI0", // ResourceSource: SPI bus controller name 0, // ResourceSourceIndex // Resource usage // DescriptorName: creates name for offset of resource descriptor @@ -61,7 +61,7 @@ Device (RHPX) , // SlaveMode: default to ControllerInitiated 0, // ConnectionSpeed: placeholder , // Addressing Mode: default to 7 bit - "\\_SB.I2C1", // ResourceSource: I2C bus controller name + "\\_SB.GDV0.I2C1", // ResourceSource: I2C bus controller name , , , // Descriptor Name: creates name for offset of resource descriptor @@ -80,92 +80,92 @@ Device (RHPX) 4000000, // Connection speed ClockPolarityLow, // Clock polarity ClockPhaseFirst, // Clock phase - "\\_SB.SPI1", // ResourceSource: SPI bus controller name + "\\_SB.GDV0.SPI1", // ResourceSource: SPI bus controller name 0, // ResourceSourceIndex // Resource usage // DescriptorName: creates name for offset of resource descriptor ) // Vendor Data // GPIO 2 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 2 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 2 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 2 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 2 } // GPIO 3 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 3 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 3 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 3 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 3 } // GPIO 4 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 4 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 4 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 4 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 4 } // GPIO 5 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 5 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 5 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 5 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 5 } // GPIO 6 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 6 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 6 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 6 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 6 } // GPIO 7 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 7 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 7 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 7 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 7 } // GPIO 8 - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 8 } - GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GPI0",) { 8 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 8 } + GpioInt (Edge, ActiveBoth, Shared, PullUp, 0, "\\_SB.GDV0.GPI0",) { 8 } // GPIO 9 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 9 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 9 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 9 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 9 } // GPIO 10 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 10 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 10 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 10 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 10 } // GPIO 11 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 11 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 11 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 11 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 11 } // GPIO 12 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 12 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 12 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 12 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 12 } // GPIO 13 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 13 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 13 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 13 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 13 } // NTRAID#MSFT-7141401-2016/04/7-jordanrh - disable UART muxing // until a proper solution can be created for the dmap conflict // GPIO 14 - UART TX - // GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 14 } - // GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 14 } + // GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 14 } + // GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 14 } // GPIO 15 - UART RX - // GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 15 } - // GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 15 } + // GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 15 } + // GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 15 } // GPIO 16 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 16 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 16 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 16 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 16 } // GPIO 17 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 17 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 17 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 17 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 17 } // GPIO 18 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 18 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 18 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 18 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 18 } // GPIO 19 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 19 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 19 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 19 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 19 } // GPIO 20 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 20 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 20 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 20 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 20 } // GPIO 21 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 21 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 21 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 21 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 21 } // GPIO 22 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 22 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 22 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 22 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 22 } // GPIO 23 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 23 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 23 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 23 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 23 } // GPIO 24 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 24 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 24 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 24 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 24 } // GPIO 25 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 25 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 25 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 25 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 25 } // GPIO 26 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 26 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 26 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 26 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 26 } // GPIO 27 - GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GPI0", 0, ResourceConsumer,,) { 27 } - GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GPI0",) { 27 } + GpioIO (Shared, PullDown, 0, 0, IoRestrictionNone, "\\_SB.GDV0.GPI0", 0, ResourceConsumer,,) { 27 } + GpioInt (Edge, ActiveBoth, Shared, PullDown, 0, "\\_SB.GDV0.GPI0",) { 27 } }) Name (_DSD, Package() diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/RaspberryPi/AcpiTables/Uart.asl index f6a14d6..5a2404f 100644 --- a/Platform/RaspberryPi/AcpiTables/Uart.asl +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl @@ -127,9 +127,9 @@ Device(BTH0) 16, // ReceiveBufferSize 16, // TransmitBufferSize #if (RPI_MODEL == 4) - "\\_SB.URTM", // ResourceSource: + "\\_SB.GDV0.URTM", // ResourceSource: #else - "\\_SB.URT0", // ResourceSource: + "\\_SB.GDV0.URT0", // ResourceSource: #endif // UART bus controller name , // ResourceSourceIndex: assumed to be 0 @@ -142,7 +142,7 @@ Device(BTH0) // // RPIQ connection for BT_ON/OFF // - GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.RPIQ", 0, ResourceConsumer, , ) { 128 } + GpioIO (Shared, PullUp, 0, 0, IoRestrictionNone, "\\_SB.GDV0.RPIQ", 0, ResourceConsumer, , ) { 128 } }) Return (RBUF) } -- 2.17.1