| Message ID | 20180625103723.24760-3-icenowy@aosc.io |
|---|---|
| State | Superseded |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | Allwinner H6 support (w/ SPL) | expand |
On Mon, Jun 25, 2018 at 06:37:12PM +0800, Icenowy Zheng wrote: > The Allwinner H6 SoC come with a totally new memory map. > > Add basical definition of the new memory map into a header file, and let > the cpu.h header include it in the situation of H6. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > --- > arch/arm/include/asm/arch-sunxi/cpu.h | 2 + > .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 +++++++++++++++++++ > 2 files changed, 75 insertions(+) > create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > > diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h > index caec865264..08be963e8e 100644 > --- a/arch/arm/include/asm/arch-sunxi/cpu.h > +++ b/arch/arm/include/asm/arch-sunxi/cpu.h > @@ -9,6 +9,8 @@ > > #if defined(CONFIG_MACH_SUN9I) > #include <asm/arch/cpu_sun9i.h> > +#elif defined(CONFIG_MACH_SUN50I_H6) > +#include <asm/arch/cpu_sun50i_h6.h> > #else > #include <asm/arch/cpu_sun4i.h> > #endif > diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > new file mode 100644 > index 0000000000..b12f2dd1a2 > --- /dev/null > +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > @@ -0,0 +1,73 @@ > +/* > + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef _SUNXI_CPU_SUN50I_H6_H > +#define _SUNXI_CPU_SUN50I_H6_H > + > +#define SUNXI_SRAM_A1_BASE 0x00020000 Isn't that the same thing than SUNXI_SRAM_ADDRESS? Having it defined twice and expecting the value to be matching seems a bit weird. Maxime
于 2018年6月25日 GMT+08:00 下午8:33:34, Maxime Ripard <maxime.ripard@bootlin.com> 写到: >On Mon, Jun 25, 2018 at 06:37:12PM +0800, Icenowy Zheng wrote: >> The Allwinner H6 SoC come with a totally new memory map. >> >> Add basical definition of the new memory map into a header file, and >let >> the cpu.h header include it in the situation of H6. >> >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> >> --- >> arch/arm/include/asm/arch-sunxi/cpu.h | 2 + >> .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 >+++++++++++++++++++ >> 2 files changed, 75 insertions(+) >> create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >> >> diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h >b/arch/arm/include/asm/arch-sunxi/cpu.h >> index caec865264..08be963e8e 100644 >> --- a/arch/arm/include/asm/arch-sunxi/cpu.h >> +++ b/arch/arm/include/asm/arch-sunxi/cpu.h >> @@ -9,6 +9,8 @@ >> >> #if defined(CONFIG_MACH_SUN9I) >> #include <asm/arch/cpu_sun9i.h> >> +#elif defined(CONFIG_MACH_SUN50I_H6) >> +#include <asm/arch/cpu_sun50i_h6.h> >> #else >> #include <asm/arch/cpu_sun4i.h> >> #endif >> diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >> new file mode 100644 >> index 0000000000..b12f2dd1a2 >> --- /dev/null >> +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >> @@ -0,0 +1,73 @@ >> +/* >> + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> + >> +#ifndef _SUNXI_CPU_SUN50I_H6_H >> +#define _SUNXI_CPU_SUN50I_H6_H >> + >> +#define SUNXI_SRAM_A1_BASE 0x00020000 > >Isn't that the same thing than SUNXI_SRAM_ADDRESS? Having it defined >twice and expecting the value to be matching seems a bit weird. This assumes SPL will be in SRAM A1, which may change. > >Maxime
On Mon, Jun 25, 2018 at 08:50:08PM +0800, Icenowy Zheng wrote: > > > 于 2018年6月25日 GMT+08:00 下午8:33:34, Maxime Ripard <maxime.ripard@bootlin.com> 写到: > >On Mon, Jun 25, 2018 at 06:37:12PM +0800, Icenowy Zheng wrote: > >> The Allwinner H6 SoC come with a totally new memory map. > >> > >> Add basical definition of the new memory map into a header file, and > >let > >> the cpu.h header include it in the situation of H6. > >> > >> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> > >> --- > >> arch/arm/include/asm/arch-sunxi/cpu.h | 2 + > >> .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 > >+++++++++++++++++++ > >> 2 files changed, 75 insertions(+) > >> create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > >> > >> diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h > >b/arch/arm/include/asm/arch-sunxi/cpu.h > >> index caec865264..08be963e8e 100644 > >> --- a/arch/arm/include/asm/arch-sunxi/cpu.h > >> +++ b/arch/arm/include/asm/arch-sunxi/cpu.h > >> @@ -9,6 +9,8 @@ > >> > >> #if defined(CONFIG_MACH_SUN9I) > >> #include <asm/arch/cpu_sun9i.h> > >> +#elif defined(CONFIG_MACH_SUN50I_H6) > >> +#include <asm/arch/cpu_sun50i_h6.h> > >> #else > >> #include <asm/arch/cpu_sun4i.h> > >> #endif > >> diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > >b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > >> new file mode 100644 > >> index 0000000000..b12f2dd1a2 > >> --- /dev/null > >> +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > >> @@ -0,0 +1,73 @@ > >> +/* > >> + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> > >> + * > >> + * SPDX-License-Identifier: GPL-2.0+ > >> + */ > >> + > >> +#ifndef _SUNXI_CPU_SUN50I_H6_H > >> +#define _SUNXI_CPU_SUN50I_H6_H > >> + > >> +#define SUNXI_SRAM_A1_BASE 0x00020000 > > > >Isn't that the same thing than SUNXI_SRAM_ADDRESS? Having it defined > >twice and expecting the value to be matching seems a bit weird. > > This assumes SPL will be in SRAM A1, which may change. Then let's deal with this when it will change. Maxime
Hi, On 25/06/18 13:50, Icenowy Zheng wrote: > > > 于 2018年6月25日 GMT+08:00 下午8:33:34, Maxime Ripard <maxime.ripard@bootlin.com> 写到: >> On Mon, Jun 25, 2018 at 06:37:12PM +0800, Icenowy Zheng wrote: >>> The Allwinner H6 SoC come with a totally new memory map. >>> >>> Add basical definition of the new memory map into a header file, and >> let >>> the cpu.h header include it in the situation of H6. >>> >>> Signed-off-by: Icenowy Zheng <icenowy@aosc.io> >>> --- >>> arch/arm/include/asm/arch-sunxi/cpu.h | 2 + >>> .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 >> +++++++++++++++++++ >>> 2 files changed, 75 insertions(+) >>> create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >>> >>> diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h >> b/arch/arm/include/asm/arch-sunxi/cpu.h >>> index caec865264..08be963e8e 100644 >>> --- a/arch/arm/include/asm/arch-sunxi/cpu.h >>> +++ b/arch/arm/include/asm/arch-sunxi/cpu.h >>> @@ -9,6 +9,8 @@ >>> >>> #if defined(CONFIG_MACH_SUN9I) >>> #include <asm/arch/cpu_sun9i.h> >>> +#elif defined(CONFIG_MACH_SUN50I_H6) >>> +#include <asm/arch/cpu_sun50i_h6.h> >>> #else >>> #include <asm/arch/cpu_sun4i.h> >>> #endif >>> diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >> b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >>> new file mode 100644 >>> index 0000000000..b12f2dd1a2 >>> --- /dev/null >>> +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h >>> @@ -0,0 +1,73 @@ >>> +/* >>> + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> >>> + * >>> + * SPDX-License-Identifier: GPL-2.0+ >>> + */ >>> + >>> +#ifndef _SUNXI_CPU_SUN50I_H6_H >>> +#define _SUNXI_CPU_SUN50I_H6_H >>> + >>> +#define SUNXI_SRAM_A1_BASE 0x00020000 >> >> Isn't that the same thing than SUNXI_SRAM_ADDRESS? Having it defined >> twice and expecting the value to be matching seems a bit weird. > > This assumes SPL will be in SRAM A1, which may change. Can it? I believe this part is fixed, because this is where the BootROM loads the initial code to. And for the boot flow we support the SPL is the first one to execute. Not sure if a TPL would change that, but as Maxime said, we can address that when we really need to. I guess we can't use that symbol in Kconfig, can we? So that we could say: "default SUNXI_SRAM_A1_BASE if MACH_SUN50I_H6" in patch 12/13 ... Cheers, Andre
Hi, On 25/06/18 11:37, Icenowy Zheng wrote: > The Allwinner H6 SoC come with a totally new memory map. > > Add basical definition of the new memory map into a header file, and let > the cpu.h header include it in the situation of H6. I checked all addresses against the manual and found no issues. > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Thanks! Andre P.S. I don't believe "basical" is an English word, it's just "basic". > --- > arch/arm/include/asm/arch-sunxi/cpu.h | 2 + > .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 +++++++++++++++++++ > 2 files changed, 75 insertions(+) > create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > > diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h > index caec865264..08be963e8e 100644 > --- a/arch/arm/include/asm/arch-sunxi/cpu.h > +++ b/arch/arm/include/asm/arch-sunxi/cpu.h > @@ -9,6 +9,8 @@ > > #if defined(CONFIG_MACH_SUN9I) > #include <asm/arch/cpu_sun9i.h> > +#elif defined(CONFIG_MACH_SUN50I_H6) > +#include <asm/arch/cpu_sun50i_h6.h> > #else > #include <asm/arch/cpu_sun4i.h> > #endif > diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > new file mode 100644 > index 0000000000..b12f2dd1a2 > --- /dev/null > +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h > @@ -0,0 +1,73 @@ > +/* > + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#ifndef _SUNXI_CPU_SUN50I_H6_H > +#define _SUNXI_CPU_SUN50I_H6_H > + > +#define SUNXI_SRAM_A1_BASE 0x00020000 > +#define SUNXI_SRAM_C_BASE 0x00028000 > +#define SUNXI_SRAM_A2_BASE 0x00100000 > + > +#define SUNXI_DE3_BASE 0x01000000 > +#define SUNXI_SS_BASE 0x01904000 > +#define SUNXI_EMCE_BASE 0x01905000 > + > +#define SUNXI_SRAMC_BASE 0x03000000 > +#define SUNXI_CCM_BASE 0x03001000 > +#define SUNXI_DMA_BASE 0x03002000 > +/* SID address space starts at 0x03006000, but e-fuse is at offset 0x200 */ > +#define SUNXI_SIDC_BASE 0x03006000 > +#define SNUXI_SID_BASE 0x03006200 > +#define SUNXI_TIMER_BASE 0x03009000 > +#define SUNXI_PIO_BASE 0x0300B000 > +#define SUNXI_PSI_BASE 0x0300C000 > + > +#define SUNXI_GIC400_BASE 0x03020000 > +#define SUNXI_IOMMU_BASE 0x030F0000 > + > +#define SUNXI_DRAM_COM_BASE 0x04002000 > +#define SUNXI_DRAM_CTL0_BASE 0x04003000 > +#define SUNXI_DRAM_PHY0_BASE 0x04005000 > +#define SUNXI_NFC_BASE 0x04011000 > +#define SUNXI_MMC0_BASE 0x04020000 > +#define SUNXI_MMC1_BASE 0x04021000 > +#define SUNXI_MMC2_BASE 0x04022000 > + > +#define SUNXI_UART0_BASE 0x05000000 > +#define SUNXI_UART1_BASE 0x05000400 > +#define SUNXI_UART2_BASE 0x05000800 > +#define SUNXI_UART3_BASE 0x05000C00 > +#define SUNXI_TWI0_BASE 0x05002000 > +#define SUNXI_TWI1_BASE 0x05002400 > +#define SUNXI_TWI2_BASE 0x05002800 > +#define SUNXI_TWI3_BASE 0x05002C00 > +#define SUNXI_SPI0_BASE 0x05010000 > +#define SUNXI_SPI1_BASE 0x05011000 > +#define SUNXI_GMAC_BASE 0x05020000 > +#define SUNXI_USB0_BASE 0x05100000 > +#define SUNXI_XHCI_BASE 0x05200000 > +#define SUNXI_USB3_BASE 0x05311000 > +#define SUNXI_PCIE_BASE 0x05400000 > + > +#define SUNXI_HDMI_BASE 0x06000000 > +#define SUNXI_TCON_TOP_BASE 0x06510000 > +#define SUNXI_TCON_LCD0_BASE 0x06511000 > +#define SUNXI_TCON_TV0_BASE 0x06515000 > + > +#define SUNXI_RTC_BASE 0x07000000 > +#define SUNXI_R_CPUCFG_BASE 0x07000400 > +#define SUNXI_PRCM_BASE 0x07010000 > +#define SUNXI_R_PIO_BASE 0x07022000 > +#define SUNXI_R_UART_BASE 0x07080000 > +#define SUNXI_R_TWI_BASE 0x07081400 > + > +#ifndef __ASSEMBLY__ > +void sunxi_board_init(void); > +void sunxi_reset(void); > +int sunxi_get_sid(unsigned int *sid); > +#endif > + > +#endif /* _SUNXI_CPU_SUN9I_H */ >
diff --git a/arch/arm/include/asm/arch-sunxi/cpu.h b/arch/arm/include/asm/arch-sunxi/cpu.h index caec865264..08be963e8e 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu.h +++ b/arch/arm/include/asm/arch-sunxi/cpu.h @@ -9,6 +9,8 @@ #if defined(CONFIG_MACH_SUN9I) #include <asm/arch/cpu_sun9i.h> +#elif defined(CONFIG_MACH_SUN50I_H6) +#include <asm/arch/cpu_sun50i_h6.h> #else #include <asm/arch/cpu_sun4i.h> #endif diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h new file mode 100644 index 0000000000..b12f2dd1a2 --- /dev/null +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h @@ -0,0 +1,73 @@ +/* + * (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _SUNXI_CPU_SUN50I_H6_H +#define _SUNXI_CPU_SUN50I_H6_H + +#define SUNXI_SRAM_A1_BASE 0x00020000 +#define SUNXI_SRAM_C_BASE 0x00028000 +#define SUNXI_SRAM_A2_BASE 0x00100000 + +#define SUNXI_DE3_BASE 0x01000000 +#define SUNXI_SS_BASE 0x01904000 +#define SUNXI_EMCE_BASE 0x01905000 + +#define SUNXI_SRAMC_BASE 0x03000000 +#define SUNXI_CCM_BASE 0x03001000 +#define SUNXI_DMA_BASE 0x03002000 +/* SID address space starts at 0x03006000, but e-fuse is at offset 0x200 */ +#define SUNXI_SIDC_BASE 0x03006000 +#define SNUXI_SID_BASE 0x03006200 +#define SUNXI_TIMER_BASE 0x03009000 +#define SUNXI_PIO_BASE 0x0300B000 +#define SUNXI_PSI_BASE 0x0300C000 + +#define SUNXI_GIC400_BASE 0x03020000 +#define SUNXI_IOMMU_BASE 0x030F0000 + +#define SUNXI_DRAM_COM_BASE 0x04002000 +#define SUNXI_DRAM_CTL0_BASE 0x04003000 +#define SUNXI_DRAM_PHY0_BASE 0x04005000 +#define SUNXI_NFC_BASE 0x04011000 +#define SUNXI_MMC0_BASE 0x04020000 +#define SUNXI_MMC1_BASE 0x04021000 +#define SUNXI_MMC2_BASE 0x04022000 + +#define SUNXI_UART0_BASE 0x05000000 +#define SUNXI_UART1_BASE 0x05000400 +#define SUNXI_UART2_BASE 0x05000800 +#define SUNXI_UART3_BASE 0x05000C00 +#define SUNXI_TWI0_BASE 0x05002000 +#define SUNXI_TWI1_BASE 0x05002400 +#define SUNXI_TWI2_BASE 0x05002800 +#define SUNXI_TWI3_BASE 0x05002C00 +#define SUNXI_SPI0_BASE 0x05010000 +#define SUNXI_SPI1_BASE 0x05011000 +#define SUNXI_GMAC_BASE 0x05020000 +#define SUNXI_USB0_BASE 0x05100000 +#define SUNXI_XHCI_BASE 0x05200000 +#define SUNXI_USB3_BASE 0x05311000 +#define SUNXI_PCIE_BASE 0x05400000 + +#define SUNXI_HDMI_BASE 0x06000000 +#define SUNXI_TCON_TOP_BASE 0x06510000 +#define SUNXI_TCON_LCD0_BASE 0x06511000 +#define SUNXI_TCON_TV0_BASE 0x06515000 + +#define SUNXI_RTC_BASE 0x07000000 +#define SUNXI_R_CPUCFG_BASE 0x07000400 +#define SUNXI_PRCM_BASE 0x07010000 +#define SUNXI_R_PIO_BASE 0x07022000 +#define SUNXI_R_UART_BASE 0x07080000 +#define SUNXI_R_TWI_BASE 0x07081400 + +#ifndef __ASSEMBLY__ +void sunxi_board_init(void); +void sunxi_reset(void); +int sunxi_get_sid(unsigned int *sid); +#endif + +#endif /* _SUNXI_CPU_SUN9I_H */
The Allwinner H6 SoC come with a totally new memory map. Add basical definition of the new memory map into a header file, and let the cpu.h header include it in the situation of H6. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> --- arch/arm/include/asm/arch-sunxi/cpu.h | 2 + .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h