Commit 2c910cb7 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'uverbs_dev_cleanups' into rdma.git for-next 

For dependencies, branch based on rdma.git 'for-rc' of
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/



Pull 'uverbs_dev_cleanups' from Leon Romanovsky:

====================
Reuse the char device code interfaces to simplify ib_uverbs_device
creation and destruction. As part of this series, we are sending fix to
cleanup path, which was discovered during internal review,

The fix definitely can go to -rc, but it means that this series will be
dependent on rdma-rc.
====================

* branch 'uverbs_dev_cleanups':
  RDMA/uverbs: Use device.groups to initialize device attributes
  RDMA/uverbs: Use cdev_device_add() instead of cdev_add()
  RDMA/core: Depend on device_add() to add device attributes
  RDMA/uverbs: Fix error cleanup path of ib_uverbs_add_one()

Resolved conflict in ib_device_unregister_sysfs()

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 627212c9 b53b1c08

Documentation/ABI/stable/sysfs-bus-xen-backend

+9 −0
Original line number Diff line number Diff line
@@ -73,3 +73,12 @@ KernelVersion: 3.0 
Contact:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Description:

                Number of sectors written by the frontend.



What:		/sys/bus/xen-backend/devices/*/state

Date:		August 2018

KernelVersion:	4.19

Contact:	Joe Jin <joe.jin@oracle.com>

Description:

                The state of the device. One of: 'Unknown',

                'Initialising', 'Initialised', 'Connected', 'Closing',

                'Closed', 'Reconfiguring', 'Reconfigured'.

Documentation/ABI/testing/sysfs-driver-xen-blkback

+10 −0
Original line number Diff line number Diff line
@@ -15,3 +15,13 @@ Description: 
                blkback. If the frontend tries to use more than

                max_persistent_grants, the LRU kicks in and starts

                removing 5% of max_persistent_grants every 100ms.



What:           /sys/module/xen_blkback/parameters/persistent_grant_unused_seconds

Date:           August 2018

KernelVersion:  4.19

Contact:        Roger Pau Monné <roger.pau@citrix.com>

Description:

                How long a persistent grant is allowed to remain

                allocated without being in use. The time is in

                seconds, 0 means indefinitely long.

                The default is 60 seconds.

Documentation/arm64/sve.txt

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ prctl(PR_SVE_SET_VL, unsigned long arg) 
      thread.



    * Changing the vector length causes all of P0..P15, FFR and all bits of

      Z0..V31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become

      Z0..Z31 except for Z0 bits [127:0] .. Z31 bits [127:0] to become

      unspecified.  Calling PR_SVE_SET_VL with vl equal to the thread's current

      vector length, or calling PR_SVE_SET_VL with the PR_SVE_SET_VL_ONEXEC

      flag, does not constitute a change to the vector length for this purpose.
@@ -500,7 +500,7 @@ References 
[2] arch/arm64/include/uapi/asm/ptrace.h

    AArch64 Linux ptrace ABI definitions



[3] linux/Documentation/arm64/cpu-feature-registers.txt

[3] Documentation/arm64/cpu-feature-registers.txt



[4] ARM IHI0055C

    http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055c/IHI0055C_beta_aapcs64.pdf

Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt

+11 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ The RISC-V supervisor ISA manual specifies three interrupt sources that are 
attached to every HLIC: software interrupts, the timer interrupt, and external

interrupts.  Software interrupts are used to send IPIs between cores.  The

timer interrupt comes from an architecturally mandated real-time timer that is

controller via Supervisor Binary Interface (SBI) calls and CSR reads.  External

controlled via Supervisor Binary Interface (SBI) calls and CSR reads.  External

interrupts connect all other device interrupts to the HLIC, which are routed

via the platform-level interrupt controller (PLIC).
@@ -25,7 +25,15 @@ in the system. 


Required properties:

- compatible : "riscv,cpu-intc"

- #interrupt-cells : should be <1>

- #interrupt-cells : should be <1>.  The interrupt sources are defined by the

  RISC-V supervisor ISA manual, with only the following three interrupts being

  defined for supervisor mode:

    - Source 1 is the supervisor software interrupt, which can be sent by an SBI

      call and is reserved for use by software.

    - Source 5 is the supervisor timer interrupt, which can be configured by

      SBI calls and implements a one-shot timer.

    - Source 9 is the supervisor external interrupt, which chains to all other

      device interrupts.

- interrupt-controller : Identifies the node as an interrupt controller



Furthermore, this interrupt-controller MUST be embedded inside the cpu
@@ -38,7 +46,7 @@ An example device tree entry for a HLIC is show below. 
		...

		cpu1-intc: interrupt-controller {

			#interrupt-cells = <1>;

			compatible = "riscv,cpu-intc", "sifive,fu540-c000-cpu-intc";

			compatible = "sifive,fu540-c000-cpu-intc", "riscv,cpu-intc";

			interrupt-controller;

		};

	};

Documentation/devicetree/bindings/watchdog/renesas-wdt.txt

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	       Examples with soctypes are:

		 - "renesas,r8a7743-wdt" (RZ/G1M)

		 - "renesas,r8a7745-wdt" (RZ/G1E)

		 - "renesas,r8a774a1-wdt" (RZ/G2M)

	         - "renesas,r8a7790-wdt" (R-Car H2)

	         - "renesas,r8a7791-wdt" (R-Car M2-W)

	         - "renesas,r8a7792-wdt" (R-Car V2H)
@@ -21,8 +22,8 @@ Required properties: 
	         - "renesas,r7s72100-wdt" (RZ/A1)

		The generic compatible string must be:

		 - "renesas,rza-wdt" for RZ/A

		 - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G

		 - "renesas,rcar-gen3-wdt" for R-Car Gen3

		 - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G1

		 - "renesas,rcar-gen3-wdt" for R-Car Gen3 and RZ/G2



- reg : Should contain WDT registers location and length

- clocks : the clock feeding the watchdog timer.

CRA Git | Maintained and supported by SUSTech CRA and CCSE