crypto: qat - abstract admin interface

Abstract access to admin interface and move generation specific code into
adf_gen2_hw_data.c in preparation for the introduction of the qat_4xxx
driver.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>
Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c b/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c
index 7af38b947cfedbd193833502a7e9e3850a40aec6..f72ed415800e029819a4c94d723de9c58811efee 100644 (file)
--- a/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c
+++ b/drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c
@@ -202,6 +202,7 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data)
        hw_data->get_misc_bar_id = get_misc_bar_id;
        hw_data->get_pf2vf_offset = get_pf2vf_offset;
        hw_data->get_vintmsk_offset = get_vintmsk_offset;
+       hw_data->get_admin_info = adf_gen2_get_admin_info;
        hw_data->get_sku = get_sku;
        hw_data->fw_name = ADF_C3XXX_FW;
        hw_data->fw_mmp_name = ADF_C3XXX_MMP;

diff --git a/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c b/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c
index c18fb77dd8ec0a76c20223e806715bf2479819ea..d4443523dc9d8f77f22287ea141c31a1a17ee3f3 100644 (file)
--- a/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c
+++ b/drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c
@@ -212,6 +212,7 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data)
        hw_data->get_misc_bar_id = get_misc_bar_id;
        hw_data->get_pf2vf_offset = get_pf2vf_offset;
        hw_data->get_vintmsk_offset = get_vintmsk_offset;
+       hw_data->get_admin_info = adf_gen2_get_admin_info;
        hw_data->get_sku = get_sku;
        hw_data->fw_name = ADF_C62X_FW;
        hw_data->fw_mmp_name = ADF_C62X_MMP;

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index 459e220768132c7ef065e14be24d5ca3853770ce..5f57850c2e8d28303f476e7cee23f08c163f769b 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -97,6 +97,12 @@ struct adf_hw_device_class {
        u32 instances;
 } __packed;
 
