Skip to content

Commit 5ef4f71

Browse files
Tony KrowiakVasily Gorbik
authored andcommitted
s390/vfio-ap: s390/crypto: fix all kernel-doc warnings
Fixes the kernel-doc warnings in the following source files: * drivers/s390/crypto/vfio_ap_private.h * drivers/s390/crypto/vfio_ap_drv.c * drivers/s390/crypto/vfio_ap_ops.c Signed-off-by: Tony Krowiak <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent a4892f8 commit 5ef4f71

File tree

3 files changed

+44
-20
lines changed

3 files changed

+44
-20
lines changed

drivers/s390/crypto/vfio_ap_drv.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ static struct ap_device_id ap_queue_ids[] = {
4242
MODULE_DEVICE_TABLE(vfio_ap, ap_queue_ids);
4343

4444
/**
45-
* vfio_ap_queue_dev_probe:
45+
* vfio_ap_queue_dev_probe: Allocate a vfio_ap_queue structure and associate it
46+
* with the device as driver_data.
4647
*
47-
* Allocate a vfio_ap_queue structure and associate it
48-
* with the device as driver_data.
48+
* @apdev: the AP device being probed
49+
*
50+
* Return: returns 0 if the probe succeeded; otherwise, returns -ENOMEM if
51+
* storage could not be allocated for a vfio_ap_queue object.
4952
*/
5053
static int vfio_ap_queue_dev_probe(struct ap_device *apdev)
5154
{
@@ -61,10 +64,11 @@ static int vfio_ap_queue_dev_probe(struct ap_device *apdev)
6164
}
6265

6366
/**
64-
* vfio_ap_queue_dev_remove:
67+
* vfio_ap_queue_dev_remove: Free the associated vfio_ap_queue structure.
68+
*
69+
* @apdev: the AP device being removed
6570
*
66-
* Takes the matrix lock to avoid actions on this device while removing
67-
* Free the associated vfio_ap_queue structure
71+
* Takes the matrix lock to avoid actions on this device while doing the remove.
6872
*/
6973
static void vfio_ap_queue_dev_remove(struct ap_device *apdev)
7074
{

drivers/s390/crypto/vfio_ap_ops.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ static struct ap_queue_status vfio_ap_irq_disable(struct vfio_ap_queue *q)
187187
* vfio_ap_irq_enable - Enable Interruption for a APQN
188188
*
189189
* @q: the vfio_ap_queue holding AQIC parameters
190+
* @isc: the guest ISC to register with the GIB interface
191+
* @nib: the notification indicator byte to pin.
190192
*
191193
* Pin the NIB saved in *q
192194
* Register the guest ISC to GIB interface and retrieve the
@@ -738,7 +740,6 @@ vfio_ap_mdev_verify_queues_reserved_for_apqi(struct ap_matrix_mdev *matrix_mdev,
738740
* assign_domain_store - parses the APQI from @buf and sets the
739741
* corresponding bit in the mediated matrix device's AQM
740742
*
741-
*
742743
* @dev: the matrix device
743744
* @attr: the mediated matrix device's assign_domain attribute
744745
* @buf: a buffer containing the AP queue index (APQI) of the domain to
@@ -866,7 +867,6 @@ static DEVICE_ATTR_WO(unassign_domain);
866867
* assign_control_domain_store - parses the domain ID from @buf and sets
867868
* the corresponding bit in the mediated matrix device's ADM
868869
*
869-
*
870870
* @dev: the matrix device
871871
* @attr: the mediated matrix device's assign_control_domain attribute
872872
* @buf: a buffer containing the domain ID to be assigned
@@ -1142,6 +1142,7 @@ static int vfio_ap_mdev_iommu_notifier(struct notifier_block *nb,
11421142
* by @matrix_mdev.
11431143
*
11441144
* @matrix_mdev: a matrix mediated device
1145+
* @kvm: the pointer to the kvm structure being unset.
11451146
*
11461147
* Note: The matrix_dev->lock must be taken prior to calling
11471148
* this function; however, the lock will be temporarily released while the

drivers/s390/crypto/vfio_ap_private.h

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,18 @@
2626
#define VFIO_AP_DRV_NAME "vfio_ap"
2727

2828
/**
29-
* ap_matrix_dev - the AP matrix device structure
29+
* struct ap_matrix_dev - Contains the data for the matrix device.
30+
*
3031
* @device: generic device structure associated with the AP matrix device
3132
* @available_instances: number of mediated matrix devices that can be created
3233
* @info: the struct containing the output from the PQAP(QCI) instruction
33-
* mdev_list: the list of mediated matrix devices created
34-
* lock: mutex for locking the AP matrix device. This lock will be
34+
* @mdev_list: the list of mediated matrix devices created
35+
* @lock: mutex for locking the AP matrix device. This lock will be
3536
* taken every time we fiddle with state managed by the vfio_ap
3637
* driver, be it using @mdev_list or writing the state of a
3738
* single ap_matrix_mdev device. It's quite coarse but we don't
3839
* expect much contention.
40+
* @vfio_ap_drv: the vfio_ap device driver
3941
*/
4042
struct ap_matrix_dev {
4143
struct device device;
@@ -49,17 +51,19 @@ struct ap_matrix_dev {
4951
extern struct ap_matrix_dev *matrix_dev;
5052

5153
/**
52-
* The AP matrix is comprised of three bit masks identifying the adapters,
53-
* queues (domains) and control domains that belong to an AP matrix. The bits i
54-
* each mask, from least significant to most significant bit, correspond to IDs
55-
* 0 to 255. When a bit is set, the corresponding ID belongs to the matrix.
54+
* struct ap_matrix - matrix of adapters, domains and control domains
5655
*
5756
* @apm_max: max adapter number in @apm
58-
* @apm identifies the AP adapters in the matrix
57+
* @apm: identifies the AP adapters in the matrix
5958
* @aqm_max: max domain number in @aqm
60-
* @aqm identifies the AP queues (domains) in the matrix
59+
* @aqm: identifies the AP queues (domains) in the matrix
6160
* @adm_max: max domain number in @adm
62-
* @adm identifies the AP control domains in the matrix
61+
* @adm: identifies the AP control domains in the matrix
62+
*
63+
* The AP matrix is comprised of three bit masks identifying the adapters,
64+
* queues (domains) and control domains that belong to an AP matrix. The bits in
65+
* each mask, from left to right, correspond to IDs 0 to 255. When a bit is set
66+
* the corresponding ID belongs to the matrix.
6367
*/
6468
struct ap_matrix {
6569
unsigned long apm_max;
@@ -71,13 +75,20 @@ struct ap_matrix {
7175
};
7276

7377
/**
74-
* struct ap_matrix_mdev - the mediated matrix device structure
75-
* @list: allows the ap_matrix_mdev struct to be added to a list
78+
* struct ap_matrix_mdev - Contains the data associated with a matrix mediated
79+
* device.
80+
* @vdev: the vfio device
81+
* @node: allows the ap_matrix_mdev struct to be added to a list
7682
* @matrix: the adapters, usage domains and control domains assigned to the
7783
* mediated matrix device.
7884
* @group_notifier: notifier block used for specifying callback function for
7985
* handling the VFIO_GROUP_NOTIFY_SET_KVM event
86+
* @iommu_notifier: notifier block used for specifying callback function for
87+
* handling the VFIO_IOMMU_NOTIFY_DMA_UNMAP even
8088
* @kvm: the struct holding guest's state
89+
* @pqap_hook: the function pointer to the interception handler for the
90+
* PQAP(AQIC) instruction.
91+
* @mdev: the mediated device
8192
*/
8293
struct ap_matrix_mdev {
8394
struct vfio_device vdev;
@@ -90,6 +101,14 @@ struct ap_matrix_mdev {
90101
struct mdev_device *mdev;
91102
};
92103

104+
/**
105+
* struct vfio_ap_queue - contains the data associated with a queue bound to the
106+
* vfio_ap device driver
107+
* @matrix_mdev: the matrix mediated device
108+
* @saved_pfn: the guest PFN pinned for the guest
109+
* @apqn: the APQN of the AP queue device
110+
* @saved_isc: the guest ISC registered with the GIB interface
111+
*/
93112
struct vfio_ap_queue {
94113
struct ap_matrix_mdev *matrix_mdev;
95114
unsigned long saved_pfn;

0 commit comments

Comments
 (0)