Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef794260 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/portdrv: Merge pcieport_if.h into portdrv.h 



pcieport_if.h contained the interfaces to register port service driver,
e.g., pcie_port_service_register().  portdrv.h contained internal data
structures of the port driver.

I don't think it's worth keeping those files separate, since both headers
and their users are all inside the PCI core.

Merge pcieport_if.h directly in drivers/pci/pcie/portdrv.h and update the
users to include that instead.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent c37e627f

drivers/pci/hotplug/pciehp.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/mutex.h>

#include <linux/workqueue.h>



#include "../pcie/pcieport_if.h"

#include "../pcie/portdrv.h"



#define MY_NAME	"pciehp"

drivers/pci/pcie/aer/aerdrv.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/aer.h>

#include <linux/interrupt.h>



#include "../pcieport_if.h"

#include "../portdrv.h"



#define SYSTEM_ERROR_INTR_ON_MESG_MASK	(PCI_EXP_RTCTL_SECEE|	\

					PCI_EXP_RTCTL_SENFEE|	\

drivers/pci/pcie/pcie-dpc.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/init.h>

#include <linux/pci.h>



#include "pcieport_if.h"

#include "portdrv.h"

#include "../pci.h"

#include "aer/aerdrv.h"

drivers/pci/pcie/pcieport_if.h

deleted100644 → 0
+0 −71
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * File:	pcieport_if.h

 * Purpose:	PCI Express Port Bus Driver's IF Data Structure

 *

 * Copyright (C) 2004 Intel

 * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)

 */



#ifndef _PCIEPORT_IF_H_

#define _PCIEPORT_IF_H_



/* Port Type */

#define PCIE_ANY_PORT			(~0)



/* Service Type */

#define PCIE_PORT_SERVICE_PME_SHIFT	0	/* Power Management Event */

#define PCIE_PORT_SERVICE_PME		(1 << PCIE_PORT_SERVICE_PME_SHIFT)

#define PCIE_PORT_SERVICE_AER_SHIFT	1	/* Advanced Error Reporting */

#define PCIE_PORT_SERVICE_AER		(1 << PCIE_PORT_SERVICE_AER_SHIFT)

#define PCIE_PORT_SERVICE_HP_SHIFT	2	/* Native Hotplug */

#define PCIE_PORT_SERVICE_HP		(1 << PCIE_PORT_SERVICE_HP_SHIFT)

#define PCIE_PORT_SERVICE_VC_SHIFT	3	/* Virtual Channel */

#define PCIE_PORT_SERVICE_VC		(1 << PCIE_PORT_SERVICE_VC_SHIFT)

#define PCIE_PORT_SERVICE_DPC_SHIFT	4	/* Downstream Port Containment */

#define PCIE_PORT_SERVICE_DPC		(1 << PCIE_PORT_SERVICE_DPC_SHIFT)



struct pcie_device {

	int		irq;	    /* Service IRQ/MSI/MSI-X Vector */

	struct pci_dev *port;	    /* Root/Upstream/Downstream Port */

	u32		service;    /* Port service this device represents */

	void		*priv_data; /* Service Private Data */

	struct device	device;     /* Generic Device Interface */

};

#define to_pcie_device(d) container_of(d, struct pcie_device, device)



static inline void set_service_data(struct pcie_device *dev, void *data)

{

	dev->priv_data = data;

}



static inline void *get_service_data(struct pcie_device *dev)

{

	return dev->priv_data;

}



struct pcie_port_service_driver {

	const char *name;

	int (*probe) (struct pcie_device *dev);

	void (*remove) (struct pcie_device *dev);

	int (*suspend) (struct pcie_device *dev);

	int (*resume) (struct pcie_device *dev);



	/* Device driver may resume normal operations */

	void (*error_resume)(struct pci_dev *dev);



	/* Link Reset Capability - AER service driver specific */

	pci_ers_result_t (*reset_link) (struct pci_dev *dev);



	int port_type;  /* Type of the port this driver can handle */

	u32 service;    /* Port service this device represents */



	struct device_driver driver;

};

#define to_service_driver(d) \

	container_of(d, struct pcie_port_service_driver, driver)



int pcie_port_service_register(struct pcie_port_service_driver *new);

void pcie_port_service_unregister(struct pcie_port_service_driver *new);



#endif /* _PCIEPORT_IF_H_ */

drivers/pci/pcie/pme.c

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/device.h>

#include <linux/pm_runtime.h>



#include "pcieport_if.h"

#include "../pci.h"

#include "portdrv.h"