On Mon, Feb 13, 2012 at 5:48 AM, Jakub Kicinski <kubakici@xxxxx> wrote:
> Bring MCU operations during device initialization to sync
> with legacy driver.
>
> This should fix following error:
> phy0 -> rt2800pci_mcu_status: Error - MCU request failed,
> no response from hardware
>
> Signed-off-by: Jakub Kicinski <kubakici@xxxxx>
> Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
provided that my comments to patches 1 & 2 are handled.
> ---
> drivers/net/wireless/rt2x00/rt2800pci.c | 20 +++++++++++++-------
> 1 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
> index f184a4f..773d078 100644
> --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> @@ -524,14 +524,20 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev,
>
> switch (state) {
> case STATE_RADIO_ON:
> - /*
> - * Before the radio can be enabled, the device first has
> - * to be woken up. After that it needs a bit of time
> - * to be fully awake and then the radio can be enabled.
> - */
> - rt2800pci_set_device_state(rt2x00dev, STATE_AWAKE);
> - msleep(1);
> + /* Initialise all registers and send MCU_BOOT_SIGNAL. */
> retval = rt2800pci_enable_radio(rt2x00dev);
> +
> + /* After resume MCU_BOOT_SIGNAL will trash these. */
> + rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
> + rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
> +
> + /* Finish initialization procedure. */
> + rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_RADIO_OFF,
> + 0xff, 0x02);
> + rt2800pci_mcu_status(rt2x00dev, TOKEN_RADIO_OFF);
> +
> + rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, TOKEN_WAKEUP, 0, 0);
> + rt2800pci_mcu_status(rt2x00dev, TOKEN_WAKEUP);
> break;
> case STATE_RADIO_OFF:
> /*
> --
> 1.7.7.6
>
>
> _______________________________________________
> users mailing list
> users@xxxxxxxxxxxxxxxxxxxxxxx
> http://rt2x00.serialmonkey.com/mailman/listinfo/users_rt2x00.serialmonkey.com
--
---
Gertjan
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
