From patchwork Tue Mar 10 01:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1251921 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ojtLF+PD; dkim-atps=neutral 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 48bygQ2m22z9sSJ; Tue, 10 Mar 2020 12:49:06 +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 1jBU10-0001Yw-Vi; Tue, 10 Mar 2020 01:49:02 +0000 Received: from mail-pl1-f195.google.com ([209.85.214.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jBU0p-0001RZ-T8 for kernel-team@lists.ubuntu.com; Tue, 10 Mar 2020 01:48:52 +0000 Received: by mail-pl1-f195.google.com with SMTP id w12so4753213pll.13 for ; Mon, 09 Mar 2020 18:48:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=kEKGvWE3KQ7k9FQz1kpVGsHGqITc+TEAXnINDm/b0J0=; b=ojtLF+PDbyh9w8jzpb3szAs9fXE36ljBsa6tDX7SvJsm6B2vng74NM+rI5nIgHxhcz 7FLUv02LyR6GnabFgw0cujfcdIHn1Un10w3MH1/n/AdZm14OAziTey4ydubz6QBz3Ui+ snn2ZgTja8c00h1wQqzoq/48fj8Y3L/SFzJYgrdFMfW6LD5Ehcm10htz2+6EhB6kbmXE zLPR+TyRFmO2ERbyq/raMg57wqJmS1TzVFPqc0IyyACunaeEhnkBNptIQ7n9s0ZU6Dc0 OB50uWz7Ajbl3RjjFqH0Pcu0ovErxmm/rFan9FbfJICIUxqf/CC4ATJXW0AYJa5nANlP CM/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=kEKGvWE3KQ7k9FQz1kpVGsHGqITc+TEAXnINDm/b0J0=; b=GrlqlvmksCMQYbSH/n6IOXqO+On5iELmqtkPfAIuDIJQLayh4ToNMAWKfu1vGVC+kn nxh8FbqXgBZmCDO/ijgfJqtTWwRu2lqlE/41yLaI+L3JWGKdr3Tto8lKx06O4poP/iEx McwiAmso4YLXGTNv0od7xl/b2Z2sHPc/24VQJpL7EtYMHivlryTyv2Wk0nYB/660cB+d CYardW/YH+Rq2k1HKv9TgNAWuRTRaLei5nTR/bYpMKAKmilfYPd+TywkT1gq2uJjpdXS DcKw+54dtzF7eXpuxznLtLHqtzn42ZSP5fm/roGA/LBInha+Ls8qfchqjgaCvmdrkiZc e8rw== X-Gm-Message-State: ANhLgQ0P1xO5T0I2W5V34xiWPWhYK9DGnquvW5iI0RPwF6J2NaBoV++Q GBHbY1L7F/IbPhG8w13YCRs/+dsw X-Google-Smtp-Source: ADFU+vtXUxiAGhg5/cOL9WjfH4elojyZhJJcCfE8TNedDpViSZJ9bbmNmXclQRWlfLsk47n5QhdaDQ== X-Received: by 2002:a17:902:8d92:: with SMTP id v18mr18833859plo.18.1583804929610; Mon, 09 Mar 2020 18:48:49 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id 72sm35284362pgd.86.2020.03.09.18.48.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Mar 2020 18:48:49 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/7][SRU][Focal] PCI/ASPM: Add pcie_aspm_get_link() Date: Tue, 10 Mar 2020 09:48:33 +0800 Message-Id: <20200310014836.23656-5-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200310014836.23656-1-acelan.kao@canonical.com> References: <20200310014836.23656-1-acelan.kao@canonical.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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Heiner Kallweit BugLink: https://bugs.launchpad.net/bugs/1836030 Factor out getting the link associated with a pci_dev and use this helper where appropriate. In addition this helper will be used in a subsequent patch of this series. Link: https://lore.kernel.org/r/19d33770-29de-a9af-4d85-f2b30269d383@gmail.com Signed-off-by: Heiner Kallweit Signed-off-by: Bjorn Helgaas (cherry picked from commit 687aaf386aeb551130f31705ce40d1341047a936) Signed-off-by: AceLan Kao --- drivers/pci/pcie/aspm.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 23e1d6b88655..2d5ecede8fa3 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1066,19 +1066,26 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev) up_read(&pci_bus_sem); } -static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) +static struct pcie_link_state *pcie_aspm_get_link(struct pci_dev *pdev) { - struct pci_dev *parent = pdev->bus->self; - struct pcie_link_state *link; + struct pci_dev *bridge; if (!pci_is_pcie(pdev)) - return 0; + return NULL; - if (pcie_downstream_port(pdev)) - parent = pdev; - if (!parent || !parent->link_state) - return -EINVAL; + bridge = pci_upstream_bridge(pdev); + if (!bridge || !pci_is_pcie(bridge)) + return NULL; + return bridge->link_state; +} + +static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) +{ + struct pcie_link_state *link = pcie_aspm_get_link(pdev); + + if (!link) + return -EINVAL; /* * A driver requested that ASPM be disabled on this device, but * if we don't have permission to manage ASPM (e.g., on ACPI @@ -1095,7 +1102,6 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) if (sem) down_read(&pci_bus_sem); mutex_lock(&aspm_lock); - link = parent->link_state; if (state & PCIE_LINK_STATE_L0S) link->aspm_disable |= ASPM_STATE_L0S; if (state & PCIE_LINK_STATE_L1) @@ -1193,12 +1199,12 @@ module_param_call(policy, pcie_aspm_set_policy, pcie_aspm_get_policy, */ bool pcie_aspm_enabled(struct pci_dev *pdev) { - struct pci_dev *bridge = pci_upstream_bridge(pdev); + struct pcie_link_state *link = pcie_aspm_get_link(pdev); - if (!bridge) + if (!link) return false; - return bridge->link_state ? !!bridge->link_state->aspm_enabled : false; + return link->aspm_enabled; } EXPORT_SYMBOL_GPL(pcie_aspm_enabled);