A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:11:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: mhi_dev: Change to not enable ERDB interrupts"

Browse source
This commit is contained in:
qctecmdr 2021-03-31 06:29:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit b8731d090e
3 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/platform/msm/mhi_dev/mhi.c
View file

@ -3397,12 +3397,11 @@ static int mhi_dev_recover(struct mhi_dev *mhi)
static void mhi_dev_enable(struct work_struct *work)
{
int rc = 0;
struct ep_pcie_msi_config msi_cfg;
struct mhi_dev *mhi = container_of(work,
struct mhi_dev, ring_init_cb_work);
u32 mhi_reset;
enum mhi_dev_state state;
uint32_t max_cnt = 0, bhi_intvec = 0;
uint32_t max_cnt = 0;
if (mhi->use_ipa) {
rc = ipa_dma_init();
@ -3424,23 +3423,6 @@ static void mhi_dev_enable(struct work_struct *work)
return;
}
rc = mhi_dev_mmio_read(mhi, BHI_INTVEC, &bhi_intvec);
if (rc)
return;
if (bhi_intvec != 0xffffffff) {
/* Indicate the host that the device is ready */
rc = ep_pcie_get_msi_config(mhi->phandle, &msi_cfg);
if (!rc) {
rc = ep_pcie_trigger_msi(mhi_ctx->phandle, bhi_intvec);
if (rc) {
pr_err("%s: error sending msi\n", __func__);
return;
}
} else {
pr_err("MHI: error geting msi configs\n");
}
}
rc = mhi_dev_mmio_get_mhi_state(mhi, &state, &mhi_reset);
if (rc) {

3
drivers/platform/msm/mhi_dev/mhi.h
View file

@ -421,7 +421,8 @@ static inline void mhi_dev_ring_inc_index(struct mhi_dev_ring *ring,
#define TRACE_DATA_MAX 128
#define MHI_DEV_DATA_MAX 512
#define MHI_DEV_MMIO_RANGE 0xc80
#define MHI_DEV_MMIO_RANGE 0xb80
#define MHI_DEV_MMIO_OFFSET 0x100
struct ring_cache_req {
struct completion *done;

18
drivers/platform/msm/mhi_dev/mhi_mmio.c
View file

@ -598,18 +598,23 @@ int mhi_dev_restore_mmio(struct mhi_dev *dev)
mhi_dev_mmio_mask_interrupts(dev);
for (i = 0; i < (MHI_DEV_MMIO_RANGE/4); i++) {
reg_cntl_addr = dev->mmio_base_addr + (i * 4);
reg_cntl_addr = dev->mmio_base_addr +
MHI_DEV_MMIO_OFFSET + (i * 4);
reg_cntl_value = dev->mmio_backup[i];
writel_relaxed(reg_cntl_value, reg_cntl_addr);
}
mhi_dev_mmio_clear_interrupts(dev);
/* Mask and enable control interrupt */
mhi_dev_mmio_enable_ctrl_interrupt(dev);
/*Enable chdb interrupt*/
mhi_dev_mmio_enable_chdb_interrupts(dev);
/* Mask and enable control interrupt */
/*Enable cmdb interrupt*/
mhi_dev_mmio_enable_cmdb_interrupt(dev);
mb();
return 0;
@ -619,13 +624,16 @@ EXPORT_SYMBOL(mhi_dev_restore_mmio);
int mhi_dev_backup_mmio(struct mhi_dev *dev)
{
uint32_t i = 0;
void __iomem *reg_cntl_addr;
if (WARN_ON(!dev))
return -EINVAL;
for (i = 0; i < MHI_DEV_MMIO_RANGE/4; i++)
dev->mmio_backup[i] =
readl_relaxed(dev->mmio_base_addr + (i * 4));
for (i = 0; i < MHI_DEV_MMIO_RANGE/4; i++) {
reg_cntl_addr = (void __iomem *) (dev->mmio_base_addr +
MHI_DEV_MMIO_OFFSET + (i * 4));
dev->mmio_backup[i] = readl_relaxed(reg_cntl_addr);
}
return 0;
}