Re: [U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy PCIe driver when DM_PCI is enabled
Hi Zhiqiang, On Tue, Aug 27, 2019 at 10:33 AM Z.q. Hou wrote: > > Hi Bin, > > Thanks a lot for your comments! > > > -Original Message- > > From: Bin Meng > > Sent: 2019年8月26日 22:49 > > To: Z.q. Hou > > Cc: U-Boot Mailing List ; Prabhakar Kushwaha > > ; Wolfgang Denk ; Priyanka > > Jain ; Shengzhou Liu > > Subject: Re: [U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy > > PCIe driver when DM_PCI is enabled > > > > Hi Zhiqiang, > > > > On Tue, Jul 23, 2019 at 9:36 PM Hou Zhiqiang > > wrote: > > > > > > Disable legacy PCIe driver and unused PCIe macros when DM_PCI enabled. > > > > > > Signed-off-by: Hou Zhiqiang > > > --- > > > include/configs/T102xRDB.h | 54 > > > +- > > > 1 file changed, 15 insertions(+), 39 deletions(-) > > > > > > diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h > > > index 3715e25..4fb1709 100644 > > > --- a/include/configs/T102xRDB.h > > > +++ b/include/configs/T102xRDB.h > > > @@ -500,72 +500,48 @@ unsigned long get_board_ddr_clk(void); > > > #define CONFIG_PCIE1 /* PCIE controller 1 */ > > > #define CONFIG_PCIE2 /* PCIE controller 2 */ > > > #define CONFIG_PCIE3 /* PCIE controller 3 */ > > > -#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > > > #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ > > > -#define CONFIG_PCI_INDIRECT_BRIDGE > > > > > > #ifdef CONFIG_PCI > > > /* controller 1, direct to uli, tgtid 3, Base address 2 */ > > > #ifdef CONFIG_PCIE1 > > > #defineCONFIG_SYS_PCIE1_MEM_VIRT 0x8000 > > > -#ifdef CONFIG_PHYS_64BIT > > > -#defineCONFIG_SYS_PCIE1_MEM_BUS0xe000 > > > #defineCONFIG_SYS_PCIE1_MEM_PHYS > > 0xcull > > > -#else > > > -#define CONFIG_SYS_PCIE1_MEM_BUS 0x8000 > > > -#define CONFIG_SYS_PCIE1_MEM_PHYS 0x8000 > > > -#endif > > > -#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* > > 256M */ > > > #define CONFIG_SYS_PCIE1_IO_VIRT 0xf800 > > > -#define CONFIG_SYS_PCIE1_IO_BUS0x > > > -#ifdef CONFIG_PHYS_64BIT > > > #define CONFIG_SYS_PCIE1_IO_PHYS 0xff800ull > > > -#else > > > -#define CONFIG_SYS_PCIE1_IO_PHYS 0xf800 > > > -#endif > > > -#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ > > > #endif > > > > > > /* controller 2, Slot 2, tgtid 2, Base address 201000 */ #ifdef > > > CONFIG_PCIE2 > > > #define CONFIG_SYS_PCIE2_MEM_VIRT 0x9000 > > > -#ifdef CONFIG_PHYS_64BIT > > > -#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 > > > #define CONFIG_SYS_PCIE2_MEM_PHYS 0xc1000ull > > > -#else > > > -#define CONFIG_SYS_PCIE2_MEM_BUS 0x9000 > > > -#define CONFIG_SYS_PCIE2_MEM_PHYS 0x9000 > > > -#endif > > > -#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* > > 256M */ > > > #define CONFIG_SYS_PCIE2_IO_VIRT 0xf801 > > > -#define CONFIG_SYS_PCIE2_IO_BUS0x > > > -#ifdef CONFIG_PHYS_64BIT > > > #define CONFIG_SYS_PCIE2_IO_PHYS 0xff801ull > > > -#else > > > -#define CONFIG_SYS_PCIE2_IO_PHYS 0xf801 > > > -#endif > > > -#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ > > > #endif > > > > > > /* controller 3, Slot 1, tgtid 1, Base address 202000 */ #ifdef > > > CONFIG_PCIE3 > > > #define CONFIG_SYS_PCIE3_MEM_VIRT 0xa000 > > > -#ifdef CONFIG_PHYS_64BIT > > > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 > > > #define CONFIG_SYS_PCIE3_MEM_PHYS 0xc2000ull > > > -#else > > > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xa000 > > > -#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa000 > > > -#endif > > > -#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* > > 256M */ > > > #define CONFIG_SYS_PCIE3_IO_VIRT 0xf802 > > > -#define CONFIG_SYS_PCIE3_IO_BUS0x > > > -#ifdef CONFIG_PHYS_64BIT > > > #define CONFIG_SYS_PCIE3_IO_PHYS 0xff802ull > > > -#else > > > -#define CONFIG_SYS_PCIE3_IO_PHYS 0xf802 > > > #endif > > > + > > > +#if !defined(CONFIG_DM_PCI) > > > +#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > > > +#define CONFIG_SYS_PCIE1_MEM_BUS 0xe000 > > > > What about the #ifdef CONFIG_PHYS_64BIT part? > > In the arch/powerpc/cpu/mpc85xx/Kconfig, all the T102x boards selected > the CONFIG_PHYS_64BIT, so removed the #else...#endif part. > Thanks for the clarification. With that info, Reviewed-by: Bin Meng Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy PCIe driver when DM_PCI is enabled
Hi Bin, Thanks a lot for your comments! > -Original Message- > From: Bin Meng > Sent: 2019年8月26日 22:49 > To: Z.q. Hou > Cc: U-Boot Mailing List ; Prabhakar Kushwaha > ; Wolfgang Denk ; Priyanka > Jain ; Shengzhou Liu > Subject: Re: [U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy > PCIe driver when DM_PCI is enabled > > Hi Zhiqiang, > > On Tue, Jul 23, 2019 at 9:36 PM Hou Zhiqiang > wrote: > > > > Disable legacy PCIe driver and unused PCIe macros when DM_PCI enabled. > > > > Signed-off-by: Hou Zhiqiang > > --- > > include/configs/T102xRDB.h | 54 > > +- > > 1 file changed, 15 insertions(+), 39 deletions(-) > > > > diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h > > index 3715e25..4fb1709 100644 > > --- a/include/configs/T102xRDB.h > > +++ b/include/configs/T102xRDB.h > > @@ -500,72 +500,48 @@ unsigned long get_board_ddr_clk(void); > > #define CONFIG_PCIE1 /* PCIE controller 1 */ > > #define CONFIG_PCIE2 /* PCIE controller 2 */ > > #define CONFIG_PCIE3 /* PCIE controller 3 */ > > -#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > > #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ > > -#define CONFIG_PCI_INDIRECT_BRIDGE > > > > #ifdef CONFIG_PCI > > /* controller 1, direct to uli, tgtid 3, Base address 2 */ > > #ifdef CONFIG_PCIE1 > > #defineCONFIG_SYS_PCIE1_MEM_VIRT 0x8000 > > -#ifdef CONFIG_PHYS_64BIT > > -#defineCONFIG_SYS_PCIE1_MEM_BUS0xe000 > > #defineCONFIG_SYS_PCIE1_MEM_PHYS > 0xcull > > -#else > > -#define CONFIG_SYS_PCIE1_MEM_BUS 0x8000 > > -#define CONFIG_SYS_PCIE1_MEM_PHYS 0x8000 > > -#endif > > -#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* > 256M */ > > #define CONFIG_SYS_PCIE1_IO_VIRT 0xf800 > > -#define CONFIG_SYS_PCIE1_IO_BUS0x > > -#ifdef CONFIG_PHYS_64BIT > > #define CONFIG_SYS_PCIE1_IO_PHYS 0xff800ull > > -#else > > -#define CONFIG_SYS_PCIE1_IO_PHYS 0xf800 > > -#endif > > -#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ > > #endif > > > > /* controller 2, Slot 2, tgtid 2, Base address 201000 */ #ifdef > > CONFIG_PCIE2 > > #define CONFIG_SYS_PCIE2_MEM_VIRT 0x9000 > > -#ifdef CONFIG_PHYS_64BIT > > -#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 > > #define CONFIG_SYS_PCIE2_MEM_PHYS 0xc1000ull > > -#else > > -#define CONFIG_SYS_PCIE2_MEM_BUS 0x9000 > > -#define CONFIG_SYS_PCIE2_MEM_PHYS 0x9000 > > -#endif > > -#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* > 256M */ > > #define CONFIG_SYS_PCIE2_IO_VIRT 0xf801 > > -#define CONFIG_SYS_PCIE2_IO_BUS0x > > -#ifdef CONFIG_PHYS_64BIT > > #define CONFIG_SYS_PCIE2_IO_PHYS 0xff801ull > > -#else > > -#define CONFIG_SYS_PCIE2_IO_PHYS 0xf801 > > -#endif > > -#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ > > #endif > > > > /* controller 3, Slot 1, tgtid 1, Base address 202000 */ #ifdef > > CONFIG_PCIE3 > > #define CONFIG_SYS_PCIE3_MEM_VIRT 0xa000 > > -#ifdef CONFIG_PHYS_64BIT > > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 > > #define CONFIG_SYS_PCIE3_MEM_PHYS 0xc2000ull > > -#else > > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xa000 > > -#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa000 > > -#endif > > -#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* > 256M */ > > #define CONFIG_SYS_PCIE3_IO_VIRT 0xf802 > > -#define CONFIG_SYS_PCIE3_IO_BUS0x > > -#ifdef CONFIG_PHYS_64BIT > > #define CONFIG_SYS_PCIE3_IO_PHYS 0xff802ull > > -#else > > -#define CONFIG_SYS_PCIE3_IO_PHYS 0xf802 > > #endif > > + > > +#if !defined(CONFIG_DM_PCI) > > +#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > > +#define CONFIG_SYS_PCIE1_MEM_BUS 0xe000 > > What about the #ifdef CONFIG_PHYS_64BIT part? In the arch/powerpc/cpu/mpc85xx/Kconfig, all the T102x boards selected the CONFIG_PHYS_64BIT, so removed the #else...#endif part. Thanks, Zhiqiang > > > +#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* > 256M */ > > +#define CONFIG_SYS_PCIE1_IO_BUS0x > > +#define CONFIG_SYS_PCIE1_IO_SIZE
Re: [U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy PCIe driver when DM_PCI is enabled
Hi Zhiqiang, On Tue, Jul 23, 2019 at 9:36 PM Hou Zhiqiang wrote: > > Disable legacy PCIe driver and unused PCIe macros when DM_PCI enabled. > > Signed-off-by: Hou Zhiqiang > --- > include/configs/T102xRDB.h | 54 > +- > 1 file changed, 15 insertions(+), 39 deletions(-) > > diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h > index 3715e25..4fb1709 100644 > --- a/include/configs/T102xRDB.h > +++ b/include/configs/T102xRDB.h > @@ -500,72 +500,48 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_PCIE1 /* PCIE controller 1 */ > #define CONFIG_PCIE2 /* PCIE controller 2 */ > #define CONFIG_PCIE3 /* PCIE controller 3 */ > -#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ > -#define CONFIG_PCI_INDIRECT_BRIDGE > > #ifdef CONFIG_PCI > /* controller 1, direct to uli, tgtid 3, Base address 2 */ > #ifdef CONFIG_PCIE1 > #defineCONFIG_SYS_PCIE1_MEM_VIRT 0x8000 > -#ifdef CONFIG_PHYS_64BIT > -#defineCONFIG_SYS_PCIE1_MEM_BUS0xe000 > #defineCONFIG_SYS_PCIE1_MEM_PHYS 0xcull > -#else > -#define CONFIG_SYS_PCIE1_MEM_BUS 0x8000 > -#define CONFIG_SYS_PCIE1_MEM_PHYS 0x8000 > -#endif > -#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* 256M */ > #define CONFIG_SYS_PCIE1_IO_VIRT 0xf800 > -#define CONFIG_SYS_PCIE1_IO_BUS0x > -#ifdef CONFIG_PHYS_64BIT > #define CONFIG_SYS_PCIE1_IO_PHYS 0xff800ull > -#else > -#define CONFIG_SYS_PCIE1_IO_PHYS 0xf800 > -#endif > -#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ > #endif > > /* controller 2, Slot 2, tgtid 2, Base address 201000 */ > #ifdef CONFIG_PCIE2 > #define CONFIG_SYS_PCIE2_MEM_VIRT 0x9000 > -#ifdef CONFIG_PHYS_64BIT > -#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 > #define CONFIG_SYS_PCIE2_MEM_PHYS 0xc1000ull > -#else > -#define CONFIG_SYS_PCIE2_MEM_BUS 0x9000 > -#define CONFIG_SYS_PCIE2_MEM_PHYS 0x9000 > -#endif > -#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* 256M */ > #define CONFIG_SYS_PCIE2_IO_VIRT 0xf801 > -#define CONFIG_SYS_PCIE2_IO_BUS0x > -#ifdef CONFIG_PHYS_64BIT > #define CONFIG_SYS_PCIE2_IO_PHYS 0xff801ull > -#else > -#define CONFIG_SYS_PCIE2_IO_PHYS 0xf801 > -#endif > -#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ > #endif > > /* controller 3, Slot 1, tgtid 1, Base address 202000 */ > #ifdef CONFIG_PCIE3 > #define CONFIG_SYS_PCIE3_MEM_VIRT 0xa000 > -#ifdef CONFIG_PHYS_64BIT > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 > #define CONFIG_SYS_PCIE3_MEM_PHYS 0xc2000ull > -#else > -#define CONFIG_SYS_PCIE3_MEM_BUS 0xa000 > -#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa000 > -#endif > -#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* 256M */ > #define CONFIG_SYS_PCIE3_IO_VIRT 0xf802 > -#define CONFIG_SYS_PCIE3_IO_BUS0x > -#ifdef CONFIG_PHYS_64BIT > #define CONFIG_SYS_PCIE3_IO_PHYS 0xff802ull > -#else > -#define CONFIG_SYS_PCIE3_IO_PHYS 0xf802 > #endif > + > +#if !defined(CONFIG_DM_PCI) > +#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ > +#define CONFIG_SYS_PCIE1_MEM_BUS 0xe000 What about the #ifdef CONFIG_PHYS_64BIT part? > +#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* 256M */ > +#define CONFIG_SYS_PCIE1_IO_BUS0x > +#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ > +#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 > +#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* 256M */ > +#define CONFIG_SYS_PCIE2_IO_BUS0x > +#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ > +#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 > +#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* 256M */ > +#define CONFIG_SYS_PCIE3_IO_BUS0x > #define CONFIG_SYS_PCIE3_IO_SIZE 0x0001 /* 64k */ > +#define CONFIG_PCI_INDIRECT_BRIDGE > #endif > > #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ > -- Regards, Bin ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 13/47] powerpc: T102xRDB: Disable legacy PCIe driver when DM_PCI is enabled
Disable legacy PCIe driver and unused PCIe macros when DM_PCI enabled. Signed-off-by: Hou Zhiqiang --- include/configs/T102xRDB.h | 54 +- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3715e25..4fb1709 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -500,72 +500,48 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE2 /* PCIE controller 2 */ #define CONFIG_PCIE3 /* PCIE controller 3 */ -#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ -#define CONFIG_PCI_INDIRECT_BRIDGE #ifdef CONFIG_PCI /* controller 1, direct to uli, tgtid 3, Base address 2 */ #ifdef CONFIG_PCIE1 #defineCONFIG_SYS_PCIE1_MEM_VIRT 0x8000 -#ifdef CONFIG_PHYS_64BIT -#defineCONFIG_SYS_PCIE1_MEM_BUS0xe000 #defineCONFIG_SYS_PCIE1_MEM_PHYS 0xcull -#else -#define CONFIG_SYS_PCIE1_MEM_BUS 0x8000 -#define CONFIG_SYS_PCIE1_MEM_PHYS 0x8000 -#endif -#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* 256M */ #define CONFIG_SYS_PCIE1_IO_VIRT 0xf800 -#define CONFIG_SYS_PCIE1_IO_BUS0x -#ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_PCIE1_IO_PHYS 0xff800ull -#else -#define CONFIG_SYS_PCIE1_IO_PHYS 0xf800 -#endif -#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ #endif /* controller 2, Slot 2, tgtid 2, Base address 201000 */ #ifdef CONFIG_PCIE2 #define CONFIG_SYS_PCIE2_MEM_VIRT 0x9000 -#ifdef CONFIG_PHYS_64BIT -#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 #define CONFIG_SYS_PCIE2_MEM_PHYS 0xc1000ull -#else -#define CONFIG_SYS_PCIE2_MEM_BUS 0x9000 -#define CONFIG_SYS_PCIE2_MEM_PHYS 0x9000 -#endif -#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* 256M */ #define CONFIG_SYS_PCIE2_IO_VIRT 0xf801 -#define CONFIG_SYS_PCIE2_IO_BUS0x -#ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_PCIE2_IO_PHYS 0xff801ull -#else -#define CONFIG_SYS_PCIE2_IO_PHYS 0xf801 -#endif -#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ #endif /* controller 3, Slot 1, tgtid 1, Base address 202000 */ #ifdef CONFIG_PCIE3 #define CONFIG_SYS_PCIE3_MEM_VIRT 0xa000 -#ifdef CONFIG_PHYS_64BIT -#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 #define CONFIG_SYS_PCIE3_MEM_PHYS 0xc2000ull -#else -#define CONFIG_SYS_PCIE3_MEM_BUS 0xa000 -#define CONFIG_SYS_PCIE3_MEM_PHYS 0xa000 -#endif -#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* 256M */ #define CONFIG_SYS_PCIE3_IO_VIRT 0xf802 -#define CONFIG_SYS_PCIE3_IO_BUS0x -#ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_PCIE3_IO_PHYS 0xff802ull -#else -#define CONFIG_SYS_PCIE3_IO_PHYS 0xf802 #endif + +#if !defined(CONFIG_DM_PCI) +#define CONFIG_FSL_PCI_INIT/* Use common FSL init code */ +#define CONFIG_SYS_PCIE1_MEM_BUS 0xe000 +#define CONFIG_SYS_PCIE1_MEM_SIZE 0x1000 /* 256M */ +#define CONFIG_SYS_PCIE1_IO_BUS0x +#define CONFIG_SYS_PCIE1_IO_SIZE 0x0001 /* 64k */ +#define CONFIG_SYS_PCIE2_MEM_BUS 0xe000 +#define CONFIG_SYS_PCIE2_MEM_SIZE 0x1000 /* 256M */ +#define CONFIG_SYS_PCIE2_IO_BUS0x +#define CONFIG_SYS_PCIE2_IO_SIZE 0x0001 /* 64k */ +#define CONFIG_SYS_PCIE3_MEM_BUS 0xe000 +#define CONFIG_SYS_PCIE3_MEM_SIZE 0x1000 /* 256M */ +#define CONFIG_SYS_PCIE3_IO_BUS0x #define CONFIG_SYS_PCIE3_IO_SIZE 0x0001 /* 64k */ +#define CONFIG_PCI_INDIRECT_BRIDGE #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -- 2.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
