On Jum, 2017-05-05 at 13:13 +0200, Marek Vasut wrote:
> On 05/05/2017 12:26 PM, tien.fong.c...@intel.com wrote:
> >
> > From: Tien Fong Chee <tien.fong.c...@intel.com>
> >
> > Move FPGA driver which is Gen5 specific code into Gen5 files.
> > No functional change.
> It's a driver, so it should stay in drivers/ . If you need to split
> it,
> split it in drivers/fpga/ and add Kconfig option(s)
>
I am confused here, all the FPGA drivers which i split into common and
platform specific are still in the drivers/fpga/. Could you explain
more? Thanks.
> >
> > Signed-off-by: Tien Fong Chee <tien.fong.c...@intel.com>
> > ---
> > arch/arm/mach-socfpga/Makefile | 2 +-
> > arch/arm/mach-socfpga/include/mach/fpga_manager.h | 65 +----
> > .../mach/{fpga_manager.h => fpga_manager_gen5.h} | 69 +++---
> > drivers/Makefile | 1 +
> > drivers/fpga/Makefile | 1 +
> > drivers/fpga/socfpga.c | 267 +-------
> > ------------
> > drivers/fpga/{socfpga.c => socfpga_gen5.c} | 29 +--
> > 7 files changed, 48 insertions(+), 386 deletions(-)
> > copy arch/arm/mach-socfpga/include/mach/{fpga_manager.h =>
> > fpga_manager_gen5.h} (57%)
> > copy drivers/fpga/{socfpga.c => socfpga_gen5.c} (92%)
> >
> > diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-
> > socfpga/Makefile
> > index 41b779c..286bfef 100644
> > --- a/arch/arm/mach-socfpga/Makefile
> > +++ b/arch/arm/mach-socfpga/Makefile
> > @@ -9,7 +9,6 @@
> >
> > obj-y += board.o
> > obj-y += clock_manager.o
> > -obj-y += fpga_manager.o
> > obj-y += misc.o
> > obj-y += reset_manager.o
> > obj-y += timer.o
> > @@ -21,6 +20,7 @@ obj-y += reset_manager_gen5.o
> > obj-y += scan_manager.o
> > obj-y += system_manager_gen5.o
> > obj-y += wrap_pll_config.o
> > +obj-y += fpga_manager.o
> > endif
> >
> > ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
> > diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > index a077e22..69d8613 100644
> > --- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > +++ b/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (C) 2012 Altera Corporation <www.altera.com>
> > + * Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
> > * All rights reserved.
> > *
> > * SPDX-License-Identifier: BSD-3-Clause
> > @@ -10,58 +10,9 @@
> >
> > #include <altera.h>
> >
> > -struct socfpga_fpga_manager {
> > - /* FPGA Manager Module */
> > - u32 stat; /* 0x00 */
> > - u32 ctrl;
> > - u32 dclkcnt;
> > - u32 dclkstat;
> > - u32 gpo; /* 0x10 */
> > - u32 gpi;
> > - u32 misci; /* 0x18 */
> > - u32 _pad_0x1c_0x82c[517];
> > -
> > - /* Configuration Monitor (MON) Registers */
> > - u32 gpio_inten; /* 0x830 */
> > - u32 gpio_intmask;
> > - u32 gpio_inttype_level;
> > - u32 gpio_int_polarity;
> > - u32 gpio_intstatus; /* 0x840 */
> > - u32 gpio_raw_intstatus;
> > - u32 _pad_0x848;
> > - u32 gpio_porta_eoi;
> > - u32 gpio_ext_porta; /* 0x850 */
> > - u32 _pad_0x854_0x85c[3];
> > - u32 gpio_1s_sync; /* 0x860 */
> > - u32 _pad_0x864_0x868[2];
> > - u32 gpio_ver_id_code;
> > - u32 gpio_config_reg2; /* 0x870 */
> > - u32 gpio_config_reg1;
> > -};
> > -
> > -#define FPGAMGRREGS_STAT_MODE_MASK 0x7
> > -#define FPGAMGRREGS_STAT_MSEL_MASK 0xf8
> > -#define FPGAMGRREGS_STAT_MSEL_LSB 3
> > -
> > -#define FPGAMGRREGS_CTRL_CFGWDTH_MASK 0x200
> > -#define FPGAMGRREGS_CTRL_AXICFGEN_MASK 0x100
> > -#define FPGAMGRREGS_CTRL_NCONFIGPULL_MASK 0x4
> > -#define FPGAMGRREGS_CTRL_NCE_MASK 0x2
> > -#define FPGAMGRREGS_CTRL_EN_MASK 0x1
> > -#define FPGAMGRREGS_CTRL_CDRATIO_LSB 6
> > -
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CRC_MASK 0x8
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK 0x4
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CD_MASK 0x2
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_NS_MASK 0x1
> > -
> > -/* FPGA Mode */
> > -#define FPGAMGRREGS_MODE_FPGAOFF 0x0
> > -#define FPGAMGRREGS_MODE_RESETPHASE 0x1
> > -#define FPGAMGRREGS_MODE_CFGPHASE 0x2
> > -#define FPGAMGRREGS_MODE_INITPHASE 0x3
> > -#define FPGAMGRREGS_MODE_USERMODE 0x4
> > -#define FPGAMGRREGS_MODE_UNKNOWN 0x5
> > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
> > +#include <asm/arch/fpga_manager_gen5.h>
> > +#endif
> >
> > /* FPGA CD Ratio Value */
> > #define CDRATIO_x1 0x0
> > @@ -74,4 +25,12 @@ int fpgamgr_test_fpga_ready(void);
> > int fpgamgr_poll_fpga_ready(void);
> > int fpgamgr_get_mode(void);
> >
> > +#define FPGA_TIMEOUT_CNT 0x1000000
> > +
> > +#ifndef __ASSEMBLY__
> > +
> > +/* Common prototypes */
> > +int fpgamgr_dclkcnt_set(unsigned long cnt);
> > +
> > +#endif /* __ASSEMBLY__ */
> > #endif /* _FPGA_MANAGER_H_ */
> > diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
> > similarity index 57%
> > copy from arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > copy to arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
> > index a077e22..2de7a11 100644
> > --- a/arch/arm/mach-socfpga/include/mach/fpga_manager.h
> > +++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_gen5.h
> > @@ -1,14 +1,38 @@
> > /*
> > - * Copyright (C) 2012 Altera Corporation <www.altera.com>
> > + * Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
> > * All rights reserved.
> > *
> > * SPDX-License-Identifier: BSD-3-Clause
> > */
> >
> > -#ifndef _FPGA_MANAGER_H_
> > -#define _FPGA_MANAGER_H_
> > +#ifndef _FPGA_MANAGER_GEN5_H_
> > +#define _FPGA_MANAGER_GEN5_H_
> >
> > -#include <altera.h>
> > +#define FPGAMGRREGS_STAT_MODE_MASK 0x7
> > +#define FPGAMGRREGS_STAT_MSEL_MASK 0xf8
> > +#define FPGAMGRREGS_STAT_MSEL_LSB 3
> > +
> > +#define FPGAMGRREGS_CTRL_CFGWDTH_MASK BIT(9)
> > +#define FPGAMGRREGS_CTRL_AXICFGEN_MASK BIT(8)
> > +#define FPGAMGRREGS_CTRL_NCONFIGPULL_MASK BIT(2)
> > +#define FPGAMGRREGS_CTRL_NCE_MASK BIT(1)
> > +#define FPGAMGRREGS_CTRL_EN_MASK BIT(0)
> > +#define FPGAMGRREGS_CTRL_CDRATIO_LSB 6
> > +
> > +#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CRC_MASK BIT(3)
> > +#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK BIT(2)
> > +#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CD_MASK BIT(1)
> > +#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_NS_MASK BIT(0)
> > +
> > +/* FPGA Mode */
> > +#define FPGAMGRREGS_MODE_FPGAOFF 0x0
> > +#define FPGAMGRREGS_MODE_RESETPHASE 0x1
> > +#define FPGAMGRREGS_MODE_CFGPHASE 0x2
> > +#define FPGAMGRREGS_MODE_INITPHASE 0x3
> > +#define FPGAMGRREGS_MODE_USERMODE 0x4
> > +#define FPGAMGRREGS_MODE_UNKNOWN 0x5
> > +
> > +#ifndef __ASSEMBLY__
> >
> > struct socfpga_fpga_manager {
> > /* FPGA Manager Module */
> > @@ -39,39 +63,6 @@ struct socfpga_fpga_manager {
> > u32 gpio_config_reg1;
> > };
> >
> > -#define FPGAMGRREGS_STAT_MODE_MASK 0x7
> > -#define FPGAMGRREGS_STAT_MSEL_MASK 0xf8
> > -#define FPGAMGRREGS_STAT_MSEL_LSB 3
> > -
> > -#define FPGAMGRREGS_CTRL_CFGWDTH_MASK 0x200
> > -#define FPGAMGRREGS_CTRL_AXICFGEN_MASK 0x100
> > -#define FPGAMGRREGS_CTRL_NCONFIGPULL_MASK 0x4
> > -#define FPGAMGRREGS_CTRL_NCE_MASK 0x2
> > -#define FPGAMGRREGS_CTRL_EN_MASK 0x1
> > -#define FPGAMGRREGS_CTRL_CDRATIO_LSB 6
> > -
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CRC_MASK 0x8
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_ID_MASK 0x4
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_CD_MASK 0x2
> > -#define FPGAMGRREGS_MON_GPIO_EXT_PORTA_NS_MASK 0x1
> > -
> > -/* FPGA Mode */
> > -#define FPGAMGRREGS_MODE_FPGAOFF 0x0
> > -#define FPGAMGRREGS_MODE_RESETPHASE 0x1
> > -#define FPGAMGRREGS_MODE_CFGPHASE 0x2
> > -#define FPGAMGRREGS_MODE_INITPHASE 0x3
> > -#define FPGAMGRREGS_MODE_USERMODE 0x4
> > -#define FPGAMGRREGS_MODE_UNKNOWN 0x5
> > -
> > -/* FPGA CD Ratio Value */
> > -#define CDRATIO_x1 0x0
> > -#define CDRATIO_x2 0x1
> > -#define CDRATIO_x4 0x2
> > -#define CDRATIO_x8 0x3
> > -
> > -/* SoCFPGA support functions */
> > -int fpgamgr_test_fpga_ready(void);
> > -int fpgamgr_poll_fpga_ready(void);
> > -int fpgamgr_get_mode(void);
> > +#endif /* __ASSEMBLY__ */
> >
> > -#endif /* _FPGA_MANAGER_H_ */
> > +#endif /* _FPGA_MANAGER_GEN5_H_ */
> > diff --git a/drivers/Makefile b/drivers/Makefile
> > index 4a4b237..b4a2230 100644
> > --- a/drivers/Makefile
> > +++ b/drivers/Makefile
> > @@ -47,6 +47,7 @@ obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
> > obj-$(CONFIG_SPL_SATA_SUPPORT) += block/
> > obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += block/
> > obj-$(CONFIG_SPL_MMC_SUPPORT) += block/
> > +obj-$(CONFIG_FPGA) += fpga/
> > endif
> >
> > ifdef CONFIG_TPL_BUILD
> > diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
> > index 84e7605..649b6d1 100644
> > --- a/drivers/fpga/Makefile
> > +++ b/drivers/fpga/Makefile
> > @@ -19,4 +19,5 @@ obj-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o
> > obj-$(CONFIG_FPGA_CYCLON2) += cyclon2.o
> > obj-$(CONFIG_FPGA_STRATIX_II) += stratixII.o
> > obj-$(CONFIG_FPGA_STRATIX_V) += stratixv.o
> > +obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += socfpga_gen5.o
> > endif
> > diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
> > index f1b2f2c..30ebee8 100644
> > --- a/drivers/fpga/socfpga.c
> > +++ b/drivers/fpga/socfpga.c
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (C) 2012 Altera Corporation <www.altera.com>
> > + * Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
> > * All rights reserved.
> > *
> > * SPDX-License-Identifier: BSD-3-Clause
> > @@ -14,23 +14,10 @@
> >
> > DECLARE_GLOBAL_DATA_PTR;
> >
> > -/* Timeout count */
> > -#define FPGA_TIMEOUT_CNT 0x1000000
> > -
> > static struct socfpga_fpga_manager *fpgamgr_regs =
> > (struct socfpga_fpga_manager
> > *)SOCFPGA_FPGAMGRREGS_ADDRESS;
> > -static struct socfpga_system_manager *sysmgr_regs =
> > - (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS;
> > -
> > -/* Set CD ratio */
> > -static void fpgamgr_set_cd_ratio(unsigned long ratio)
> > -{
> > - clrsetbits_le32(&fpgamgr_regs->ctrl,
> > - 0x3 << FPGAMGRREGS_CTRL_CDRATIO_LSB,
> > - (ratio & 0x3) <<
> > FPGAMGRREGS_CTRL_CDRATIO_LSB);
> > -}
> >
> > -static int fpgamgr_dclkcnt_set(unsigned long cnt)
> > +int fpgamgr_dclkcnt_set(unsigned long cnt)
> > {
> > unsigned long i;
> >
> > @@ -52,253 +39,3 @@ static int fpgamgr_dclkcnt_set(unsigned long
> > cnt)
> >
> > return -ETIMEDOUT;
> > }
> > -
> > -/* Start the FPGA programming by initialize the FPGA Manager */
> > -static int fpgamgr_program_init(void)
> > -{
> > - unsigned long msel, i;
> > -
> > - /* Get the MSEL value */
> > - msel = readl(&fpgamgr_regs->stat);
> > - msel &= FPGAMGRREGS_STAT_MSEL_MASK;
> > - msel >>= FPGAMGRREGS_STAT_MSEL_LSB;
> > -
> > - /*
> > - * Set the cfg width
> > - * If MSEL[3] = 1, cfg width = 32 bit
> > - */
> > - if (msel & 0x8) {
> > - setbits_le32(&fpgamgr_regs->ctrl,
> > - FPGAMGRREGS_CTRL_CFGWDTH_MASK);
> > -
> > - /* To determine the CD ratio */
> > - /* MSEL[1:0] = 0, CD Ratio = 1 */
> > - if ((msel & 0x3) == 0x0)
> > - fpgamgr_set_cd_ratio(CDRATIO_x1);
> > - /* MSEL[1:0] = 1, CD Ratio = 4 */
> > - else if ((msel & 0x3) == 0x1)
> > - fpgamgr_set_cd_ratio(CDRATIO_x4);
> > - /* MSEL[1:0] = 2, CD Ratio = 8 */
> > - else if ((msel & 0x3) == 0x2)
> > - fpgamgr_set_cd_ratio(CDRATIO_x8);
> > -
> > - } else { /* MSEL[3] = 0 */
> > - clrbits_le32(&fpgamgr_regs->ctrl,
> > - FPGAMGRREGS_CTRL_CFGWDTH_MASK);
> > -
> > - /* To determine the CD ratio */
> > - /* MSEL[1:0] = 0, CD Ratio = 1 */
> > - if ((msel & 0x3) == 0x0)
> > - fpgamgr_set_cd_ratio(CDRATIO_x1);
> > - /* MSEL[1:0] = 1, CD Ratio = 2 */
> > - else if ((msel & 0x3) == 0x1)
> > - fpgamgr_set_cd_ratio(CDRATIO_x2);
> > - /* MSEL[1:0] = 2, CD Ratio = 4 */
> > - else if ((msel & 0x3) == 0x2)
> > - fpgamgr_set_cd_ratio(CDRATIO_x4);
> > - }
> > -
> > - /* To enable FPGA Manager configuration */
> > - clrbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_NCE_MASK);
> > -
> > - /* To enable FPGA Manager drive over configuration line */
> > - setbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_EN_MASK);
> > -
> > - /* Put FPGA into reset phase */
> > - setbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_NCONFIGPULL_MASK);
> > -
> > - /* (1) wait until FPGA enter reset phase */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - if (fpgamgr_get_mode() ==
> > FPGAMGRREGS_MODE_RESETPHASE)
> > - break;
> > - }
> > -
> > - /* If not in reset state, return error */
> > - if (fpgamgr_get_mode() != FPGAMGRREGS_MODE_RESETPHASE) {
> > - puts("FPGA: Could not reset\n");
> > - return -1;
> > - }
> > -
> > - /* Release FPGA from reset phase */
> > - clrbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_NCONFIGPULL_MASK);
> > -
> > - /* (2) wait until FPGA enter configuration phase */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - if (fpgamgr_get_mode() ==
> > FPGAMGRREGS_MODE_CFGPHASE)
> > - break;
> > - }
> > -
> > - /* If not in configuration state, return error */
> > - if (fpgamgr_get_mode() != FPGAMGRREGS_MODE_CFGPHASE) {
> > - puts("FPGA: Could not configure\n");
> > - return -2;
> > - }
> > -
> > - /* Clear all interrupts in CB Monitor */
> > - writel(0xFFF, &fpgamgr_regs->gpio_porta_eoi);
> > -
> > - /* Enable AXI configuration */
> > - setbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_AXICFGEN_MASK);
> > -
> > - return 0;
> > -}
> > -
> > -/* Write the RBF data to FPGA Manager */
> > -static void fpgamgr_program_write(const void *rbf_data, unsigned
> > long rbf_size)
> > -{
> > - uint32_t src = (uint32_t)rbf_data;
> > - uint32_t dst = SOCFPGA_FPGAMGRDATA_ADDRESS;
> > -
> > - /* Number of loops for 32-byte long copying. */
> > - uint32_t loops32 = rbf_size / 32;
> > - /* Number of loops for 4-byte long copying + trailing
> > bytes */
> > - uint32_t loops4 = DIV_ROUND_UP(rbf_size % 32, 4);
> > -
> > - asm volatile(
> > - "1: ldmia %0!, {r0-r7}\n"
> > - " stmia %1!, {r0-r7}\n"
> > - " sub %1, #32\n"
> > - " subs %2, #1\n"
> > - " bne 1b\n"
> > - " cmp %3, #0\n"
> > - " beq 3f\n"
> > - "2: ldr %2, [%0], #4\n
> > "
> > - " str %2, [%1]\n"
> > - " subs %3, #1\n"
> > - " bne 2b\n"
> > - "3: nop\n"
> > - : "+r"(src), "+r"(dst), "+r"(loops32),
> > "+r"(loops4) :
> > - : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
> > "cc");
> > -}
> > -
> > -/* Ensure the FPGA entering config done */
> > -static int fpgamgr_program_poll_cd(void)
> > -{
> > - const uint32_t mask =
> > FPGAMGRREGS_MON_GPIO_EXT_PORTA_NS_MASK |
> > - FPGAMGRREGS_MON_GPIO_EXT_PORTA_CD_MA
> > SK;
> > - unsigned long reg, i;
> > -
> > - /* (3) wait until full config done */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - reg = readl(&fpgamgr_regs->gpio_ext_porta);
> > -
> > - /* Config error */
> > - if (!(reg & mask)) {
> > - printf("FPGA: Configuration error.\n");
> > - return -3;
> > - }
> > -
> > - /* Config done without error */
> > - if (reg & mask)
> > - break;
> > - }
> > -
> > - /* Timeout happened, return error */
> > - if (i == FPGA_TIMEOUT_CNT) {
> > - printf("FPGA: Timeout waiting for program.\n");
> > - return -4;
> > - }
> > -
> > - /* Disable AXI configuration */
> > - clrbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_AXICFGEN_MASK);
> > -
> > - return 0;
> > -}
> > -
> > -/* Ensure the FPGA entering init phase */
> > -static int fpgamgr_program_poll_initphase(void)
> > -{
> > - unsigned long i;
> > -
> > - /* Additional clocks for the CB to enter initialization
> > phase */
> > - if (fpgamgr_dclkcnt_set(0x4))
> > - return -5;
> > -
> > - /* (4) wait until FPGA enter init phase or user mode */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - if (fpgamgr_get_mode() ==
> > FPGAMGRREGS_MODE_INITPHASE)
> > - break;
> > - if (fpgamgr_get_mode() ==
> > FPGAMGRREGS_MODE_USERMODE)
> > - break;
> > - }
> > -
> > - /* If not in configuration state, return error */
> > - if (i == FPGA_TIMEOUT_CNT)
> > - return -6;
> > -
> > - return 0;
> > -}
> > -
> > -/* Ensure the FPGA entering user mode */
> > -static int fpgamgr_program_poll_usermode(void)
> > -{
> > - unsigned long i;
> > -
> > - /* Additional clocks for the CB to exit initialization
> > phase */
> > - if (fpgamgr_dclkcnt_set(0x5000))
> > - return -7;
> > -
> > - /* (5) wait until FPGA enter user mode */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - if (fpgamgr_get_mode() ==
> > FPGAMGRREGS_MODE_USERMODE)
> > - break;
> > - }
> > - /* If not in configuration state, return error */
> > - if (i == FPGA_TIMEOUT_CNT)
> > - return -8;
> > -
> > - /* To release FPGA Manager drive over configuration line
> > */
> > - clrbits_le32(&fpgamgr_regs->ctrl,
> > FPGAMGRREGS_CTRL_EN_MASK);
> > -
> > - return 0;
> > -}
> > -
> > -/*
> > - * FPGA Manager to program the FPGA. This is the interface used by
> > FPGA driver.
> > - * Return 0 for sucess, non-zero for error.
> > - */
> > -int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t
> > rbf_size)
> > -{
> > - unsigned long status;
> > -
> > - if ((uint32_t)rbf_data & 0x3) {
> > - puts("FPGA: Unaligned data, realign to 32bit
> > boundary.\n");
> > - return -EINVAL;
> > - }
> > -
> > - /* Prior programming the FPGA, all bridges need to be shut
> > off */
> > -
> > - /* Disable all signals from hps peripheral controller to
> > fpga */
> > - writel(0, &sysmgr_regs->fpgaintfgrp_module);
> > -
> > - /* Disable all signals from FPGA to HPS SDRAM */
> > -#define SDR_CTRLGRP_FPGAPORTRST_ADDRESS 0x5080
> > - writel(0, SOCFPGA_SDR_ADDRESS +
> > SDR_CTRLGRP_FPGAPORTRST_ADDRESS);
> > -
> > - /* Disable all axi bridge (hps2fpga, lwhps2fpga &
> > fpga2hps) */
> > - socfpga_bridges_reset(1);
> > -
> > - /* Unmap the bridges from NIC-301 */
> > - writel(0x1, SOCFPGA_L3REGS_ADDRESS);
> > -
> > - /* Initialize the FPGA Manager */
> > - status = fpgamgr_program_init();
> > - if (status)
> > - return status;
> > -
> > - /* Write the RBF data to FPGA Manager */
> > - fpgamgr_program_write(rbf_data, rbf_size);
> > -
> > - /* Ensure the FPGA entering config done */
> > - status = fpgamgr_program_poll_cd();
> > - if (status)
> > - return status;
> > -
> > - /* Ensure the FPGA entering init phase */
> > - status = fpgamgr_program_poll_initphase();
> > - if (status)
> > - return status;
> > -
> > - /* Ensure the FPGA entering user mode */
> > - return fpgamgr_program_poll_usermode();
> > -}
> > diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga_gen5.c
> > similarity index 92%
> > copy from drivers/fpga/socfpga.c
> > copy to drivers/fpga/socfpga_gen5.c
> > index f1b2f2c..6992d83 100644
> > --- a/drivers/fpga/socfpga.c
> > +++ b/drivers/fpga/socfpga_gen5.c
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (C) 2012 Altera Corporation <www.altera.com>
> > + * Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
> > * All rights reserved.
> > *
> > * SPDX-License-Identifier: BSD-3-Clause
> > @@ -14,9 +14,6 @@
> >
> > DECLARE_GLOBAL_DATA_PTR;
> >
> > -/* Timeout count */
> > -#define FPGA_TIMEOUT_CNT 0x1000000
> > -
> > static struct socfpga_fpga_manager *fpgamgr_regs =
> > (struct socfpga_fpga_manager
> > *)SOCFPGA_FPGAMGRREGS_ADDRESS;
> > static struct socfpga_system_manager *sysmgr_regs =
> > @@ -30,29 +27,6 @@ static void fpgamgr_set_cd_ratio(unsigned long
> > ratio)
> > (ratio & 0x3) <<
> > FPGAMGRREGS_CTRL_CDRATIO_LSB);
> > }
> >
> > -static int fpgamgr_dclkcnt_set(unsigned long cnt)
> > -{
> > - unsigned long i;
> > -
> > - /* Clear any existing done status */
> > - if (readl(&fpgamgr_regs->dclkstat))
> > - writel(0x1, &fpgamgr_regs->dclkstat);
> > -
> > - /* Write the dclkcnt */
> > - writel(cnt, &fpgamgr_regs->dclkcnt);
> > -
> > - /* Wait till the dclkcnt done */
> > - for (i = 0; i < FPGA_TIMEOUT_CNT; i++) {
> > - if (!readl(&fpgamgr_regs->dclkstat))
> > - continue;
> > -
> > - writel(0x1, &fpgamgr_regs->dclkstat);
> > - return 0;
> > - }
> > -
> > - return -ETIMEDOUT;
> > -}
> > -
> > /* Start the FPGA programming by initialize the FPGA Manager */
> > static int fpgamgr_program_init(void)
> > {
> > @@ -267,7 +241,6 @@ int socfpga_load(Altera_desc *desc, const void
> > *rbf_data, size_t rbf_size)
> > }
> >
> > /* Prior programming the FPGA, all bridges need to be shut
> > off */
> > -
> > /* Disable all signals from hps peripheral controller to
> > fpga */
> > writel(0, &sysmgr_regs->fpgaintfgrp_module);
> >
> >
>
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
