From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZoS6p8bWNrLojoS5ShioDRzmLAlvg+RrA9N/kQO8JGzTGFUiFqx360LFpztVBgU57fZphDF ARC-Seal: i=1; a=rsa-sha256; t=1525323846; cv=none; d=google.com; s=arc-20160816; b=ebVbi0k8FNvZNsxwSoqUV/Fue/XYqdzHaDzSb1M10j9Ztr4OJM+ZyL+o6lE7qA0fv1 NyEf0Hxk274F7gXXtg9ueOtVXmRw6cKzGgS+ORk5tnsh7ruskMTRW1xcwk9azgMQnaaC FDgrL3SBHDqunTvG6D66xFQqE928s84i+vnbhdlymqM4JxGVTqOYVmhOYNx13EruHvEC IMO3GPaTDiRKtghxL+jBF+NxtCqUyQTvaT8Gio+d7VGyMUuxSjrY7Exb+fFeOutdUzsu LT1mY034ln+97Aixg37QjZN6EnEmo1MRdSOUJhClOp6QTdq6/teC7dVSeVcYisDu6Ofm KByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=5XHei5eJxNesxHpVuu9xyl0mRv6j984eYXvalHLI+G4=; b=GkIn2QrO0AvO4hTB+K5k9JJDS6jcyHZYems4+XHYFFeSrn+wfcTVc8140jSP+iHXv3 nOaaLZ2jnyLXZvVX8bvjwg2pyFm44lbouMImY9zPUFu8MPnwCImY4ELllgVFu/x1Yw5b zG3l657MMUgSx6gV7VUOI8xTuqxTZEm4Ci8LLMYoda695/HIEaWD2vPQrSIUnUpyvjhV WnPP5T89qtvRINPjFNevnUEyDzyRBjza4Tvxwt2dpB+v26HR1iYvkpYule7Hbn3Z4WWc yFsf9CTHQ6jhrGhTuvPMowIVZEuUISczgOYkoXDFaxSA7erpOA3o3Rd/NN1vcG/izHv3 v8DA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of poza@qualcomm.com designates 129.46.98.28 as permitted sender) smtp.mailfrom=poza@qualcomm.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of poza@qualcomm.com designates 129.46.98.28 as permitted sender) smtp.mailfrom=poza@qualcomm.com X-IronPort-AV: E=Sophos;i="5.49,356,1520924400"; d="scan'208";a="17319047" X-IronPort-AV: E=McAfee;i="5900,7806,8881"; a="76225529" From: Oza Pawandeep To: Bjorn Helgaas , Philippe Ombredanne , Thomas Gleixner , Greg Kroah-Hartman , Kate Stewart , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Dongdong Liu , Keith Busch , Wei Zhang , Sinan Kaya , Timur Tabi Cc: Oza Pawandeep Subject: [PATCH v15 6/9] PCI/PORTDRV: Implement generic find service Date: Thu, 3 May 2018 01:03:55 -0400 Message-Id: <1525323838-1735-7-git-send-email-poza@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525323838-1735-1-git-send-email-poza@codeaurora.org> References: <1525323838-1735-1-git-send-email-poza@codeaurora.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1599417977769925395?= X-GMAIL-MSGID: =?utf-8?q?1599417977769925395?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: This patch implements generic pcie_port_find_service() routine. Signed-off-by: Oza Pawandeep Reviewed-by: Keith Busch diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 51515d1..a525296 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -228,32 +228,6 @@ static bool find_source_device(struct pci_dev *parent, return true; } -static int find_aer_service_iter(struct device *device, void *data) -{ - struct pcie_port_service_driver *service_driver, **drv; - - drv = (struct pcie_port_service_driver **) data; - - if (device->bus == &pcie_port_bus_type && device->driver) { - service_driver = to_service_driver(device->driver); - if (service_driver->service == PCIE_PORT_SERVICE_AER) { - *drv = service_driver; - return 1; - } - } - - return 0; -} - -struct pcie_port_service_driver *find_aer_service(struct pci_dev *dev) -{ - struct pcie_port_service_driver *drv = NULL; - - device_for_each_child(&dev->dev, &drv, find_aer_service_iter); - - return drv; -} - /** * handle_error_source - handle logging error into an event log * @aerdev: pointer to pcie_device data structure of the root port diff --git a/drivers/pci/pcie/err.c b/drivers/pci/pcie/err.c index 55df974..877785d 100644 --- a/drivers/pci/pcie/err.c +++ b/drivers/pci/pcie/err.c @@ -195,10 +195,8 @@ static pci_ers_result_t reset_link(struct pci_dev *dev) udev = dev->bus->self; } -#if IS_ENABLED(CONFIG_PCIEAER) /* Use the aer driver of the component firstly */ - driver = find_aer_service(udev); -#endif + driver = pcie_port_find_service(udev, PCIE_PORT_SERVICE_AER); if (driver && driver->reset_link) { status = driver->reset_link(udev); diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h index 47c9824..ba6c963 100644 --- a/drivers/pci/pcie/portdrv.h +++ b/drivers/pci/pcie/portdrv.h @@ -112,5 +112,6 @@ static inline bool pcie_pme_no_msi(void) { return false; } static inline void pcie_pme_interrupt_enable(struct pci_dev *dev, bool en) {} #endif /* !CONFIG_PCIE_PME */ -struct pcie_port_service_driver *find_aer_service(struct pci_dev *dev); +struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev, + u32 service); #endif /* _PORTDRV_H_ */ diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index c9c0663..d843055 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c @@ -18,6 +18,10 @@ #include "../pci.h" #include "portdrv.h" +struct portdrv_service_data { + struct pcie_port_service_driver *drv; + u32 service; +}; /** * release_pcie_device - free PCI Express port service device structure @@ -398,6 +402,46 @@ static int remove_iter(struct device *dev, void *data) return 0; } +static int find_service_iter(struct device *device, void *data) +{ + struct pcie_port_service_driver *service_driver; + struct portdrv_service_data *pdrvs; + u32 service; + + pdrvs = (struct portdrv_service_data *) data; + service = pdrvs->service; + + if (device->bus == &pcie_port_bus_type && device->driver) { + service_driver = to_service_driver(device->driver); + if (service_driver->service == service) { + pdrvs->drv = service_driver; + return 1; + } + } + + return 0; +} +/** + * pcie_port_find_service - find the service driver + * @dev: PCI Express port the service devices associated with + * @service: Service to find + * + * Find PCI Express port service driver associated with given service + */ +struct pcie_port_service_driver *pcie_port_find_service(struct pci_dev *dev, + u32 service) +{ + struct pcie_port_service_driver *drv; + struct portdrv_service_data pdrvs; + + pdrvs.drv = NULL; + pdrvs.service = service; + device_for_each_child(&dev->dev, &pdrvs, find_service_iter); + + drv = pdrvs.drv; + return drv; +} + /** * pcie_port_device_remove - unregister PCI Express port service devices * @dev: PCI Express port the service devices to unregister are associated with -- 2.7.4