crypto: qat - Move BAR definitions to device specific module
authorTadeusz Struk <tadeusz.struk@intel.com>
Tue, 21 Oct 2014 18:01:06 +0000 (11:01 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 6 Nov 2014 15:14:59 +0000 (23:14 +0800)
Move PCI BARs definitions to device specific module where it belongs.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/qat/qat_common/adf_accel_devices.h
drivers/crypto/qat/qat_common/qat_hal.c
drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h

index 9282381b03ced19b0e890a10e51421224276be69..62f43abaa230389748a0def5f1b0a700b2b8909d 100644 (file)
@@ -56,8 +56,6 @@
 #define PCI_VENDOR_ID_INTEL 0x8086
 #define ADF_DH895XCC_DEVICE_NAME "dh895xcc"
 #define ADF_DH895XCC_PCI_DEVICE_ID 0x435
-#define ADF_DH895XCC_PMISC_BAR 1
-#define ADF_DH895XCC_ETR_BAR 2
 #define ADF_PCI_MAX_BARS 3
 #define ADF_DEVICE_NAME_LENGTH 32
 #define ADF_ETR_MAX_RINGS_PER_BANK 16
index 9b8a31521ff3bdd0daacabfc2cfdd98c089469dc..b818c19713bfa8ea05904d008876d41013d39dc9 100644 (file)
@@ -679,7 +679,8 @@ int qat_hal_init(struct adf_accel_dev *accel_dev)
        struct icp_qat_fw_loader_handle *handle;
        struct adf_accel_pci *pci_info = &accel_dev->accel_pci_dev;
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
-       struct adf_bar *bar = &pci_info->pci_bars[ADF_DH895XCC_PMISC_BAR];
+       struct adf_bar *bar =
+                       &pci_info->pci_bars[hw_data->get_misc_bar_id(hw_data)];
 
        handle = kzalloc(sizeof(*handle), GFP_KERNEL);
        if (!handle)
index 65dd1ff93d3bf6b0ba5b0bf9cfb56fc5d15edcbc..01e0be21e93a8370cd3b799be54b99d851946d5e 100644 (file)
@@ -48,6 +48,8 @@
 #define ADF_DH895x_HW_DATA_H_
 
 /* PCIe configuration space */
+#define ADF_DH895XCC_PMISC_BAR 1
+#define ADF_DH895XCC_ETR_BAR 2
 #define ADF_DH895XCC_RX_RINGS_OFFSET 8
 #define ADF_DH895XCC_TX_RINGS_MASK 0xFF
 #define ADF_DH895XCC_FUSECTL_OFFSET 0x40