diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 20:34:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 20:34:00 -0400 |
commit | fd9879b9bb3258ebc27a4cc6d2d29f528f71901f (patch) | |
tree | 48b68994f5e8083aafe116533e8143cb2bf30c85 /Documentation/ABI | |
parent | 81ae31d78239318610d7c2acb3e2610d622a5aa4 (diff) | |
parent | d53ba6b3bba33432cc37b7101a86f8f3392c46e7 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc updates from Michael Ellerman:
"Here's a first pull request for powerpc updates for 3.18.
The bulk of the additions are for the "cxl" driver, for IBM's Coherent
Accelerator Processor Interface (CAPI). Most of it's in drivers/misc,
which Greg & Arnd maintain, Greg said he was happy for us to take it
through our tree.
There's the usual minor cleanups and fixes, including a bit of noise
in drivers from some of those. A bunch of updates to our EEH code,
which has been getting more testing. Several nice speedups from
Anton, including 20% in clear_page().
And a bunch of updates for freescale from Scott"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux: (130 commits)
cxl: Fix afu_read() not doing finish_wait() on signal or non-blocking
cxl: Add documentation for userspace APIs
cxl: Add driver to Kbuild and Makefiles
cxl: Add userspace header file
cxl: Driver code for powernv PCIe based cards for userspace access
cxl: Add base builtin support
powerpc/mm: Add hooks for cxl
powerpc/opal: Add PHB to cxl mode call
powerpc/mm: Add new hash_page_mm()
powerpc/powerpc: Add new PCIe functions for allocating cxl interrupts
cxl: Add new header for call backs and structs
powerpc/powernv: Split out set MSI IRQ chip code
powerpc/mm: Export mmu_kernel_ssize and mmu_linear_psize
powerpc/msi: Improve IRQ bitmap allocator
powerpc/cell: Make spu_flush_all_slbs() generic
powerpc/cell: Move data segment faulting code out of cell platform
powerpc/cell: Move spu_handle_mm_fault() out of cell platform
powerpc/pseries: Use new defines when calling H_SET_MODE
powerpc: Update contact info in Documentation files
powerpc/perf/hv-24x7: Simplify catalog_read()
...
Diffstat (limited to 'Documentation/ABI')
3 files changed, 138 insertions, 9 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 b/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 index e78ee798d7bd..32f3f5f8bba2 100644 --- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 +++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog | 1 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog |
2 | Date: February 2014 | 2 | Date: February 2014 |
3 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 3 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
4 | Description: | 4 | Description: |
5 | Provides access to the binary "24x7 catalog" provided by the | 5 | Provides access to the binary "24x7 catalog" provided by the |
6 | hypervisor on POWER7 and 8 systems. This catalog lists events | 6 | hypervisor on POWER7 and 8 systems. This catalog lists events |
@@ -10,14 +10,14 @@ Description: | |||
10 | 10 | ||
11 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_length | 11 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_length |
12 | Date: February 2014 | 12 | Date: February 2014 |
13 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 13 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
14 | Description: | 14 | Description: |
15 | A number equal to the length in bytes of the catalog. This is | 15 | A number equal to the length in bytes of the catalog. This is |
16 | also extractable from the provided binary "catalog" sysfs entry. | 16 | also extractable from the provided binary "catalog" sysfs entry. |
17 | 17 | ||
18 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_version | 18 | What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_version |
19 | Date: February 2014 | 19 | Date: February 2014 |
20 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 20 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
21 | Description: | 21 | Description: |
22 | Exposes the "version" field of the 24x7 catalog. This is also | 22 | Exposes the "version" field of the 24x7 catalog. This is also |
23 | extractable from the provided binary "catalog" sysfs entry. | 23 | extractable from the provided binary "catalog" sysfs entry. |
diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci b/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci index 3fa58c23f13b..3ca4e554d2f9 100644 --- a/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci +++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci | |||
@@ -1,6 +1,6 @@ | |||
1 | What: /sys/bus/event_source/devices/hv_gpci/interface/collect_privileged | 1 | What: /sys/bus/event_source/devices/hv_gpci/interface/collect_privileged |
2 | Date: February 2014 | 2 | Date: February 2014 |
3 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 3 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
4 | Description: | 4 | Description: |
5 | '0' if the hypervisor is configured to forbid access to event | 5 | '0' if the hypervisor is configured to forbid access to event |
6 | counters being accumulated by other guests and to physical | 6 | counters being accumulated by other guests and to physical |
@@ -9,35 +9,35 @@ Description: | |||
9 | 9 | ||
10 | What: /sys/bus/event_source/devices/hv_gpci/interface/ga | 10 | What: /sys/bus/event_source/devices/hv_gpci/interface/ga |
11 | Date: February 2014 | 11 | Date: February 2014 |
12 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 12 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
13 | Description: | 13 | Description: |
14 | 0 or 1. Indicates whether we have access to "GA" events (listed | 14 | 0 or 1. Indicates whether we have access to "GA" events (listed |
15 | in arch/powerpc/perf/hv-gpci.h). | 15 | in arch/powerpc/perf/hv-gpci.h). |
16 | 16 | ||
17 | What: /sys/bus/event_source/devices/hv_gpci/interface/expanded | 17 | What: /sys/bus/event_source/devices/hv_gpci/interface/expanded |
18 | Date: February 2014 | 18 | Date: February 2014 |
19 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 19 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
20 | Description: | 20 | Description: |
21 | 0 or 1. Indicates whether we have access to "EXPANDED" events (listed | 21 | 0 or 1. Indicates whether we have access to "EXPANDED" events (listed |
22 | in arch/powerpc/perf/hv-gpci.h). | 22 | in arch/powerpc/perf/hv-gpci.h). |
23 | 23 | ||
24 | What: /sys/bus/event_source/devices/hv_gpci/interface/lab | 24 | What: /sys/bus/event_source/devices/hv_gpci/interface/lab |
25 | Date: February 2014 | 25 | Date: February 2014 |
26 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 26 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
27 | Description: | 27 | Description: |
28 | 0 or 1. Indicates whether we have access to "LAB" events (listed | 28 | 0 or 1. Indicates whether we have access to "LAB" events (listed |
29 | in arch/powerpc/perf/hv-gpci.h). | 29 | in arch/powerpc/perf/hv-gpci.h). |
30 | 30 | ||
31 | What: /sys/bus/event_source/devices/hv_gpci/interface/version | 31 | What: /sys/bus/event_source/devices/hv_gpci/interface/version |
32 | Date: February 2014 | 32 | Date: February 2014 |
33 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 33 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
34 | Description: | 34 | Description: |
35 | A number indicating the version of the gpci interface that the | 35 | A number indicating the version of the gpci interface that the |
36 | hypervisor reports supporting. | 36 | hypervisor reports supporting. |
37 | 37 | ||
38 | What: /sys/bus/event_source/devices/hv_gpci/interface/kernel_version | 38 | What: /sys/bus/event_source/devices/hv_gpci/interface/kernel_version |
39 | Date: February 2014 | 39 | Date: February 2014 |
40 | Contact: Cody P Schafer <cody@linux.vnet.ibm.com> | 40 | Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org> |
41 | Description: | 41 | Description: |
42 | A number indicating the latest version of the gpci interface | 42 | A number indicating the latest version of the gpci interface |
43 | that the kernel is aware of. | 43 | that the kernel is aware of. |
diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl new file mode 100644 index 000000000000..554405ec1955 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-class-cxl | |||
@@ -0,0 +1,129 @@ | |||
1 | Slave contexts (eg. /sys/class/cxl/afu0.0s): | ||
2 | |||
3 | What: /sys/class/cxl/<afu>/irqs_max | ||
4 | Date: September 2014 | ||
5 | Contact: linuxppc-dev@lists.ozlabs.org | ||
6 | Description: read/write | ||
7 | Decimal value of maximum number of interrupts that can be | ||
8 | requested by userspace. The default on probe is the maximum | ||
9 | that hardware can support (eg. 2037). Write values will limit | ||
10 | userspace applications to that many userspace interrupts. Must | ||
11 | be >= irqs_min. | ||
12 | |||
13 | What: /sys/class/cxl/<afu>/irqs_min | ||
14 | Date: September 2014 | ||
15 | Contact: linuxppc-dev@lists.ozlabs.org | ||
16 | Description: read only | ||
17 | Decimal value of the minimum number of interrupts that | ||
18 | userspace must request on a CXL_START_WORK ioctl. Userspace may | ||
19 | omit the num_interrupts field in the START_WORK IOCTL to get | ||
20 | this minimum automatically. | ||
21 | |||
22 | What: /sys/class/cxl/<afu>/mmio_size | ||
23 | Date: September 2014 | ||
24 | Contact: linuxppc-dev@lists.ozlabs.org | ||
25 | Description: read only | ||
26 | Decimal value of the size of the MMIO space that may be mmaped | ||
27 | by userspace. | ||
28 | |||
29 | What: /sys/class/cxl/<afu>/modes_supported | ||
30 | Date: September 2014 | ||
31 | Contact: linuxppc-dev@lists.ozlabs.org | ||
32 | Description: read only | ||
33 | List of the modes this AFU supports. One per line. | ||
34 | Valid entries are: "dedicated_process" and "afu_directed" | ||
35 | |||
36 | What: /sys/class/cxl/<afu>/mode | ||
37 | Date: September 2014 | ||
38 | Contact: linuxppc-dev@lists.ozlabs.org | ||
39 | Description: read/write | ||
40 | The current mode the AFU is using. Will be one of the modes | ||
41 | given in modes_supported. Writing will change the mode | ||
42 | provided that no user contexts are attached. | ||
43 | |||
44 | |||
45 | What: /sys/class/cxl/<afu>/prefault_mode | ||
46 | Date: September 2014 | ||
47 | Contact: linuxppc-dev@lists.ozlabs.org | ||
48 | Description: read/write | ||
49 | Set the mode for prefaulting in segments into the segment table | ||
50 | when performing the START_WORK ioctl. Possible values: | ||
51 | none: No prefaulting (default) | ||
52 | work_element_descriptor: Treat the work element | ||
53 | descriptor as an effective address and | ||
54 | prefault what it points to. | ||
55 | all: all segments process calling START_WORK maps. | ||
56 | |||
57 | What: /sys/class/cxl/<afu>/reset | ||
58 | Date: September 2014 | ||
59 | Contact: linuxppc-dev@lists.ozlabs.org | ||
60 | Description: write only | ||
61 | Writing 1 here will reset the AFU provided there are not | ||
62 | contexts active on the AFU. | ||
63 | |||
64 | What: /sys/class/cxl/<afu>/api_version | ||
65 | Date: September 2014 | ||
66 | Contact: linuxppc-dev@lists.ozlabs.org | ||
67 | Description: read only | ||
68 | Decimal value of the current version of the kernel/user API. | ||
69 | |||
70 | What: /sys/class/cxl/<afu>/api_version_com | ||
71 | Date: September 2014 | ||
72 | Contact: linuxppc-dev@lists.ozlabs.org | ||
73 | Description: read only | ||
74 | Decimal value of the the lowest version of the userspace API | ||
75 | this this kernel supports. | ||
76 | |||
77 | |||
78 | |||
79 | Master contexts (eg. /sys/class/cxl/afu0.0m) | ||
80 | |||
81 | What: /sys/class/cxl/<afu>m/mmio_size | ||
82 | Date: September 2014 | ||
83 | Contact: linuxppc-dev@lists.ozlabs.org | ||
84 | Description: read only | ||
85 | Decimal value of the size of the MMIO space that may be mmaped | ||
86 | by userspace. This includes all slave contexts space also. | ||
87 | |||
88 | What: /sys/class/cxl/<afu>m/pp_mmio_len | ||
89 | Date: September 2014 | ||
90 | Contact: linuxppc-dev@lists.ozlabs.org | ||
91 | Description: read only | ||
92 | Decimal value of the Per Process MMIO space length. | ||
93 | |||
94 | What: /sys/class/cxl/<afu>m/pp_mmio_off | ||
95 | Date: September 2014 | ||
96 | Contact: linuxppc-dev@lists.ozlabs.org | ||
97 | Description: read only | ||
98 | Decimal value of the Per Process MMIO space offset. | ||
99 | |||
100 | |||
101 | Card info (eg. /sys/class/cxl/card0) | ||
102 | |||
103 | What: /sys/class/cxl/<card>/caia_version | ||
104 | Date: September 2014 | ||
105 | Contact: linuxppc-dev@lists.ozlabs.org | ||
106 | Description: read only | ||
107 | Identifies the CAIA Version the card implements. | ||
108 | |||
109 | What: /sys/class/cxl/<card>/psl_version | ||
110 | Date: September 2014 | ||
111 | Contact: linuxppc-dev@lists.ozlabs.org | ||
112 | Description: read only | ||
113 | Identifies the revision level of the PSL. | ||
114 | |||
115 | What: /sys/class/cxl/<card>/base_image | ||
116 | Date: September 2014 | ||
117 | Contact: linuxppc-dev@lists.ozlabs.org | ||
118 | Description: read only | ||
119 | Identifies the revision level of the base image for devices | ||
120 | that support loadable PSLs. For FPGAs this field identifies | ||
121 | the image contained in the on-adapter flash which is loaded | ||
122 | during the initial program load. | ||
123 | |||
124 | What: /sys/class/cxl/<card>/image_loaded | ||
125 | Date: September 2014 | ||
126 | Contact: linuxppc-dev@lists.ozlabs.org | ||
127 | Description: read only | ||
128 | Will return "user" or "factory" depending on the image loaded | ||
129 | onto the card. | ||