Skip to content

Commit

Permalink
PCI: Fix PRI and PASID consistency
Browse files Browse the repository at this point in the history 
These are extended capabilities, rename and move to proper
group for consistency.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Alex Williamson authored and Jesse Barnes committed Jan 6, 2012
1 parent da8d1c8 commit cfa4d8c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions drivers/pci/ats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,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;

Expand Down Expand Up @@ -206,7 +206,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;

Expand All @@ -227,7 +227,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;

Expand All @@ -249,7 +249,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;

Expand Down Expand Up @@ -282,7 +282,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;

Expand Down Expand Up @@ -311,7 +311,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;

Expand Down Expand Up @@ -342,7 +342,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;

Expand Down Expand Up @@ -376,7 +376,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;

Expand All @@ -400,7 +400,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;

Expand All @@ -426,7 +426,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;

Expand Down
4 changes: 2 additions & 2 deletions include/linux/pci_regs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down

0 comments on commit cfa4d8c

Please sign in to comment.