test0r
0dde479994
When the LMAC active monitor detects 'link break between lmac and host'
(the hw_buf_used==pending watchdog in bes2600_bh_lmac_active_monitor),
bes2600_chrdev_wifi_force_close(hw_priv, true) is invoked to tear the
device down and prepare for a fresh probe. On the wifi_force_close_work
side this calls bes2600_chrdev_do_system_close() which dispatches
sbus_ops->power_switch(0).
On PineTab2 (RK3566 + BES2600WM over SDIO) this recovery path is a
no-op:
* bes2600_sdio_power_down() writes a SYSTEM_CLOSE host-int message,
clears MMC_CAP_NONREMOVABLE, and schedules sdio_scan_work, which is
the literal one-line stub bes_warn("...this function does
nothing\n").
* bes2600_sdio_on() (the eventual power_switch(1) counterpart)
toggles pdata->powerup, which is NULL on PineTab2 because the
wifi-reset GPIO is owned by sdio_pwrseq, not the bes2600 device
tree node (see arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi:
'The reset pin is claimed by sdio_mmcseq, It is better to move it
to U-Boot so the OS can use it.').
Net result: the chip is never reset. The function drivers are not
removed (the SDIO core has no signal that the card is gone), the
firmware stays wedged, and a subsequent rmmod bes2600 leaves the SDIO
function in a half-torn-down state. modprobe bes2600 then fails with
'probe with driver bes2600_wlan failed with error -123' (-ENOMEDIUM)
on both functions (:1 wifi, :2 BT-companion) until a full system
reboot.
Observed on PineTab2 (linux-pinetab2 6.19.10-danctnix1-1) after ~150
minutes of background-scan rejects (wsm_generic_confirm 0x0007,
[SCAN] Scan failed (-22)) accumulating until the LMAC stopped
acknowledging TX buffers (hw_buf_used:24 pending:24). Reproducible
under sustained scan pressure.
Add a sbus operation bus_reset() that the recovery path can call when
power_switch() has no effective chip-reset signal of its own. Provide
an SDIO implementation that calls mmc_hw_reset(self->func->card),
which on a multi-function SDIO card (PineTab2 binds func 1 for WLAN
and func 2 for the BT-companion path) takes the remove-and-rescan
path: mmc_sdio_hw_reset() marks the card removed and schedules
mmc_rescan, which tears down the bound function drivers and re-detects
the card on the next sweep, in turn reinvoking bes2600_sdio_probe().
With a single function probed it instead invokes mmc_power_cycle()
directly, which on PineTab2 toggles the wifi-reset GPIO via
sdio_pwrseq.
Add bes2600_chrdev_do_bus_reset() as the chrdev-side helper. It
invokes the bus op and then waits on probe_done_wq for the SDIO
remove() callback to clear sbus_priv, mirroring the wait pattern
already used by bes2600_chrdev_do_system_close() so that a subsequent
bes2600_switch_wifi(true) sees a clean state and can wait on the
fresh probe.
Wire it into bes2600_chrdev_wifi_force_close_work(): when halt_dev is
set (the hard-exception path used by both
bes2600_bh_lmac_active_monitor and bes2600_bh_mcu_active_monitor) and
the underlying bus implements bus_reset, take the new recovery path;
otherwise fall back to the legacy power_switch(0) sequence so this
patch is a no-op on USB or any other future bus that does not provide
bus_reset.
mmc_hw_reset() is exported by the MMC core and is the canonical
recovery primitive; calling it without holding the SDIO host claim is
correct because the multi-func remove-and-rescan path acquires the
host claim via the mmc workqueue, and the single-func mmc_power_cycle
path does not require the host claim.
No DT change is required: this works against the existing PineTab2
DTS, where the wifi-reset GPIO and the optional sdio_pwrkey GPIO (on
v2.0 boards) are both already configured as MMC pwrseq resets.
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
94 lines
3.0 KiB
C
94 lines
3.0 KiB
C
/*
|
|
* Common sbus abstraction layer interface for bes2600 wireless driver
|
|
*
|
|
* Copyright (c) 2010, Bestechnic
|
|
* Author:
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef BES2600_SBUS_H
|
|
#define BES2600_SBUS_H
|
|
|
|
/*
|
|
* sbus priv forward definition.
|
|
* Implemented and instantiated in particular modules.
|
|
*/
|
|
struct sbus_priv;
|
|
struct bes2600_common;
|
|
|
|
typedef void (*sbus_irq_handler)(void *priv);
|
|
|
|
enum SUBSYSTEM {
|
|
SUBSYSTEM_MCU = 0,
|
|
SUBSYSTEM_WIFI,
|
|
SUBSYSTEM_BT,
|
|
SUBSYSTEM_BT_LP,
|
|
};
|
|
|
|
enum GPIO_WAKE_FLAG
|
|
{
|
|
GPIO_WAKE_FLAG_MCU = 0,
|
|
GPIO_WAKE_FLAG_WIFI_ON,
|
|
GPIO_WAKE_FLAG_WIFI_OFF,
|
|
GPIO_WAKE_FLAG_BT_ON,
|
|
GPIO_WAKE_FLAG_BT_OFF,
|
|
GPIO_WAKE_FLAG_BT_LP_ON,
|
|
GPIO_WAKE_FLAG_BT_LP_OFF,
|
|
GPIO_WAKE_FLAG_HOST_SUSPEND,
|
|
GPIO_WAKE_FLAG_HOST_RESUME,
|
|
GPIO_WAKE_FLAG_SDIO_RX,
|
|
GPIO_WAKE_FLAG_SDIO_PROBE,
|
|
};
|
|
|
|
struct sbus_ops {
|
|
int (*init)(struct sbus_priv *self, struct bes2600_common *core);
|
|
int (*sbus_memcpy_fromio)(struct sbus_priv *self, unsigned int addr,
|
|
void *dst, int count);
|
|
int (*sbus_memcpy_toio)(struct sbus_priv *self, unsigned int addr,
|
|
const void *src, int count);
|
|
void (*lock)(struct sbus_priv *self);
|
|
void (*unlock)(struct sbus_priv *self);
|
|
int (*irq_subscribe)(struct sbus_priv *self, sbus_irq_handler handler,
|
|
void *priv);
|
|
int (*irq_unsubscribe)(struct sbus_priv *self);
|
|
int (*reset)(struct sbus_priv *self);
|
|
size_t (*align_size)(struct sbus_priv *self, size_t size);
|
|
int (*set_block_size)(struct sbus_priv *self, size_t size);
|
|
int (*pipe_send)(struct sbus_priv *self, u8 pipe, u32 len, u8 *buf);
|
|
void * (*pipe_read)(struct sbus_priv *self);
|
|
int (*sbus_reg_read)(struct sbus_priv *self, u32 reg,
|
|
void *buf, int count);
|
|
int (*sbus_reg_write)(struct sbus_priv *self, u32 reg,
|
|
const void *buf, int count);
|
|
|
|
/* sub_system: 0 for mcu, 1 for wifi, 2 for bt, ... */
|
|
int (*sbus_active)(struct sbus_priv *self, int sub_system);
|
|
int (*sbus_deactive)(struct sbus_priv *self, int sub_system);
|
|
int (*power_switch)(struct sbus_priv *self, int on);
|
|
/* gpio wake, beacuse bes2600 sdio can't wakeup mcu, so add the two of interfaces */
|
|
void (*gpio_wake)(struct sbus_priv *self, int falg);
|
|
void (*gpio_sleep)(struct sbus_priv *self, int falg);
|
|
/* halt device to get debug information */
|
|
void (*halt_device)(struct sbus_priv *self);
|
|
bool (*wakeup_source)(struct sbus_priv *self);
|
|
int (*reboot)(struct sbus_priv *self);
|
|
/*
|
|
* Force the host bus to re-detect and re-probe the chip. Called
|
|
* from the firmware-wedge recovery path when power_switch() has no
|
|
* effective chip-reset signal of its own (e.g. PineTab2, where the
|
|
* wifi-reset GPIO is owned by sdio_pwrseq, not the bes2600 node).
|
|
* Returns 0 on success or a negative errno.
|
|
*/
|
|
int (*bus_reset)(struct sbus_priv *self);
|
|
};
|
|
|
|
void bes2600_irq_handler(struct bes2600_common *priv);
|
|
|
|
/* This MUST be wrapped with hwbus_ops->lock/unlock! */
|
|
int __bes2600_irq_enable(int enable);
|
|
|
|
#endif /* BES2600_SBUS_H */
|