pci: Fix PRI and PASID consistency
PATCH 1/1 pci: Fix PRI and PASID consistency
These are extended capabilities, rename and move to proper group for consistency.
Signed-off-by Alex Williamson <[email protected]>
---
drivers/pci/ats.c | 20 ++++++++++---------- include/linux/pci_regs.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/pci/ats.c +10 -10
@@ -174,7 +174,7 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs)u32 max_requests;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return -EINVAL ;
@@ -205,7 +205,7 @@ void pci_disable_pri(struct pci_dev *pdev)u16 control;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return ;
@@ -226,7 +226,7 @@ bool pci_pri_enabled(struct pci_dev *pdev)u16 control;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return false;
@@ -248,7 +248,7 @@ int pci_reset_pri(struct pci_dev *pdev)u16 control;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return -EINVAL ;
@@ -281,7 +281,7 @@ bool pci_pri_stopped(struct pci_dev *pdev)u16 control, status;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return true;
@@ -310,7 +310,7 @@ int pci_pri_status(struct pci_dev *pdev)u16 status, control;int pos; - pos =pci_find_ext_capability (pdev,PCI_PRI_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PRI );if (!pos)return -EINVAL ;
@@ -341,7 +341,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)u16 control, supported;int pos; - pos =pci_find_ext_capability (pdev,PCI_PASID_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID );if (!pos)return -EINVAL ;
@@ -375,7 +375,7 @@ void pci_disable_pasid(struct pci_dev *pdev)u16 control =0 ;int pos; - pos =pci_find_ext_capability (pdev,PCI_PASID_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID );if (!pos)return ;
@@ -399,7 +399,7 @@ int pci_pasid_features(struct pci_dev *pdev)u16 supported;int pos; - pos =pci_find_ext_capability (pdev,PCI_PASID_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID );if (!pos)return -EINVAL ;
@@ -425,7 +425,7 @@ int pci_max_pasids(struct pci_dev *pdev)u16 supported;int pos; - pos =pci_find_ext_capability (pdev,PCI_PASID_CAP ); + pos =pci_find_ext_capability (pdev,PCI_EXT_CAP_ID_PASID );if (!pos)return -EINVAL ;
include/linux/pci_regs.h +2 -2
@@ -537,7 +537,9 @@#define PCI_EXT_CAP_ID_ARI 14#define PCI_EXT_CAP_ID_ATS 15#define PCI_EXT_CAP_ID_SRIOV 16 +#define PCI_EXT_CAP_ID_PRI 19#define PCI_EXT_CAP_ID_LTR 24 +#define PCI_EXT_CAP_ID_PASID 27/* Advanced Error Reporting */ #define PCI_ERR_UNCOR_STATUS 4/* Uncorrectable Error Status */
@@ -664,7 +666,6 @@#define PCI_ATS_MIN_STU 12/* shift of minimum STU block */ /* Page Request Interface */ -#define PCI_PRI_CAP 0x13/* PRI capability ID */ #define PCI_PRI_CONTROL_OFF 0x04/* Offset of control register */ #define PCI_PRI_STATUS_OFF 0x06/* Offset of status register */ #define PCI_PRI_ENABLE 0x0001/* Enable mask */
@@ -676,7 +677,6 @@#define PCI_PRI_ALLOC_REQ_OFF 0x0c/* Cap offset for max reqs allowed */ /* PASID capability */ -#define PCI_PASID_CAP 0x1b/* PASID capability ID */ #define PCI_PASID_CAP_OFF 0x04/* PASID feature register */ #define PCI_PASID_CONTROL_OFF 0x06/* PASID control register */ #define PCI_PASID_ENABLE 0x01/* Enable/Supported bit */
Jesse Barnes
AppliedQuoted 5 lines · On Wed, 02 Nov 2011 14:07:15 -0600 Alex Williamson…
These are extended capabilities, rename and move to proper group for consistency.
Signed-off-by Alex Williamson <[email protected]>---
Applied to -next, thanks Alex.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center