On Fri, 18 Sep 2020 13:46:02 -0700
Sean V Kelley <sean.v.kelley@xxxxxxxxx> wrote:
> The Root Complex Event Collectors(RCEC) appear as peers of Root Ports
> and also have the PME capability. As with AER, there is a need to be
> able to walk the RCiEPs associated with their RCEC for purposes of
> acting upon them with callbacks. So add RCEC support through the use
> of pcie_walk_rcec() to the current PME service driver and attach the
> PME service driver to the RCEC device.
>
> Co-developed-by: Qiuxu Zhuo <qiuxu.zhuo@xxxxxxxxx>
> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@xxxxxxxxx>
> Signed-off-by: Sean V Kelley <sean.v.kelley@xxxxxxxxx>
I'm a lot less familiar with this code, but looks
good to me.
Thanks,
Jonathan
> ---
> drivers/pci/pcie/pme.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
> index 6a32970bb731..87799166c96a 100644
> --- a/drivers/pci/pcie/pme.c
> +++ b/drivers/pci/pcie/pme.c
> @@ -310,7 +310,10 @@ static int pcie_pme_can_wakeup(struct pci_dev *dev, void *ign)
> static void pcie_pme_mark_devices(struct pci_dev *port)
> {
> pcie_pme_can_wakeup(port, NULL);
> - if (port->subordinate)
> +
> + if (pci_pcie_type(port) == PCI_EXP_TYPE_RC_EC)
> + pcie_walk_rcec(port, pcie_pme_can_wakeup, NULL);
> + else if (port->subordinate)
> pci_walk_bus(port->subordinate, pcie_pme_can_wakeup, NULL);
> }
>
> @@ -320,10 +323,15 @@ static void pcie_pme_mark_devices(struct pci_dev *port)
> */
> static int pcie_pme_probe(struct pcie_device *srv)
> {
> - struct pci_dev *port;
> + struct pci_dev *port = srv->port;
> struct pcie_pme_service_data *data;
> int ret;
>
> + /* Limit to Root Ports or Root Complex Event Collectors */
> + if ((pci_pcie_type(port) != PCI_EXP_TYPE_RC_EC) &&
> + (pci_pcie_type(port) != PCI_EXP_TYPE_ROOT_PORT))
> + return -ENODEV;
> +
> data = kzalloc(sizeof(*data), GFP_KERNEL);
> if (!data)
> return -ENOMEM;
> @@ -333,7 +341,6 @@ static int pcie_pme_probe(struct pcie_device *srv)
> data->srv = srv;
> set_service_data(srv, data);
>
> - port = srv->port;
> pcie_pme_interrupt_enable(port, false);
> pcie_clear_root_pme_status(port);
>
> @@ -445,7 +452,7 @@ static void pcie_pme_remove(struct pcie_device *srv)
>
> static struct pcie_port_service_driver pcie_pme_driver = {
> .name = "pcie_pme",
> - .port_type = PCI_EXP_TYPE_ROOT_PORT,
> + .port_type = PCIE_ANY_PORT,
> .service = PCIE_PORT_SERVICE_PME,
>
> .probe = pcie_pme_probe,
