Commit 7f946e6d authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-6.7/cxl-rch-eh' into cxl/next 

Restricted CXL Host (RCH) Error Handling undoes the topology munging of
CXL 1.1 to enabled some AER recovery, and lands some base infrastructure
for handling Root-Complex-Event-Collectors (RCECs) with CXL. Include
this long running series finally for v6.7.
parents 8f61d48c e8db0701

Documentation/admin-guide/cgroup-v1/memory.rst

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ Brief summary of control files. 
 memory.oom_control		     set/show oom controls.

 memory.numa_stat		     show the number of memory usage per numa

				     node

 memory.kmem.limit_in_bytes          Deprecated knob to set and read the kernel

                                     memory hard limit. Kernel hard limit is not

                                     supported since 5.16. Writing any value to

                                     do file will not have any effect same as if

                                     nokmem kernel parameter was specified.

                                     Kernel memory is still charged and reported

                                     by memory.kmem.usage_in_bytes.

 memory.kmem.usage_in_bytes          show current kernel memory allocation

 memory.kmem.failcnt                 show the number of kernel memory usage

				     hits limits

Documentation/devicetree/bindings/ata/pata-common.yaml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ patternProperties: 
      ID number 0 and the slave drive will have ID number 1. The PATA port

      nodes will be named "ide-port".

    type: object

    additionalProperties: false



    properties:

      reg:

Documentation/devicetree/bindings/clock/renesas,5p35023.yaml

+7 −4
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ properties: 
    maxItems: 1



  '#clock-cells':

    description:

      The index in the assigned-clocks is mapped to the output clock as below

      0 - REF, 1 - SE1, 2 - SE2, 3 - SE3, 4 - DIFF1, 5 - DIFF2.

    const: 1



  clocks:
@@ -68,7 +71,7 @@ examples: 
            reg = <0x68>;

            #clock-cells = <1>;



            clocks = <&x1_x2>;

            clocks = <&x1>;



            renesas,settings = [

                80 00 11 19 4c 02 23 7f 83 19 08 a9 5f 25 24 bf
@@ -79,8 +82,8 @@ examples: 
            assigned-clocks = <&versa3 0>, <&versa3 1>,

                              <&versa3 2>, <&versa3 3>,

                              <&versa3 4>, <&versa3 5>;

            assigned-clock-rates = <12288000>, <25000000>,

                                   <12000000>, <11289600>,

                                   <11289600>, <24000000>;

            assigned-clock-rates = <24000000>, <11289600>,

                                   <11289600>, <12000000>,

                                   <25000000>, <12288000>;

        };

    };

Documentation/devicetree/bindings/i2c/i2c-mxs.yaml

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Freescale MXS Inter IC (I2C) Controller 
maintainers:

  - Shawn Guo <shawnguo@kernel.org>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#



properties:

  compatible:

    enum:
@@ -37,7 +40,7 @@ required: 
  - dmas

  - dma-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml

+37 −6
Original line number Diff line number Diff line
@@ -11,10 +11,15 @@ maintainers: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - const: loongson,ls2k0500-pmc

          - const: syscon

      - items:

          - enum:

          - loongson,ls2k0500-pmc

              - loongson,ls2k1000-pmc

              - loongson,ls2k2000-pmc

          - const: loongson,ls2k0500-pmc

          - const: syscon



  reg:
@@ -32,6 +37,18 @@ properties: 
      addition, the PM need according to it to indicate that current

      SoC whether support Suspend To RAM.



  syscon-poweroff:

    $ref: /schemas/power/reset/syscon-poweroff.yaml#

    type: object

    description:

      Node for power off method



  syscon-reboot:

    $ref: /schemas/power/reset/syscon-reboot.yaml#

    type: object

    description:

      Node for reboot method



required:

  - compatible

  - reg
@@ -44,9 +61,23 @@ examples: 
    #include <dt-bindings/interrupt-controller/irq.h>



    power-management@1fe27000 {

        compatible = "loongson,ls2k1000-pmc", "syscon";

        compatible = "loongson,ls2k1000-pmc", "loongson,ls2k0500-pmc", "syscon";

        reg = <0x1fe27000 0x58>;

        interrupt-parent = <&liointc1>;

        interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

        loongson,suspend-address = <0x0 0x1c000500>;



        syscon-reboot {

            compatible = "syscon-reboot";

            offset = <0x30>;

            mask = <0x1>;

        };



        syscon-poweroff {

            compatible = "syscon-poweroff";

            regmap = <&pmc>;

            offset = <0x14>;

            mask = <0x3c00>;

            value = <0x3c00>;

        };

    };