Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp951471pxy; Sun, 1 Aug 2021 07:28:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJya5WqLqTaKWzaaLfvF2908uVwdq1MytA2ZgSZ9i9jrcxQUUW8mRZkfLoS2U9OC0egNIFVb X-Received: by 2002:a05:6602:3404:: with SMTP id n4mr373254ioz.31.1627828106645; Sun, 01 Aug 2021 07:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627828106; cv=none; d=google.com; s=arc-20160816; b=UoRjqaCrOr7lCjWrZIMT/DdO+gnpR2SlrZy+kUYdt9CSBf9WveTmVsapuIpoTQdJrO SmphPKr9aPCWMcY07eD++5EHYJwzgYJNm1P2d3jfbUw35dfC+Qo9IeD28i8ApZiwJT57 fODIst14z4zTe4pYtxGVZCYadYWoK1YNLn8Qgjl0jJBR74vH9LH6Gq3B/CxgTSKPfpxh EpaOA4vLtaur2DdMvPV6AGVa3XvJd35tFhY85rw8x9AIFz0ijeHRy/Szi9G4ym/zphl3 k4FPJdQ1AFvVCELQ4Lml0CVfSi4IoPgsJo1jpGeHb/qZUUHhjh1JVvVCc8nZs1xMuzBR p2sQ== 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=rzemOKr8SkBV19b/ZnGS+URhX00WU8DKUyy8R3iVY7U=; b=IJHGNqZ5VnknYvHeYLx8m92og6cqG8TmC2YazChZQ7tFl3isdAqr5sSpQnmw0kJjMM BO+y+bEH1AMHPVZXdmhYvu9Fm9FsIJV1mE0eMRzXGNHR4HDDb7oSzpd/k1sKwQkfGMHZ HsChz6VsQs11D2gksrE89/6YLliN/mU5MVILDI9UtolqhBEfeGRetPOoIdv/UZwzGy5u X2nc7m1PPdJf+L9GG+0FincVzguB/TN4UXgkcK5+CmadxbXb7VLPLjAUn9SSmtpcbiWA HuILH+gFVVnLl6T+MrIzTQpCE6LkS6Podx7RBWeKUO6MyJoZCIqyQsI+JBPPnVePVn2A 7jVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=imK3wtpY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b16si9538979iln.129.2021.08.01.07.27.42; Sun, 01 Aug 2021 07:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@gmail.com header.s=20161025 header.b=imK3wtpY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232119AbhHAOZx (ORCPT + 99 others); Sun, 1 Aug 2021 10:25:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232033AbhHAOZw (ORCPT ); Sun, 1 Aug 2021 10:25:52 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8659DC0613D3; Sun, 1 Aug 2021 07:25:43 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id e21so16678737pla.5; Sun, 01 Aug 2021 07:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rzemOKr8SkBV19b/ZnGS+URhX00WU8DKUyy8R3iVY7U=; b=imK3wtpY5LimeDX2dscS00vwhBBEG3tHTkMUsaq8gtxEHqb8TliFJmIBBGUpIm6gHV JJet0NppCw/Vwh17WjMt32TcCto63Y4+90IggPVNTfc/YKE+BfRVmQ6d00NDchvFDF4b 4yVYDDO0/NTGoiOgi/1J+oH6gN2yNP7k3q7d/D5rdyLWz+JXpRjaXJ6+Wfeep7TCEmO3 tclDCGmbAKcBk8gDwvuiMfNHG29sMfznLoXr94qEFxUzeyZyg/5jIGzDcb6W+Spg1qB6 HxFIzt6ExCsfVePDwj+jPf62O3b6KcTB2T7GRlB+aiTAU5gsnZiWW+FNFazfYPxjA6eD Csvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rzemOKr8SkBV19b/ZnGS+URhX00WU8DKUyy8R3iVY7U=; b=IgZTWeH0Ztcuf9q3aN2+jljgChQ/yIy8lWqZZtjoFc5tEuhmTMDXILIeZWbgDoulWW eZTwe3k7XX4RJhuO1Ld1jXXPg1rQYO9pvOEreTlpS5IZ6skscGtqO2qU170Pr0sHUTOO KEpWQANCWOJkkw6ry+U6uurHmO2kb9wihwl0RDbUpH9b8w3IITK/dqFN+2ZcatlVAS1S d0hySvcdQM9gPhvp/NVgqw3kTCKBF5XJ0sSE8zhjBr3EXAMuSHiARGNTsqyhnYqkVnnq eEJgV1GE8RJdKn1wsjoDULGV2gOpBaTo6f2I8NEdmXiQh/5cfcc2kg0DvcO5k+qUtDPr Ln8A== X-Gm-Message-State: AOAM53317AF+oECF7GkBnmWbPKpRo3y3tlRNspI0IUMIJsn4M4/OVLwz TLnO5GpSn2MZ6KSrfKJtGS8= X-Received: by 2002:a65:6088:: with SMTP id t8mr4351714pgu.371.1627827943162; Sun, 01 Aug 2021 07:25:43 -0700 (PDT) Received: from localhost.localdomain ([139.5.31.186]) by smtp.googlemail.com with ESMTPSA id g11sm7740897pju.13.2021.08.01.07.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 07:25:42 -0700 (PDT) From: Amey Narkhede To: Bjorn Helgaas Cc: alex.williamson@redhat.com, Raphael Norwitz , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, kw@linux.com, Shanker Donthineni , Sinan Kaya , Len Brown , "Rafael J . Wysocki" , Amey Narkhede Subject: [PATCH v13 4/9] PCI: Remove reset_fn field from pci_dev Date: Sun, 1 Aug 2021 19:55:13 +0530 Message-Id: <20210801142518.1224-5-ameynarkhede03@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210801142518.1224-1-ameynarkhede03@gmail.com> References: <20210801142518.1224-1-ameynarkhede03@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org reset_fn field is used to indicate whether the device supports any reset mechanism or not. Remove the use of reset_fn in favor of new reset_methods array which can be used to keep track of all supported reset mechanisms of a device and their ordering. The octeon driver is incorrectly using reset_fn field to detect if the device supports FLR or not. Use pcie_reset_flr() to probe whether it supports FLR or not. Reviewed-by: Alex Williamson Reviewed-by: Raphael Norwitz Co-developed-by: Alex Williamson Signed-off-by: Alex Williamson Signed-off-by: Amey Narkhede --- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- drivers/pci/pci-sysfs.c | 2 +- drivers/pci/pci.c | 6 +++--- drivers/pci/probe.c | 1 - drivers/pci/quirks.c | 2 +- drivers/pci/remove.c | 1 - include/linux/pci.h | 1 - 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 516f166ceff8..336d149ee2e2 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -526,7 +526,7 @@ static void octeon_destroy_resources(struct octeon_device *oct) oct->irq_name_storage = NULL; } /* Soft reset the octeon device before exiting */ - if (oct->pci_dev->reset_fn) + if (!pcie_reset_flr(oct->pci_dev, 1)) octeon_pci_flr(oct); else cn23xx_vf_ask_pf_to_do_flr(oct); diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index beb8d1f4fafe..316f70c3e3b4 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1367,7 +1367,7 @@ static umode_t pci_dev_reset_attr_is_visible(struct kobject *kobj, { struct pci_dev *pdev = to_pci_dev(kobj_to_dev(kobj)); - if (!pdev->reset_fn) + if (!pci_reset_supported(pdev)) return 0; return a->mode; diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 010962d7dba6..932dd21e759b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5235,7 +5235,7 @@ int pci_reset_function(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!pci_reset_supported(dev)) return -ENOTTY; pci_dev_lock(dev); @@ -5271,7 +5271,7 @@ int pci_reset_function_locked(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!pci_reset_supported(dev)) return -ENOTTY; pci_dev_save_and_disable(dev); @@ -5294,7 +5294,7 @@ int pci_try_reset_function(struct pci_dev *dev) { int rc; - if (!dev->reset_fn) + if (!pci_reset_supported(dev)) return -ENOTTY; if (!pci_dev_trylock(dev)) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5d8ad230f7d0..379e85037d9b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2406,7 +2406,6 @@ static void pci_init_capabilities(struct pci_dev *dev) pcie_report_downtraining(dev); pci_init_reset_methods(dev); - dev->reset_fn = pci_reset_supported(dev); } /* diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b48e7ef8b641..0db5dac3ddce 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5589,7 +5589,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev) if (pdev->subsystem_vendor != PCI_VENDOR_ID_LENOVO || pdev->subsystem_device != 0x222e || - !pdev->reset_fn) + !pci_reset_supported(pdev)) return; if (pci_enable_device_mem(pdev)) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index dd12c2fcc7dc..4c54c75050dc 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -19,7 +19,6 @@ static void pci_stop_dev(struct pci_dev *dev) pci_pme_active(dev, false); if (pci_dev_is_added(dev)) { - dev->reset_fn = 0; device_release_driver(&dev->dev); pci_proc_detach_device(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index d1a9a232d08e..94d74fd594c1 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -431,7 +431,6 @@ struct pci_dev { unsigned int state_saved:1; unsigned int is_physfn:1; unsigned int is_virtfn:1; - unsigned int reset_fn:1; unsigned int is_hotplug_bridge:1; unsigned int shpc_managed:1; /* SHPC owned by shpchp */ unsigned int is_thunderbolt:1; /* Thunderbolt controller */ -- 2.32.0