From nobody Wed Apr 8 14:47:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EBBDC6FA82 for ; Sat, 10 Sep 2022 09:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbiIJJF6 (ORCPT ); Sat, 10 Sep 2022 05:05:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229689AbiIJJFs (ORCPT ); Sat, 10 Sep 2022 05:05:48 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3501367CB8 for ; Sat, 10 Sep 2022 02:05:40 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id n23-20020a7bc5d7000000b003a62f19b453so6647545wmk.3 for ; Sat, 10 Sep 2022 02:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Y0MJ+CUZZvqiC06rOGoANeiEeLDH+rfWRVr8HGOI0zE=; b=JL/7tJpFFNt6I0x+sRh6bunVJzy8r/WOAsVV8w76zGCB5XQVktEAGb9HHK8vHI9YeC HjPByWNqnByPDygAadbwGtWtsXqR6FMMja6ms122eqsOKu4FjkKiByxo+ecuOzbSeY/s xEo5kb8papQjc2m2QYsL6r96rrjoYVXPyGlWo9wvdz/lm2NaG6bRMDrkxVsHVTBUSjkb gWxBFZRYesLcVdktsaJenYpazA3dqMmEAQFR25FqYxBbhUzIGGOFToAOeEt1Jn375crv bOQCPaqqvFA7AUsanhJLwmS1aGgYdPQvY5lLBJqlZ3bIN1qOiEcPqUp0kTW1PKhTSqR7 2/Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=Y0MJ+CUZZvqiC06rOGoANeiEeLDH+rfWRVr8HGOI0zE=; b=SuBjlgwWSHKlFKc9qL9jNWGycJbh6uyyvsAgdhJq5Pyf5dxh0daklocmYmjnc5+uRa 99QUMnwAWYTD8VJTZoYs6PMxHAAYBXyWJWutDbrHQ91FOA+k6qGZlu5B+yn2HxSjvHaW G/QzUpf/aqKqE4XtoVnReubphK+0Xew7BXsex4rbAJ35OWxfj4kp0d2qtLoGVhszcYN2 r9dnvYXBprGpgf2Nm2DCwaLtFZRWK7DHZ2mkw3qmqPuZihBcaXvBLnOxugP3ft0N3DsF zZgYjEBphPKRHLYOupoRwRcb0kDY4Vvy20t5S44dsQcB73YveSyUk/6Isuavw9/1ZBTl DQPw== X-Gm-Message-State: ACgBeo1kfclKeBF8kT+C5FPpQq0r3FEtpMRlR4rUXSCnZYHwayeSCYrX 3vLr48MXmqm60NqGqqkqXdHv X-Google-Smtp-Source: AA6agR6xqNmpMJ+bl9GxDyy+2JYWrL4dYlAvfr90iqZ/8pT9q+jsTeABU0kY1dKfQPXmQSIC5lfHzw== X-Received: by 2002:a05:600c:3512:b0:3a5:e9d3:d418 with SMTP id h18-20020a05600c351200b003a5e9d3d418mr7958031wmq.0.1662800739168; Sat, 10 Sep 2022 02:05:39 -0700 (PDT) Received: from localhost.localdomain ([117.217.182.47]) by smtp.gmail.com with ESMTPSA id i81-20020a1c3b54000000b003a8418ee646sm3081677wma.12.2022.09.10.02.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 02:05:38 -0700 (PDT) From: Manivannan Sadhasivam To: kishon@ti.com, lpieralisi@kernel.org, bhelgaas@google.com Cc: kw@linux.com, robh@kernel.org, vidyas@nvidia.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH v2 3/3] PCI: endpoint: Use link_up() callback in place of LINK_UP notifier Date: Sat, 10 Sep 2022 14:35:08 +0530 Message-Id: <20220910090508.61157-4-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910090508.61157-1-manivannan.sadhasivam@linaro.org> References: <20220910090508.61157-1-manivannan.sadhasivam@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As a part of the transition towards callback mechanism for signalling the events from EPC to EPF, let's use the link_up() callback in the place of the LINK_UP notifier. This also removes the notifier support completely from the PCI endpoint framework. Signed-off-by: Manivannan Sadhasivam --- drivers/pci/endpoint/functions/pci-epf-test.c | 33 ++++++------------- drivers/pci/endpoint/pci-epc-core.c | 12 +++++-- include/linux/pci-epc.h | 8 ----- include/linux/pci-epf.h | 8 ++--- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/en= dpoint/functions/pci-epf-test.c index 868de17e1ad2..f75045f2dee3 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -826,30 +826,21 @@ static int pci_epf_test_core_init(struct pci_epf *epf) return 0; } =20 -static const struct pci_epc_event_ops pci_epf_test_event_ops =3D { - .core_init =3D pci_epf_test_core_init, -}; - -static int pci_epf_test_notifier(struct notifier_block *nb, unsigned long = val, - void *data) +int pci_epf_test_link_up(struct pci_epf *epf) { - struct pci_epf *epf =3D container_of(nb, struct pci_epf, nb); struct pci_epf_test *epf_test =3D epf_get_drvdata(epf); =20 - switch (val) { - case LINK_UP: - queue_delayed_work(kpcitest_workqueue, &epf_test->cmd_handler, - msecs_to_jiffies(1)); - break; - - default: - dev_err(&epf->dev, "Invalid EPF test notifier event\n"); - return NOTIFY_BAD; - } + queue_delayed_work(kpcitest_workqueue, &epf_test->cmd_handler, + msecs_to_jiffies(1)); =20 - return NOTIFY_OK; + return 0; } =20 +static const struct pci_epc_event_ops pci_epf_test_event_ops =3D { + .core_init =3D pci_epf_test_core_init, + .link_up =3D pci_epf_test_link_up, +}; + static int pci_epf_test_alloc_space(struct pci_epf *epf) { struct pci_epf_test *epf_test =3D epf_get_drvdata(epf); @@ -976,12 +967,8 @@ static int pci_epf_test_bind(struct pci_epf *epf) if (ret) epf_test->dma_supported =3D false; =20 - if (linkup_notifier || core_init_notifier) { - epf->nb.notifier_call =3D pci_epf_test_notifier; - pci_epc_register_notifier(epc, &epf->nb); - } else { + if (!linkup_notifier && !core_init_notifier) queue_work(kpcitest_workqueue, &epf_test->cmd_handler.work); - } =20 return 0; } diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci= -epc-core.c index ba54f17ae06f..5dac1496cf16 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -690,10 +690,19 @@ EXPORT_SYMBOL_GPL(pci_epc_remove_epf); */ void pci_epc_linkup(struct pci_epc *epc) { + struct pci_epf *epf; + if (!epc || IS_ERR(epc)) return; =20 - atomic_notifier_call_chain(&epc->notifier, LINK_UP, NULL); + mutex_lock(&epc->list_lock); + list_for_each_entry(epf, &epc->pci_epf, list) { + mutex_lock(&epf->lock); + if (epf->event_ops->link_up) + epf->event_ops->link_up(epf); + mutex_unlock(&epf->lock); + } + mutex_unlock(&epc->list_lock); } EXPORT_SYMBOL_GPL(pci_epc_linkup); =20 @@ -784,7 +793,6 @@ __pci_epc_create(struct device *dev, const struct pci_e= pc_ops *ops, mutex_init(&epc->lock); mutex_init(&epc->list_lock); INIT_LIST_HEAD(&epc->pci_epf); - ATOMIC_INIT_NOTIFIER_HEAD(&epc->notifier); =20 device_initialize(&epc->dev); epc->dev.class =3D pci_epc_class; diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h index fe729dfe509b..301bb0e53707 100644 --- a/include/linux/pci-epc.h +++ b/include/linux/pci-epc.h @@ -135,7 +135,6 @@ struct pci_epc_mem { * @group: configfs group representing the PCI EPC device * @lock: mutex to protect pci_epc ops * @function_num_map: bitmap to manage physical function number - * @notifier: used to notify EPF of any EPC events (like linkup) */ struct pci_epc { struct device dev; @@ -151,7 +150,6 @@ struct pci_epc { /* mutex to protect against concurrent access of EP controller */ struct mutex lock; unsigned long function_num_map; - struct atomic_notifier_head notifier; }; =20 /** @@ -194,12 +192,6 @@ static inline void *epc_get_drvdata(struct pci_epc *ep= c) return dev_get_drvdata(&epc->dev); } =20 -static inline int -pci_epc_register_notifier(struct pci_epc *epc, struct notifier_block *nb) -{ - return atomic_notifier_chain_register(&epc->notifier, nb); -} - struct pci_epc * __devm_pci_epc_create(struct device *dev, const struct pci_epc_ops *ops, struct module *owner); diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index a06f3b4c8bee..bc613f0df7e3 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -17,10 +17,6 @@ struct pci_epf; enum pci_epc_interface_type; =20 -enum pci_notify_event { - LINK_UP, -}; - enum pci_barno { NO_BAR =3D -1, BAR_0, @@ -74,9 +70,11 @@ struct pci_epf_ops { /** * struct pci_epf_event_ops - Callbacks for capturing the EPC events * @core_init: Callback for the EPC initialization complete event + * @link_up: Callback for the EPC link up event */ struct pci_epc_event_ops { int (*core_init)(struct pci_epf *epf); + int (*link_up)(struct pci_epf *epf); }; =20 /** @@ -135,7 +133,6 @@ struct pci_epf_bar { * @driver: the EPF driver to which this EPF device is bound * @id: Pointer to the EPF device ID * @list: to add pci_epf as a list of PCI endpoint functions to pci_epc - * @nb: notifier block to notify EPF of any EPC events (like linkup) * @lock: mutex to protect pci_epf_ops * @sec_epc: the secondary EPC device to which this EPF device is bound * @sec_epc_list: to add pci_epf as list of PCI endpoint functions to seco= ndary @@ -164,7 +161,6 @@ struct pci_epf { struct pci_epf_driver *driver; const struct pci_epf_device_id *id; struct list_head list; - struct notifier_block nb; /* mutex to protect against concurrent access of pci_epf_ops */ struct mutex lock; =20 --=20 2.25.1