Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
crypto: qat - rename and relocate timer logic
Rename adf_gen4_timer.c to adf_timer.c and adf_gen4_timer.h to
adf_timer.h to make the files generation-agnostic. This includes
renaming the start() and stop() timer APIs and macro definitions
to be generic, allowing for reuse across different device
generations.
This does not introduce any functional changes.
Signed-off-by: George Abraham P <george.abraham.p@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
authored by
George Abraham P
and committed by
Herbert Xu
b8ca4380
ce026b35
+21
-21
+3
-3
drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
+3
-3
drivers/crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c
···
15
15
#include <adf_gen4_pfvf.h>
16
16
#include <adf_gen4_pm.h>
17
17
#include <adf_gen4_ras.h>
18
-
#include <adf_gen4_timer.h>
19
18
#include <adf_gen4_tl.h>
20
19
#include <adf_gen4_vf_mig.h>
20
+
#include <adf_timer.h>
21
21
#include "adf_420xx_hw_data.h"
22
22
#include "icp_qat_hw.h"
23
23
···
468
468
hw_data->enable_pm = adf_gen4_enable_pm;
469
469
hw_data->handle_pm_interrupt = adf_gen4_handle_pm_interrupt;
470
470
hw_data->dev_config = adf_gen4_dev_config;
471
-
hw_data->start_timer = adf_gen4_timer_start;
472
-
hw_data->stop_timer = adf_gen4_timer_stop;
471
+
hw_data->start_timer = adf_timer_start;
472
+
hw_data->stop_timer = adf_timer_stop;
473
473
hw_data->get_hb_clock = adf_gen4_get_heartbeat_clock;
474
474
hw_data->num_hb_ctrs = ADF_NUM_HB_CNT_PER_AE;
475
475
hw_data->clock_frequency = ADF_420XX_AE_FREQ;
+3
-3
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
+3
-3
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
···
15
15
#include <adf_gen4_pfvf.h>
16
16
#include <adf_gen4_pm.h>
17
17
#include "adf_gen4_ras.h"
18
-
#include <adf_gen4_timer.h>
19
18
#include <adf_gen4_tl.h>
20
19
#include <adf_gen4_vf_mig.h>
20
+
#include <adf_timer.h>
21
21
#include "adf_4xxx_hw_data.h"
22
22
#include "icp_qat_hw.h"
23
23
···
454
454
hw_data->enable_pm = adf_gen4_enable_pm;
455
455
hw_data->handle_pm_interrupt = adf_gen4_handle_pm_interrupt;
456
456
hw_data->dev_config = adf_gen4_dev_config;
457
-
hw_data->start_timer = adf_gen4_timer_start;
458
-
hw_data->stop_timer = adf_gen4_timer_stop;
457
+
hw_data->start_timer = adf_timer_start;
458
+
hw_data->stop_timer = adf_timer_stop;
459
459
hw_data->get_hb_clock = adf_gen4_get_heartbeat_clock;
460
460
hw_data->num_hb_ctrs = ADF_NUM_HB_CNT_PER_AE;
461
461
hw_data->clock_frequency = ADF_4XXX_AE_FREQ;
+1
-1
drivers/crypto/intel/qat/qat_common/Makefile
+1
-1
drivers/crypto/intel/qat/qat_common/Makefile
···
19
19
adf_gen4_hw_data.o \
20
20
adf_gen4_pm.o \
21
21
adf_gen4_ras.o \
22
-
adf_gen4_timer.o \
23
22
adf_gen4_vf_mig.o \
24
23
adf_hw_arbiter.o \
25
24
adf_init.o \
···
29
30
adf_sysfs.o \
30
31
adf_sysfs_ras_counters.o \
31
32
adf_sysfs_rl.o \
33
+
adf_timer.o \
32
34
adf_transport.o \
33
35
qat_algs.o \
34
36
qat_algs_send.o \
+9
-9
drivers/crypto/intel/qat/qat_common/adf_gen4_timer.c
drivers/crypto/intel/qat/qat_common/adf_timer.c
+9
-9
drivers/crypto/intel/qat/qat_common/adf_gen4_timer.c
drivers/crypto/intel/qat/qat_common/adf_timer.c
···
12
12
#include "adf_admin.h"
13
13
#include "adf_accel_devices.h"
14
14
#include "adf_common_drv.h"
15
-
#include "adf_gen4_timer.h"
15
+
#include "adf_timer.h"
16
16
17
-
#define ADF_GEN4_TIMER_PERIOD_MS 200
17
+
#define ADF_DEFAULT_TIMER_PERIOD_MS 200
18
18
19
19
/* This periodic update is used to trigger HB, RL & TL fw events */
20
20
static void work_handler(struct work_struct *work)
···
27
27
accel_dev = timer_ctx->accel_dev;
28
28
29
29
adf_misc_wq_queue_delayed_work(&timer_ctx->work_ctx,
30
-
msecs_to_jiffies(ADF_GEN4_TIMER_PERIOD_MS));
30
+
msecs_to_jiffies(ADF_DEFAULT_TIMER_PERIOD_MS));
31
31
32
32
time_periods = div_u64(ktime_ms_delta(ktime_get_real(), timer_ctx->initial_ktime),
33
-
ADF_GEN4_TIMER_PERIOD_MS);
33
+
ADF_DEFAULT_TIMER_PERIOD_MS);
34
34
35
35
if (adf_send_admin_tim_sync(accel_dev, time_periods))
36
36
dev_err(&GET_DEV(accel_dev), "Failed to synchronize qat timer\n");
37
37
}
38
38
39
-
int adf_gen4_timer_start(struct adf_accel_dev *accel_dev)
39
+
int adf_timer_start(struct adf_accel_dev *accel_dev)
40
40
{
41
41
struct adf_timer *timer_ctx;
42
42
···
50
50
51
51
INIT_DELAYED_WORK(&timer_ctx->work_ctx, work_handler);
52
52
adf_misc_wq_queue_delayed_work(&timer_ctx->work_ctx,
53
-
msecs_to_jiffies(ADF_GEN4_TIMER_PERIOD_MS));
53
+
msecs_to_jiffies(ADF_DEFAULT_TIMER_PERIOD_MS));
54
54
55
55
return 0;
56
56
}
57
-
EXPORT_SYMBOL_GPL(adf_gen4_timer_start);
57
+
EXPORT_SYMBOL_GPL(adf_timer_start);
58
58
59
-
void adf_gen4_timer_stop(struct adf_accel_dev *accel_dev)
59
+
void adf_timer_stop(struct adf_accel_dev *accel_dev)
60
60
{
61
61
struct adf_timer *timer_ctx = accel_dev->timer;
62
62
···
68
68
kfree(timer_ctx);
69
69
accel_dev->timer = NULL;
70
70
}
71
-
EXPORT_SYMBOL_GPL(adf_gen4_timer_stop);
71
+
EXPORT_SYMBOL_GPL(adf_timer_stop);
+5
-5
drivers/crypto/intel/qat/qat_common/adf_gen4_timer.h
drivers/crypto/intel/qat/qat_common/adf_timer.h
+5
-5
drivers/crypto/intel/qat/qat_common/adf_gen4_timer.h
drivers/crypto/intel/qat/qat_common/adf_timer.h
···
1
1
/* SPDX-License-Identifier: GPL-2.0-only */
2
2
/* Copyright(c) 2023 Intel Corporation */
3
3
4
-
#ifndef ADF_GEN4_TIMER_H_
5
-
#define ADF_GEN4_TIMER_H_
4
+
#ifndef ADF_TIMER_H_
5
+
#define ADF_TIMER_H_
6
6
7
7
#include <linux/ktime.h>
8
8
#include <linux/workqueue.h>
···
15
15
ktime_t initial_ktime;
16
16
};
17
17
18
-
int adf_gen4_timer_start(struct adf_accel_dev *accel_dev);
19
-
void adf_gen4_timer_stop(struct adf_accel_dev *accel_dev);
18
+
int adf_timer_start(struct adf_accel_dev *accel_dev);
19
+
void adf_timer_stop(struct adf_accel_dev *accel_dev);
20
20
21
-
#endif /* ADF_GEN4_TIMER_H_ */
21
+
#endif /* ADF_TIMER_H_ */