From patchwork Tue Nov 14 13:55:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 164916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1874727vqg; Tue, 14 Nov 2023 05:58:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IES5UtHiBTvEMAmQv5UMP9GPO+uBxs/I9jlee0geGHL3PL6jjn10OLqY3iq88tZ5Tgup60w X-Received: by 2002:a05:6830:1d52:b0:6b8:807b:b50 with SMTP id p18-20020a0568301d5200b006b8807b0b50mr2026233oth.22.1699970295431; Tue, 14 Nov 2023 05:58:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699970295; cv=none; d=google.com; s=arc-20160816; b=T7k9gQh+XQKBbMKFbB1h1X0aZNIF+4DwC9e5Y7evKOxQxDGZK6BkPQa08m7c1mF8aO cobIhXqYUKIzT4PpimuR39Dvm8Ojo5mnwl21k4c7UEsYBKZP9SbqVP5vaHfXD6gTGmW4 jS1rXSJ0Kl4OZc6CmDySIuMLZVuo8G1sk1kn7pJjQjsyqOrwWlqtJExCIAdQve9poSE3 xEZRpBbjwUqJxj1ZUff4Vyx1ncPaLcvmvNxxC0SEIr5PohwPtzSe/cVsUAoWDtMYGpJk J7myfW+P6xwpJMIEDG4gJfhJfDjK870kCpOl3Fdt4JxquWBqynOmkYxUuX+vzNgbPKiH 1V1Q== 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=vb6+FB3XbxewiTcxLooAWaNMw6xB9NLiKzSe9cItMnw=; fh=f41aoNjmAiOEyLMnqyIyK2t7KtKRMELjVBNz1UXAmhs=; b=IT3WQJgESk2MkR2OmXRF2dmwGlbftaC7ZezQRj0c0ym/GBWYEvS7fLpGxdUiwc9EvW f80QPxW0ebUz8l/QmCDyh7PG1XYAULnIkNM63rUssB1dVsR3WCf8OGoAHEGEoCEwp+hx XXURV3imWpSRL+2VTTtcqTCkBa0SH4zcOjOQSOqoBBy2RCHMFkjLxtNm/tNQIEcxJOJ9 bY1LgedmmfMZkp0dKyXKTs37pwx4fsckwP2DaV1quWIzhibxs7QWi3bzm3UELBeQuBjv wSNUuumwZ4lFfLNQihPa+Z4DAHgy09LYu02+VagvBPAxUXDz/bkHLoeNxfYP9d1bCZve vbAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=socAihQ3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id z9-20020a6552c9000000b00565eedb1cf8si7516855pgp.825.2023.11.14.05.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 05:58:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=socAihQ3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 1ABBF80AA24D; Tue, 14 Nov 2023 05:58:01 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233364AbjKNN46 (ORCPT + 29 others); Tue, 14 Nov 2023 08:56:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbjKNN4j (ORCPT ); Tue, 14 Nov 2023 08:56:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BD4E1BF; Tue, 14 Nov 2023 05:56:35 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1843C4167D; Tue, 14 Nov 2023 13:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699970193; bh=p5enpBm/h3uKua9dX8qlaS0tuKFBhLHUpM9Hd7d/DZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=socAihQ3HhCJY6z/F1yux89ciHZ0i9NTT73CZGbk2iSRhZrNiwOchaHzlSlA4x7mL Jh4QM7ItBKDZ7uvt+YBwdLHluA4bRtiOHB9puOtJVrH5qYkAkdFSJ4RyZ4K1pqPdQk 05axIFOg4Fj8Z2e/ZPr4P3ECM6EB7jOamGMzz+83rXjq3+SB6Zot6mAiEiW0UVk+3n BmGlycYYJsSd/S+e8MeN+OvJcmpDhKFMUZOZT06+LH8LE8ekq2/TFUmBOjwoKLLcnC 7mTgPdbWtX+7/9iEi/vQXd4cG4nrCU1iz5x9Ey8dAOhYMA6IvF3upeRRZ+FJnD4xwi kmfFcMjOGmyoA== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1r2tu2-0008PR-2N; Tue, 14 Nov 2023 14:56:30 +0100 From: Johan Hovold To: Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Manivannan Sadhasivam , Rob Herring , Nirmal Patel , Jonathan Derrick , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, Michael Bottini , "David E . Box" Subject: [PATCH 2/6] PCI: vmd: Fix deadlock when enabling ASPM Date: Tue, 14 Nov 2023 14:55:49 +0100 Message-ID: <20231114135553.32301-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231114135553.32301-1-johan+linaro@kernel.org> References: <20231114135553.32301-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 14 Nov 2023 05:58:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782548052785256370 X-GMAIL-MSGID: 1782548052785256370 The vmd_pm_enable_quirk() helper is called from pci_walk_bus() during probe to enable ASPM for controllers with VMD_FEAT_BIOS_PM_QUIRK set. Since pci_walk_bus() already holds a pci_bus_sem read lock, use the new locked helper to enable link states in order to avoid a potential deadlock (e.g. in case someone takes a write lock before reacquiring the read lock). Fixes: f492edb40b54 ("PCI: vmd: Add quirk to configure PCIe ASPM and LTR") Cc: stable@vger.kernel.org # 6.3 Cc: Michael Bottini Cc: David E. Box Signed-off-by: Johan Hovold Reviewed-by: Manivannan Sadhasivam --- drivers/pci/controller/vmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index 94ba61fe1c44..0452cbc362ee 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -751,7 +751,7 @@ static int vmd_pm_enable_quirk(struct pci_dev *pdev, void *userdata) if (!(features & VMD_FEAT_BIOS_PM_QUIRK)) return 0; - pci_enable_link_state(pdev, PCIE_LINK_STATE_ALL); + pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL); pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_LTR); if (!pos)