| Message ID | 910e5a85a6a8020069996e2ff397c93e9c5fe18c.1526935804.git.chunkeey@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On Mon, May 21, 2018 at 10:57:36PM +0200, Christian Lamparter wrote: > This patch adds the gpio-ranges and gpio-reserved-ranges property > definitions to the binding text files supported by the pinctrl-msm > driver framework. > > gpio-ranges: > For DT-based platforms the pinctrl-msm framework currently relies > on the deprecated-for-DT gpiochip_add_pin_range() function to add > the range of GPIOs to be handled by the pin controller. Due to > interactions within gpiolib code, this causes the pinctrl-msm > driver to bail out (-517) during boot when a gpio-hog is declared. > This can be fatal and cause the system to not boot or reset > (for a detailed explanation and call-trace, refer to patch: > "pinctrl: msm: fix gpio-hog related boot issues" in this series). > > gpio-reserved-ranges: > The binding has been added as a precaution since the TrustZone > firmware (aka QSEE), which is running as the hypervisor, might > have reserved certain, but undisclosed pins. Hence reading or > writing to the registers for those pins will cause an > XPU violation and this subsequently crashes the kernel. > > Signed-off-by: Christian Lamparter <chunkeey@gmail.com> > --- > .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 6 ++++++ > .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 11 +++++++++++ > .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 6 ++++++ > .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 6 ++++++ > .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 10 ++++++++++ > .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 11 +++++++++++ > .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 6 ++++++ > .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 11 +++++++++++ > .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 11 +++++++++++ > .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 6 ++++++ > .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 11 +++++++++++ > .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 11 +++++++++++ > 12 files changed, 106 insertions(+) > > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt > index a752a4716486..7f78c6bb4e35 100644 > --- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt > @@ -10,6 +10,11 @@ Required properties: > - #gpio-cells : Should be two. > The first cell is the gpio pin number and the > second cell is used for optional parameters. > +- gpio-ranges: Range of pins managed by the GPIO controller. Just 'see gpio.txt' is sufficient unless you can say how many entries. > + > +Optional properties: > + > +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. ditto. > > Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for > a general description of GPIO and interrupt bindings. > @@ -67,6 +72,7 @@ Example: > > pinctrl-names = "default"; > pinctrl-0 = <&gsbi5_uart_default>; > + gpio-ranges = <&msmgpio 0 0 90>; > > gsbi5_uart_default: gsbi5_uart_default { > mux { > diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt > index c4ea61ac56f2..362f32b945af 100644 > --- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt > +++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt > @@ -40,6 +40,16 @@ MSM8960 platform. > Definition: must be 2. Specifying the pin number and flags, as defined > in <dt-bindings/gpio/gpio.h> > > +- gpio-ranges: > + Usage: required > + Value type: <prop-encoded-array> But this is phandle with 3 cells. Still, you don't need to redefine standard properties here. Just need to know optional vs. required and any constraints you can define (e.g. allowed values, number of values, etc.) Same comments apply to the rest. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt index a752a4716486..7f78c6bb4e35 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt @@ -10,6 +10,11 @@ Required properties: - #gpio-cells : Should be two. The first cell is the gpio pin number and the second cell is used for optional parameters. +- gpio-ranges: Range of pins managed by the GPIO controller. + +Optional properties: + +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -67,6 +72,7 @@ Example: pinctrl-names = "default"; pinctrl-0 = <&gsbi5_uart_default>; + gpio-ranges = <&msmgpio 0 0 90>; gsbi5_uart_default: gsbi5_uart_default { mux { diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt index c4ea61ac56f2..362f32b945af 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt @@ -40,6 +40,16 @@ MSM8960 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -154,6 +164,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&tlmm 0 0 147>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 208 0>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt index 93374f478b9e..7323bc54a1a0 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt @@ -13,6 +13,11 @@ Required properties: - #gpio-cells : Should be two. The first cell is the gpio pin number and the second cell is used for optional parameters. +- gpio-ranges: Range of pins managed by the GPIO controller. + +Optional properties: + +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -64,6 +69,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&tlmm 0 0 100>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 208 0>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt index 6e88e91feb11..e6843ef15169 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt @@ -10,6 +10,11 @@ Required properties: - #gpio-cells : Should be two. The first cell is the gpio pin number and the second cell is used for optional parameters. +- gpio-ranges: Range of pins managed by the GPIO controller. + +Optional properties: + +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -67,6 +72,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&pinmux 0 0 69>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 32 0x4>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.txt index 407b9443629d..e4d7ebcda0b0 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8074-pinctrl.txt @@ -39,6 +39,15 @@ IPQ8074 platform. Value type: <u32> Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -148,6 +157,7 @@ Example: interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&tlmm 0 0 70>; interrupt-controller; #interrupt-cells = <2>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt index 1b52f01ddcb7..6a104f7800f9 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,mdm9615-pinctrl.txt @@ -40,6 +40,16 @@ MDM9615 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -127,6 +137,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&msmgpio 0 0 88>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 16 0x4>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt index df9a838ec5f9..311ea80a0101 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8660-pinctrl.txt @@ -10,6 +10,11 @@ Required properties: - #gpio-cells : Should be two. The first cell is the gpio pin number and the second cell is used for optional parameters. +- gpio-ranges: Range of pins managed by the GPIO controller. + +Optional properties: + +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -62,6 +67,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&msmgpio 0 0 173>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 16 0x4>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt index 498caff6029e..99d1629f0940 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8916-pinctrl.txt @@ -40,6 +40,16 @@ MSM8916 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -162,6 +172,7 @@ Example: interrupts = <0 208 0>; gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&tlmm 0 0 122>; interrupt-controller; #interrupt-cells = <2>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt index eb8d8aa41f20..b1ad096ad60d 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt @@ -40,6 +40,16 @@ MSM8960 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -156,6 +166,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&msmgpio 0 0 152>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 16 0x4>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt index 453bd7c76d6b..54eda96a0d95 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt @@ -10,6 +10,11 @@ Required properties: - #gpio-cells : Should be two. The first cell is the gpio pin number and the second cell is used for optional parameters. +- gpio-ranges: Range of pins managed by the GPIO controller. + +Optional properties: + +- gpio-reserved-ranges: Range of pins reserved by the TrustZone TEE. Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -87,6 +92,7 @@ Example: gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&msmgpio 0 0 146>; interrupt-controller; #interrupt-cells = <2>; interrupts = <0 208 0>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt index 13cd629f896e..58208f2eb455 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8994-pinctrl.txt @@ -42,6 +42,16 @@ MSM8994 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -160,6 +170,7 @@ Example: interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; gpio-controller; #gpio-cells = <2>; + gpio-ranges = <&msmgpio 0 0 146>; interrupt-controller; #interrupt-cells = <2>; diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt index aaf01e929eea..65f5e901ee1a 100644 --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt @@ -40,6 +40,16 @@ MSM8996 platform. Definition: must be 2. Specifying the pin number and flags, as defined in <dt-bindings/gpio/gpio.h> +- gpio-ranges: + Usage: required + Value type: <prop-encoded-array> + Definition: Range of pins managed by the GPIO controller. + +- gpio-reserved-ranges: + Usage: optional + Value type: <prop-encoded-array> + Definition: Range of pins reserved by the TrustZone TEE. + Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for a general description of GPIO and interrupt bindings. @@ -180,6 +190,7 @@ Example: reg = <0x01010000 0x300000>; interrupts = <0 208 0>; gpio-controller; + gpio-ranges = <&tlmm 0 0 150>; #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>;
This patch adds the gpio-ranges and gpio-reserved-ranges property definitions to the binding text files supported by the pinctrl-msm driver framework. gpio-ranges: For DT-based platforms the pinctrl-msm framework currently relies on the deprecated-for-DT gpiochip_add_pin_range() function to add the range of GPIOs to be handled by the pin controller. Due to interactions within gpiolib code, this causes the pinctrl-msm driver to bail out (-517) during boot when a gpio-hog is declared. This can be fatal and cause the system to not boot or reset (for a detailed explanation and call-trace, refer to patch: "pinctrl: msm: fix gpio-hog related boot issues" in this series). gpio-reserved-ranges: The binding has been added as a precaution since the TrustZone firmware (aka QSEE), which is running as the hypervisor, might have reserved certain, but undisclosed pins. Hence reading or writing to the registers for those pins will cause an XPU violation and this subsequently crashes the kernel. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> --- .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 6 ++++++ .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 11 +++++++++++ .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 6 ++++++ .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 6 ++++++ .../bindings/pinctrl/qcom,ipq8074-pinctrl.txt | 10 ++++++++++ .../bindings/pinctrl/qcom,mdm9615-pinctrl.txt | 11 +++++++++++ .../bindings/pinctrl/qcom,msm8660-pinctrl.txt | 6 ++++++ .../bindings/pinctrl/qcom,msm8916-pinctrl.txt | 11 +++++++++++ .../bindings/pinctrl/qcom,msm8960-pinctrl.txt | 11 +++++++++++ .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 6 ++++++ .../bindings/pinctrl/qcom,msm8994-pinctrl.txt | 11 +++++++++++ .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 11 +++++++++++ 12 files changed, 106 insertions(+)