Revert "wifi: fix wifi close issue"

[GitHub/LineageOS/G12/android_hardware_amlogic_kernel-modules_dhd-driver.git] / bcmdhd.1.579.77.41.1.cn / dhd_sdio.c

diff --git a/bcmdhd.1.579.77.41.1.cn/dhd_sdio.c b/bcmdhd.1.579.77.41.1.cn/dhd_sdio.c
index fb6150facbd2b41779b120cccee09bfaf5dda1ab..ea32a6b89ea286efec965ceca048317884458ee3 100644 (file)
--- a/bcmdhd.1.579.77.41.1.cn/dhd_sdio.c
+++ b/bcmdhd.1.579.77.41.1.cn/dhd_sdio.c
@@ -437,7 +437,7 @@ typedef struct dhd_bus {
 #endif /* defined (BT_OVER_SDIO) */
        uint            txglomframes;   /* Number of tx glom frames (superframes) */
        uint            txglompkts;             /* Number of packets from tx glom frames */
-       uint8           *membuf;                /* Buffer for dhdsdio_membytes */
+       uint8           *membuf;                /* Buffer for receiving big glom packet */
 } dhd_bus_t;
 
 
@@ -2762,15 +2762,13 @@ dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen)
 
 
        /* Need to lock here to protect txseq and SDIO tx calls */
-       dhd_os_sdlock(bus->dhd);
        if (bus->dhd->conf->txctl_tmo_fix > 0 && !TXCTLOK(bus)) {
                bus->ctrl_wait = TRUE;
-               dhd_os_sdunlock(bus->dhd);
                wait_event_interruptible_timeout(bus->ctrl_tx_wait, TXCTLOK(bus),
                        msecs_to_jiffies(bus->dhd->conf->txctl_tmo_fix));
-               dhd_os_sdlock(bus->dhd);
                bus->ctrl_wait = FALSE;
        }
+       dhd_os_sdlock(bus->dhd);
 
        BUS_WAKE(bus);
 
@@ -3363,7 +3361,6 @@ dhdsdio_membytes(dhd_bus_t *bus, bool write, uint32 address, uint8 *data, uint s
        int bcmerror = 0;
        uint32 sdaddr;
        uint dsize;
-       uint8 *pdata;
 
        /* In remap mode, adjust address beyond socram and redirect
         * to devram at SOCDEVRAM_BP_ADDR since remap address > orig_ramsize
@@ -3380,6 +3377,10 @@ dhdsdio_membytes(dhd_bus_t *bus, bool write, uint32 address, uint8 *data, uint s
                dsize = (SBSDIO_SB_OFT_ADDR_LIMIT - sdaddr);
        else
                dsize = size;
+       if (dsize > MAX_MEM_BUF) {
+               DHD_ERROR(("%s: dsize %d > %d\n", __FUNCTION__, dsize, MAX_MEM_BUF));
+               goto xfer_done;
+       }
 
        /* Set the backplane window to include the start address */
        if ((bcmerror = dhdsdio_set_siaddr_window(bus, address))) {
@@ -3392,20 +3393,14 @@ dhdsdio_membytes(dhd_bus_t *bus, bool write, uint32 address, uint8 *data, uint s
                DHD_INFO(("%s: %s %d bytes at offset 0x%08x in window 0x%08x\n",
                          __FUNCTION__, (write ? "write" : "read"), dsize, sdaddr,
                          (address & SBSDIO_SBWINDOW_MASK)));
-               if (dsize <= MAX_MEM_BUF) {
-                       pdata = bus->membuf;
-                       if (write)
-                               memcpy(bus->membuf, data, dsize);
-               } else {
-                       pdata = data;
-               }
-               if ((bcmerror = bcmsdh_rwdata(bus->sdh, write, sdaddr, pdata, dsize))) {
+               if (write)
+                       memcpy(bus->membuf, data, dsize);
+               if ((bcmerror = bcmsdh_rwdata(bus->sdh, write, sdaddr, bus->membuf, dsize))) {
                        DHD_ERROR(("%s: membytes transfer failed\n", __FUNCTION__));
                        break;
                }
-               if (dsize <= MAX_MEM_BUF && !write) {
+               if (!write)
                        memcpy(data, bus->membuf, dsize);
-               }
 
                /* Adjust for next transfer (if any) */
                if ((size -= dsize)) {
@@ -6610,7 +6605,7 @@ dhdsdio_dpc(dhd_bus_t *bus)
                goto clkwait;
 
        /* Pending interrupt indicates new device status */
-       if (bus->ipend || (bus->ctrl_frame_stat && bus->dhd->conf->txctl_tmo_fix)) {
+       if (bus->ipend) {
                bus->ipend = FALSE;
 #if defined(BT_OVER_SDIO)
        bcmsdh_btsdio_process_f3_intr();
@@ -6733,8 +6728,7 @@ clkwait:
         * or clock availability.  (Allows tx loop to check ipend if desired.)
         * (Unless register access seems hosed, as we may not be able to ACK...)
         */
-       if (bus->intr && bus->intdis && !bcmsdh_regfail(sdh) &&
-                       !(bus->dhd->conf->oob_enabled_later && !bus->ctrl_frame_stat)) {
+       if (!bus->dhd->conf->oob_enabled_later && bus->intr && bus->intdis && !bcmsdh_regfail(sdh)) {
                DHD_INTR(("%s: enable SDIO interrupts, rxdone %d framecnt %d\n",
                          __FUNCTION__, rxdone, framecnt));
                bus->intdis = FALSE;
@@ -6792,7 +6786,7 @@ clkwait:
        }
        /* Resched the DPC if ctrl cmd is pending on bus credit */
        if (bus->ctrl_frame_stat) {
-               if (bus->dhd->conf->txctl_tmo_fix) {
+               if (bus->dhd->conf->txctl_tmo_fix > 0) {
                        set_current_state(TASK_INTERRUPTIBLE);
                        if (!kthread_should_stop())
                                schedule_timeout(1);
@@ -6840,8 +6834,7 @@ exit:
                 * or clock availability.  (Allows tx loop to check ipend if desired.)
                 * (Unless register access seems hosed, as we may not be able to ACK...)
                 */
-               if (bus->intr && bus->intdis && !bcmsdh_regfail(sdh) &&
-                               (bus->dhd->conf->oob_enabled_later && !bus->ctrl_frame_stat)) {
+               if (bus->dhd->conf->oob_enabled_later && bus->intr && bus->intdis && !bcmsdh_regfail(sdh)) {
                        DHD_INTR(("%s: enable SDIO interrupts, rxdone %d framecnt %d\n",
                                          __FUNCTION__, rxdone, framecnt));
                        bus->intdis = FALSE;