samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix rmmod crash on 8074 soc emulation setup

Browse Source 
Use correct dev_id in free_irq and add conditional check to avoid
access to registers not present on 8074 soc emulation.

Change-Id: I60055b8426b1941fca1b2f238d4e26b47ead54f9
This commit is contained in:
Kiran Venkatappa
2017-03-24 15:31:28 +05:30
committed by Sandeep Puligilla
parent 6eca1a62da
commit 564d355833
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hif/src/snoc/if_ahb.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -388,7 +388,9 @@ void hif_ahb_disable_bus(struct hif_softc *scn)
struct platform_device *pdev = (struct platform_device *)sc->pdev; struct platform_device *pdev = (struct platform_device *)sc->pdev;
struct resource *memres = NULL; struct resource *memres = NULL;
int mem_pa_size = 0; int mem_pa_size = 0;
struct hif_target_info *tgt_info = NULL;
tgt_info = &scn->target_info;
/*Disable WIFI clock input*/ /*Disable WIFI clock input*/
if (sc->mem) { if (sc->mem) {
memres = platform_get_resource(pdev, IORESOURCE_MEM, 0); memres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -399,9 +401,12 @@ void hif_ahb_disable_bus(struct hif_softc *scn)
} }
mem_pa_size = memres->end - memres->start + 1; mem_pa_size = memres->end - memres->start + 1;
/* Should not be executed on 8074 platform */
if (tgt_info->target_type != TARGET_TYPE_QCA8074) {
hif_ahb_clk_enable_disable(&pdev->dev, 0); hif_ahb_clk_enable_disable(&pdev->dev, 0);
hif_ahb_device_reset(scn); hif_ahb_device_reset(scn);
}
mem = (void __iomem *)sc->mem; mem = (void __iomem *)sc->mem;
if (mem) { if (mem) {
devm_iounmap(&pdev->dev, mem); devm_iounmap(&pdev->dev, mem);
@@ -574,7 +579,7 @@ void hif_ahb_nointrs(struct hif_softc *scn)
} else { } else {
for (i = 0; i < scn->ce_count; i++) { for (i = 0; i < scn->ce_count; i++) {
free_irq(ic_irqnum[HIF_IC_CE0_IRQ_OFFSET + i], free_irq(ic_irqnum[HIF_IC_CE0_IRQ_OFFSET + i],
sc); &hif_state->tasklets[i]);
} }
} }
} }