From patchwork Fri Aug 23 09:33:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13774840 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AF4B14B963 for ; Fri, 23 Aug 2024 09:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724405617; cv=none; b=bfvEoeGa0/uN7O/jo8TSFQjS3KyHzf15kbzjfSinmABw0xUi59fFKn+DvQcWl6fPde2VfCcjviKbqGPj0s4kRnFnx3nyqpDJJjNBmewAA+U4bwd73db1do60stxObHd/R1t6BZxkYYLXylpYgfOGkfl6fI0dlKqAa27OgQFJYSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724405617; c=relaxed/simple; bh=SDW+jhpHqOJq3t1ya0ovj2sjAIj5GyPFm3xRSUy/2F0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AoQcOL6XKiqNdGtc6RNqoU0aEHuo60GDi10w4+fyTAPPgCAQPSi8pG8ie1kBtOn0Kl7VpCXif5Pa1CX3SJAjq4Gyd9qIApIdnL2IyQOsGQK4SZcrMhUaCTIXeZppLT9HQ6aukMxSgXkiRBc35o5icabmMB57ztoFdLVWUgvshrI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=O4dRrsTJ; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="O4dRrsTJ" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-42817f1eb1fso13671425e9.1 for ; Fri, 23 Aug 2024 02:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1724405614; x=1725010414; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UV0kDEyv+rHlN+IT+BwYqyEyzLehqMc19rUT/kqAz5s=; b=O4dRrsTJCYE8pGZG+zP/kEpBQUHJLNnc8A6R4ACfr33ts6TqwlnUGekD1iZI+z/XJQ OiuEANBDmki6RVSfUI6is0xxiE/JXA6+hVs5X1WrwgQuYkAAvvy2j2d38/8oC0izK3yS jJpGNtqYDKzlx2nmITa86WkVQ7BlbvT7Tv26Br9+zyypYoRRN5jRoOE9P7NOlZOA0PRS xkkEygVQNrPoofuTjt184TeWLuVDgxexR+xcEybyxMojbbmT2VrbJEp7r/S02CxLNtZk WwNojfOwb2v2dZNAIxr9N2KYry2SHKeABwYuxI/ioLCulLi09u8GfbxvHM5EVJ0yy7U6 5j8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724405614; x=1725010414; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UV0kDEyv+rHlN+IT+BwYqyEyzLehqMc19rUT/kqAz5s=; b=BvZ8EFoKzsH1ERRa36Sak3T6iDwdNuP0UvEqURWkqTbdaEhv4yys5T/7StRxdH6tiG 1tIqz8vlX5U2YjKD7LkCuF1YYFfd4exlqOCpn+44JO2HPS+XTb5SPHcHzn43ytqJb2gJ UQ8yVxd4DLLBy/RRmtOgqQcpulVgJvsTnWuy5301WnOVTj1MNgwo3j2+wMXPUomgDVhP RyuKtafU8PmteS8YB8cZrRE+DmR4S1FjcnPtBx8HsScfQnWc1CJj2v35HWzTFGd80d0R SJnJ/H7xUyEigMxQNcOWUkceBCAluagH3ZowtTCxVHm+pnpoaJeaDnZTOh5hLgfweruq nECQ== X-Gm-Message-State: AOJu0Yz1spVttyxYTdi9JZC145neJJs5UkC33rxTBUDCwjwWNnYegwPn 41RqsJSS955NR61NsVzvCVs9IrYiFrTWescIbx3TxO1wsaplmn8LlJgLxhwZMX+PhfUYcLlPQsy vqO0= X-Google-Smtp-Source: AGHT+IEeAv1jnkfW+fOz1SblCfxZMUL3ovR6NdTgXGEH2aaFFKUhFX0IWkYCwyAUiU4W+DH5ULiI6w== X-Received: by 2002:a05:600c:1c9c:b0:429:e67f:1249 with SMTP id 5b1f17b1804b1-42acc8d525emr12713535e9.3.1724405613016; Fri, 23 Aug 2024 02:33:33 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:58fc:2464:50b0:90c5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42abee86d5esm87612035e9.15.2024.08.23.02.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 02:33:32 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Helgaas , Krishna chaitanya chundru , Manivannan Sadhasivam Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v3 1/2] PCI: don't rely on of_platform_depopulate() for reused OF-nodes Date: Fri, 23 Aug 2024 11:33:22 +0200 Message-ID: <20240823093323.33450-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240823093323.33450-1-brgl@bgdev.pl> References: <20240823093323.33450-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski of_platform_depopulate() doesn't play nice with reused OF nodes - it ignores the ones that are not marked explicitly as populated and it may happen that the PCI device goes away before the platform device in which case the PCI core clears the OF_POPULATED bit. We need to unconditionally unregister the platform devices for child nodes when stopping the PCI device. Fixes: 8fb18619d910 ("PCI/pwrctl: Create platform devices for child OF nodes of the port node") Signed-off-by: Bartosz Golaszewski Acked-by: Manivannan Sadhasivam --- drivers/pci/remove.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 910387e5bdbf..4770cb87e3f0 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c @@ -1,7 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 #include #include +#include #include +#include + #include "pci.h" static void pci_free_resources(struct pci_dev *dev) @@ -14,12 +17,25 @@ static void pci_free_resources(struct pci_dev *dev) } } +static int pci_pwrctl_unregister(struct device *dev, void *data) +{ + struct device_node *pci_node = data, *plat_node = dev_of_node(dev); + + if (dev_is_platform(dev) && plat_node && plat_node == pci_node) { + of_device_unregister(to_platform_device(dev)); + of_node_clear_flag(plat_node, OF_POPULATED); + } + + return 0; +} + static void pci_stop_dev(struct pci_dev *dev) { pci_pme_active(dev, false); if (pci_dev_is_added(dev)) { - of_platform_depopulate(&dev->dev); + device_for_each_child(dev->dev.parent, dev_of_node(&dev->dev), + pci_pwrctl_unregister); device_release_driver(&dev->dev); pci_proc_detach_device(dev); pci_remove_sysfs_dev_files(dev); From patchwork Fri Aug 23 09:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 13774841 X-Patchwork-Delegate: bhelgaas@google.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5458314B97B for ; Fri, 23 Aug 2024 09:33:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724405618; cv=none; b=tUtRwO0V+7FuJESkYEBSdmTgPfORJQrd3OYA0JQugVpqwiZCu/tdWbzoZYtl+6Oop8ZNSzcualrXRnPMx2txtfO+uXEQhFslZmpG96nDUiROYELK/UINLpBP+Omgd4wMuvtJw/ejOylw94YPbXcaHb+3BrZOeoIdPPl+2w+y+7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724405618; c=relaxed/simple; bh=VlEWS+I2qBUoAZu3MZiZFqikaq4uXZWuP6/ITJZxiQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=chZgT1Ntl9hGrbCvi3I7uhysNKpV3dfMAietzPyZXhu81NTA+CZ9f48K12olsQ4kcne3jVbzhT0oqD/llCKkO6Oe7AZ4pabY8iR/rT+TSDdK+DSvL+DNUSPyyfDZ0iQFiy8BdhZgoBqrzl7Q8J5H42DSEWwa2u620KVCmDQ8UEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=GProBBiS; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="GProBBiS" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4281d812d3eso17555255e9.3 for ; Fri, 23 Aug 2024 02:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1724405616; x=1725010416; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ns4EUZZ3nTL5odSKliuQhTwD1CbjvkOmQ7rToMzAA/s=; b=GProBBiSE10kSUudTPOUq83MZLnurR8SZLXlzMtQjWYn72Hd1C5o+Mh2ZhzBxYv6Oj xYhVMCxw8k4i8pZSc9UR7DH+gqgAzm4PoD5u9EMumGDFsVghYtxe6CzAuOWiBk54dXTu EC/GZ6XHOU/eQ32Oh+5NtVeVbmzdX2SMkSM2vGni1Zo+TvpiXpuuGB2NkcWUO8pN0J0U E8k0dYTuIKoz27Q1GOH3B3jpo7kb8kPCCmDRA+ZVz7L/hhQPZF6PVoruCRbAkNmIHRZT uY1szmYClOEf8D3+xXi3Aq+HNnn5rA+/gHKpR0tkP+aBfr4nQBZBLobu6Dxx1HEdd7rt Gy0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724405616; x=1725010416; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ns4EUZZ3nTL5odSKliuQhTwD1CbjvkOmQ7rToMzAA/s=; b=DD2p+u8x4RpnRb4wTdSJnMbSVRIVK2WAISMeUFVlst1yggu3eLmZLP1SxfkhrknTy1 zsQxUlvuunoA+Dnxb7XghfTQKy7CHB0ngHbalyEA1Ph9WHweyw0WZ1ABqGeafAXKmUDJ KGrTcWagjItSSX2ljGbnLv73myluv9HmQJwm+Os13vTrkIDVZD76XGaLSFjlRTa5o/de dC4t58uSS4Tx/YOr+yf5b2cTY3KpYYl0kLW65c/bHMaCH+8dj2jtR7GvrFCuIdssuGHY G39A5PDSNIf1dom21AYw0znYYLEX0eH1HGa7pfT1pj2pqS3Bb+PoNKPGmpAXD164e7XQ 3bkw== X-Gm-Message-State: AOJu0Yzc+fnoYS4sq+3QtPfzhkHbj4o1C5wy0JMfxM3kfKcnAFmPzKK9 Q5wVvMGyzvvHhZRGpZSalpSABevcYfCmPu8B6RayA2WHGlSnVvY4WBmTh2cquHh/W/eOH/RUrqL QLEI= X-Google-Smtp-Source: AGHT+IFDN6ciVAxxG2thf6jNJ/OndV0vdP06G8DkZr6xUCbixfP6dzAPR8cgPbEm9FRU4nH0OyFf6g== X-Received: by 2002:a05:600c:35cd:b0:428:15b0:c8dd with SMTP id 5b1f17b1804b1-42acd57c113mr12461705e9.20.1724405615130; Fri, 23 Aug 2024 02:33:35 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:58fc:2464:50b0:90c5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42abee86d5esm87612035e9.15.2024.08.23.02.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 02:33:33 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Helgaas , Krishna chaitanya chundru , Manivannan Sadhasivam Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Konrad Dybcio Subject: [PATCH v3 2/2] PCI/pwrctl: put the bus rescan on a different thread Date: Fri, 23 Aug 2024 11:33:23 +0200 Message-ID: <20240823093323.33450-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240823093323.33450-1-brgl@bgdev.pl> References: <20240823093323.33450-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Bartosz Golaszewski If we trigger the bus rescan from sysfs, we'll try to lock the PCI rescan mutex recursively and deadlock - the platform device will be populated and probed on the same thread that handles the sysfs write. Add a workqueue to the pwrctl code on which we schedule the rescan for controlled PCI devices. While at it: add a new interface for initializing the pwrctl context where we'd now assign the parent device address and initialize the workqueue. Fixes: 4565d2652a37 ("PCI/pwrctl: Add PCI power control core code") Reported-by: Konrad Dybcio Signed-off-by: Bartosz Golaszewski Reviewed-by: Manivannan Sadhasivam --- drivers/pci/pwrctl/core.c | 26 +++++++++++++++++++++++--- drivers/pci/pwrctl/pci-pwrctl-pwrseq.c | 2 +- include/linux/pci-pwrctl.h | 3 +++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pwrctl/core.c b/drivers/pci/pwrctl/core.c index feca26ad2f6a..01d913b60316 100644 --- a/drivers/pci/pwrctl/core.c +++ b/drivers/pci/pwrctl/core.c @@ -48,6 +48,28 @@ static int pci_pwrctl_notify(struct notifier_block *nb, unsigned long action, return NOTIFY_DONE; } +static void rescan_work_func(struct work_struct *work) +{ + struct pci_pwrctl *pwrctl = container_of(work, struct pci_pwrctl, work); + + pci_lock_rescan_remove(); + pci_rescan_bus(to_pci_dev(pwrctl->dev->parent)->bus); + pci_unlock_rescan_remove(); +} + +/** + * pci_pwrctl_init() - Initialize the PCI power control context struct + * + * @pwrctl: PCI power control data + * @dev: Parent device + */ +void pci_pwrctl_init(struct pci_pwrctl *pwrctl, struct device *dev) +{ + pwrctl->dev = dev; + INIT_WORK(&pwrctl->work, rescan_work_func); +} +EXPORT_SYMBOL_GPL(pci_pwrctl_init); + /** * pci_pwrctl_device_set_ready() - Notify the pwrctl subsystem that the PCI * device is powered-up and ready to be detected. @@ -74,9 +96,7 @@ int pci_pwrctl_device_set_ready(struct pci_pwrctl *pwrctl) if (ret) return ret; - pci_lock_rescan_remove(); - pci_rescan_bus(to_pci_dev(pwrctl->dev->parent)->bus); - pci_unlock_rescan_remove(); + schedule_work(&pwrctl->work); return 0; } diff --git a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c index c7a113a76c0c..f07758c9edad 100644 --- a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c +++ b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c @@ -50,7 +50,7 @@ static int pci_pwrctl_pwrseq_probe(struct platform_device *pdev) if (ret) return ret; - data->ctx.dev = dev; + pci_pwrctl_init(&data->ctx, dev); ret = devm_pci_pwrctl_device_set_ready(dev, &data->ctx); if (ret) diff --git a/include/linux/pci-pwrctl.h b/include/linux/pci-pwrctl.h index 45e9cfe740e4..0d23dddf59ec 100644 --- a/include/linux/pci-pwrctl.h +++ b/include/linux/pci-pwrctl.h @@ -7,6 +7,7 @@ #define __PCI_PWRCTL_H__ #include +#include struct device; struct device_link; @@ -41,8 +42,10 @@ struct pci_pwrctl { /* Private: don't use. */ struct notifier_block nb; struct device_link *link; + struct work_struct work; }; +void pci_pwrctl_init(struct pci_pwrctl *pwrctl, struct device *dev); int pci_pwrctl_device_set_ready(struct pci_pwrctl *pwrctl); void pci_pwrctl_device_unset_ready(struct pci_pwrctl *pwrctl); int devm_pci_pwrctl_device_set_ready(struct device *dev,