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

Commit 5cdede24 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

PCI: Move ATS declarations in seperate header file 



This patch moves the relevant declarations from the local
header file in drivers/pci to a more accessible locations so
that it can be used by the AMD IOMMU driver too.
The file is named pci-ats.h because support for the PCI PRI
capability will also be added there in a later patch-set.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 7d0c5cc5

drivers/pci/intel-iommu.c

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

#include <linux/tboot.h>

#include <linux/dmi.h>

#include <linux/pci-ats.h>

#include <asm/cacheflush.h>

#include <asm/iommu.h>

#include "pci.h"

drivers/pci/iov.c

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

#include <linux/string.h>

#include <linux/delay.h>

#include <linux/pci-ats.h>

#include "pci.h"



#define VIRTFN_ID_LEN	16

drivers/pci/pci.h

+0 −37
Original line number Diff line number Diff line
@@ -250,15 +250,6 @@ struct pci_sriov { 
	u8 __iomem *mstate;	/* VF Migration State Array */

};



/* Address Translation Service */

struct pci_ats {

	int pos;	/* capability position */

	int stu;	/* Smallest Translation Unit */

	int qdep;	/* Invalidate Queue Depth */

	int ref_cnt;	/* Physical Function reference count */

	unsigned int is_enabled:1;	/* Enable bit is set */

};



#ifdef CONFIG_PCI_IOV

extern int pci_iov_init(struct pci_dev *dev);

extern void pci_iov_release(struct pci_dev *dev);
@@ -269,19 +260,6 @@ extern resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, 
extern void pci_restore_iov_state(struct pci_dev *dev);

extern int pci_iov_bus_range(struct pci_bus *bus);



extern int pci_enable_ats(struct pci_dev *dev, int ps);

extern void pci_disable_ats(struct pci_dev *dev);

extern int pci_ats_queue_depth(struct pci_dev *dev);

/**

 * pci_ats_enabled - query the ATS status

 * @dev: the PCI device

 *

 * Returns 1 if ATS capability is enabled, or 0 if not.

 */

static inline int pci_ats_enabled(struct pci_dev *dev)

{

	return dev->ats && dev->ats->is_enabled;

}

#else

static inline int pci_iov_init(struct pci_dev *dev)

{
@@ -304,21 +282,6 @@ static inline int pci_iov_bus_range(struct pci_bus *bus) 
	return 0;

}



static inline int pci_enable_ats(struct pci_dev *dev, int ps)

{

	return -ENODEV;

}

static inline void pci_disable_ats(struct pci_dev *dev)

{

}

static inline int pci_ats_queue_depth(struct pci_dev *dev)

{

	return -ENODEV;

}

static inline int pci_ats_enabled(struct pci_dev *dev)

{

	return 0;

}

#endif /* CONFIG_PCI_IOV */



static inline resource_size_t pci_resource_alignment(struct pci_dev *dev,

include/linux/pci-ats.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#ifndef LINUX_PCI_ATS_H

#define LINUX_PCI_ATS_H



/* Address Translation Service */

struct pci_ats {

	int pos;        /* capability position */

	int stu;        /* Smallest Translation Unit */

	int qdep;       /* Invalidate Queue Depth */

	int ref_cnt;    /* Physical Function reference count */

	unsigned int is_enabled:1;      /* Enable bit is set */

};



#ifdef CONFIG_PCI_IOV



extern int pci_enable_ats(struct pci_dev *dev, int ps);

extern void pci_disable_ats(struct pci_dev *dev);

extern int pci_ats_queue_depth(struct pci_dev *dev);

/**

 * pci_ats_enabled - query the ATS status

 * @dev: the PCI device

 *

 * Returns 1 if ATS capability is enabled, or 0 if not.

 */

static inline int pci_ats_enabled(struct pci_dev *dev)

{

	return dev->ats && dev->ats->is_enabled;

}



#else /* CONFIG_PCI_IOV */



static inline int pci_enable_ats(struct pci_dev *dev, int ps)

{

	return -ENODEV;

}



static inline void pci_disable_ats(struct pci_dev *dev)

{

}



static inline int pci_ats_queue_depth(struct pci_dev *dev)

{

	return -ENODEV;

}



static inline int pci_ats_enabled(struct pci_dev *dev)

{

	return 0;

}



#endif /* CONFIG_PCI_IOV */



#endif /* LINUX_PCI_ATS_H*/