Skip to contentSkip to conversation

fsl: add LAW target to fsl_pci_info structure

PATCH New Timur Tabi 2 participants 6 messages May 28, 2010 PowerPC

lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

Add the LAW target (enum law_trgt_if) to the fsl_pci_info structure, so that we can capture the LAW target for a given PCI or PCIE controller. Also update the SET_STD_PCI_INFO and SET_STD_PCIE_INFO macros to assign the LAW_TRGT_IF_PCI[E]_x macro to the LAW target field of the structure.

This will allow future PCI[E] code to configure the LAW target automatically, rather than requiring each board to it for each PCI controller separately.

---

Tested via MAKEALL.

If this patch is accepted, I'll use it for the P1022DS board support that I'm working on.

 arch/powerpc/include/asm/fsl_pci.h |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/fsl_pci.h +11 -8
index db61e7e..bb87543 100644
@@ -162,14 +162,15 @@ typedef struct ccsr_pci {
 } ccsr_fsl_pci_t;
 
 struct fsl_pci_info {
-	unsigned long	regs;
-	pci_addr_t	mem_bus;
-	phys_size_t	mem_phys;
-	pci_size_t	mem_size;
-	pci_addr_t	io_bus;
-	phys_size_t	io_phys;
-	pci_size_t	io_size;
-	int		pci_num;
+	unsigned long regs;
+	pci_addr_t mem_bus;
+	phys_size_t mem_phys;
+	pci_size_t mem_size;
+	pci_addr_t io_bus;
+	phys_size_t io_phys;
+	pci_size_t io_size;
+	enum law_trgt_if law;
+	int pci_num;
 };
 
 int fsl_pci_init_port(struct fsl_pci_info *pci_info,
@@ -184,6 +185,7 @@ int fsl_pci_init_port(struct fsl_pci_info *pci_info,
 	x.io_bus = CONFIG_SYS_PCI##num##_IO_BUS; \
 	x.io_phys = CONFIG_SYS_PCI##num##_IO_PHYS; \
 	x.io_size = CONFIG_SYS_PCI##num##_IO_SIZE; \
+	x.law = LAW_TRGT_IF_PCI_##num; \
 	x.pci_num = num; \
 }
 
@@ -196,6 +198,7 @@ int fsl_pci_init_port(struct fsl_pci_info *pci_info,
 	x.io_bus = CONFIG_SYS_PCIE##num##_IO_BUS; \
 	x.io_phys = CONFIG_SYS_PCIE##num##_IO_PHYS; \
 	x.io_size = CONFIG_SYS_PCIE##num##_IO_SIZE; \
+	x.law = LAW_TRGT_IF_PCIE_##num; \
 	x.pci_num = num; \
 }
 
Signature · 1 line
1.6.5
#1 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

Quoted 11 lines · Timur Tabi

Add the LAW target (enum law_trgt_if) to the fsl_pci_info structure, so that we can capture the LAW target for a given PCI or PCIE controller. Also update the SET_STD_PCI_INFO and SET_STD_PCIE_INFO macros to assign the LAW_TRGT_IF_PCI[E]_x macro to the LAW target field of the structure.

This will allow future PCI[E] code to configure the LAW target automatically, rather than requiring each board to it for each PCI controller separately.

---

Quoted 7 lines

Tested via MAKEALL.

If this patch is accepted, I'll use it for the P1022DS board support that I'm working on.

arch/powerpc/include/asm/fsl_pci.h | 19 +++++++++++--------

1 files changed, 11 insertions(+), 8 deletions(-)

Ack.

Will wait til there is code that uses fsl_pci_info.law until this is applied.

- k

author
#2 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

Quoted 2 lines · Kumar Gala

Will wait til there is code that uses fsl_pci_info.law until this is applied.

Can you push your ics307 patch to your repository?

#3 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

In reply to Timur Tabi
Quoted 19 lines

struct fsl_pci_info {

arch/powerpc/include/asm/fsl_pci.h +9 -8
-	unsigned long	regs;
-	pci_addr_t	mem_bus;
-	phys_size_t	mem_phys;
-	pci_size_t	mem_size;
-	pci_addr_t	io_bus;
-	phys_size_t	io_phys;
-	pci_size_t	io_size;
-	int		pci_num;
+	unsigned long regs;
+	pci_addr_t mem_bus;
+	phys_size_t mem_phys;
+	pci_size_t mem_size;
+	pci_addr_t io_bus;
+	phys_size_t io_phys;
+	pci_size_t io_size;
+	enum law_trgt_if law;
+	int pci_num;
Quoted 1 line

};

My pref is to leave the tabs.

- k

author
#4 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

Quoted 1 line · Kumar Gala

My pref is to leave the tabs.

The 'law' field would be misaligned. I would need to insert lots of tabs.

	unsigned long	regs;
	pci_addr_t	mem_bus;
	phys_size_t	mem_phys;
	pci_size_t	mem_size;
	pci_addr_t	io_bus;
	phys_size_t	io_phys;
	pci_size_t	io_size;
	enum law_target_if law;
	int		pci_num;
#5 lore raw

PATCH 1/1 fsl: add LAW target to fsl_pci_info structure

Quoted 6 lines · Timur Tabi
Quoted 1 line · Kumar Gala

My pref is to leave the tabs.

The 'law' field would be misaligned. I would need to insert lots of tabs.

Quoted 9 lines
	unsigned long	regs;
	pci_addr_t	mem_bus;
	phys_size_t	mem_phys;
	pci_size_t	mem_size;
	pci_addr_t	io_bus;
	phys_size_t	io_phys;
	pci_size_t	io_size;
	enum law_target_if law;
	int		pci_num;

ok, I'm good with the patch as you have it.

- k