From patchwork Fri Jan 28 12:04:24 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: 1585644 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 4Jlbjk4fjHz9t6h 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 1nDPzW-000651-JD; Fri, 28 Jan 2022 12:04:34 +0000 Received: from mail-pj1-f41.google.com ([209.85.216.41]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nDPzU-00063h-Nl for kernel-team@lists.ubuntu.com; Fri, 28 Jan 2022 12:04:32 +0000 Received: by mail-pj1-f41.google.com with SMTP id z14-20020a17090ab10e00b001b6175d4040so5031725pjq.0 for ; Fri, 28 Jan 2022 04:04:32 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fRCt3AS1z+827HrPJ3AyZMHEIuoCLTUhwveuVxtRa+w=; b=0fKWDtTSr2KbBDlW9UgwcWylxm9TRDLNkbxxs3yxKg/FQTFjpt+Mmyk4Qutk9Tlu20 SMhSVMtF272rOPocIB4XGAgU7s6SVX5kQs4I4IIFJFoKr4Z/qsLDKnsl6qpU9VleJbz4 TSDnQm+SDgxu1MKeKurUGyfJPav2Q0hDKh5Y55ADzjJ4PCuIHnEePua4P6BllsRVsyGL aiY8oWdSHNjxXflOAt/bwcjv5f+SfS3XxvQcrVH0pauxzki53xWmurtFTZwRGieVn7xm qoPcDV14S7N5zTNlBhkEZMIM5vYamPmoeECSCatLLdKuWgSKez8UOgTXBaeM6PdAltG/ 3Fcw== X-Gm-Message-State: AOAM533rv/n5vrjB6NTjEsxIIatqCeh6HhHk6A2xEaeJ9st9EsL/4Wgr CqtB0auYZ/qYB24K2IE/iqqOhUJ9g6N1WMuP X-Google-Smtp-Source: ABdhPJwYUbjGPRJ6yb/teDXln5X4uSntmBDaKfs5sY0qF2UyUSdtXfRRXdSjMYqP7Kg/EqTptJpPqQ== X-Received: by 2002:a17:902:db02:: with SMTP id m2mr7757910plx.136.1643371470754; Fri, 28 Jan 2022 04:04:30 -0800 (PST) Received: from localhost (218-173-144-78.dynamic-ip.hinet.net. [218.173.144.78]) by smtp.gmail.com with ESMTPSA id k13sm10141229pfc.176.2022.01.28.04.04.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 04:04:30 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/2][SRU][oem-5.14] UBUNTU: SAUCE: ath11k: shrink TCSR read mask for WCN6855 hw2.1 Date: Fri, 28 Jan 2022 20:04:24 +0800 Message-Id: <20220128120424.384168-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220128120424.384168-1-vicamo.yang@canonical.com> References: <20220128120424.384168-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.41; envelope-from=vicamo@gmail.com; helo=mail-pj1-f41.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 Full WCN6855 hw2.1 support has landed to kernel as commit d1147a316b53 ("ath11k: add support for WCN6855 hw2.1"), and it was based on several new features and fixes that involves additions & removals of members in ath11k_hw_params, which in turn pulls in numerous prerequisite commits. While additional features of hw2.1, e.g. WiFi 6G, are still not planned for Focal oem-5.14 and Jammy 5.15 kernels, this patch brings in the minimum change to enable basic functions. The high bits of TCSR are reserved for other use, and the actual major version mask occupies 4 bits only. Signed-off-by: You-Sheng Yang --- drivers/net/wireless/ath/ath11k/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c index 23df380432ea..177c7ac9cb4d 100644 --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c @@ -25,7 +25,7 @@ #define WINDOW_RANGE_MASK GENMASK(18, 0) #define TCSR_SOC_HW_VERSION 0x0224 -#define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(16, 8) +#define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(11, 8) #define TCSR_SOC_HW_VERSION_MINOR_MASK GENMASK(7, 0) /* BAR0 + 4k is always accessible, and no