+struct admin_info {
+       u32 admin_msg_ur;
+       u32 admin_msg_lr;
+       u32 mailbox_offset;
+};
+
 struct adf_hw_csr_ops {
        u32 (*read_csr_ring_head)(void __iomem *csr_base_addr, u32 bank,
                                  u32 ring);
@@ -138,6 +144,7 @@ struct adf_hw_device_data {
        u32 (*get_num_accels)(struct adf_hw_device_data *self);
        u32 (*get_pf2vf_offset)(u32 i);
        u32 (*get_vintmsk_offset)(u32 i);
+       void (*get_admin_info)(struct admin_info *admin_csrs_info);
        enum dev_sku_info (*get_sku)(struct adf_hw_device_data *self);
        int (*alloc_irq)(struct adf_accel_dev *accel_dev);
        void (*free_irq)(struct adf_accel_dev *accel_dev);

diff --git a/drivers/crypto/qat/qat_common/adf_admin.c b/drivers/crypto/qat/qat_common/adf_admin.c
index ec9b390276d6fb10df3c66d045a229d73f8612e8..3ae7c89ce82a883d91e304a412eb6d41226a29a3 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_admin.c
+++ b/drivers/crypto/qat/qat_common/adf_admin.c
@@ -10,11 +10,7 @@
 #include "adf_common_drv.h"
 #include "icp_qat_fw_init_admin.h"
 
-/* Admin Messages Registers */
-#define ADF_DH895XCC_ADMINMSGUR_OFFSET (0x3A000 + 0x574)
-#define ADF_DH895XCC_ADMINMSGLR_OFFSET (0x3A000 + 0x578)
-#define ADF_DH895XCC_MAILBOX_BASE_OFFSET 0x20970
-#define ADF_DH895XCC_MAILBOX_STRIDE 0x1000
+#define ADF_ADMIN_MAILBOX_STRIDE 0x1000
 #define ADF_ADMINMSG_LEN 32
 #define ADF_CONST_TABLE_SIZE 1024
 #define ADF_ADMIN_POLL_DELAY_US 20
@@ -118,7 +114,7 @@ static int adf_put_admin_msg_sync(struct adf_accel_dev *accel_dev, u32 ae,
        struct adf_admin_comms *admin = accel_dev->admin;
        int offset = ae * ADF_ADMINMSG_LEN * 2;
        void __iomem *mailbox = admin->mailbox_addr;
-       int mb_offset = ae * ADF_DH895XCC_MAILBOX_STRIDE;
+       int mb_offset = ae * ADF_ADMIN_MAILBOX_STRIDE;
        struct icp_qat_fw_init_admin_req *request = in;
 
        mutex_lock(&admin->lock);
@@ -225,8 +221,9 @@ int adf_init_admin_comms(struct adf_accel_dev *accel_dev)
        struct adf_bar *pmisc =
                &GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)];
        void __iomem *csr = pmisc->virt_addr;
-       void __iomem *mailbox = (void __iomem *)((uintptr_t)csr +
-                                ADF_DH895XCC_MAILBOX_BASE_OFFSET);
+       struct admin_info admin_csrs_info;
+       u32 mailbox_offset, adminmsg_u, adminmsg_l;
+       void __iomem *mailbox;
        u64 reg_val;
 
        admin = kzalloc_node(sizeof(*accel_dev->admin), GFP_KERNEL,
@@ -254,9 +251,17 @@ int adf_init_admin_comms(struct adf_accel_dev *accel_dev)
        }
 
        memcpy(admin->virt_tbl_addr, const_tab, sizeof(const_tab));
+       hw_data->get_admin_info(&admin_csrs_info);
+
+       mailbox_offset = admin_csrs_info.mailbox_offset;
+       mailbox = (void __iomem *)((uintptr_t)csr + mailbox_offset);
+       adminmsg_u = admin_csrs_info.admin_msg_ur;
+       adminmsg_l = admin_csrs_info.admin_msg_lr;
+
        reg_val = (u64)admin->phy_addr;
-       ADF_CSR_WR(csr, ADF_DH895XCC_ADMINMSGUR_OFFSET, reg_val >> 32);
-       ADF_CSR_WR(csr, ADF_DH895XCC_ADMINMSGLR_OFFSET, reg_val);
+       ADF_CSR_WR(csr, adminmsg_u, upper_32_bits(reg_val));
+       ADF_CSR_WR(csr, adminmsg_l, lower_32_bits(reg_val));
+
        mutex_init(&admin->lock);
        admin->mailbox_addr = mailbox;
        accel_dev->admin = admin;

diff --git a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.c b/drivers/crypto/qat/qat_common/adf_gen2_hw_data.c
index 9011c94156a9bc2df7959112d069301a0022bdd8..15a0bc921d7e346ceeb0931d88cb8a67336a3fdc 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.c
+++ b/drivers/crypto/qat/qat_common/adf_gen2_hw_data.c
@@ -37,6 +37,14 @@ void adf_gen2_cfg_iov_thds(struct adf_accel_dev *accel_dev, bool enable,
 }
 EXPORT_SYMBOL_GPL(adf_gen2_cfg_iov_thds);
 
+void adf_gen2_get_admin_info(struct admin_info *admin_csrs_info)
+{
+       admin_csrs_info->mailbox_offset = ADF_MAILBOX_BASE_OFFSET;
+       admin_csrs_info->admin_msg_ur = ADF_ADMINMSGUR_OFFSET;
+       admin_csrs_info->admin_msg_lr = ADF_ADMINMSGLR_OFFSET;
+}
+EXPORT_SYMBOL_GPL(adf_gen2_get_admin_info);
+
 static u32 read_csr_ring_head(void __iomem *csr_base_addr, u32 bank, u32 ring)
 {
        return READ_CSR_RING_HEAD(csr_base_addr, bank, ring);

diff --git a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.h b/drivers/crypto/qat/qat_common/adf_gen2_hw_data.h
index 592aee6277627bb839982f377375124683839d5c..e9d2591b2be866ef9e90b369c9ddf5341888999f 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_gen2_hw_data.h
+++ b/drivers/crypto/qat/qat_common/adf_gen2_hw_data.h
@@ -92,8 +92,14 @@ do { \
        ADF_CSR_WR(pmisc_bar_addr, AE2FUNCTION_MAP_B_OFFSET + \
                   AE2FUNCTION_MAP_REG_SIZE * (index), value)
 
+/* Admin Interface Offsets */
+#define ADF_ADMINMSGUR_OFFSET  (0x3A000 + 0x574)
+#define ADF_ADMINMSGLR_OFFSET  (0x3A000 + 0x578)
+#define ADF_MAILBOX_BASE_OFFSET        0x20970
+
 void adf_gen2_cfg_iov_thds(struct adf_accel_dev *accel_dev, bool enable,
                           int num_a_regs, int num_b_regs);
 void adf_gen2_init_hw_csr_ops(struct adf_hw_csr_ops *csr_ops);
+void adf_gen2_get_admin_info(struct admin_info *admin_csrs_info);
 
 #endif

diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
index 39423316664bf05b4c55de0b4b884689de019bba..c568e9808cec7e1e629b9c746f7156f3a2064f1c 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c
@@ -210,6 +210,7 @@ void adf_init_hw_data_dh895xcc(struct adf_hw_device_data *hw_data)
        hw_data->get_misc_bar_id = get_misc_bar_id;
        hw_data->get_pf2vf_offset = get_pf2vf_offset;
        hw_data->get_vintmsk_offset = get_vintmsk_offset;
+       hw_data->get_admin_info = adf_gen2_get_admin_info;
        hw_data->get_sram_bar_id = get_sram_bar_id;
        hw_data->get_sku = get_sku;
        hw_data->fw_name = ADF_DH895XCC_FW;