Skip to contentSkip to conversation

PCIe:change the method to get the address of a requested capability in configuration space.

PATCH New Zhao Qiang 1 participant 1 message Oct 12, 2013

Subsystems (2)
lore
Share & tools
lore

Zhao Qiang

author
#0 lore raw

PATCH v5 1/1 PCIe:change the method to get the address of a requested capability in configuration space.

Previously, the address of a requested capability is define like that

	"#define PCI_DCR	0x78"

But, the addresses of capabilities is different with regard to PCIe revs. So this method is not flexible.

Now a function to get the address of a requested capability is added and used. It can get the address dynamically by capability ID.
The step of this function:
1. Read Status register in PCIe configuration space to confirm that Capabilities List is valid.
2. Find the address of Capabilities Pointer Register.
3. Find the address of requested capability from the first capability.

---
Changes for v2:
-Put an variable into "#ifdef" and "#endif"
Changes for v3:
-Modify the patch description
Changes for v4:
-Rebase on u-boot master branch
Changes for v5:
-Remove a blank

 arch/powerpc/include/asm/fsl_pci.h | 18 -----------
 drivers/pci/fsl_pci_init.c         | 44 +++++++++++++++++++-------
 drivers/pci/pci.c                  | 65 ++++++++++++++++++++++++++++++++++++++
 include/pci.h                      | 10 ++++++
 4 files changed, 107 insertions(+), 30 deletions(-)
arch/powerpc/include/asm/fsl_pci.h +0 -18
index 749411c..5be718b 100644
@@ -18,24 +18,6 @@
 /* Freescale-specific PCI config registers */
 #define FSL_PCI_PBFR		0x44
 
-#ifdef CONFIG_SYS_FSL_PCI_VER_3_X
-/* Currently only the PCIe capability is used, so hardcode the offset.
- * if more capabilities need to be justified, the capability link method
- * should be applied here
- */
-#define FSL_PCIE_CAP_ID		0x70
-#define PCI_DCR		0x78    /* PCIe Device Control Register */
-#define PCI_DSR		0x7a    /* PCIe Device Status Register */
-#define PCI_LSR		0x82    /* PCIe Link Status Register */
-#define PCI_LCR		0x80    /* PCIe Link Control Register */
-#else
-#define FSL_PCIE_CAP_ID		0x4c
-#define PCI_DCR		0x54    /* PCIe Device Control Register */
-#define PCI_DSR		0x56    /* PCIe Device Status Register */
-#define PCI_LSR		0x5e    /* PCIe Link Status Register */
-#define PCI_LCR		0x5c    /* PCIe Link Control Register */
-#endif
-
 #define FSL_PCIE_CFG_RDY	0x4b0
 #define FSL_PROG_IF_AGENT	0x1
 
drivers/pci/fsl_pci_init.c +32 -12

116 lines not on this page · raw message

drivers/pci/pci.c +65 -0

68 lines not on this page · raw message

include/pci.h +10 -0
index 911ba89..d462479 100644
@@ -410,6 +410,9 @@
 #define PCI_MAX_PCI_DEVICES	32
 #define PCI_MAX_PCI_FUNCTIONS	8
 
+#define PCI_FIND_CAP_TTL 0x48
+#define CAP_START_POS 0x40
+
 /* Include the ID list */
 
 #include <pci_ids.h>
@@ -647,6 +650,13 @@ extern int pci_hose_config_device(struct pci_controller *hose,
 				  pci_addr_t mem,
 				  unsigned long command);
 
+extern int pci_hose_find_capability(struct pci_controller *hose, pci_dev_t dev,
+				    int cap);
+extern int pci_hose_find_cap_start(struct pci_controller *hose, pci_dev_t dev,
+				   u8 hdr_type);
+extern int pci_find_cap(struct pci_controller *hose, pci_dev_t dev, int pos,
+			int cap);
+
 const char * pci_class_str(u8 class);
 int pci_last_busno(void);
 
Signature · 1 line
1.8.0