clean up base on Matt Wilcox feedback.
PATCH v2 1/1 clean up base on Matt Wilcox feedback.
--- drivers/pci/pci.c | 35 +++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 1 + drivers/pci/probe.c | 3 +++ include/linux/pci_regs.h | 13 +++++++++++++ 4 files changed, 52 insertions(+), 0 deletions(-)
drivers/pci/pci.c +35 -0
@@ -1533,6 +1533,41 @@ void pci_enable_ari(struct pci_dev *dev) }/** +* pci_acs_enable - enable ACS if hardware support it +* @dev: the PCI device +*/ +void pci_acs_init (struct pci_dev *dev) +{ +int pos; +u16 cap; +u16 ctrl; + +if (!dev->is_pcie) +return ; + + pos =pci_find_ext_capability (dev,PCI_EXT_CAP_ID_ACS ); +if (!pos) +return ; + +pci_read_config_word (dev, pos +PCI_ACS_CAP , &cap); +pci_read_config_word (dev, pos +PCI_ACS_CTRL , &ctrl); + +/* Source Validation */ + ctrl |= (cap &PCI_ACS_SV ); + +/* P2P Request Redirect */ + ctrl |= (cap &PCI_ACS_RR ); + +/* P2P Completion Redirect */ + ctrl |= (cap &PCI_ACS_CR ); + +/* Upstream Forwarding */ + ctrl |= (cap &PCI_ACS_UF ); + +pci_write_config_word (dev, pos +PCI_ACS_CTRL , ctrl); +} + +/** * pci_swizzle_interrupt_pin - swizzle INTx for device behind bridge * @dev: the PCI device * @pin: the INTx pin (1=INTA, 2=INTB, 3=INTD, 4=INTD)
drivers/pci/pci.h +1 -0
@@ -202,6 +202,7 @@ static inline int pci_ari_enabled(struct pci_bus *bus) {return bus->self && bus->self->ari_enabled; } +extern void pci_acs_init (struct pci_dev *dev);#ifdef CONFIG_PCI_QUIRKS extern int pci_is_reassigndev (struct pci_dev *dev);
drivers/pci/probe.c +3 -0
@@ -1014,6 +1014,9 @@ static void pci_init_capabilities(struct pci_dev *dev)/* Single Root I/O Virtualization */ pci_iov_init (dev); + +/* Access Control Service */ +pci_acs_init (dev); }void pci_device_add (struct pci_dev *dev,struct pci_bus *bus)
include/linux/pci_regs.h +13 -0
@@ -502,6 +502,7 @@#define PCI_EXT_CAP_ID_VC 2#define PCI_EXT_CAP_ID_DSN 3#define PCI_EXT_CAP_ID_PWR 4 +#define PCI_EXT_CAP_ID_ACS 13#define PCI_EXT_CAP_ID_ARI 14#define PCI_EXT_CAP_ID_ATS 15#define PCI_EXT_CAP_ID_SRIOV 16
@@ -662,4 +663,16 @@#define PCI_SRIOV_VFM_MO 0x2/* Active.MigrateOut */ #define PCI_SRIOV_VFM_AV 0x3/* Active.Available */ +/* Access Control Service */ +#define PCI_ACS_CAP 0x04/* ACS Capability Register */ +#define PCI_ACS_CTRL 0x06/* ACS Control Register */ +#define PCI_ACS_EGRESS_CTL_V 0x08/* ACS Egress Control Vector */ +#define PCI_ACS_SV 0x01/* Source Validation */ +#define PCI_ACS_TB 0x02/* Translation Blocking */ +#define PCI_ACS_RR 0x04/* P2P Request Redirect */ +#define PCI_ACS_CR 0x08/* P2P Completion Redirect */ +#define PCI_ACS_UF 0x10/* Upstream Forwarding */ +#define PCI_ACS_EC 0x20/* P2P Egress Control */ +#define PCI_ACS_DT 0x40/* Direct Translated P2P */ +#endif /* LINUX_PCI_REGS_H */
Signature · 1 line
1.6.0.6
include/linux/pci_regs.h line 676
Quoted 11 lines · Allen Kay
include/linux/pci_regs.h +11
-0+/* Access Control Service */ +#define PCI_ACS_CAP 0x04/* ACS Capability Register */ +#define PCI_ACS_CTRL 0x06/* ACS Control Register */ +#define PCI_ACS_EGRESS_CTL_V 0x08/* ACS Egress Control Vector */ +#define PCI_ACS_SV 0x01/* Source Validation */ +#define PCI_ACS_TB 0x02/* Translation Blocking */ +#define PCI_ACS_RR 0x04/* P2P Request Redirect */ +#define PCI_ACS_CR 0x08/* P2P Completion Redirect */ +#define PCI_ACS_UF 0x10/* Upstream Forwarding */ +#define PCI_ACS_EC 0x20/* P2P Egress Control */ +#define PCI_ACS_DT 0x40/* Direct Translated P2P */
Oops, I wasn't clear. The convention in this file is to use one space after the #define for register names and two spaces for bits within those registers. Also, the bits generally go after the register to which they apply.
So what I meant was more like this:
#define PCI_ACS_CAP 0x04 /* ACS Capability Register */
#define PCI_ACS_SV 0x01 /* Source Validation */ #define PCI_ACS_TB 0x02 /* Translation Blocking */ #define PCI_ACS_RR 0x04 /* P2P Request Redirect */
...
#define PCI_ACS_CTRL 0x06 /* ACS Control Register */
#define PCI_ACS_EGRESS_CTL_V 0x08 /* ACS Egress Control Vector */
Since the bits are the same between CAP and CTRL, they don't need to be repeated.
With this change,
Signature · 4 lines
Matthew Wilcox Intel Open Source Technology Centre "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Quoted 32 lines · On Wed, 16 Sep 2009 20:18:41 -0600 Matthew Wilcox <[email protected]> wrote:
Quoted 6 lines · Allen Kay
(quoted diff) +2
-0+/* Access Control Service */ +#define PCI_ACS_CAP 0x04 /* ACS CapabilityRegister */ +#define
PCI_ACS_CTRL0x06/*
ACS Control Register */ +#definePCI_ACS_EGRESS_CTL_V0x08/* ACS Egress Control Vector */ +#definePCI_ACS_SV0x01/* Source Validation */Quoted 8 lines
+#define
PCI_ACS_TB0x02/* Translation
Blocking */ +#definePCI_ACS_RR0x04/* P2P
Request Redirect */ +#definePCI_ACS_CR0x08/* P2P Completion Redirect */ +#definePCI_ACS_UF0x10/* Upstream Forwarding */
+#definePCI_ACS_EC0x20/* P2P Egress
Control */ +#definePCI_ACS_DT0x40/*
Direct Translated P2P */Oops, I wasn't clear. The convention in this file is to use one space after the #define for register names and two spaces for bits within those registers. Also, the bits generally go after the register to which they apply.
So what I meant was more like this:
#define
PCI_ACS_CAP0x04/* ACS Capability
Register */ #definePCI_ACS_SV0x01/* Source
Validation */ #definePCI_ACS_TB0x02/*
Translation Blocking */ #definePCI_ACS_RR0x04/* P2P Request Redirect */ ...
#definePCI_ACS_CTRL0x06/* ACS Control
Register */ #definePCI_ACS_EGRESS_CTL_V0x08/* ACS
Egress Control Vector */
Quoted 6 lines
Since the bits are the same between CAP and CTRL, they don't need to be repeated.
With this change,
Reviewed-by Matthew Wilcox <[email protected]>
Allen, easiest for me if you respin with Matthew's suggestion and a full changelong + Matthew's reviewed-by. Then I can just git am it.
Thanks,
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center