ARM: add fncpy.h from linux v4.6
Subsystems (6)
PATCH 1/13 ARM: add fncpy.h from linux v4.6
From: Steffen Trumtrar <[email protected]>
Description from the linux commit 5756e9dd0de6d5c307773f8f734c0684b3098fdd:
ARM: 6640/1: Thumb-2: Symbol manipulation macros for function body copying
In low-level board support code, there is sometimes a need to copy a function body to another location at run-time.
A straightforward call to memcpy doesn't work in Thumb-2, because bit 0 of external Thumb function symbols is set to 1, indicating that the function is Thumb. Without corrective measures, this will cause an off-by-one copy, and the copy may be called using the wrong instruction set.
This patch adds an fncpy() macro to help with such copies.
Particular care is needed, because C doesn't guarantee any defined behaviour when casting a function pointer to any other type. This has been observed to lead to strange optimisation side-effects when doing the arithmetic which is required in order to copy/move function bodies correctly in Thumb-2.
Thanks to Russell King and Nicolas Pitre for their input on this patch.
--- arch/arm/include/asm/fncpy.h | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 arch/arm/include/asm/fncpy.h
arch/arm/include/asm/fncpy.h new file +82 -0
@@ -0,0 +1,82 @@ +/* +* arch/arm/include/asm/fncpy.h - helper macros for function body copying +* +* Copyright (C) 2011 Linaro Limited +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* +* These macros are intended for use when there is a need to copy a low-level +* function body into special memory. +* +* For example, when reconfiguring the SDRAM controller, the code doing the +* reconfiguration may need to run from SRAM. +* +* NOTE: that the copied function body must be entirely self-contained and +* position-independent in order for this to work properly. +* +* NOTE: in order for embedded literals and data to get referenced correctly, +* the alignment of functions must be preserved when copying. To ensure this, +* the source and destination addresses for fncpy() must be aligned to a +* multiple of 8 bytes: you will be get a BUG() if this condition is not met. +* You will typically need a ".align 3" directive in the assembler where the +* function to be copied is defined, and ensure that your allocator for the +* destination buffer returns 8-byte-aligned pointers. +* +* Typical usage example: +* +* extern int f(args); +* extern uint32_t size_of_f; +* int (*copied_f)(args); +* void *sram_buffer; +* +* copied_f = fncpy(sram_buffer, &f, size_of_f); +* +* ... later, call the function: ... +* +* copied_f(args); +* +* The size of the function to be copied can't be determined from C: +* this must be determined by other means, such as adding assmbler directives +* in the file where f is defined. +*/ + +#ifndef __ASM_FNCPY_H +#define __ASM_FNCPY_H + +#include <linux/types.h> +#include <linux/string.h> + +/* +* Minimum alignment requirement for the source and destination addresses +* for function copying. +*/ +#define FNCPY_ALIGN 8 + +#define fncpy (dest_buf, funcp, size) ({ \ + uintptr_t __funcp_address; \ + typeof(funcp) __result; \ + \ + asm("" : "=r" (__funcp_address) : "0" (funcp)); \ + \ + memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \ + \ + asm("" : "=r" (__result) \ + : "0" ((uintptr_t)(dest_buf) | (__funcp_address & 1))); \ + \ + __result; \ +}) + +#endif /* !__ASM_FNCPY_H */
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/13 ARM: mmu: inherit pte flags from pmd
From: Sascha Hauer <[email protected]>
When creating a 2nd level page table from a section inherit the flags from the section rather than assuming the section was mapped cached previously. This fixes creating a 2nd level pagetable when the section was mapped differently than we expected.
--- arch/arm/cpu/mmu.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
arch/arm/cpu/mmu.c +24 -4
@@ -138,6 +138,29 @@ static u32 *arm_create_pte(unsigned long virt, uint32_t flags)return table; } +static u32 pmd_flags_to_pte (u32 pmd) +{ +u32 pte =0 ; + +if (pmd &PMD_SECT_BUFFERABLE ) + pte |=PTE_BUFFERABLE ; +if (pmd &PMD_SECT_CACHEABLE ) + pte |=PTE_CACHEABLE ; +if (pmd & PMD_SECT_nG) + pte |=PTE_EXT_NG ; +if (pmd &PMD_SECT_XN ) + pte |=PTE_EXT_XN ; + +/* TEX[2:0] */ + pte |=PTE_EXT_TEX ((pmd >>12 ) &7 ); +/* AP[1:0] */ + pte |= ((pmd >>10 ) &0x3 ) <<4 ; +/* AP[2] */ + pte |= ((pmd >>15 ) &0x1 ) <<9 ; + +return pte; +} +int arch_remap_range (void *start,size_t size,unsigned flags) {u32 addr = (u32 )start;
@@ -206,11 +229,8 @@ int arch_remap_range(void *start, size_t size, unsigned flags)* If PTE is not found it means that * we needs to split this section and * create a new page table for it -* -* NOTE: Here we assume that section -* we just split was mapped as cached */ - table =arm_create_pte (addr, pte_flags_cached); + table =arm_create_pte (addr,pmd_flags_to_pte (*pgd)); pte =find_pte (addr);BUG_ON (!pte); }
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/13 firmware: socfpga: set APPLYCFG after loading bitstream
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
To make changes to the SDRAM controller effective, the APPLYCFG bit must be set after programming the bitstream to the FPGA. This has to be done without any SDRAM usage. Therefore copy the function to execute to the OCRAM and execute it from there.
--- .../mach-socfpga/include/mach/cyclone5-regs.h | 1 + drivers/firmware/Makefile | 2 +- drivers/firmware/socfpga.c | 21 +++++++++++++++++++ drivers/firmware/socfpga_sdr.S | 17 +++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 drivers/firmware/socfpga_sdr.S
arch/arm/mach-socfpga/include/mach/cyclone5-regs.h +1 -0
@@ -18,5 +18,6 @@#define CYCLONE5_SYSMGR_ADDRESS 0xffd08000#define CYCLONE5_SCANMGR_ADDRESS 0xfff02000#define CYCLONE5_SMP_TWD_ADDRESS 0xfffec600 +#define CYCLONE5_OCRAM_ADDRESS 0xffff0000#endif /* __MACH_SOCFPGA_REGS_H */
drivers/firmware/Makefile +1 -1
@@ -1,3 +1,3 @@ obj-$(CONFIG_FIRMWARE_ALTERA_SERIAL) += altera_serial.o -obj-$(CONFIG_FIRMWARE_ALTERA_SOCFPGA) += socfpga.o +obj-$(CONFIG_FIRMWARE_ALTERA_SOCFPGA) += socfpga.o socfpga_sdr.o obj-$(CONFIG_FIRMWARE_ZYNQMP_FPGA) += zynqmp-fpga.o
drivers/firmware/socfpga.c +21 -0
@@ -38,6 +38,9 @@#include <mach/cyclone5-reset-manager.h> #include <mach/cyclone5-regs.h> #include <mach/cyclone5-sdram.h> +#include <asm/fncpy.h> +#include <mmu.h> +#include <asm/cache.h> #define FPGAMGRREGS_STAT 0x0#define FPGAMGRREGS_CTRL 0x4
@@ -77,6 +80,9 @@#define CDRATIO_x4 0x2#define CDRATIO_x8 0x3 +extern void socfpga_sdram_apply_static_cfg (void __iomem *sdrctrlgrp); +extern void socfpga_sdram_apply_static_cfg_end (void *); +struct fpgamgr {struct firmware_handler fh;struct device_d dev;
@@ -353,6 +359,9 @@ static int fpgamgr_program_finish(struct firmware_handler *fh) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh);int status; +unsigned int func_size = &socfpga_sdram_apply_static_cfg_end - + &socfpga_sdram_apply_static_cfg; +void (*ocram_func)(void __iomem *ocram_base);/* Ensure the FPGA entering config done */ status =fpgamgr_program_poll_cd (mgr);
@@ -382,6 +391,18 @@ static int fpgamgr_program_finish(struct firmware_handler *fh)return status; } +remap_range ((void *)CYCLONE5_OCRAM_ADDRESS ,PAGE_SIZE ,MAP_CACHED ); + +dev_dbg (&mgr->dev,"Setting APPLYCFG bit...\n" ); + + ocram_func =fncpy ((void __iomem *)CYCLONE5_OCRAM_ADDRESS , + &socfpga_sdram_apply_static_cfg, func_size); + +sync_caches_for_execution (); + +ocram_func ((void __iomem *) (CYCLONE5_SDR_ADDRESS + +SDR_CTRLGRP_STATICCFG_ADDRESS )); +return 0 ; }
drivers/firmware/socfpga_sdr.S new file +17 -0
@@ -0,0 +1,17 @@ +#include <linux/linkage.h> + + .arch armv7-a + .arm + +/* + * r0 : sdram controller staticcfg + */ + +ENTRY(socfpga_sdram_apply_static_cfg) + push {ip,lr} + ldr r1, [r0] + orr r1, r1, #8 + str r1, [r0] + pop {ip,pc} + .align +ENTRY(socfpga_sdram_apply_static_cfg_end)
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/13 reset: add of_reset_control_get to header
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
--- drivers/reset/core.c | 2 +- include/linux/reset.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/reset/core.c +1 -1
@@ -147,7 +147,7 @@ EXPORT_SYMBOL_GPL(reset_control_deassert);* * Use of id names is optional. */ -static struct reset_control *of_reset_control_get (struct device_node *node, +struct reset_control *of_reset_control_get (struct device_node *node,const char *id) {struct reset_control *rstc;
include/linux/reset.h +2 -0
@@ -11,6 +11,8 @@ int reset_control_assert(struct reset_control *rstc);int reset_control_deassert (struct reset_control *rstc);struct reset_control *reset_control_get (struct device_d *dev,const char *id); +struct reset_control *of_reset_control_get (struct device_node *node, +const char *id);void reset_control_put (struct reset_control *rstc);int __must_check device_reset (struct device_d *dev);
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/13 drivers: add fpga bridge framework
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
Import the fpga bridge framework from linux v4.10-rc2.
Description from the initial commit adding this to linux:21aeda950c5f84a8351b862816d832120b217a9b
fpga: add fpga bridge framework
This framework adds API functions for enabling/ disabling FPGA bridges under kernel control.
This allows the Linux kernel to disable FPGA bridges during FPGA reprogramming and to enable FPGA bridges when FPGA reprogramming is done. This framework is be manufacturer-agnostic, allowing it to be used in interfaces that use the FPGA Manager Framework to reprogram FPGA's.
The functions are:
* of_fpga_bridge_get
* fpga_bridge_put
Get/put an exclusive reference to a FPGA bridge.
* fpga_bridge_enable
* fpga_bridge_disable
Enable/Disable traffic through a bridge.
* fpga_bridge_register
* fpga_bridge_unregister
Register/unregister a device-specific low level FPGA Bridge driver.
Get an exclusive reference to a bridge and add it to a list:
* fpga_bridge_get_to_list
To enable/disable/put a set of bridges that are on a list:
* fpga_bridges_enable
* fpga_bridges_disable
* fpga_bridges_put
--- drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/fpga/Kconfig | 22 ++++ drivers/fpga/Makefile | 6 + drivers/fpga/fpga-bridge.c | 226 +++++++++++++++++++++++++++++++++++++ include/fpga-bridge.h | 69 +++++++++++ 6 files changed, 325 insertions(+) create mode 100644 drivers/fpga/Kconfig create mode 100644 drivers/fpga/Makefile create mode 100644 drivers/fpga/fpga-bridge.c create mode 100644 include/fpga-bridge.h
drivers/Kconfig +1 -0
@@ -36,6 +36,7 @@ source "drivers/reset/Kconfig" source "drivers/pci/Kconfig" source "drivers/rtc/Kconfig" source "drivers/firmware/Kconfig" +source "drivers/fpga/Kconfig" source "drivers/phy/Kconfig" source "drivers/crypto/Kconfig" source "drivers/memory/Kconfig"
drivers/Makefile +1 -0
@@ -34,6 +34,7 @@ obj-$(CONFIG_RESET_CONTROLLER) += reset/ obj-$(CONFIG_PCI) += pci/ obj-y += rtc/ obj-$(CONFIG_FIRMWARE) += firmware/ +obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_GENERIC_PHY) += phy/ obj-$(CONFIG_HAB) += hab/ obj-$(CONFIG_CRYPTO_HW) += crypto/
drivers/fpga/Kconfig new file +22 -0
@@ -0,0 +1,22 @@ +# +# FPGA framework configuration +# + +menu "FPGA Configuration Support" + +config FPGA + tristate "FPGA Configuration Framework" + help + Say Y here if you want support for configuring FPGAs from barebox. + +if FPGA + +config FPGA_BRIDGE + tristate "FPGA Bridge Framework" + help + Say Y here if you want to support bridges connected between host + processors and FPGAs or between FPGAs. + +endif # FPGA + +endmenu
drivers/fpga/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# +# Makefile for the fpga framework and fpga manager drivers. +# + +# FPGA Bridge Drivers +obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o
drivers/fpga/fpga-bridge.c new file +226 -0
226 lines not on this page · raw message
include/fpga-bridge.h new file +69 -0
69 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 6/13 drivers: fpga: add socfpga bridges
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
Import the SoCFPGA bridges drivers from linux v4.10-rc2.
Description from the original commit:e5f8efa5c8bf86c1fa698551d54db8f6aee221fd
ARM: socfpga: fpga bridge driver support
Supports Altera SOCFPGA bridges:
* fpga2sdram
* fpga2hps
* hps2fpga
* lwhps2fpga
Allows enabling/disabling the bridges through the FPGA Bridge Framework API functions.
The fpga2sdram driver only supports enabling and disabling of the ports that been configured early on. This is due to a hardware limitation where the read, write, and command ports on the fpga2sdram bridge can only be reconfigured while there are no transactions to the sdram, i.e. when running out of OCRAM before the kernel boots.
Device tree property 'init-val' configures the driver to enable or disable the bridge during probe. If the property does not exist, the driver will leave the bridge in its current state.
--- drivers/fpga/Kconfig | 8 + drivers/fpga/Makefile | 1 + drivers/fpga/fpga-bridge.c | 2 +- drivers/fpga/socfpga-fpga2sdram-bridge.c | 139 ++++++++++++++++++ drivers/fpga/socfpga-hps2fpga-bridge.c | 179 +++++++++++++++++++++++ 5 files changed, 328 insertions(+), 1 deletion(-) create mode 100644 drivers/fpga/socfpga-fpga2sdram-bridge.c create mode 100644 drivers/fpga/socfpga-hps2fpga-bridge.c
drivers/fpga/Kconfig +8 -0
@@ -17,6 +17,14 @@ config FPGA_BRIDGE Say Y here if you want to support bridges connected between host processors and FPGAs or between FPGAs. +config SOCFPGA_FPGA_BRIDGE + tristate "Altera SoCFPGA FPGA Bridges" + depends on ARCH_SOCFPGA && FPGA_BRIDGE + select RESET_CONTROLLER + help + Say Y to enable drivers for FPGA bridges for Altera SOCFPGA + devices. + endif # FPGA endmenu
drivers/fpga/Makefile +1 -0
@@ -4,3 +4,4 @@ # FPGA Bridge Drivers obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o +obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += socfpga-hps2fpga-bridge.o socfpga-fpga2sdram-bridge.o
drivers/fpga/fpga-bridge.c +1 -1
@@ -68,7 +68,7 @@ struct fpga_bridge *of_fpga_bridge_get(struct device_node *np) {struct device_d *dev;struct fpga_bridge *bridge; -int ret = -ENODEV ; +int ret = -EPROBE_DEFER ; dev =of_find_device_by_node (np);if (!dev || !dev->priv)
drivers/fpga/socfpga-fpga2sdram-bridge.c new file +139 -0
139 lines not on this page · raw message
drivers/fpga/socfpga-hps2fpga-bridge.c new file +179 -0
179 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 7/13 firmware: socfpga: change function prefixes
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
Since there is now a fpgamgr framework in barebox, the function names are misleading. Change that to be SoCFPGA specific.
--- drivers/firmware/socfpga.c | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
drivers/firmware/socfpga.c +29 -29
@@ -92,12 +92,12 @@ struct fpgamgr { };/* Get the FPGA mode */ -static uint32_t fpgamgr_get_mode (struct fpgamgr *mgr) +static uint32_t socfpga_fpgamgr_get_mode (struct fpgamgr *mgr) {return readl (mgr->regs +FPGAMGRREGS_STAT ) &FPGAMGRREGS_STAT_MODE_MASK ; } -static int fpgamgr_dclkcnt_set (struct fpgamgr *mgr,unsigned long cnt) +static int socfpga_fpgamgr_dclkcnt_set (struct fpgamgr *mgr,unsigned long cnt) {uint64_t start;
@@ -121,7 +121,7 @@ static int fpgamgr_dclkcnt_set(struct fpgamgr *mgr, unsigned long cnt) }/* Start the FPGA programming by initialize the FPGA Manager */ -static int fpgamgr_program_init (struct fpgamgr *mgr) +static int socfpga_fpgamgr_program_init (struct fpgamgr *mgr) {unsigned long reg;uint32_t ctrl =0 , ratio;
@@ -170,7 +170,7 @@ static int fpgamgr_program_init(struct fpgamgr *mgr)/* (1) wait until FPGA enter reset phase */ start =get_time_ns ();while (1 ) { -if (fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_RESETPHASE ) +if (socfpga_fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_RESETPHASE )break ;if (is_timeout (start,100 *MSECOND ))return -ETIMEDOUT ;
@@ -184,7 +184,7 @@ static int fpgamgr_program_init(struct fpgamgr *mgr)/* (2) wait until FPGA enter configuration phase */ start =get_time_ns ();while (1 ) { -if (fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_CFGPHASE ) +if (socfpga_fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_CFGPHASE )break ;if (is_timeout (start,100 *MSECOND ))return -ETIMEDOUT ;
@@ -202,7 +202,7 @@ static int fpgamgr_program_init(struct fpgamgr *mgr) }/* Ensure the FPGA entering config done */ -static int fpgamgr_program_poll_cd (struct fpgamgr *mgr) +static int socfpga_fpgamgr_program_poll_cd (struct fpgamgr *mgr) {unsigned long reg;uint32_t val;
@@ -236,18 +236,18 @@ static int fpgamgr_program_poll_cd(struct fpgamgr *mgr) }/* Ensure the FPGA entering init phase */ -static int fpgamgr_program_poll_initphase (struct fpgamgr *mgr) +static int socfpga_fpgamgr_program_poll_initphase (struct fpgamgr *mgr) {uint64_t start;/* additional clocks for the CB to enter initialization phase */ -if (fpgamgr_dclkcnt_set (mgr,0x4 ) !=0 ) +if (socfpga_fpgamgr_dclkcnt_set (mgr,0x4 ) !=0 )return -5 ;/* (4) wait until FPGA enter init phase or user mode */ start =get_time_ns ();while (1 ) { -int mode =fpgamgr_get_mode (mgr); +int mode =socfpga_fpgamgr_get_mode (mgr);if (mode ==FPGAMGRREGS_MODE_INITPHASE || mode ==FPGAMGRREGS_MODE_USERMODE )
@@ -261,19 +261,19 @@ static int fpgamgr_program_poll_initphase(struct fpgamgr *mgr) }/* Ensure the FPGA entering user mode */ -static int fpgamgr_program_poll_usermode (struct fpgamgr *mgr) +static int socfpga_fpgamgr_program_poll_usermode (struct fpgamgr *mgr) {uint32_t val;uint64_t start;/* additional clocks for the CB to exit initialization phase */ -if (fpgamgr_dclkcnt_set (mgr,0x5000 ) !=0 ) +if (socfpga_fpgamgr_dclkcnt_set (mgr,0x5000 ) !=0 )return -7 ;/* (5) wait until FPGA enter user mode */ start =get_time_ns ();while (1 ) { -if (fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_USERMODE ) +if (socfpga_fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_USERMODE )break ;if (is_timeout (start,100 *MSECOND ))return -ETIMEDOUT ;
@@ -291,7 +291,7 @@ static int fpgamgr_program_poll_usermode(struct fpgamgr *mgr)* Using FPGA Manager to program the FPGA * Return 0 for sucess */ -static int fpgamgr_program_start (struct firmware_handler *fh) +static int socfpga_fpgamgr_program_start (struct firmware_handler *fh) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh);int status;
@@ -313,7 +313,7 @@ static int fpgamgr_program_start(struct firmware_handler *fh)dev_dbg (&mgr->dev,"start programming...\n" );/* initialize the FPGA Manager */ - status =fpgamgr_program_init (mgr); + status =socfpga_fpgamgr_program_init (mgr);if (status) {dev_err (&mgr->dev,"program init failed with: %s\n" ,strerror (-status));
@@ -324,7 +324,7 @@ static int fpgamgr_program_start(struct firmware_handler *fh) }/* Write the RBF data to FPGA Manager */ -static int fpgamgr_program_write_buf (struct firmware_handler *fh,const void *buf, +static int socfpga_fpgamgr_program_write_buf (struct firmware_handler *fh,const void *buf,size_t size) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh);
@@ -355,7 +355,7 @@ static int fpgamgr_program_write_buf(struct firmware_handler *fh, const void *bureturn 0 ; } -static int fpgamgr_program_finish (struct firmware_handler *fh) +static int socfpga_fpgamgr_program_finish (struct firmware_handler *fh) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh);int status;
@@ -364,7 +364,7 @@ static int fpgamgr_program_finish(struct firmware_handler *fh)void (*ocram_func)(void __iomem *ocram_base);/* Ensure the FPGA entering config done */ - status =fpgamgr_program_poll_cd (mgr); + status =socfpga_fpgamgr_program_poll_cd (mgr);if (status) {dev_err (&mgr->dev,"poll for config done failed with: %s\n" ,strerror (-status));
@@ -374,7 +374,7 @@ static int fpgamgr_program_finish(struct firmware_handler *fh)dev_dbg (&mgr->dev,"waiting for init phase...\n" );/* Ensure the FPGA entering init phase */ - status =fpgamgr_program_poll_initphase (mgr); + status =socfpga_fpgamgr_program_poll_initphase (mgr);if (status) {dev_err (&mgr->dev,"poll for init phase failed with: %s\n" ,strerror (-status));
@@ -384,7 +384,7 @@ static int fpgamgr_program_finish(struct firmware_handler *fh)dev_dbg (&mgr->dev,"waiting for user mode...\n" );/* Ensure the FPGA entering user mode */ - status =fpgamgr_program_poll_usermode (mgr); + status =socfpga_fpgamgr_program_poll_usermode (mgr);if (status) {dev_err (&mgr->dev,"poll for user mode with: %s\n" ,strerror (-status));
@@ -410,11 +410,11 @@ static int fpgamgr_program_finish(struct firmware_handler *fh)static int programmed_get (struct param_d *p,void *priv) {struct fpgamgr *mgr = priv; - mgr->programmed =fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_USERMODE ; + mgr->programmed =socfpga_fpgamgr_get_mode (mgr) ==FPGAMGRREGS_MODE_USERMODE ;return 0 ; } -static int fpgamgr_probe (struct device_d *dev) +static int socfpga_fpgamgr_probe (struct device_d *dev) {struct resource *iores;struct fpgamgr *mgr;
@@ -448,9 +448,9 @@ static int fpgamgr_probe(struct device_d *dev)else fh->id =xstrdup ("socfpga-fpga" ); - fh->open = fpgamgr_program_start; - fh->write = fpgamgr_program_write_buf; - fh->close = fpgamgr_program_finish; + fh->open = socfpga_fpgamgr_program_start; + fh->write = socfpga_fpgamgr_program_write_buf; + fh->close = socfpga_fpgamgr_program_finish;of_property_read_string (dev->device_node,"compatible" , &model);if (model) fh->model =xstrdup (model);
@@ -488,7 +488,7 @@ out:return ret; } -static struct of_device_id fpgamgr_id_table[] = { +static struct of_device_id socfpga_fpgamgr_id_table[] = { { .compatible ="altr,socfpga-fpga-mgr" , },
@@ -498,9 +498,9 @@ static struct of_device_id fpgamgr_id_table[] = { {/* sentinel */ } }; -static struct driver_d fpgamgr_driver = { +static struct driver_d socfpga_fpgamgr_driver = { .name ="socfpa-fpgamgr" , - .of_compatible =DRV_OF_COMPAT (fpgamgr_id_table), - .probe = fpgamgr_probe, + .of_compatible =DRV_OF_COMPAT (socfpga_fpgamgr_id_table), + .probe = socfpga_fpgamgr_probe, }; -device_platform_driver (fpgamgr_driver); +device_platform_driver (socfpga_fpgamgr_driver);
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 8/13 firmware: import fpga-mgr.h from linux
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
Instead of defining the fpga-mgr structure in the socfpga driver, import the fpga-mgr.h file from linux v4.13.
--- drivers/firmware/socfpga.c | 9 +--- include/firmware.h | 1 + include/fpga-mgr.h | 102 +++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 include/fpga-mgr.h
drivers/firmware/socfpga.c +1 -8
@@ -27,6 +27,7 @@*/ #include <firmware.h> +#include <fpga-mgr.h> #include <command.h> #include <common.h> #include <malloc.h>
@@ -83,14 +84,6 @@extern void socfpga_sdram_apply_static_cfg (void __iomem *sdrctrlgrp);extern void socfpga_sdram_apply_static_cfg_end (void *); -struct fpgamgr { -struct firmware_handler fh; -struct device_d dev; -void __iomem *regs; -void __iomem *regs_data; -int programmed; -}; -/* Get the FPGA mode */ static uint32_t socfpga_fpgamgr_get_mode (struct fpgamgr *mgr) {
include/firmware.h +1 -0
@@ -13,6 +13,7 @@ struct firmware_handler {char *id;/* unique identifier for this firmware device */ char *model;/* description for this device */ struct device_d *dev; +void *priv;/* called once to prepare the firmware's programming cycle */ int (*open)(struct firmware_handler *);/* called multiple times to program the firmware with the given data */
include/fpga-mgr.h new file +102 -0
102 lines not on this page · raw message
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 9/13 of: kconfig: of_overlay uses firmwaremgr_load_file
In reply to Steffen TrumtrarAs of_firmware.c uses the firmwaremgr_load_file function, it depends on FIRMWARE.
--- drivers/of/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/of/Kconfig +1 -0
@@ -49,6 +49,7 @@ config OF_BAREBOX_ENV_IN_FS config OF_OVERLAY select OFTREE + select FIRMWARE bool "Devicetree overlays" help Overlays allow to patch the devicetree. Unlike Linux, Barebox does
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 10/13 of: of_firmware: add support for fpga bridges
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
Add support for potentially defined FPGA-bridges in the overlay.
While at it also add support for loading the firmware directly via a path instead of 'needing' an overlay for that.
The direct loading will be done with the existent firmwareload command.
--- drivers/of/Makefile | 3 +- drivers/of/of_firmware.c | 88 ++++++++++++++++++++++++++++++++++++---- include/of.h | 21 +++++++--- 3 files changed, 96 insertions(+), 16 deletions(-)
drivers/of/Makefile +2 -1
@@ -6,4 +6,5 @@ obj-y += partition.o obj-y += of_net.o obj-$(CONFIG_MTD) += of_mtd.o obj-$(CONFIG_OF_BAREBOX_DRIVERS) += barebox.o -obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o of_firmware.o +obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o +obj-$(CONFIG_FIRMWARE) += of_firmware.o
drivers/of/of_firmware.c +79 -9
128 lines not on this page · raw message
include/of.h +15 -6
@@ -1020,6 +1020,21 @@ static inline struct device_node *of_find_root_node(struct device_node *node)return node; } +#ifdef CONFIG_FIRMWARE +int of_firmware_load_file (const char *path); +int of_firmware_load_overlay (struct device_node *overlay,const char *path); +#else +static inline int of_firmware_load_file (const char *path) +{ +return -ENOSYS ; +} + +static inline int of_firmware_load_overlay (const char *path) +{ +return -ENOSYS ; +} +#endif +#ifdef CONFIG_OF_OVERLAY struct device_node *of_resolve_phandles (struct device_node *root,const struct device_node *overlay);
@@ -1032,7 +1047,6 @@ int of_process_overlay(struct device_node *root, struct device_node *overlay, void *data), void *data); -int of_firmware_load_overlay (struct device_node *overlay,const char *path);#else static inline struct device_node *of_resolve_phandles (struct device_node *root,const struct device_node *overlay)
@@ -1059,11 +1073,6 @@ static inline int of_process_overlay(struct device_node *root, {return -ENOSYS ; } - -static inline int of_firmware_load_overlay (struct device_node *overlay,const char *path) -{ -return -ENOSYS ; -}#endif #endif /* __OF_H */
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 10/13] of: of_firmware: add support for fpga bridges
Quoted 32 lines · Steffen Trumtrar
From: Steffen Trumtrar <[email protected]>
Add support for potentially defined FPGA-bridges in the overlay.
While at it also add support for loading the firmware directly via a path instead of 'needing' an overlay for that.
The direct loading will be done with the existent firmwareload command.Signed-off-by Steffen Trumtrar <[email protected]>--- drivers/of/Makefile | 3 +- drivers/of/of_firmware.c | 88 ++++++++++++++++++++++++++++++++++++---- include/of.h | 21 +++++++--- 3 files changed, 96 insertions(+), 16 deletions(-)drivers/of/Makefile +2
-1@@ -6,4 +6,5 @@ obj-y += partition.o obj-y += of_net.o obj-$(CONFIG_MTD) += of_mtd.o obj-$(CONFIG_OF_BAREBOX_DRIVERS) += barebox.o -obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o of_firmware.o +obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o +obj-$(CONFIG_FIRMWARE) += of_firmware.odrivers/of/of_firmware.c +0
-0@@ -4,12 +4,52 @@*/
drivers/of/of_firmware.c line 14
Quoted 10 lines
drivers/of/of_firmware.c +2
-0#include <common.h> #include <firmware.h> +#include <fpga-bridge.h> #include <of.h> struct overlay_info {const char *firmware_path; }; +#ifdef CONFIG_FPGA_BRIDGE
Trailing whitespace here.
drivers/of/of_firmware.c static struct firmware_mgr *of_node_get_mgr(struct device_node *np) · line 96
Quoted 6 lines
drivers/of/of_firmware.c +6
-0+int of_firmware_load_file (const char *path) +{ +int err; +struct device_node *target; + + target =of_find_compatible_node (NULL ,NULL ,"fpga-region" );
This assumes there is only one node compatible to fpga-region. What about others?
Sascha
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 10/13] of: of_firmware: add support for fpga bridges
Quoted 38 lines · Sascha Hauer
Quoted 37 lines · Steffen Trumtrar
From: Steffen Trumtrar <[email protected]>
Add support for potentially defined FPGA-bridges in the overlay.
While at it also add support for loading the firmware directly via a path instead of 'needing' an overlay for that.
The direct loading will be done with the existent firmwareload command.Signed-off-by Steffen Trumtrar <[email protected]>--- drivers/of/Makefile | 3 +- drivers/of/of_firmware.c | 88 ++++++++++++++++++++++++++++++++++++---- include/of.h | 21 +++++++--- 3 files changed, 96 insertions(+), 16 deletions(-)drivers/of/Makefile +2
-1@@ -6,4 +6,5 @@ obj-y += partition.o obj-y += of_net.o obj-$(CONFIG_MTD) += of_mtd.o obj-$(CONFIG_OF_BAREBOX_DRIVERS) += barebox.o -obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o of_firmware.o +obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o +obj-$(CONFIG_FIRMWARE) += of_firmware.odrivers/of/of_firmware.c +1
-0@@ -4,12 +4,52 @@*/ #include <common.h> #include <firmware.h> +#include <fpga-bridge.h> #include <of.h>
Quoted 8 lines
drivers/of/of_firmware.c line 14
Quoted 5 lines
drivers/of/of_firmware.c +1
-0struct overlay_info {const char *firmware_path; }; +#ifdef CONFIG_FPGA_BRIDGE Trailing whitespace here.
Meh :(
Quoted 9 lines
drivers/of/of_firmware.c static struct firmware_mgr *of_node_get_mgr(struct device_node *np) · line 96
Quoted 6 lines
drivers/of/of_firmware.c +6
-0+int of_firmware_load_file (const char *path) +{ +int err; +struct device_node *target; + + target =of_find_compatible_node (NULL ,NULL ,"fpga-region" );This assumes there is only one node compatible to fpga-region. What about others?
Ah, right, it is actually allowed to have multiple regions in one FPGA. I didn't think about that.
Steffen
--
Pengutronix e.K. | Dipl.-Inform. Steffen Trumtrar | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686| Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 10/13] of: of_firmware: add support for fpga bridges
Quoted 62 lines · Steffen Trumtrar
Quoted 38 lines · Sascha Hauer
Quoted 37 lines · Steffen Trumtrar
From: Steffen Trumtrar <[email protected]>
Add support for potentially defined FPGA-bridges in the overlay.
While at it also add support for loading the firmware directly via a path instead of 'needing' an overlay for that.
The direct loading will be done with the existent firmwareload command.Signed-off-by Steffen Trumtrar <[email protected]>--- drivers/of/Makefile | 3 +- drivers/of/of_firmware.c | 88 ++++++++++++++++++++++++++++++++++++---- include/of.h | 21 +++++++--- 3 files changed, 96 insertions(+), 16 deletions(-)drivers/of/Makefile +2
-1@@ -6,4 +6,5 @@ obj-y += partition.o obj-y += of_net.o obj-$(CONFIG_MTD) += of_mtd.o obj-$(CONFIG_OF_BAREBOX_DRIVERS) += barebox.o -obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o of_firmware.o +obj-$(CONFIG_OF_OVERLAY) += overlay.o resolver.o +obj-$(CONFIG_FIRMWARE) += of_firmware.odrivers/of/of_firmware.c +1
-0@@ -4,12 +4,52 @@*/ #include <common.h> #include <firmware.h> +#include <fpga-bridge.h> #include <of.h> Quoted 8 lines
drivers/of/of_firmware.c line 14
Quoted 5 lines
drivers/of/of_firmware.c +1
-0struct overlay_info {const char *firmware_path; }; +#ifdef CONFIG_FPGA_BRIDGE Trailing whitespace here.
Meh :(
Quoted 9 lines
drivers/of/of_firmware.c static struct firmware_mgr *of_node_get_mgr(struct device_node *np) · line 96
Quoted 6 lines
drivers/of/of_firmware.c +6
-0+int of_firmware_load_file (const char *path) +{ +int err; +struct device_node *target; + + target =of_find_compatible_node (NULL ,NULL ,"fpga-region" );This assumes there is only one node compatible to fpga-region. What about others?
Quoted 2 lines
Ah, right, it is actually allowed to have multiple regions in one FPGA. I didn't think about that.
Also multiple regions in multiple FPGAs
Sascha
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 11/13 commands: firmwareload: allow loading firmware from dt
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
firmwareload can only load a bitstream into an FPGA without any knowledge of possible additional needs (e.g. FPGA bridges).
These are defined in the fpga-region nodes in the devicetree. The fpga-region describes the layout of the FPGA and the bridges it needs en/disabled.
Add an option to let firmwareload go via the oftree route and load the firmware that way.
--- commands/firmwareload.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
commands/firmwareload.c +12 -1
@@ -5,18 +5,23 @@#include <command.h> #include <getopt.h> #include <firmware.h> +#include <of.h> static int do_firmwareload (int argc,char *argv[]) {int ret, opt;const char *name =NULL , *firmware;struct firmware_mgr *mgr; +int oftree =0 ; -while ((opt =getopt (argc, argv,"t:l" )) >0 ) { +while ((opt =getopt (argc, argv,"t:lo" )) >0 ) {switch (opt) {case 't' : name = optarg;break ; +case 'o' : + oftree =1 ; +break ;case 'l' :firmwaremgr_list_handlers ();return 0 ;
@@ -30,6 +35,11 @@ static int do_firmwareload(int argc, char *argv[]) firmware = argv[optind]; +if (oftree) { + ret =of_firmware_load_file (firmware); +return ret; + } + mgr =firmwaremgr_find (name);if (!mgr) {
@@ -46,6 +56,7 @@ static int do_firmwareload(int argc, char *argv[]) BAREBOX_CMD_HELP_START(firmwareload) BAREBOX_CMD_HELP_TEXT("Options:") BAREBOX_CMD_HELP_OPT("-t <target>", "define the firmware handler by name") +BAREBOX_CMD_HELP_OPT("-o\t", "find firmware definition from devicetree") BAREBOX_CMD_HELP_OPT("-l\t", "list devices capable of firmware loading")BAREBOX_CMD_HELP_END
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 12/13 drivers: firmware: socfpga: remove bridges shutdown
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
The bridges are now handled via the bridges driver. There is no need to hardcode the memory writes anymore.
--- drivers/firmware/socfpga.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/firmware/socfpga.c +0 -9
@@ -294,15 +294,6 @@ static int socfpga_fpgamgr_program_start(struct firmware_handler *fh)/* disable all signals from hps peripheral controller to fpga */ writel (0 ,SYSMGR_FPGAINTF_MODULE ); -/* disable all signals from fpga to hps sdram */ -writel (0 , (CYCLONE5_SDR_ADDRESS +SDR_CTRLGRP_FPGAPORTRST_ADDRESS )); - -/* disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */ -writel (~0 ,CYCLONE5_RSTMGR_ADDRESS +RESET_MGR_BRG_MOD_RESET_OFS ); - -/* unmap the bridges from NIC-301 */ -writel (0x1 ,CYCLONE5_L3REGS_ADDRESS ); -dev_dbg (&mgr->dev,"start programming...\n" );/* initialize the FPGA Manager */
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 13/13 firmware: add support for compressed images
In reply to Steffen TrumtrarFrom: Steffen Trumtrar <[email protected]>
At least bitstreams for FPGAs can consist of a lot of zeros depending on device utilization. These bitstreams can be compressed very effectively.
Let the firmware code accept these images and decompress them before handing it to the firmware-manager in question.
--- common/firmware.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-)
common/firmware.c +38 -5
@@ -14,6 +14,8 @@#include <linux/list.h> #include <linux/stat.h> #include <linux/err.h> +#include <uncompress.h> +#include <filetype.h> #define BUFSIZ 4096
@@ -211,12 +213,43 @@ out:*/ int firmwaremgr_load_file (struct firmware_mgr *mgr,const char *firmware) { -int ret; -char *name =basprintf ("/dev/%s" , mgr->handler->id); - - ret =copy_file (firmware, name,0 ); +char *dst; +enum filetype type; +int ret = -ENOENT ; +int srcfd =0 ; +int dstfd =0 ; + +if (mgr->handler->id) { + dst =basprintf ("/dev/%s" , mgr->handler->id); + }else { +pr_err ("id not defined for handler\n" ); +return -ENODEV ; + } -free (name); +if (firmware) { + type =file_name_detect_type (firmware); +if (type == filetype_unknown) { + ret =copy_file (firmware, dst,0 ); + }else { + srcfd =open (firmware,O_RDONLY ); +if (srcfd <0 ) +return srcfd; + dstfd =open (dst,O_WRONLY |O_CREAT ); + +if (dstfd <0 ) { +printf ("could not open %s: %s\n" , dst,errno_str ()); + ret = dstfd; + goto out; + } + + ret =uncompress_fd_to_fd (srcfd, dstfd, uncompress_err_stdout); + +close (dstfd); + } + } +out: +close (srcfd); +free (dst);return ret; }
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 23 lines · Steffen Trumtrar
From: Steffen Trumtrar <[email protected]>
Description from the linux commit
5756e9dd0de6d5c307773f8f734c0684b3098fdd:ARM: 6640/1: Thumb-2: Symbol manipulation macros for function body copying
In low-level board support code, there is sometimes a need to copy a function body to another location at run-time.
A straightforward call to memcpy doesn't work in Thumb-2, because bit 0 of external Thumb function symbols is set to 1, indicating that the function is Thumb. Without corrective measures, this will cause an off-by-one copy, and the copy may be called using the wrong instruction set.
This patch adds an
fncpy()macro to help with such copies.Particular care is needed, because C doesn't guarantee any defined behaviour when casting a function pointer to any other type. This has been observed to lead to strange optimisation side-effects when doing the arithmetic which is required in order to copy/move function bodies correctly in Thumb-2.
Quoted 8 lines
Thanks to Russell King and Nicolas Pitre for their input on this patch.
Signed-off-by Steffen Trumtrar <[email protected]>--- arch/arm/include/asm/fncpy.h | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 arch/arm/include/asm/fncpy.h
Applied this patch for now, but with an update to v5.10 with the only change that the licence header is changed to SPDX now.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox