From patchwork Wed Aug 26 05:01:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 7074311 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D480E9F374 for ; Wed, 26 Aug 2015 05:03:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45042207AF for ; Wed, 26 Aug 2015 05:03:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 42CD8205B3 for ; Wed, 26 Aug 2015 05:03:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZUSql-0003X6-1f; Wed, 26 Aug 2015 05:02:15 +0000 Received: from mail-la0-x232.google.com ([2a00:1450:4010:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZUSqj-0003Ro-44 for ath10k@lists.infradead.org; Wed, 26 Aug 2015 05:02:14 +0000 Received: by lalv9 with SMTP id v9so111669571lal.0 for ; Tue, 25 Aug 2015 22:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=VIohhTFh+px4C9a6JZ4CFuyOU3HoGDnucBqGGd5o444=; b=CcmqA9aLLDBF/qk8Iaiv0hx4Vk6rGFUIklCfwa3Fjlu08kuZ6ulScIYGT3UJkX5hAo AdEme2aZhAqUZo7GU+jDVzpWCN75alELqXbsr0yduXVUAkdersN0pKqrLbj35iaUKy6j 2jHb0meUUeNvYl6TGhQ4wrcR28YIUMT/59Z5o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=VIohhTFh+px4C9a6JZ4CFuyOU3HoGDnucBqGGd5o444=; b=f6pLzssJfBeH9H6Obo8iLMC/6mh4Xe9VTCWNZ67+6U6S1MgwyMjrUWu7D3yIHJH09j TRYRYuI7//j2R5QBi/K6grZHXy4MqqVphFrqXrlIuRbtJjxCVEZxQUyWjTNo1JpW56+B 57JkqeFRSf1AwBuFiyBu0C8uxISDkpbR9HfRXkMi+sNYnlY0J/C+OoDTFyI+VBeZMWVW t45H2C5bNV4E2EephLfebmUjOEXtgvM83KpE4rtRvgV8cxQkOMXJ/IsyvnAek2sKMEMd fu2i1QTbnDTl1Tguki55Fc+nyX9deQht6kZgrWJOuxMJN8I4ns9fD4ONMbeeYq7Rh/je ZWCQ== X-Gm-Message-State: ALoCoQkb238u7/xR+V2DIOXZkRwoegalduLMNaO+WJpXUjmHPWXqPqCBVgYC1Q1+hHTlSf3MZnVheJJx9kZZ/KwiHGDfykGMp3WlWzCM/c0F6VSgS2Ph2QPi5oFUptiQhfqNGgVEcDX2 MIME-Version: 1.0 X-Received: by 10.152.206.41 with SMTP id ll9mr29245667lac.103.1440565308877; Tue, 25 Aug 2015 22:01:48 -0700 (PDT) Received: by 10.25.23.83 with HTTP; Tue, 25 Aug 2015 22:01:48 -0700 (PDT) In-Reply-To: References: <874mk3pjht.fsf@kamboji.qca.qualcomm.com> Date: Wed, 26 Aug 2015 07:01:48 +0200 Message-ID: Subject: Re: ath10k: first qca6174 hw2.1 firmware released From: Michal Kazior To: Lapo Calamandrei X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150825_220213_518186_F40C661C X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -2.7 (--) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kalle Valo , "ath10k@lists.infradead.org" Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 On 25 August 2015 at 16:04, Lapo Calamandrei wrote: [...] > Yep, the previous crash was without your patch applied, the following > is with the patch applied though. > > iw list output: [...] > Band 2: > Capabilities: 0x19e3 > RX LDPC > HT20/HT40 > Static SM Power Save > RX HT20 SGI > RX HT40 SGI > TX STBC > RX STBC 1-stream > Max AMSDU length: 7935 bytes > DSSS/CCK HT40 > Maximum RX AMPDU length 65535 bytes (exponent: 0x003) > Minimum RX AMPDU time spacing: 8 usec (0x06) > HT TX/RX MCS rate indexes supported: 0-15 > VHT Capabilities (0x339011b2): > Max MPDU length: 11454 > Supported Channel Width: neither 160 nor 80+80 > RX LDPC > short GI (80 MHz) > TX STBC > SU Beamformee > MU Beamformee [...] Sorry, my bad. The diff I provided earlier wasn't correct (it was a quick hack-idea I didn't test myself). The correct thing that should work is: if (i < ar->num_rf_chains) Micha? --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -6798,27 +6798,14 @@ static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar) u32 val; int i; + ar->vht_cap_info &= ~(IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE | + IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE | + IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | + IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE); + vht_cap.vht_supported = 1; vht_cap.cap = ar->vht_cap_info; - if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE | - IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE)) { - val = ar->num_rf_chains - 1; - val <<= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT; - val &= IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK; - - vht_cap.cap |= val; - } - - if (ar->vht_cap_info & (IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE | - IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) { - val = ar->num_rf_chains - 1; - val <<= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT; - val &= IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MASK; - - vht_cap.cap |= val; - } - mcs_map = 0; for (i = 0; i < 8; i++) {