From patchwork Fri Jan 28 12:04:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1585643 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jlbjk3ZyQz9t56 for ; Fri, 28 Jan 2022 23:04:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nDPzT-00063S-3Q; Fri, 28 Jan 2022 12:04:31 +0000 Received: from mail-pl1-f180.google.com ([209.85.214.180]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nDPzQ-00062m-MX for kernel-team@lists.ubuntu.com; Fri, 28 Jan 2022 12:04:28 +0000 Received: by mail-pl1-f180.google.com with SMTP id j16so5707740plx.4 for ; Fri, 28 Jan 2022 04:04:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=M1/MoZMFS2nEBqKtSlkyz05O7XZbNopu6PiA/IKirJ4=; b=icDRm0PeJ+7LdPw5rvkWVx3aFZ4VvxqdKQBxOQHGfu+0IlJR58SbaGATF4hLyg85mG r1DLKcBN/v2DwwVAE63rRjyNdIkgyGc/4Ui7BZMQB7+10zmgisA/9ntsTfc2J3E+KM/y MOlUkT8zbT4kYk746DrLGfbubl6mtEPfqcEIoxEvbYqXvSbEpT0z4xhxpJWG6wvUMwJk 46p7y3CvF7PJNhEBRlybPhZzm3MTmQtoK27Va8cQvpXbQEOrAMhx9kJ2DQ6CAKQncaqG EDQ6mBdEVZKYhVjDWmNsbXWkWzucLWgoVVYdjSLNwFXib0vW4eceqF5jsGKiWC/k7y/M V3Pg== X-Gm-Message-State: AOAM532y8+f6gCvte4KdOwIwfZ++o1OLkwovajn1xaucGaQ/94P9iofC Bl1wrGSX8DH/5eZsIlOlUXXP0IXMmIzai7Q6 X-Google-Smtp-Source: ABdhPJxe66YgDG7RRAQjvol0CnOHkARMAIzTMnCDgYxhrO0IRres+wPX+itDinxhnAXkncaQugJJ3g== X-Received: by 2002:a17:90a:1696:: with SMTP id o22mr9714126pja.233.1643371466495; Fri, 28 Jan 2022 04:04:26 -0800 (PST) Received: from localhost (218-173-144-78.dynamic-ip.hinet.net. [218.173.144.78]) by smtp.gmail.com with ESMTPSA id s14sm9705424pfk.174.2022.01.28.04.04.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 04:04:25 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 0/1][SRU][oem-5.14] Include the QCA WCN 6856 v2.1 support Date: Fri, 28 Jan 2022 20:04:22 +0800 Message-Id: <20220128120424.384168-1-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.180; envelope-from=vicamo@gmail.com; helo=mail-pl1-f180.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1954938 [Impact] WCN685x hw2.1 takes additional/updated firmware for both WiFi and Bluetooth function. ath11k_pci 0000:71:00.0: BAR 0: assigned [mem 0xa6000000-0xa61fffff 64bit] ath11k_pci 0000:71:00.0: enabling device (0000 -> 0002) ath11k_pci 0000:71:00.0: Unsupported WCN6855 SOC hardware version: 18 17 ath11k_pci: probe of 0000:71:00.0 failed with error -95 [Fix] WCN685x hw2.1 currently shares most WiFi firmware with hw2.0 except for the directory path and a board-2.bin. For Bluetooth, updated revision of qca/nvm_usb_00130201_gf* from mainline are neccessary for Focal. Jammy has all of them already. For kernel, many of the prerequisite works have been committed for hw2.0 in bug 1945154, 1952215 and 1958850. Currently, while WiFi 6G will be turned off for the lack of userspace support, the only fix necessary is to correct read mask of version info register. ath11k 6G band lives in mainline v5.16 and was backported to oem-5.14 in bug 1939528, so only oem-5.14 has to be reverted. [Test Case] WiFi and Bluetooth devices should be up and running, pass basic operations. $ lspci -nnk|grep -A3 Network 0000:71:00.0 Network controller [0280]: Qualcomm Device [17cb:1103] (rev 01) Subsystem: Foxconn International, Inc. Device [105b:e0ce] Kernel driver in use: ath11k_pci Kernel modules: ath11k_pci $ lsusb Bus 003 Device 004: ID 0489:e0e3 Foxconn / Hon Hai [Where problems could occur] At the time being, WCN685x WiFi 6G support will be turnef off deliberately due to the lack of full support in the userspace management tools. [Other Info] While this is a new hardware model from OEM program, it's only nominated for Focal oem-5.14 kernel and the coming LTS Jammy. V2: revert "ath11k: enable 6G channels for WCN6855" You-Sheng Yang (2): Revert "ath11k: enable 6G channels for WCN6855" UBUNTU: SAUCE: ath11k: shrink TCSR read mask for WCN6855 hw2.1 drivers/net/wireless/ath/ath11k/mac.c | 25 +++++++++---------------- drivers/net/wireless/ath/ath11k/pci.c | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-)