mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
0db0d797ab
The hardware specific function adf_get_arbiter_mapping() modifies the static array thrd_to_arb_map to disable mappings for AEs that are disabled. This static array is used for each device of the same type. If the ae mask is not identical for all devices of the same type then the arbiter mapping returned by adf_get_arbiter_mapping() may be wrong. This patch fixes this problem by ensuring the static arbiter mapping is unchanged and the device arbiter mapping is re-calculated each time based on the static mapping. Signed-off-by: Wojciech Ziemba <wojciech.ziemba@intel.com> Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
105 lines
3.2 KiB
C
105 lines
3.2 KiB
C
// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
|
|
/* Copyright(c) 2014 - 2020 Intel Corporation */
|
|
#include "adf_accel_devices.h"
|
|
#include "adf_common_drv.h"
|
|
#include "adf_transport_internal.h"
|
|
|
|
#define ADF_ARB_NUM 4
|
|
#define ADF_ARB_REG_SIZE 0x4
|
|
|
|
#define WRITE_CSR_ARB_SARCONFIG(csr_addr, arb_offset, index, value) \
|
|
ADF_CSR_WR(csr_addr, (arb_offset) + \
|
|
(ADF_ARB_REG_SIZE * (index)), value)
|
|
|
|
#define WRITE_CSR_ARB_WT2SAM(csr_addr, arb_offset, wt_offset, index, value) \
|
|
ADF_CSR_WR(csr_addr, ((arb_offset) + (wt_offset)) + \
|
|
(ADF_ARB_REG_SIZE * (index)), value)
|
|
|
|
int adf_init_arb(struct adf_accel_dev *accel_dev)
|
|
{
|
|
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
|
|
void __iomem *csr = accel_dev->transport->banks[0].csr_addr;
|
|
unsigned long ae_mask = hw_data->ae_mask;
|
|
u32 arb_off, wt_off, arb_cfg;
|
|
const u32 *thd_2_arb_cfg;
|
|
struct arb_info info;
|
|
int arb, i;
|
|
|
|
hw_data->get_arb_info(&info);
|
|
arb_cfg = info.arb_cfg;
|
|
arb_off = info.arb_offset;
|
|
wt_off = info.wt2sam_offset;
|
|
|
|
/* Service arb configured for 32 bytes responses and
|
|
* ring flow control check enabled. */
|
|
for (arb = 0; arb < ADF_ARB_NUM; arb++)
|
|
WRITE_CSR_ARB_SARCONFIG(csr, arb_off, arb, arb_cfg);
|
|
|
|
/* Map worker threads to service arbiters */
|
|
thd_2_arb_cfg = hw_data->get_arb_mapping();
|
|
|
|
for_each_set_bit(i, &ae_mask, hw_data->num_engines)
|
|
WRITE_CSR_ARB_WT2SAM(csr, arb_off, wt_off, i, thd_2_arb_cfg[i]);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(adf_init_arb);
|
|
|
|
void adf_update_ring_arb(struct adf_etr_ring_data *ring)
|
|
{
|
|
struct adf_accel_dev *accel_dev = ring->bank->accel_dev;
|
|
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
|
|
struct adf_hw_csr_ops *csr_ops = GET_CSR_OPS(accel_dev);
|
|
u32 tx_ring_mask = hw_data->tx_rings_mask;
|
|
u32 shift = hw_data->tx_rx_gap;
|
|
u32 arben, arben_tx, arben_rx;
|
|
u32 rx_ring_mask;
|
|
|
|
/*
|
|
* Enable arbitration on a ring only if the TX half of the ring mask
|
|
* matches the RX part. This results in writes to CSR on both TX and
|
|
* RX update - only one is necessary, but both are done for
|
|
* simplicity.
|
|
*/
|
|
rx_ring_mask = tx_ring_mask << shift;
|
|
arben_tx = (ring->bank->ring_mask & tx_ring_mask) >> 0;
|
|
arben_rx = (ring->bank->ring_mask & rx_ring_mask) >> shift;
|
|
arben = arben_tx & arben_rx;
|
|
|
|
csr_ops->write_csr_ring_srv_arb_en(ring->bank->csr_addr,
|
|
ring->bank->bank_number, arben);
|
|
}
|
|
|
|
void adf_exit_arb(struct adf_accel_dev *accel_dev)
|
|
{
|
|
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
|
|
struct adf_hw_csr_ops *csr_ops = GET_CSR_OPS(accel_dev);
|
|
u32 arb_off, wt_off;
|
|
struct arb_info info;
|
|
void __iomem *csr;
|
|
unsigned int i;
|
|
|
|
hw_data->get_arb_info(&info);
|
|
arb_off = info.arb_offset;
|
|
wt_off = info.wt2sam_offset;
|
|
|
|
if (!accel_dev->transport)
|
|
return;
|
|
|
|
csr = accel_dev->transport->banks[0].csr_addr;
|
|
|
|
hw_data->get_arb_info(&info);
|
|
|
|
/* Reset arbiter configuration */
|
|
for (i = 0; i < ADF_ARB_NUM; i++)
|
|
WRITE_CSR_ARB_SARCONFIG(csr, arb_off, i, 0);
|
|
|
|
/* Unmap worker threads to service arbiters */
|
|
for (i = 0; i < hw_data->num_engines; i++)
|
|
WRITE_CSR_ARB_WT2SAM(csr, arb_off, wt_off, i, 0);
|
|
|
|
/* Disable arbitration on all rings */
|
|
for (i = 0; i < GET_MAX_BANKS(accel_dev); i++)
|
|
csr_ops->write_csr_ring_srv_arb_en(csr, i, 0);
|
|
}
|
|
EXPORT_SYMBOL_GPL(adf_exit_arb);
|