From patchwork Fri Dec 4 15:20:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1411085 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 ozlabs.org (Postfix) with ESMTPS id 4CnbyQ1NmRz9sWQ; Sat, 5 Dec 2020 02:21:18 +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 1klCtW-0006Kp-3E; Fri, 04 Dec 2020 15:21:14 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1klCtT-0006DS-8J for kernel-team@lists.ubuntu.com; Fri, 04 Dec 2020 15:21:11 +0000 Received: by mail-pf1-f196.google.com with SMTP id o9so3914054pfd.10 for ; Fri, 04 Dec 2020 07:21:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YzliC0Lvk+40HbSgAvvYCYVsy5uqAsApZmV2uWc7cR0=; b=iOMb6bvZlgNkg0wvH1+hTJnIRdyP2z4Nxg/afq/JxPb56ACKOIRSStNxsuiSvcexzI sHqi7A2aYlQL98Gi46upihjcOfCLMhp1fGc4Ine6/uWjpvT3vdOAW80ZyT93EBuWvscE ySlLSblyL8+FYZvThvEk3coXV5ZjF8JDteAwkAXqH2GXY/mU5UwR8q3zs/DF5enNWdNz jWJBmtThtYa7cJsanbV7cMO8NsICXa1NEi5wix9WNK2hxhuz3IArcb0lqVMUwWwxeIWh hEP4i9jR1E/UXojFrsoVJHmtUGCZZudqdD73qUtQ0UtzbyMEjjq7WKT4E+WffE9YMsvC L9aw== X-Gm-Message-State: AOAM530PrMGwbVVNgga9geZnvh15fiz0J5K0+VTMYArlTUTdGBpIJ55O B4ytHd5335jTMlHdi4vfx50OiWR1U2tbuw== X-Google-Smtp-Source: ABdhPJw5WSr8lO6GM4LGcMWELh/b/JE8E1iA3tBGZcJermhrC0p5YoRIDT6vohjLWMrEWoxabpRi+Q== X-Received: by 2002:a63:cc55:: with SMTP id q21mr8027732pgi.78.1607095264794; Fri, 04 Dec 2020 07:21:04 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id 5sm4118122pgm.57.2020.12.04.07.21.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 07:21:04 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 16/26][SRU][U/OEM-5.10] UBUNTU: SAUCE: ath11k: disable OTP write privilege Date: Fri, 4 Dec 2020 23:20:02 +0800 Message-Id: <20201204152013.195139-17-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201204152013.195139-1-vicamo.yang@canonical.com> References: <20201204152013.195139-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.196; envelope-from=vicamo@gmail.com; helo=mail-pf1-f196.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" From: Carl Huang BugLink: https://bugs.launchpad.net/bugs/1879633 Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1 Signed-off-by: Carl Huang Signed-off-by: Kalle Valo (cherry picked from commit 86c5a1d6983e647a55448c80f94eb8f0aa97dfad https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Signed-off-by: You-Sheng Yang --- drivers/net/wireless/ath/ath11k/pci.c | 15 +++++++++++++++ drivers/net/wireless/ath/ath11k/pci.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c index 0b8478081f15..c058c6e9db43 100644 --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c @@ -342,6 +342,20 @@ static void ath11k_pci_clear_all_intrs(struct ath11k_base *ab) ath11k_pci_write32(ab, PCIE_PCIE_INT_ALL_CLEAR, PCIE_INT_CLEAR_ALL); } +static void ath11k_pci_set_wlaon_pwr_ctrl(struct ath11k_base *ab, bool set_vdd4blow) +{ + u32 val; + + val = ath11k_pci_read32(ab, WLAON_QFPROM_PWR_CTRL_REG); + + if (set_vdd4blow) + val |= QFPROM_PWR_CTRL_VDD4BLOW_MASK; + else + val &= ~QFPROM_PWR_CTRL_VDD4BLOW_MASK; + + ath11k_pci_write32(ab, WLAON_QFPROM_PWR_CTRL_REG, val); +} + static void ath11k_pci_force_wake(struct ath11k_base *ab) { int val; @@ -358,6 +372,7 @@ static void ath11k_pci_sw_reset(struct ath11k_base *ab, bool power_on) if (power_on) { ath11k_pci_enable_LTSSM(ab); ath11k_pci_clear_all_intrs(ab); + ath11k_pci_set_wlaon_pwr_ctrl(ab, false); ath11k_pci_fix_l1ss(ab); } diff --git a/drivers/net/wireless/ath/ath11k/pci.h b/drivers/net/wireless/ath/ath11k/pci.h index 00a2e9dd2dfc..2125cdfaa334 100644 --- a/drivers/net/wireless/ath/ath11k/pci.h +++ b/drivers/net/wireless/ath/ath11k/pci.h @@ -34,6 +34,10 @@ #define PCIE_SMLH_REQ_RST_LINK_DOWN 0x2 #define PCIE_INT_CLEAR_ALL 0xFFFFFFFF +#define WLAON_QFPROM_PWR_CTRL_REG 0x01F8031C +#define QFPROM_PWR_CTRL_VDD4BLOW_MASK 0x4 +#define QFPROM_PWR_CTRL_SHUTDOWN_MASK 0x1 + #define PCIE_QSERDES_COM_SYSCLK_EN_SEL_REG 0x01E0C0AC #define PCIE_QSERDES_COM_SYSCLK_EN_SEL_VAL 0x10 #define PCIE_QSERDES_COM_SYSCLK_EN_SEL_MSK 0xFFFFFFFF