Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4580943pxv; Tue, 6 Jul 2021 04:34:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFR1N8VsQxKXGNOMZmTDq9nT7UPKGBhYNcUovBr3y1SUtpq+rKU9AJCt90FR5/LW8r2c33 X-Received: by 2002:a17:906:919:: with SMTP id i25mr17592144ejd.171.1625571255765; Tue, 06 Jul 2021 04:34:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625571255; cv=none; d=google.com; s=arc-20160816; b=RvEA8LNQExrLF/tQr2bO7n5QbppcAZT46CoQVYAz7MXs5mGWDDcnYdRW4LovJ8C9IZ dqdE9d/seoRqp6ZrqPObSEBaKRQ/mNqwdkohNW3oj4Ex6U1fwM/gTTyskrxSqCPznzlK +UCQ+ucnZMXtmzZIgTO0zCmOVR0ikbOO03y4KrdlmhRmKb+FqR39engRyNzBdGTUtJPz I8RaWJrIW36AqUf/QTJiW40M3YX6NN2CId5RwjFaIEcMcIuv4TcH6REiSqBsYlSEEDbT e985l6hxZBMKTDhEny7rf2nbjtJFpp2UQUKO7MIWHPLcIqK5JsabtHg7R7RU8zLGrTIB cSEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=On2F0wR0iZosDn8Aa9bDlCk7qUWW7Dle8UfGCggduDE=; b=IxiPYSJvb4cl0KYe+/EWnKZCipPbW5/KMapaz8hn6aW5PYJwGQ9PMnQbbPN8OK8p8Z UvuxDwFbmLUzcywqPq06i1sp8pZ0DwE/FIV27ipyQpQmbXkqeP4dkJDRVjRdlnkO7oDR 5qY3BFc+iwNzbg8HoLxVoSDzbTXQv6yBiT9IFVUQG4fMwC0S8qi4GqKV/FGJY2/MG6Bv fGurzHKZDgi48iq1zVpL+lyKm/V+VvS3KncYBugqCCy4c3bV2ysQLybDYIf9g7CfBYd+ 6YkQPhiVa7Fwl6/cftEhn81xGLOoP1Dg0rgehTHt5ePwgkZ1pX2pMZ3wjU+InmSv0EjE rTQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JroNzpBZ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id el21si13644799ejc.619.2021.07.06.04.33.52; Tue, 06 Jul 2021 04:34:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JroNzpBZ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235433AbhGFLeN (ORCPT + 99 others); Tue, 6 Jul 2021 07:34:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:42564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235530AbhGFLaK (ORCPT ); Tue, 6 Jul 2021 07:30:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1DF6B61DB2; Tue, 6 Jul 2021 11:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570479; bh=u8Ivap6Yz4KRmQsyQWImKIcEhtJI8QScwssbNbl8UkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JroNzpBZ1oPrWm28ZHgYoJ1yZ/fyreohwh6IuDxSxRVqDa0YRpLxU44b5lj6yOZqJ Sepw+Y6jQyvxFQx7aoiGo3Qnq3t1lG6FmqVFpprRhzjQQsLQd3XDXqV2gzyZyx2cVH 9dahBzRZLOmKGSS4LeAhjUYW5xrApotpaTeq/Vk8xdShusvK/UclNaWK91wk51wiK4 YpIZxGSZfA7cS1HJkRWnZzRYrOSKjdwgLCYvaUuOWyxWQYO54HUBYolN+fsgzK+oAJ rGi8Og/sJA4WdTEyaq1pztx+D12xrrKCm6Wct8KCxYTluCXzwo27HMrpgLY7wxI9Uk C2wBy/evEMwvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ping-Ke Shih , Paul Szabo , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 128/160] rtw88: add quirks to disable pci capabilities Date: Tue, 6 Jul 2021 07:17:54 -0400 Message-Id: <20210706111827.2060499-128-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111827.2060499-1-sashal@kernel.org> References: <20210706111827.2060499-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ping-Ke Shih [ Upstream commit 956c6d4f20c5446727e0c912dd8f527f2dc7b779 ] 8821CE with ASPM cannot work properly on Protempo Ltd L116HTN6SPW. Add a quirk to disable the cap. The reporter describes the symptom is that this module (driver) causes frequent freezes, randomly but usually within a few minutes of running (thus very soon after boot): screen display remains frozen, no response to either keyboard or mouse input. All I can do is to hold the power button to power off, then reboot. Reported-by: Paul Szabo Signed-off-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210607012254.6306-1-pkshih@realtek.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw88/pci.c | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c index 6b5c885798a4..e5110d2cbc1d 100644 --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c @@ -2,6 +2,7 @@ /* Copyright(c) 2018-2019 Realtek Corporation */ +#include #include #include #include "main.h" @@ -1598,6 +1599,36 @@ static void rtw_pci_napi_deinit(struct rtw_dev *rtwdev) netif_napi_del(&rtwpci->napi); } +enum rtw88_quirk_dis_pci_caps { + QUIRK_DIS_PCI_CAP_MSI, + QUIRK_DIS_PCI_CAP_ASPM, +}; + +static int disable_pci_caps(const struct dmi_system_id *dmi) +{ + uintptr_t dis_caps = (uintptr_t)dmi->driver_data; + + if (dis_caps & BIT(QUIRK_DIS_PCI_CAP_MSI)) + rtw_disable_msi = true; + if (dis_caps & BIT(QUIRK_DIS_PCI_CAP_ASPM)) + rtw_pci_disable_aspm = true; + + return 1; +} + +static const struct dmi_system_id rtw88_pci_quirks[] = { + { + .callback = disable_pci_caps, + .ident = "Protempo Ltd L116HTN6SPW", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Protempo Ltd"), + DMI_MATCH(DMI_PRODUCT_NAME, "L116HTN6SPW"), + }, + .driver_data = (void *)BIT(QUIRK_DIS_PCI_CAP_ASPM), + }, + {} +}; + int rtw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -1648,6 +1679,7 @@ int rtw_pci_probe(struct pci_dev *pdev, goto err_destroy_pci; } + dmi_check_system(rtw88_pci_quirks); rtw_pci_phy_cfg(rtwdev); ret = rtw_register_hw(rtwdev, hw); -- 2.30.2