Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: qat - abstract PFVF receive logic
Refactor the PFVF receive logic so it is common between PF and VF and
make it device specific.
This is in preparation for the introduction of PFVF support in the
qat_4xxx driver since the receive logic differs between QAT GEN2 and
QAT GEN4 devices.
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Co-developed-by: Marco Chiappero <marco.chiappero@intel.com>
Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
Giovanni Cabiddu
and committed by
Herbert Xu
1ea7c2be
49c43538
+81
-44
+1
drivers/crypto/qat/qat_common/adf_accel_devices.h
+1
drivers/crypto/qat/qat_common/adf_accel_devices.h
···
155
155
void (*enable_vf2pf_interrupts)(void __iomem *pmisc_addr, u32 vf_mask);
156
156
void (*disable_vf2pf_interrupts)(void __iomem *pmisc_addr, u32 vf_mask);
157
157
int (*send_msg)(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr);
158
+
u32 (*recv_msg)(struct adf_accel_dev *accel_dev, u8 vf_nr);
158
159
};
159
160
160
161
struct adf_hw_device_data {
+45
drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
+45
drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
···
156
156
}
157
157
}
158
158
159
+
static u32 adf_gen2_pfvf_recv(struct adf_accel_dev *accel_dev, u8 vf_nr)
160
+
{
161
+
struct adf_accel_pci *pci_info = &accel_dev->accel_pci_dev;
162
+
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
163
+
void __iomem *pmisc_addr =
164
+
pci_info->pci_bars[hw_data->get_misc_bar_id(hw_data)].virt_addr;
165
+
u32 pfvf_offset;
166
+
u32 msg_origin;
167
+
u32 int_bit;
168
+
u32 msg;
169
+
170
+
if (accel_dev->is_vf) {
171
+
pfvf_offset = GET_PFVF_OPS(accel_dev)->get_pf2vf_offset(0);
172
+
int_bit = ADF_PF2VF_INT;
173
+
msg_origin = ADF_PF2VF_MSGORIGIN_SYSTEM;
174
+
} else {
175
+
pfvf_offset = GET_PFVF_OPS(accel_dev)->get_vf2pf_offset(vf_nr);
176
+
int_bit = ADF_VF2PF_INT;
177
+
msg_origin = ADF_VF2PF_MSGORIGIN_SYSTEM;
178
+
}
179
+
180
+
/* Read message */
181
+
msg = ADF_CSR_RD(pmisc_addr, pfvf_offset);
182
+
if (!(msg & int_bit)) {
183
+
dev_info(&GET_DEV(accel_dev),
184
+
"Spurious PFVF interrupt, msg %X. Ignored\n", msg);
185
+
return 0;
186
+
}
187
+
188
+
/* Ignore legacy non-system (non-kernel) VF2PF messages */
189
+
if (!(msg & msg_origin)) {
190
+
dev_dbg(&GET_DEV(accel_dev),
191
+
"Ignored non-system message (0x%x);\n", msg);
192
+
return 0;
193
+
}
194
+
195
+
/* To ACK, clear the INT bit */
196
+
msg &= ~int_bit;
197
+
ADF_CSR_WR(pmisc_addr, pfvf_offset, msg);
198
+
199
+
return msg;
200
+
}
201
+
159
202
void adf_gen2_init_pf_pfvf_ops(struct adf_pfvf_ops *pfvf_ops)
160
203
{
161
204
pfvf_ops->enable_comms = adf_enable_pf2vf_comms;
···
208
165
pfvf_ops->enable_vf2pf_interrupts = adf_gen2_enable_vf2pf_interrupts;
209
166
pfvf_ops->disable_vf2pf_interrupts = adf_gen2_disable_vf2pf_interrupts;
210
167
pfvf_ops->send_msg = adf_gen2_pfvf_send;
168
+
pfvf_ops->recv_msg = adf_gen2_pfvf_recv;
211
169
}
212
170
EXPORT_SYMBOL_GPL(adf_gen2_init_pf_pfvf_ops);
213
171
···
218
174
pfvf_ops->get_pf2vf_offset = adf_gen2_vf_get_pfvf_offset;
219
175
pfvf_ops->get_vf2pf_offset = adf_gen2_vf_get_pfvf_offset;
220
176
pfvf_ops->send_msg = adf_gen2_pfvf_send;
177
+
pfvf_ops->recv_msg = adf_gen2_pfvf_recv;
221
178
}
222
179
EXPORT_SYMBOL_GPL(adf_gen2_init_vf_pfvf_ops);
+18
-23
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
+18
-23
drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
···
41
41
}
42
42
43
43
/**
44
+
* adf_recv_vf2pf_msg() - receive a VF to PF message
45
+
* @accel_dev: Pointer to acceleration device
46
+
* @vf_nr: Number of the VF from where the message will be received
47
+
*
48
+
* This function allows the PF to receive a message from a specific VF.
49
+
*
50
+
* Return: a valid message on success, zero otherwise.
51
+
*/
52
+
static u32 adf_recv_vf2pf_msg(struct adf_accel_dev *accel_dev, u8 vf_nr)
53
+
{
54
+
return GET_PFVF_OPS(accel_dev)->recv_msg(accel_dev, vf_nr);
55
+
}
56
+
57
+
/**
44
58
* adf_send_vf2pf_req() - send VF2PF request message
45
59
* @accel_dev: Pointer to acceleration device.
46
60
* @msg: Request message to send
···
177
163
178
164
bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
179
165
{
180
-
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
181
-
int bar_id = hw_data->get_misc_bar_id(hw_data);
182
-
struct adf_bar *pmisc = &GET_BARS(accel_dev)[bar_id];
183
-
void __iomem *pmisc_addr = pmisc->virt_addr;
184
-
u32 msg, resp = 0;
166
+
u32 resp = 0;
167
+
u32 msg;
185
168
186
-
/* Read message from the VF */
187
-
msg = ADF_CSR_RD(pmisc_addr, hw_data->pfvf_ops.get_vf2pf_offset(vf_nr));
188
-
if (!(msg & ADF_VF2PF_INT)) {
189
-
dev_info(&GET_DEV(accel_dev),
190
-
"Spurious VF2PF interrupt, msg %X. Ignored\n", msg);
169
+
msg = adf_recv_vf2pf_msg(accel_dev, vf_nr);
170
+
if (!msg)
191
171
return true;
192
-
}
193
-
194
-
/* Ignore legacy non-system (non-kernel) VF2PF messages */
195
-
if (!(msg & ADF_VF2PF_MSGORIGIN_SYSTEM)) {
196
-
dev_dbg(&GET_DEV(accel_dev),
197
-
"Ignored non-system message from VF%d (0x%x);\n",
198
-
vf_nr + 1, msg);
199
-
return true;
200
-
}
201
-
202
-
/* To ACK, clear the VF2PFINT bit */
203
-
msg &= ~ADF_VF2PF_INT;
204
-
ADF_CSR_WR(pmisc_addr, hw_data->pfvf_ops.get_vf2pf_offset(vf_nr), msg);
205
172
206
173
if (adf_handle_vf2pf_msg(accel_dev, vf_nr, msg, &resp))
207
174
return false;
+17
-21
drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
+17
-21
drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
···
47
47
}
48
48
EXPORT_SYMBOL_GPL(adf_vf2pf_notify_shutdown);
49
49
50
+
/**
51
+
* adf_recv_pf2vf_msg() - receive a PF to VF message
52
+
* @accel_dev: Pointer to acceleration device
53
+
*
54
+
* This function allows the VF to receive a message from the PF.
55
+
*
56
+
* Return: a valid message on success, zero otherwise.
57
+
*/
58
+
static u32 adf_recv_pf2vf_msg(struct adf_accel_dev *accel_dev)
59
+
{
60
+
return GET_PFVF_OPS(accel_dev)->recv_msg(accel_dev, 0);
61
+
}
62
+
50
63
static bool adf_handle_pf2vf_msg(struct adf_accel_dev *accel_dev, u32 msg)
51
64
{
52
65
switch ((msg & ADF_PF2VF_MSGTYPE_MASK) >> ADF_PF2VF_MSGTYPE_SHIFT) {
···
90
77
91
78
bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)
92
79
{
93
-
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
94
-
struct adf_bar *pmisc =
95
-
&GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)];
96
-
void __iomem *pmisc_bar_addr = pmisc->virt_addr;
97
-
u32 offset = hw_data->pfvf_ops.get_pf2vf_offset(0);
98
80
u32 msg;
99
81
100
-
/* Read the message from PF */
101
-
msg = ADF_CSR_RD(pmisc_bar_addr, offset);
102
-
if (!(msg & ADF_PF2VF_INT)) {
103
-
dev_info(&GET_DEV(accel_dev),
104
-
"Spurious PF2VF interrupt, msg %X. Ignored\n", msg);
105
-
return true;
106
-
}
82
+
msg = adf_recv_pf2vf_msg(accel_dev);
83
+
if (msg)
84
+
return adf_handle_pf2vf_msg(accel_dev, msg);
107
85
108
-
if (!(msg & ADF_PF2VF_MSGORIGIN_SYSTEM))
109
-
/* Ignore legacy non-system (non-kernel) PF2VF messages */
110
-
return true;
111
-
112
-
/* To ack, clear the PF2VFINT bit */
113
-
msg &= ~ADF_PF2VF_INT;
114
-
ADF_CSR_WR(pmisc_bar_addr, offset, msg);
115
-
116
-
return adf_handle_pf2vf_msg(accel_dev, msg);
86
+
return true;
117
87
}