Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions Documentation/devicetree/bindings/arm/psci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,27 @@ properties:
[1] Kernel documentation - ARM idle states bindings
Documentation/devicetree/bindings/cpu/idle-states.yaml

reboot-mode:
type: object
$ref: /schemas/power/reset/reboot-mode.yaml#
unevaluatedProperties: false
properties:
# "mode-normal" is just SYSTEM_RESET
mode-normal: false
patternProperties:
"^mode-.*$":
minItems: 1
maxItems: 2
description: |
Describes a vendor-specific reset type. The string after "mode-"
maps a reboot mode to the parameters in the PSCI SYSTEM_RESET2 call.

Parameters are named mode-xxx = <type[, cookie]>, where xxx
is the name of the magic reboot mode, type is the lower 31 bits
of the reset_type, and, optionally, the cookie value. If the cookie
is not provided, it is defaulted to zero.
The 31st bit (vendor-resets) will be implicitly set by the driver.

patternProperties:
"^power-domain-":
$ref: /schemas/power/power-domain.yaml#
Expand Down Expand Up @@ -137,6 +158,15 @@ allOf:
required:
- cpu_off
- cpu_on
- if:
not:
properties:
compatible:
contains:
const: arm,psci-1.0
then:
properties:
reboot-mode: false

additionalProperties: false

Expand Down Expand Up @@ -260,4 +290,17 @@ examples:
domain-idle-states = <&cluster_ret>, <&cluster_pwrdn>;
};
};

- |+

// Case 5: SYSTEM_RESET2 vendor resets
psci {
compatible = "arm,psci-1.0";
method = "smc";

reboot-mode {
mode-edl = <0>;
mode-bootloader = <1 2>;
};
};
...
50 changes: 47 additions & 3 deletions arch/arm64/boot/dts/qcom/kodiak.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@
qcom,client-id = <1>;
qcom,vmid = <QCOM_SCM_VMID_MSS_MSA>;
};

adsp_rpc_remote_heap_mem: adsp-rpc-remote-heap@9cb80000 {
reg = <0x0 0x9cb80000 0x0 0x800000>;
no-map;
};
};

cpus {
Expand Down Expand Up @@ -858,7 +863,7 @@
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW>;
};

psci {
psci: psci {
compatible = "arm,psci-1.0";
method = "smc";

Expand Down Expand Up @@ -2424,7 +2429,7 @@

status = "disabled";

pcie@0 {
pcie1_port0: pcie@0 {
device_type = "pci";
reg = <0x0 0x0 0x0 0x0 0x0>;
bus-range = <0x01 0xff>;
Expand All @@ -2440,7 +2445,7 @@
reg = <0 0x01c0e000 0 0x1000>;
clocks = <&gcc GCC_PCIE_1_AUX_CLK>,
<&gcc GCC_PCIE_1_CFG_AHB_CLK>,
<&gcc GCC_PCIE_CLKREF_EN>,
<&rpmhcc RPMH_CXO_CLK>,
<&gcc GCC_PCIE1_PHY_RCHNG_CLK>,
<&gcc GCC_PCIE_1_PIPE_CLK>;
clock-names = "aux",
Expand Down Expand Up @@ -4431,6 +4436,9 @@
qcom,glink-channels = "fastrpcglink-apps-dsp";
label = "adsp";
qcom,non-secure-domain;
memory-region = <&adsp_rpc_remote_heap_mem>;
qcom,vmids = <QCOM_SCM_VMID_LPASS
QCOM_SCM_VMID_ADSP_HEAP>;
#address-cells = <1>;
#size-cells = <0>;

Expand Down Expand Up @@ -4780,6 +4788,14 @@
};
};
};

cooling {
compatible = "qcom,qmi-cooling-cdsp";
cdsp_sw: cdsp_sw {
label = "cdsp_sw";
#cooling-cells = <2>;
};
};
};

usb_1: usb@a600000 {
Expand Down Expand Up @@ -7587,12 +7603,26 @@
type = "hot";
};

nspss0_alert1: trip-point1 {
temperature = <100000>;
hysteresis = <5000>;
type = "passive";
};

nspss0_crit: nspss0-crit {
temperature = <110000>;
hysteresis = <0>;
type = "critical";
};
};

cooling-maps {
map0 {
trip = <&nspss0_alert1>;
cooling-device = <&cdsp_sw
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};

nspss1-thermal {
Expand All @@ -7605,12 +7635,26 @@
type = "hot";
};

nspss1_alert1: trip-point1 {
temperature = <100000>;
hysteresis = <5000>;
type = "passive";
};

nspss1_crit: nspss1-crit {
temperature = <110000>;
hysteresis = <0>;
type = "critical";
};
};

cooling-maps {
map0 {
trip = <&nspss1_alert1>;
cooling-device = <&cdsp_sw
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};

video-thermal {
Expand Down
Loading