From patchwork Sun Jun 1 17:52:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: michael-dev X-Patchwork-Id: 4278991 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52EE39F326 for ; Sun, 1 Jun 2014 18:00:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C3832024D for ; Sun, 1 Jun 2014 18:00:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1BC520219 for ; Sun, 1 Jun 2014 18:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752871AbaFAR7p (ORCPT ); Sun, 1 Jun 2014 13:59:45 -0400 Received: from mail.fem.tu-ilmenau.de ([141.24.220.54]:40585 "EHLO mail.fem.tu-ilmenau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbaFAR7m (ORCPT ); Sun, 1 Jun 2014 13:59:42 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.fem.tu-ilmenau.de (Postfix) with ESMTP id 86D3E68AD; Sun, 1 Jun 2014 19:53:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at fem.tu-ilmenau.de Received: from mail.fem.tu-ilmenau.de ([127.0.0.1]) by localhost (mail.fem.tu-ilmenau.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MQyfTbFN1f5r; Sun, 1 Jun 2014 19:52:54 +0200 (CEST) Received: from charlie.fem.tu-ilmenau.de (a-keller-042.fem.tu-ilmenau.de [141.24.40.106]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.fem.tu-ilmenau.de (Postfix) with ESMTPSA; Sun, 1 Jun 2014 19:52:54 +0200 (CEST) Received: from charlie.fem.tu-ilmenau.de (localhost [127.0.0.1]) by charlie.fem.tu-ilmenau.de (Postfix) with ESMTP id DFA721C82FCA; Sun, 1 Jun 2014 19:52:52 +0200 (CEST) Subject: [PATCH 2/2] rt2800usb:fix hang during firmware load To: Ivo van Doorn , Helmut Schaa From: Michael Braun Cc: netdev@vger.kernel.org, users@rt2x00.serialmonkey.com, linux-wireless@vger.kernel.org, "John W. Linville" , linux-kernel@vger.kernel.org Date: Sun, 01 Jun 2014 19:52:52 +0200 Message-ID: <20140601175252.7980.64143.stgit@charlie.fem.tu-ilmenau.de> In-Reply-To: <20140601174736.7980.18330.stgit@charlie.fem.tu-ilmenau.de> References: <20140601174736.7980.18330.stgit@charlie.fem.tu-ilmenau.de> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The device 057c:8501 (AVM Fritz! WLAN v2 rev. B) boots into a state that does not actually require loading a firmware file. The vendors driver finds out about this by checking a firmware state register, so this patch adopts this here. Finally, with this patch applied, my wifi dongle actually becomes usefull (scan + connect to wpa network works). Signed-off-by: Michael Braun --- drivers/net/wireless/rt2x00/rt2800usb.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index b601422..71bf101 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -240,6 +240,7 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev, int status; u32 offset; u32 length; + __le32 fwMode; /* * Check which section of the firmware we need. @@ -257,8 +258,17 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev, /* * Write firmware to device. */ - rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE, - data + offset, length); + rt2x00usb_vendor_request(rt2x00dev, USB_DEVICE_MODE, + USB_VENDOR_REQUEST_IN, 0, 0x11, &fwMode, + sizeof(fwMode), REGISTER_TIMEOUT_FIRMWARE); + + if ((fwMode & 0x00000003) == 2) { + rt2x00_info(rt2x00dev, + "Firmware loading not required - NIC in AutoRun mode\n"); + } else { + rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE, + data + offset, length); + } rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);