Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2650324lqp; Mon, 25 Mar 2024 05:43:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV0xU8o0uzEVlGEy4RWwRykwecsvK4u+iaCF+XXfj6h0EO/NBmSHupT4jBVL7iygFu6uoeQoikuxKESoxa2c8WrRYqGclG2gpoiZK24LQ== X-Google-Smtp-Source: AGHT+IFknsEZ2axhNE/oEBC3vBF7gO60asMB8uiJtAjvzqvQ+XVjMR1pnhzDJMNSwOzlUkpTXn/j X-Received: by 2002:a05:6a00:c95:b0:6ea:b1f5:1134 with SMTP id a21-20020a056a000c9500b006eab1f51134mr1054663pfv.27.1711370632298; Mon, 25 Mar 2024 05:43:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711370632; cv=pass; d=google.com; s=arc-20160816; b=h28L+9q2MOkaadSujB3Oal6aD/MeGL8e4uB0eQj2l3ibx6rrUBNUD5NqOt7VAYoJAZ zTkkqCJW9S2tZmroM6mvA9NMnOz3qA0Z+HLoA8XfuVbJl7n+4OKsKqY+Z+Ci0KzJ7wdm QBr2ySYGpQ1WhR7WmHJsDg8wutrSyR+29pZzZ2/O3b00MQ34m/7hnMhztktZlkjuIeqD eFEH2+vF76L4fzhKojQkEGhFHala0Nwxb0Yl4D2nZuc8w0QxSNOLYoE9tPi1vQL6846b gh4BfhiRa3UnBTkAAcqAJaILIKEuj7y8Lei0h7c4IxwNL0PVGUnQddPRbc46oefKz0Ju ItMA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3VtiSdJIJXuVDRly8u/Kv7Hc/LwSB+MRH3rnFKXX7no=; fh=5jGsJgaEw6po3N4U8EOpndReOFvAiCcsSXr18UMgLA0=; b=PY0nQ4JOanvU9ZIGeuJ2gjT+KOWQXJGvLC37KfLnqbRwSnXARJPrpvdGuoS0n6CZK1 qfGjrqJZTivOB7A/j1fhF/yCAgC/VAH5wfrcSrj+wiEaDu3EykaFUgtT6Zgh370ZBzIV ijX3OOsq0sZgSxcH00WbptSXKqCepTHAwOuVRpBMklgrv54/jPoOlwKoguSlaWdmG28R nLr++HmLvoai/YPgJ6TUFJYmXOGpy/Xv/KIyXt/hFq5MRNi++PLQT8QkEDg5UYEKhfrc wFI8Un2M1Ns2o5IVEIFgGp2N4j10LGA2SPPTJqcB1IZAbmqKkgUol9xVcsas4vo/papM nslA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SaiHNNtc; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115664-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115664-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id o15-20020a056a001b4f00b006e747cba5c9si4979021pfv.310.2024.03.25.05.43.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115664-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SaiHNNtc; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115664-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115664-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 696C3B36DE3 for ; Mon, 25 Mar 2024 11:37:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 199B2354670; Mon, 25 Mar 2024 02:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SaiHNNtc" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A42B4DA19; Sun, 24 Mar 2024 23:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321565; cv=none; b=GhySO8cz7CAturGreWQ7K8A9liqnkp/4bbXmQN43goUAxyDzMszfEKjAEtQIFskhtIZtvvNLx35XmdT5l0G7f6aAscibydsCzpuGFOXWxUOZWPoeHhz3q/GqMuVcswlo6eoPBP88hVEOML3TWAQD1rrDzYJ7XYbNPo9jt5NJxZ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321565; c=relaxed/simple; bh=0h+dVccax6ro0iS08S+b3SQ+pRrc0gTGC3ATwkrtnoI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eRuPsfbKws2tOfSOzTGEEiJBd7zibcBhgPie0FQX1LVe1AxPCPjZTFJhod6Kma56//UCUzdfsKMh4gTu0cYEeno9NhjR7Pr1sc6GIENfcS2ppHLskwA039haHiddNdot92eQMnlnIcTbKKr32tMtDtt5mWelumzIbbApJl9tNFA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SaiHNNtc; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CDCBC43390; Sun, 24 Mar 2024 23:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321565; bh=0h+dVccax6ro0iS08S+b3SQ+pRrc0gTGC3ATwkrtnoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SaiHNNtcn8XYMnqmPV/sQEs4xbUXv/AbpTTGW02QXYvcSM8+DI9Ui3dpFKoODlLlo z7u/y2oDz87nytQt6SzzS/HwsAL9LZl37XudVozNUhX1ZbGxVwIbmSUm5RvuIVQwZ/ NGxInmXcwibnhidXJuJqbFz/1yrTXLriyRfRZRl/2IfZbk840buErbItmA10/V4EQn JU/kctReqrb4pF871TJ/Bv+PTzHkicWIVolgU2w7YZIAuxgd8LvnWlqSDnjYR1PpV2 /lxP/DORxghVNhaPDmdM6eFgrCcXwUc6M+24UZXu/egwc941EIkK1mi3Fpf8aqzzcC WUG4kKpyRiGkw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ethan Zhao , Bjorn Helgaas , Dan Carpenter , Haorong Ye , Lu Baolu , Joerg Roedel , Sasha Levin Subject: [PATCH 6.6 293/638] PCI: Make pci_dev_is_disconnected() helper public for other drivers Date: Sun, 24 Mar 2024 18:55:30 -0400 Message-ID: <20240324230116.1348576-294-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Ethan Zhao [ Upstream commit 39714fd73c6b60a8d27bcc5b431afb0828bf4434 ] Make pci_dev_is_disconnected() public so that it can be called from Intel VT-d driver to quickly fix/workaround the surprise removal unplug hang issue for those ATS capable devices on PCIe switch downstream hotplug capable ports. Beside pci_device_is_present() function, this one has no config space space access, so is light enough to optimize the normal pure surprise removal and safe removal flow. Acked-by: Bjorn Helgaas Reviewed-by: Dan Carpenter Tested-by: Haorong Ye Signed-off-by: Ethan Zhao Link: https://lore.kernel.org/r/20240301080727.3529832-2-haifeng.zhao@linux.intel.com Signed-off-by: Lu Baolu Signed-off-by: Joerg Roedel Stable-dep-of: 4fc82cd907ac ("iommu/vt-d: Don't issue ATS Invalidation request when device is disconnected") Signed-off-by: Sasha Levin --- drivers/pci/pci.h | 5 ----- include/linux/pci.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 99abc4cec0df1..1b4f941829724 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -363,11 +363,6 @@ static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused) return 0; } -static inline bool pci_dev_is_disconnected(const struct pci_dev *dev) -{ - return dev->error_state == pci_channel_io_perm_failure; -} - /* pci_dev priv_flags */ #define PCI_DEV_ADDED 0 #define PCI_DPC_RECOVERED 1 diff --git a/include/linux/pci.h b/include/linux/pci.h index 3af5f29985511..b548d5646a86d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2477,6 +2477,11 @@ static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev) return NULL; } +static inline bool pci_dev_is_disconnected(const struct pci_dev *dev) +{ + return dev->error_state == pci_channel_io_perm_failure; +} + void pci_request_acs(void); bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags); bool pci_acs_path_enabled(struct pci_dev *start, -- 2.43.0