diff options
Diffstat (limited to 'arch')
153 files changed, 1316 insertions, 4091 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab0bf03013..d2e3661892 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -5,6 +5,7 @@ config ARM select HAVE_CONFIGURABLE_TEXT_BASE if !RELOCATABLE select HAVE_IMAGE_COMPRESSION select HAVE_ARCH_KASAN + select HAS_ARCH_SJLJ select ARM_OPTIMZED_STRING_FUNCTIONS if KASAN default y @@ -44,6 +45,7 @@ config ARCH_BCM283X select GPIOLIB select CLKDEV_LOOKUP select COMMON_CLK + select COMMON_CLK_OF_PROVIDER select CLOCKSOURCE_BCM283X select ARM_AMBA select HAS_DEBUG_LL @@ -81,17 +83,6 @@ config ARCH_EP93XX select CPU_ARM920T select GENERIC_GPIO -config ARCH_HIGHBANK - bool "Calxeda Highbank" - select HAS_DEBUG_LL - select ARCH_HAS_L2X0 - select CPU_V7 - select ARM_AMBA - select AMBA_SP804 - select CLKDEV_LOOKUP - select COMMON_CLK - select GPIOLIB - config ARCH_IMX bool "Freescale iMX-based" select GPIOLIB @@ -277,9 +268,16 @@ config ARCH_ZYNQMP select SYS_SUPPORTS_64BIT_KERNEL select HAS_MACB -config ARCH_QEMU - bool "ARM QEMU boards" - select HAS_DEBUG_LL +config ARCH_ARM64_VIRT + bool "ARM64 QEMU Virt board" + select CPU_V8 + select HAVE_PBL_MULTI_IMAGES + select OFDEVICE + select OFTREE + select RELOCATABLE + select SYS_SUPPORTS_64BIT_KERNEL + select ARM_AMBA + select BOARD_ARM_VIRT endchoice @@ -290,7 +288,6 @@ source "arch/arm/mach-clps711x/Kconfig" source "arch/arm/mach-davinci/Kconfig" source "arch/arm/mach-digic/Kconfig" source "arch/arm/mach-ep93xx/Kconfig" -source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-layerscape/Kconfig" source "arch/arm/mach-mxs/Kconfig" @@ -307,9 +304,13 @@ source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-uemd/Kconfig" source "arch/arm/mach-zynq/Kconfig" -source "arch/arm/mach-qemu/Kconfig" source "arch/arm/mach-zynqmp/Kconfig" +config BOARD_ARM_VIRT + bool + select BOARD_ARM_GENERIC_DT + select OF_OVERLAY + config BOARD_ARM_GENERIC_DT select LIBFDT select ARM_AMBA diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 9dc0897e58..a46d9d6bde 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -88,7 +88,6 @@ machine-$(CONFIG_ARCH_CLPS711X) := clps711x machine-$(CONFIG_ARCH_DAVINCI) := davinci machine-$(CONFIG_ARCH_DIGIC) := digic machine-$(CONFIG_ARCH_EP93XX) := ep93xx -machine-$(CONFIG_ARCH_HIGHBANK) := highbank machine-$(CONFIG_ARCH_IMX) := imx machine-$(CONFIG_ARCH_LAYERSCAPE) := layerscape machine-$(CONFIG_ARCH_MXS) := mxs @@ -106,7 +105,6 @@ machine-$(CONFIG_ARCH_TEGRA) := tegra machine-$(CONFIG_ARCH_UEMD) := uemd machine-$(CONFIG_ARCH_ZYNQ) := zynq machine-$(CONFIG_ARCH_ZYNQMP) := zynqmp -machine-$(CONFIG_ARCH_QEMU) := qemu # Board directory name. This list is sorted alphanumerically diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 732936bad6..9ccb75e27b 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -60,7 +60,6 @@ obj-$(CONFIG_MACH_GUF_SANTARO) += guf-santaro/ obj-$(CONFIG_MACH_GUF_VINCELL) += guf-vincell/ obj-$(CONFIG_MACH_GW_VENTANA) += gateworks-ventana/ obj-$(CONFIG_MACH_HABA_KNX_LITE) += haba-knx/ -obj-$(CONFIG_MACH_HIGHBANK) += highbank/ obj-$(CONFIG_MACH_IMX21ADS) += freescale-mx21-ads/ obj-$(CONFIG_MACH_IMX233_OLINUXINO) += imx233-olinuxino/ obj-$(CONFIG_MACH_IMX27ADS) += freescale-mx27-ads/ @@ -164,8 +163,7 @@ obj-$(CONFIG_MACH_ZEDBOARD) += avnet-zedboard/ obj-$(CONFIG_MACH_ZYLONITE) += zylonite/ obj-$(CONFIG_MACH_VARISCITE_MX6) += variscite-mx6/ obj-$(CONFIG_MACH_VSCOM_BALTOS) += vscom-baltos/ -obj-$(CONFIG_MACH_QEMU_VIRT64) += qemu-virt64/ -obj-$(CONFIG_MACH_VIRT) += qemu-virt/ +obj-$(CONFIG_BOARD_ARM_VIRT) += qemu-virt/ obj-$(CONFIG_MACH_WARP7) += element14-warp7/ obj-$(CONFIG_MACH_WEBASTO_CCBV2) += webasto-ccbv2/ obj-$(CONFIG_MACH_VF610_TWR) += freescale-vf610-twr/ diff --git a/arch/arm/boards/highbank/Makefile b/arch/arm/boards/highbank/Makefile deleted file mode 100644 index e5e4536cd1..0000000000 --- a/arch/arm/boards/highbank/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += init.o - -lwl-y += lowlevel.o -bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-highbank diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/010-ahci-boot b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/010-ahci-boot deleted file mode 120000 index 3672f0495e..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/010-ahci-boot +++ /dev/null @@ -1 +0,0 @@ -../boot/ahci-boot
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/011-ahci b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/011-ahci deleted file mode 120000 index 36b3b2815b..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/011-ahci +++ /dev/null @@ -1 +0,0 @@ -../boot/ahci
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/020-mmc-boot b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/020-mmc-boot deleted file mode 120000 index 85c19bbd66..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/020-mmc-boot +++ /dev/null @@ -1 +0,0 @@ -../boot/mmc-boot
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/021-mmc b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/021-mmc deleted file mode 120000 index 5af95d0ac7..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/021-mmc +++ /dev/null @@ -1 +0,0 @@ -../boot/mmc
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/030-net b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/030-net deleted file mode 120000 index 70b8ea3965..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/030-net +++ /dev/null @@ -1 +0,0 @@ -../boot/net
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/031-net-eth1 b/arch/arm/boards/highbank/defaultenv-highbank/boot.d/031-net-eth1 deleted file mode 120000 index 5a30a308c7..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot.d/031-net-eth1 +++ /dev/null @@ -1 +0,0 @@ -../boot/net-eth1
\ No newline at end of file diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci b/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci deleted file mode 100644 index 46a8c1b321..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -path="/mnt/ahci" - -global.bootm.image="${path}/zImage" - -. /env/data/oftree - -oftree=${path}/oftree -if [ -f $oftree ]; then - global.bootm.oftree="$oftree" -fi - -# The rootdevice may actually be mmcblk1p2 if a card -# is inserted to the back MMC slot -global.linux.bootargs.dyn.root="root=/dev/sda2" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci-boot b/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci-boot deleted file mode 100644 index 919eac54a7..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/ahci-boot +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -path="/mnt/ahci-boot" - -global.bootm.image="${path}/zImage" - -. /env/data/oftree - -oftree=${path}/oftree -if [ -f $oftree ]; then - global.bootm.oftree="$oftree" -fi - -# The rootdevice may actually be mmcblk1p2 if a card -# is inserted to the back MMC slot -global.linux.bootargs.dyn.root="root=/dev/sda2" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc b/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc deleted file mode 100644 index 0fff5b4a81..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -path="/mnt/mmc" - -global.bootm.image="${path}/zimage" - -. /env/data/oftree - -oftree=${path}/oftree -if [ -f $oftree ]; then - global.bootm.oftree="$oftree" -fi - -# The rootdevice may actually be mmcblk1p2 if a card -# is inserted to the back MMC slot -global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc-boot b/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc-boot deleted file mode 100644 index f3ae301e1b..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/mmc-boot +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -path="/mnt/mmc-boot" - -global.bootm.image="${path}/zimage" - -. /env/data/oftree - -oftree=${path}/oftree -if [ -f $oftree ]; then - global.bootm.oftree="$oftree" -fi - -# The rootdevice may actually be mmcblk1p2 if a card -# is inserted to the back MMC slot -global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/net b/arch/arm/boards/highbank/defaultenv-highbank/boot/net deleted file mode 100644 index 6a700087fb..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/net +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -ethact eth0 - -path="/mnt/tftp" - -. /env/data/oftree - -global.bootm.image="${path}/${global.user}-linux-${global.hostname}" -#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}" -nfsroot="/home/${global.user}/nfsroot/${global.hostname}" -bootargs-ip -global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/boot/net-eth1 b/arch/arm/boards/highbank/defaultenv-highbank/boot/net-eth1 deleted file mode 100644 index 1c70bdf3f0..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/boot/net-eth1 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -ethact eth1 - -path="/mnt/tftp" - -. /env/data/oftree - -global.bootm.image="${path}/${global.user}-linux-${global.hostname}" -#global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}" -nfsroot="/home/${global.user}/nfsroot/${global.hostname}" -bootargs-ip -global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/data/oftree b/arch/arm/boards/highbank/defaultenv-highbank/data/oftree deleted file mode 100644 index 9a94b310c3..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/data/oftree +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -#device tree provided by the firmware -global.bootm.oftree="/dev/dtb" diff --git a/arch/arm/boards/highbank/defaultenv-highbank/init/001-dtb-probe b/arch/arm/boards/highbank/defaultenv-highbank/init/001-dtb-probe deleted file mode 100644 index 610db1500e..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/init/001-dtb-probe +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -e /dev/dtb ] -then - oftree -l /dev/dtb - oftree -p -fi diff --git a/arch/arm/boards/highbank/defaultenv-highbank/init/automount b/arch/arm/boards/highbank/defaultenv-highbank/init/automount deleted file mode 100644 index eb5c07a739..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/init/automount +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# automount tftp server based on $eth0.serverip - -mkdir -p /mnt/tftp -automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp' - -# SD card slot, boot partition -mkdir -p /mnt/mmc-boot -automount -d /mnt/mmc 'mount /dev/disk0.boot /mnt/mmc-boot' - -# SD card slot, first partition -mkdir -p /mnt/mmc -automount -d /mnt/mmc 'mount /dev/disk0.0 /mnt/mmc' - -# AHCI, boot partition -mkdir -p /mnt/ahci-boot -automount -d /mnt/ahci 'mount /dev/ata0.boot /mnt/ahci-boot' - -# AHCI, first partition -mkdir -p /mnt/ahci -automount -d /mnt/ahci 'mount /dev/ata0.0 /mnt/ahci' diff --git a/arch/arm/boards/highbank/defaultenv-highbank/nv/boot.default b/arch/arm/boards/highbank/defaultenv-highbank/nv/boot.default deleted file mode 100644 index c47e1b2bca..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/nv/boot.default +++ /dev/null @@ -1 +0,0 @@ -/env/boot.d diff --git a/arch/arm/boards/highbank/defaultenv-highbank/nv/bootm.oftree b/arch/arm/boards/highbank/defaultenv-highbank/nv/bootm.oftree deleted file mode 100644 index c373173805..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/nv/bootm.oftree +++ /dev/null @@ -1 +0,0 @@ -/dev/dtb diff --git a/arch/arm/boards/highbank/defaultenv-highbank/nv/linux.bootargs.console b/arch/arm/boards/highbank/defaultenv-highbank/nv/linux.bootargs.console deleted file mode 100644 index 826debe7c2..0000000000 --- a/arch/arm/boards/highbank/defaultenv-highbank/nv/linux.bootargs.console +++ /dev/null @@ -1 +0,0 @@ -console=ttyAMA0,115200n8 CONSOLE=/dev/ttyAMA0 diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c deleted file mode 100644 index 32e217321a..0000000000 --- a/arch/arm/boards/highbank/init.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <init.h> -#include <asm/armlinux.h> -#include <asm/system_info.h> -#include <generated/mach-types.h> -#include <mach/devices.h> -#include <mach/hardware.h> -#include <mach/sysregs.h> -#include <environment.h> -#include <partition.h> -#include <linux/sizes.h> -#include <io.h> -#include <of.h> -#include <envfs.h> - -#define FIRMWARE_DTB_BASE 0x1000 - -#define HB_OPP_VERSION 0 - -struct fdt_header *fdt = NULL; - -static int hb_fixup(struct device_node *root, void *unused) -{ - struct device_node *node; - u32 reg = readl(sregs_base + HB_SREG_A9_PWRDOM_DATA); - u32 *opp_table = (u32 *)HB_SYSRAM_OPP_TABLE_BASE; - u32 dtb_table[2*10]; - u32 i; - u32 num_opps; - __be32 latency; - - if (!(reg & HB_PWRDOM_STAT_SATA)) { - for_each_compatible_node_from(node, root, NULL, "calxeda,hb-ahci") - of_property_write_string(node, "status", "disabled"); - } - - if (!(reg & HB_PWRDOM_STAT_EMMC)) { - for_each_compatible_node_from(node, root, NULL, "calxeda,hb-sdhci") - of_property_write_string(node, "status", "disabled"); - } - - if ((opp_table[0] >> 16) != HB_OPP_VERSION) - return 0; - - node = of_find_node_by_path("/cpus/cpu@0"); - if (!node) - return 0; - - num_opps = opp_table[0] & 0xff; - - for (i = 0; i < num_opps; i++) { - dtb_table[2 * i] = cpu_to_be32(opp_table[3 + 3 * i]); - dtb_table[2 * i + 1] = cpu_to_be32(opp_table[2 + 3 * i]); - } - - latency = cpu_to_be32(opp_table[1]); - - of_set_property(node, "transition-latency", &latency, 4, 1); - of_set_property(node, "operating-points", dtb_table, 8 * num_opps, 1); - - return 0; -} - -static int highbank_mem_init(void) -{ - struct device_node *root, *np; - int ret; - - /* load by the firmware at 0x1000 */ - fdt = IOMEM(FIRMWARE_DTB_BASE); - - root = of_unflatten_dtb(fdt); - if (IS_ERR(root)) { - pr_warn("no dtb found at 0x1000 use default configuration\n"); - fdt = NULL; - goto not_found; - } - - of_set_root_node(root); - - np = of_find_node_by_path("/memory"); - if (!np) { - pr_warn("no memory node use default configuration\n"); - goto not_found; - } - - ret = of_add_memory(np, true); - if (ret) { - pr_warn("memory node: probe failed use default configuration\n"); - goto not_found; - } - - pr_info("highbank: dtb probed memory size\n"); - - return 0; -not_found: - highbank_add_ddram(4089 << 20); - return 0; -} -mem_initcall(highbank_mem_init); - -static int highbank_devices_init(void) -{ - of_register_fixup(hb_fixup, NULL); - if (!fdt) { - highbank_register_gpio(0); - highbank_register_gpio(1); - highbank_register_gpio(2); - highbank_register_gpio(3); - highbank_register_ahci(); - highbank_register_xgmac(0); - highbank_register_xgmac(1); - } else { - fdt = of_get_fixed_tree(NULL); - add_mem_device("dtb", (unsigned long)fdt, be32_to_cpu(fdt->totalsize), - IORESOURCE_MEM_WRITEABLE); - devfs_add_partition("ram0", FIRMWARE_DTB_BASE, SZ_64K, DEVFS_PARTITION_FIXED, "firmware-dtb"); - } - - devfs_add_partition("nvram", 0x00000, SZ_16K, DEVFS_PARTITION_FIXED, "env0"); - - if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) - defaultenv_append_directory(defaultenv_highbank); - - return 0; -} -device_initcall(highbank_devices_init); - -static int highbank_console_init(void) -{ - barebox_set_model("Calxeda Highbank"); - barebox_set_hostname("highbank"); - - highbank_register_uart(); - - return 0; -} -console_initcall(highbank_console_init); diff --git a/arch/arm/boards/highbank/lowlevel.c b/arch/arm/boards/highbank/lowlevel.c deleted file mode 100644 index 6363ec96df..0000000000 --- a/arch/arm/boards/highbank/lowlevel.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <linux/sizes.h> -#include <asm/barebox-arm-head.h> -#include <asm/barebox-arm.h> -#include <asm/system_info.h> - -void __naked barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2) -{ - arm_cpu_lowlevel_init(); - barebox_arm_entry(0x00000000, SZ_512M, NULL); -} diff --git a/arch/arm/boards/qemu-virt/board.c b/arch/arm/boards/qemu-virt/board.c index 9d8c90eb5b..d0a7e3da4f 100644 --- a/arch/arm/boards/qemu-virt/board.c +++ b/arch/arm/boards/qemu-virt/board.c @@ -9,6 +9,12 @@ #include <asm/system_info.h> #include <asm/barebox-arm.h> +#ifdef CONFIG_64BIT +#define MACHINE "virt64" +#else +#define MACHINE "virt" +#endif + extern char __dtb_overlay_of_flash_start[]; static int replace_dtb(void) { @@ -43,14 +49,14 @@ pure_initcall(replace_dtb); static int virt_probe(struct device_d *dev) { - char *hostname = "virt"; + const char *hostname = MACHINE; if (cpu_is_cortex_a7()) hostname = "virt-a7"; else if (cpu_is_cortex_a15()) hostname = "virt-a15"; - barebox_set_model("ARM QEMU virt"); + barebox_set_model("ARM QEMU " MACHINE); barebox_set_hostname(hostname); return 0; diff --git a/arch/arm/boards/qemu-virt64/Makefile b/arch/arm/boards/qemu-virt64/Makefile deleted file mode 100644 index b394dde0a1..0000000000 --- a/arch/arm/boards/qemu-virt64/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -obj-y += init.o -lwl-y += lowlevel.o lowlevel_init.o -bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-qemu-virt64 diff --git a/arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config b/arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config deleted file mode 100644 index 781dbfefa6..0000000000 --- a/arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -autoboot_timeout=3 - -bootargs="console=ttyAMA0,115200" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;31m[barebox@\h]:\w\e[0m\n# " diff --git a/arch/arm/boards/qemu-virt64/init.c b/arch/arm/boards/qemu-virt64/init.c deleted file mode 100644 index 19cfcae1f0..0000000000 --- a/arch/arm/boards/qemu-virt64/init.c +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2016 Raphaël Poggi <poggi.raph@gmail.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <init.h> -#include <asm/armlinux.h> -#include <asm/system_info.h> -#include <asm/pgtable64.h> -#include <mach/devices.h> -#include <environment.h> -#include <linux/sizes.h> -#include <io.h> -#include <envfs.h> -#include <globalvar.h> -#include <asm/mmu.h> - -static int virt_mem_init(void) -{ - virt_add_ddram(SZ_2G); - - return 0; -} -mem_initcall(virt_mem_init); - -static int virt_env_init(void) -{ - add_cfi_flash_device(0, 0x00000000, SZ_128M, 0); - - devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); - devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); - - if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) - defaultenv_append_directory(defaultenv_qemu_virt64); - - return 0; -} -device_initcall(virt_env_init); - -static int virt_console_init(void) -{ - virt_register_uart(0); - - return 0; -} -console_initcall(virt_console_init); - -static int virt_core_init(void) -{ - char *hostname = "virt64"; - - if (cpu_is_cortex_a53()) - hostname = "virt64-a53"; - else if (cpu_is_cortex_a57()) - hostname = "virt64-a57"; - - barebox_set_model("ARM QEMU virt64"); - barebox_set_hostname(hostname); - - return 0; -} -postcore_initcall(virt_core_init); diff --git a/arch/arm/boards/qemu-virt64/lowlevel.c b/arch/arm/boards/qemu-virt64/lowlevel.c deleted file mode 100644 index fcb052369a..0000000000 --- a/arch/arm/boards/qemu-virt64/lowlevel.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <linux/sizes.h> -#include <asm/barebox-arm-head.h> -#include <asm/barebox-arm.h> -#include <asm/system_info.h> - -void qemu_virt64_start(uint32_t, uint32_t, uint32_t); - -void noinline qemu_virt64_start(uint32_t r0, uint32_t r1, uint32_t r2) -{ - arm_cpu_lowlevel_init(); - arm_setup_stack(0x40000000 + SZ_2G - SZ_16K); - - barebox_arm_entry(0x40000000, SZ_2G, NULL); -} diff --git a/arch/arm/boards/qemu-virt64/lowlevel_init.S b/arch/arm/boards/qemu-virt64/lowlevel_init.S deleted file mode 100644 index 1967fadb6c..0000000000 --- a/arch/arm/boards/qemu-virt64/lowlevel_init.S +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -#include <linux/linkage.h> -#include <asm/barebox-arm64.h> - -/* The DRAM is already setup */ -#define STACK_TOP 0x80000000 - -ENTRY_PROC(barebox_arm_reset_vector) - mov x0, #STACK_TOP - mov sp, x0 - b qemu_virt64_start -ENTRY_PROC_END(barebox_arm_reset_vector) diff --git a/arch/arm/configs/highbank_defconfig b/arch/arm/configs/highbank_defconfig deleted file mode 100644 index 8a045d8fe2..0000000000 --- a/arch/arm/configs/highbank_defconfig +++ /dev/null @@ -1,59 +0,0 @@ -CONFIG_ARCH_HIGHBANK=y -CONFIG_AEABI=y -CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_PBL_IMAGE=y -CONFIG_MMU=y -CONFIG_MALLOC_SIZE=0xa00000 -CONFIG_MALLOC_TLSF=y -CONFIG_PROMPT="vexpress: " -CONFIG_GLOB=y -CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -CONFIG_MENU=y -CONFIG_BOOTM_SHOW_TYPE=y -CONFIG_BOOTM_VERBOSE=y -CONFIG_BOOTM_INITRD=y -CONFIG_BOOTM_OFTREE=y -CONFIG_BOOTM_OFTREE_UIMAGE=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_LONGHELP=y -CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_BOOTU is not set -CONFIG_CMD_GO=y -CONFIG_CMD_LOADB=y -CONFIG_CMD_RESET=y -CONFIG_CMD_UIMAGE=y -CONFIG_CMD_PARTITION=y -CONFIG_CMD_EXPORT=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_UNCOMPRESS=y -CONFIG_CMD_SLEEP=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_PING=y -CONFIG_CMD_TFTP=y -CONFIG_CMD_ECHO_E=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_LOGIN=y -CONFIG_CMD_MENU=y -CONFIG_CMD_MENU_MANAGEMENT=y -CONFIG_CMD_PASSWD=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_TIMEOUT=y -CONFIG_CMD_CLK=y -CONFIG_CMD_POWEROFF=y -CONFIG_CMD_OFTREE=y -CONFIG_NET=y -CONFIG_NET_NFS=y -CONFIG_NET_NETCONSOLE=y -CONFIG_NET_RESOLV=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_DRIVER_NET_CALXEDA_XGMAC=y -# CONFIG_SPI is not set -CONFIG_DISK=y -CONFIG_DISK_AHCI=y -CONFIG_GPIO_PL061=y -CONFIG_FS_TFTP=y -CONFIG_DIGEST_SHA1_GENERIC=y -CONFIG_DIGEST_SHA256_GENERIC=y diff --git a/arch/arm/configs/qemu_virt64_defconfig b/arch/arm/configs/qemu_virt64_defconfig index 6f9bb9591c..17509ce9d6 100644 --- a/arch/arm/configs/qemu_virt64_defconfig +++ b/arch/arm/configs/qemu_virt64_defconfig @@ -1,26 +1,38 @@ -CONFIG_TEXT_BASE=0x41000000 -CONFIG_ARCH_QEMU=y +CONFIG_ARCH_ARM64_VIRT=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_MMU=y # CONFIG_MMU_EARLY is not set -CONFIG_PROMPT="qemu-virt64: " -CONFIG_GLOB=y +CONFIG_KALLSYMS=y +CONFIG_PROMPT="" CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_MENU=y -CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y +CONFIG_IMD=y +CONFIG_CONSOLE_ACTIVATE_NONE=y +CONFIG_CONSOLE_ALLOW_COLOR=y +CONFIG_PARTITION_DISK_EFI=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y +CONFIG_POLLER=y +CONFIG_STATE=y +CONFIG_BOOTCHOOSER=y +CONFIG_RESET_SOURCE=y +CONFIG_MACHINE_ID=y CONFIG_LONGHELP=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_RESET=y CONFIG_CMD_UIMAGE=y +CONFIG_CMD_BOOTCHOOSER=y CONFIG_CMD_PARTITION=y CONFIG_CMD_EXPORT=y CONFIG_CMD_PRINTENV=y +CONFIG_CMD_MAGICVAR=y +CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_FILETYPE=y +CONFIG_CMD_SHA256SUM=y CONFIG_CMD_UNCOMPRESS=y CONFIG_CMD_SLEEP=y CONFIG_CMD_ECHO_E=y @@ -31,11 +43,37 @@ CONFIG_CMD_MENU_MANAGEMENT=y CONFIG_CMD_PASSWD=y CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_CRC=y +CONFIG_CMD_CRC_CMP=y +CONFIG_CMD_DETECT=y +CONFIG_CMD_FLASH=y +CONFIG_CMD_POWEROFF=y +CONFIG_CMD_BAREBOX_UPDATE=y +CONFIG_CMD_OF_DIFF=y +CONFIG_CMD_OF_NODE=y +CONFIG_CMD_OF_PROPERTY=y +CONFIG_CMD_OF_DISPLAY_TIMINGS=y +CONFIG_CMD_OF_FIXUP_STATUS=y +CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y +CONFIG_CMD_STATE=y +CONFIG_OF_BAREBOX_DRIVERS=y +CONFIG_OF_BAREBOX_ENV_IN_FS=y CONFIG_SERIAL_AMBA_PL011=y +CONFIG_VIRTIO_CONSOLE=y # CONFIG_SPI is not set CONFIG_MTD=y CONFIG_DRIVER_CFI=y CONFIG_CFI_BUFFER_WRITE=y +CONFIG_DISK=y +CONFIG_DISK_WRITE=y +CONFIG_VIRTIO_BLK=y +CONFIG_HWRNG=y +CONFIG_HW_RANDOM_VIRTIO=y +# CONFIG_PINCTRL is not set +CONFIG_VIRTIO_MMIO=y +CONFIG_FS_EXT4=y +CONFIG_FS_FAT=y +CONFIG_FS_PSTORE=y +CONFIG_FS_PSTORE_CONSOLE=y CONFIG_DIGEST_SHA1_GENERIC=y -CONFIG_DIGEST_SHA256_GENERIC=y diff --git a/arch/arm/cpu/board-dt-2nd-aarch64.S b/arch/arm/cpu/board-dt-2nd-aarch64.S index 0540a1690d..d2c9f132ce 100644 --- a/arch/arm/cpu/board-dt-2nd-aarch64.S +++ b/arch/arm/cpu/board-dt-2nd-aarch64.S @@ -1,11 +1,29 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <linux/linkage.h> #include <asm/barebox-arm64.h> +#include <asm/image.h> -ENTRY_PROC(start_dt_2nd) - adr x1, stack +#define IMAGE_FLAGS \ + (ARM64_IMAGE_FLAG_PAGE_SIZE_4K << ARM64_IMAGE_FLAG_PAGE_SIZE_SHIFT) | \ + (ARM64_IMAGE_FLAG_PHYS_BASE << ARM64_IMAGE_FLAG_PHYS_BASE_SHIFT) + +.section .text_head_entry_start_dt_2nd +ENTRY("start_dt_2nd") + adr x1, 0 /* code0 */ + b 2f /* code1 */ + .xword 0x80000 /* Image load offset */ + .xword _barebox_image_size /* Effective Image size */ + .xword IMAGE_FLAGS /* Kernel flags */ + .xword 0 /* reserved */ + .xword 0 /* reserved */ + .xword 0 /* reserved */ + .ascii ARM64_IMAGE_MAGIC /* magic number */ + .int 0 /* reserved (PE-COFF offset) */ + .asciz "barebox" /* unused for now */ +2: mov sp, x1 + /* Stack now grows into the 0x80000 image load offset specified + * above. This is more than enough until FDT /memory is decoded. + */ b dt_2nd_aarch64 -.word 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -stack: ENTRY_PROC_END(start_dt_2nd) diff --git a/arch/arm/cpu/board-dt-2nd.c b/arch/arm/cpu/board-dt-2nd.c index bb13180785..6f6f535918 100644 --- a/arch/arm/cpu/board-dt-2nd.c +++ b/arch/arm/cpu/board-dt-2nd.c @@ -29,9 +29,7 @@ void dt_2nd_aarch64(void *fdt); void dt_2nd_aarch64(void *fdt) { - unsigned long image_start = (unsigned long)_text + global_variable_offset(); - - arm_setup_stack(image_start); + /* entry point already set up stack */ relocate_to_current_adr(); setup_c(); diff --git a/arch/arm/dts/stm32mp151.dtsi b/arch/arm/dts/stm32mp151.dtsi index b82227fa20..f1fd888fa1 100644 --- a/arch/arm/dts/stm32mp151.dtsi +++ b/arch/arm/dts/stm32mp151.dtsi @@ -66,3 +66,8 @@ &vrefbuf { regulator-name = "vref"; }; + +&usbphyc { + vdda1v1-supply = <®11>; + vdda1v8-supply = <®18>; +}; diff --git a/arch/arm/include/asm/image.h b/arch/arm/include/asm/image.h new file mode 100644 index 0000000000..c2b13213c7 --- /dev/null +++ b/arch/arm/include/asm/image.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ASM_IMAGE_H +#define __ASM_IMAGE_H + +#define ARM64_IMAGE_MAGIC "ARM\x64" + +#define ARM64_IMAGE_FLAG_BE_SHIFT 0 +#define ARM64_IMAGE_FLAG_PAGE_SIZE_SHIFT (ARM64_IMAGE_FLAG_BE_SHIFT + 1) +#define ARM64_IMAGE_FLAG_PHYS_BASE_SHIFT \ + (ARM64_IMAGE_FLAG_PAGE_SIZE_SHIFT + 2) +#define ARM64_IMAGE_FLAG_BE_MASK 0x1 +#define ARM64_IMAGE_FLAG_PAGE_SIZE_MASK 0x3 +#define ARM64_IMAGE_FLAG_PHYS_BASE_MASK 0x1 + +#define ARM64_IMAGE_FLAG_LE 0 +#define ARM64_IMAGE_FLAG_BE 1 +#define ARM64_IMAGE_FLAG_PAGE_SIZE_4K 1 +#define ARM64_IMAGE_FLAG_PAGE_SIZE_16K 2 +#define ARM64_IMAGE_FLAG_PAGE_SIZE_64K 3 +#define ARM64_IMAGE_FLAG_PHYS_BASE 1 + +#ifndef __ASSEMBLY__ + +#define arm64_image_flag_field(flags, field) \ + (((flags) >> field##_SHIFT) & field##_MASK) + +/* + * struct arm64_image_header - arm64 kernel image header + * See Documentation/arm64/booting.rst for details + * + * @code0: Executable code, or + * @mz_header alternatively used for part of MZ header + * @code1: Executable code + * @text_offset: Image load offset + * @image_size: Effective Image size + * @flags: kernel flags + * @reserved: reserved + * @magic: Magic number + * @reserved5: reserved, or + * @pe_header: alternatively used for PE COFF offset + */ + +struct arm64_image_header { + __le32 code0; + __le32 code1; + __le64 text_offset; + __le64 image_size; + __le64 flags; + __le64 res2; + __le64 res3; + __le64 res4; + __le32 magic; + __le32 res5; +}; + +#endif /* __ASSEMBLY__ */ + +#endif /* __ASM_IMAGE_H */ diff --git a/arch/arm/include/asm/setjmp.h b/arch/arm/include/asm/setjmp.h index 62bac613d6..0cee5bfdda 100644 --- a/arch/arm/include/asm/setjmp.h +++ b/arch/arm/include/asm/setjmp.h @@ -23,7 +23,9 @@ struct jmp_buf_data { typedef struct jmp_buf_data jmp_buf[1]; -int setjmp(jmp_buf jmp); -void longjmp(jmp_buf jmp, int ret); +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); #endif /* _SETJMP_H_ */ diff --git a/arch/arm/include/asm/system_info.h b/arch/arm/include/asm/system_info.h index a27b79e6dd..1e3dfc845c 100644 --- a/arch/arm/include/asm/system_info.h +++ b/arch/arm/include/asm/system_info.h @@ -42,12 +42,6 @@ #define CPU_IS_CORTEX_A15 0x410fc0f0 #define CPU_IS_CORTEX_A15_MASK 0xff0ffff0 -#define CPU_IS_CORTEX_A53 0x410fd034 -#define CPU_IS_CORTEX_A53_MASK 0xff0ffff0 - -#define CPU_IS_CORTEX_A57 0x411fd070 -#define CPU_IS_CORTEX_A57_MASK 0xff0ffff0 - #define CPU_IS_PXA250 0x69052100 #define CPU_IS_PXA250_MASK 0xfffff7f0 @@ -125,11 +119,6 @@ #else #define ARM_ARCH CPU_ARCH_ARMv8 #endif -#define cpu_is_cortex_a53() cpu_is_arm(CORTEX_A53) -#define cpu_is_cortex_a57() cpu_is_arm(CORTEX_A57) -#else -#define cpu_is_cortex_a53() (0) -#define cpu_is_cortex_a57() (0) #endif #ifndef __ASSEMBLY__ diff --git a/arch/arm/lib32/setjmp.S b/arch/arm/lib32/setjmp.S index f0606a7f66..626d915da1 100644 --- a/arch/arm/lib32/setjmp.S +++ b/arch/arm/lib32/setjmp.S @@ -33,4 +33,12 @@ ENTRY(longjmp) 1: bx lr ENDPROC(longjmp) + +.pushsection .text.initjmp, "ax" +ENTRY(initjmp) + str a3, [a1, #32] /* stack pointer */ + str a2, [a1, #36] /* return address */ + mov a1, #0 + bx lr +ENDPROC(initjmp) .popsection diff --git a/arch/arm/lib64/setjmp.S b/arch/arm/lib64/setjmp.S index 0910e2f5a6..80be8cb0f2 100644 --- a/arch/arm/lib64/setjmp.S +++ b/arch/arm/lib64/setjmp.S @@ -36,3 +36,12 @@ ENTRY(longjmp) ret ENDPROC(longjmp) .popsection + +.pushsection .text.initjmp, "ax" +ENTRY(initjmp) + str x2, [x0, #96] /* stack pointer */ + str x1, [x0, #88] /* return address */ + mov x0, #0 + ret +ENDPROC(initjmp) +.popsection diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig deleted file mode 100644 index 8a22348798..0000000000 --- a/arch/arm/mach-highbank/Kconfig +++ /dev/null @@ -1,16 +0,0 @@ -if ARCH_HIGHBANK - -config ARCH_TEXT_BASE - hex - default 0x03f00000 - -choice - prompt "Calxeda Board type" - -config MACH_HIGHBANK - bool "Calxeda Highbank" - select OFTREE - -endchoice - -endif diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile deleted file mode 100644 index 6a7330f633..0000000000 --- a/arch/arm/mach-highbank/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -obj-y += core.o -obj-y += devices.o -obj-y += reset.o -obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o smc.o diff --git a/arch/arm/mach-highbank/cache-l2x0.c b/arch/arm/mach-highbank/cache-l2x0.c deleted file mode 100644 index 28d5f6c7dc..0000000000 --- a/arch/arm/mach-highbank/cache-l2x0.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * 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. - * - */ - -#include <common.h> -#include <init.h> -#include <io.h> - -#include <asm/mmu.h> -#include <asm/cache-l2x0.h> - -#include "core.h" - -static void highbank_l2x0_disable(void) -{ - /* Disable PL310 L2 Cache controller */ - highbank_smc1(0x102, 0x0); -} - -static int highbank_l2x0_init(void) -{ - /* Enable PL310 L2 Cache controller */ - highbank_smc1(0x102, 0x1); - l2x0_init(IOMEM(0xfff12000), 0, ~0UL); - outer_cache.disable = highbank_l2x0_disable; - - return 0; -} -postmmu_initcall(highbank_l2x0_init); diff --git a/arch/arm/mach-highbank/core.c b/arch/arm/mach-highbank/core.c deleted file mode 100644 index 967d13f939..0000000000 --- a/arch/arm/mach-highbank/core.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <init.h> -#include <io.h> - -#include <linux/clk.h> -#include <linux/clkdev.h> -#include <linux/amba/bus.h> - -#include <asm/hardware/arm_timer.h> - -#include <mach/devices.h> -#include <mach/hardware.h> -#include <mach/sysregs.h> - -void __iomem *sregs_base = IOMEM(HB_SREG_A9_BASE); - -static void highbank_clk_init(void) -{ - struct clk *clk; - - clk = clk_fixed("dummy_apb_pclk", 0); - clk_register_clkdev(clk, "apb_pclk", NULL); - - clk = clk_fixed("pclk", 150000000); - clk_register_clkdev(clk, NULL, "sp804"); - clk_register_clkdev(clk, NULL, "uart-pl011"); -} - -static void highbank_sp804_init(void) -{ - amba_apb_device_add(NULL, "sp804", DEVICE_ID_SINGLE, 0xfff34000, 4096, NULL, 0); -} - -static int highbank_init(void) -{ - highbank_clk_init(); - highbank_sp804_init(); - - return 0; -} -postcore_initcall(highbank_init); diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h deleted file mode 100644 index e3f19b2e56..0000000000 --- a/arch/arm/mach-highbank/core.h +++ /dev/null @@ -1,2 +0,0 @@ - -extern void highbank_smc1(int fn, int arg); diff --git a/arch/arm/mach-highbank/devices.c b/arch/arm/mach-highbank/devices.c deleted file mode 100644 index 8f9b8e0f45..0000000000 --- a/arch/arm/mach-highbank/devices.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <linux/sizes.h> - -#include <linux/amba/bus.h> - -#include <asm/memory.h> - -#include <mach/devices.h> - -void highbank_add_ddram(u32 size) -{ - arm_add_mem_device("ram1", 0x00000000, size); - add_mem_device("nvram", 0xfff88000, SZ_32K, IORESOURCE_MEM_WRITEABLE); -} - -void highbank_register_uart(void) -{ - amba_apb_device_add(NULL, "uart-pl011", DEVICE_ID_SINGLE, 0xfff36000, 4096, NULL, 0); -} - -void highbank_register_ahci(void) -{ - add_generic_device("ahci", DEVICE_ID_SINGLE, NULL, 0xffe08000, - 0x10000, IORESOURCE_MEM, NULL); -} - -void highbank_register_xgmac(unsigned id) -{ - resource_size_t start; - - switch (id) { - case 0: - start = 0xfff50000; - break; - case 1: - start = 0xfff51000; - break; - default: - return; - } - - add_generic_device("hb-xgmac", id, NULL, start, 0x1000, - IORESOURCE_MEM, NULL); -} - -void highbank_register_gpio(unsigned id) -{ - resource_size_t start; - - switch (id) { - case 0: - start = 0xfff30000; - break; - case 1: - start = 0xfff31000; - break; - case 2: - start = 0xfff32000; - break; - case 3: - start = 0xfff33000; - break; - default: - return; - } - - amba_apb_device_add(NULL, "pl061_gpio", id, start, 0x1000, NULL, 0); -} diff --git a/arch/arm/mach-highbank/include/mach/debug_ll.h b/arch/arm/mach-highbank/include/mach/debug_ll.h deleted file mode 100644 index 5d0fae80e7..0000000000 --- a/arch/arm/mach-highbank/include/mach/debug_ll.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2013 Jean-Christophe PLAGNIOL-VILLARD <plagniol@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __MACH_DEBUG_LL_H__ -#define __MACH_DEBUG_LL_H__ - -#define DEBUG_LL_UART_ADDR 0xfff36000 - -#include <debug_ll/pl011.h> - -#endif diff --git a/arch/arm/mach-highbank/include/mach/devices.h b/arch/arm/mach-highbank/include/mach/devices.h deleted file mode 100644 index 2cf2b6161c..0000000000 --- a/arch/arm/mach-highbank/include/mach/devices.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __ASM_ARCH_DEVICES_H__ -#define __ASM_ARCH_DEVICES_H__ - -void highbank_add_ddram(u32 size); - -void highbank_register_uart(void); -void highbank_register_ahci(void); -void highbank_register_xgmac(unsigned id); -void highbank_register_gpio(unsigned id); - -#endif /* __ASM_ARCH_DEVICES_H__ */ diff --git a/arch/arm/mach-highbank/include/mach/hardware.h b/arch/arm/mach-highbank/include/mach/hardware.h deleted file mode 100644 index db7fff242f..0000000000 --- a/arch/arm/mach-highbank/include/mach/hardware.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2010-2011 Calxeda, Inc - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __MACH_HARDWARE_H__ -#define __MACH_HARDWARE_H__ - -#define HB_SREG_A9_BASE 0xfff3c000 -#define HB_SYSRAM_OPP_TABLE_BASE 0xfff8f000 - -#endif /* __MACH_HARDWARE_H__ */ diff --git a/arch/arm/mach-highbank/include/mach/sysregs.h b/arch/arm/mach-highbank/include/mach/sysregs.h deleted file mode 100644 index 2f058f2d96..0000000000 --- a/arch/arm/mach-highbank/include/mach/sysregs.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Calxeda, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>. - */ -#ifndef _MACH_HIGHBANK__SYSREGS_H_ -#define _MACH_HIGHBANK__SYSREGS_H_ - -#include <io.h> - -extern void __iomem *sregs_base; - -#define HB_SREG_A9_PWR_REQ 0xf00 -#define HB_SREG_A9_BOOT_STAT 0xf04 -#define HB_SREG_A9_BOOT_DATA 0xf08 -#define HB_SREG_A9_PWRDOM_DATA 0xf20 - -#define HB_PWRDOM_STAT_SATA 0x80000000 -#define HB_PWRDOM_STAT_PCI 0x40000000 -#define HB_PWRDOM_STAT_EMMC 0x20000000 - -#define HB_PWR_SUSPEND 0 -#define HB_PWR_SOFT_RESET 1 -#define HB_PWR_HARD_RESET 2 -#define HB_PWR_SHUTDOWN 3 - -static inline void hingbank_set_pwr_suspend(void) -{ - writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); -} - -static inline void hingbank_set_pwr_shutdown(void) -{ - writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ); -} - -static inline void hingbank_set_pwr_soft_reset(void) -{ - writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ); -} - -static inline void hingbank_set_pwr_hard_reset(void) -{ - writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ); -} - -#endif diff --git a/arch/arm/mach-highbank/reset.c b/arch/arm/mach-highbank/reset.c deleted file mode 100644 index ea3908ec2b..0000000000 --- a/arch/arm/mach-highbank/reset.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <io.h> -#include <poweroff.h> -#include <restart.h> -#include <init.h> - -#include <mach/devices.h> -#include <mach/sysregs.h> - -static void __noreturn highbank_restart_soc(struct restart_handler *rst) -{ - hingbank_set_pwr_hard_reset(); - asm(" wfi"); - - hang(); -} - -static void __noreturn highbank_poweroff(struct poweroff_handler *handler) -{ - shutdown_barebox(); - - hingbank_set_pwr_shutdown(); - asm(" wfi"); - - while(1); -} - -static int highbank_init(void) -{ - restart_handler_register_fn("soc", highbank_restart_soc); - poweroff_handler_register_fn(highbank_poweroff); - - return 0; -} -coredevice_initcall(highbank_init); diff --git a/arch/arm/mach-highbank/smc.S b/arch/arm/mach-highbank/smc.S deleted file mode 100644 index cc932a3931..0000000000 --- a/arch/arm/mach-highbank/smc.S +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copied from omap44xx-smc.S Copyright (C) 2010 Texas Instruments, Inc. - * Copyright 2012 Calxeda, Inc. - * - * 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. - */ - -#include <linux/linkage.h> - -/* - * This is common routine to manage secure monitor API - * used to modify the PL310 secure registers. - * 'r0' contains the value to be modified and 'r12' contains - * the monitor API number. - * Function signature : void highbank_smc1(u32 fn, u32 arg) - */ - -ENTRY(highbank_smc1) - .arch_extension sec - stmfd sp!, {r4-r11, lr} - mov r12, r0 - mov r0, r1 - dsb - smc #0 - ldmfd sp!, {r4-r11, pc} -ENDPROC(highbank_smc1) diff --git a/arch/arm/mach-qemu/Kconfig b/arch/arm/mach-qemu/Kconfig deleted file mode 100644 index d30bae4c6f..0000000000 --- a/arch/arm/mach-qemu/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -if ARCH_QEMU - -config ARCH_TEXT_BASE - hex - default 0x40000000 - -choice - prompt "ARM Board type" - -config MACH_QEMU_VIRT64 - bool "QEMU arm64 virt machine" - select CPU_V8 - select SYS_SUPPORTS_64BIT_KERNEL - select ARM_AMBA - select HAVE_CONFIGURABLE_MEMORY_LAYOUT - -endchoice -endif diff --git a/arch/arm/mach-qemu/Makefile b/arch/arm/mach-qemu/Makefile deleted file mode 100644 index ece277ce0e..0000000000 --- a/arch/arm/mach-qemu/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_MACH_QEMU_VIRT64) += virt_devices.o diff --git a/arch/arm/mach-qemu/include/mach/debug_ll.h b/arch/arm/mach-qemu/include/mach/debug_ll.h deleted file mode 100644 index d59f68ea19..0000000000 --- a/arch/arm/mach-qemu/include/mach/debug_ll.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2013 Jean-Christophe PLAGNIOL-VILLARD <plagniol@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __MACH_DEBUG_LL_H__ -#define __MACH_DEBUG_LL_H__ - -#include <linux/amba/serial.h> -#include <io.h> - -#define DEBUG_LL_PHYS_BASE 0x10000000 -#define DEBUG_LL_PHYS_BASE_RS1 0x1c000000 - -#ifdef MP -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE -#else -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1 -#endif - -#include <debug_ll/pl011.h> - -#endif diff --git a/arch/arm/mach-qemu/include/mach/devices.h b/arch/arm/mach-qemu/include/mach/devices.h deleted file mode 100644 index 9872c61b49..0000000000 --- a/arch/arm/mach-qemu/include/mach/devices.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2016 Raphaël Poggi <poggi.raph@gmail.com> - * - * GPLv2 only - */ - -#ifndef __ASM_ARCH_DEVICES_H__ -#define __ASM_ARCH_DEVICES_H__ - -void virt_add_ddram(u32 size); -void virt_register_uart(unsigned id); - -#endif /* __ASM_ARCH_DEVICES_H__ */ diff --git a/arch/arm/mach-qemu/virt_devices.c b/arch/arm/mach-qemu/virt_devices.c deleted file mode 100644 index 999f463125..0000000000 --- a/arch/arm/mach-qemu/virt_devices.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2016 Raphaël Poggi <poggi.raph@gmail.com> - * - * GPLv2 only - */ - -#include <common.h> -#include <linux/amba/bus.h> -#include <asm/memory.h> -#include <mach/devices.h> -#include <linux/ioport.h> - -void virt_add_ddram(u32 size) -{ - arm_add_mem_device("ram0", 0x40000000, size); -} - -void virt_register_uart(unsigned id) -{ - resource_size_t start; - - switch (id) { - case 0: - start = 0x09000000; - break; - default: - return; - } - amba_apb_device_add(NULL, "uart-pl011", id, start, 4096, NULL, 0); -} diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 557c9653f4..b72684caa7 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -9,8 +9,7 @@ config MACH_VEXPRESS config MACH_VIRT bool "QEMU virt" + select BOARD_ARM_VIRT select ARM_PSCI_CLIENT - select BOARD_ARM_GENERIC_DT - select OF_OVERLAY endif diff --git a/arch/kvx/Kconfig b/arch/kvx/Kconfig index 3327021e1a..0934440880 100644 --- a/arch/kvx/Kconfig +++ b/arch/kvx/Kconfig @@ -11,6 +11,9 @@ config KVX select ELF select FLEXIBLE_BOOTARGS select GENERIC_FIND_NEXT_BIT + select HAS_ARCH_SJLJ + select HAS_CACHE + select HAS_DMA select LIBFDT select MFD_SYSCON select OF_BAREBOX_DRIVERS diff --git a/arch/kvx/cpu/start.S b/arch/kvx/cpu/start.S index d90272c71f..a647e8a513 100644 --- a/arch/kvx/cpu/start.S +++ b/arch/kvx/cpu/start.S @@ -115,6 +115,10 @@ ENDPROC(kvx_start) wfxl $psow = $r21 ;\ ;; ;\ wfxm $psow = $r22 ;\ + ;; ;\ + make $r21 = DO_WFXL_VALUE_##__pl ;\ + ;; ;\ + wfxl $dow = $r21 ;\ ;; /** diff --git a/arch/kvx/include/asm/cache.h b/arch/kvx/include/asm/cache.h index 3be1767250..0bf3c8f06e 100644 --- a/arch/kvx/include/asm/cache.h +++ b/arch/kvx/include/asm/cache.h @@ -8,6 +8,8 @@ #include <linux/types.h> +void invalidate_dcache_range(unsigned long addr, unsigned long stop); + static inline void sync_caches_for_execution(void) { __builtin_kvx_fence(); @@ -15,4 +17,15 @@ static inline void sync_caches_for_execution(void) __builtin_kvx_barrier(); } +static inline void sync_dcache_icache(void) +{ + sync_caches_for_execution(); +} + +static inline void dcache_inval(void) +{ + __builtin_kvx_fence(); + __builtin_kvx_dinval(); +} + #endif /* __KVX_CACHE_H */ diff --git a/arch/kvx/include/asm/dma.h b/arch/kvx/include/asm/dma.h new file mode 100644 index 0000000000..a7ecf279a9 --- /dev/null +++ b/arch/kvx/include/asm/dma.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2021 Yann Sionneau <ysionneau@kalray.eu>, Kalray Inc. */ + +#ifndef __ASM_DMA_H +#define __ASM_DMA_H + +#include <common.h> + +#define KVX_DDR_32BIT_RAM_WINDOW_BA (0x80000000ULL) +#define KVX_DDR_64BIT_RAM_WINDOW_BA (0x100000000ULL) +#define MAX_32BIT_ADDR (0xffffffffULL) + +#define dma_alloc dma_alloc +static inline void *dma_alloc(size_t size) +{ + return xmemalign(64, ALIGN(size, 64)); +} + +static inline void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle) +{ + BUILD_BUG_ON_MSG(1, "dma_alloc_coherent not supported: " + "MMU support is required to map uncached pages"); + return NULL; +} + +static inline void dma_free_coherent(void *mem, dma_addr_t dma_handle, + size_t size) +{ + free(mem); +} + +#endif /* __ASM_DMA_H */ diff --git a/arch/kvx/include/asm/privilege.h b/arch/kvx/include/asm/privilege.h index 36b9ade494..f183b24d42 100644 --- a/arch/kvx/include/asm/privilege.h +++ b/arch/kvx/include/asm/privilege.h @@ -114,6 +114,21 @@ #define ITO_WFXM_VALUE_PL_CUR ITO_WFXM_VALUE(PL_CUR) /** + * Debug Owner configuration + */ + +#define DO_WFXL_OWN(__field, __pl) \ + SFR_SET_VAL_WFXL(DO, __field, __pl) + +#define DO_WFXL_VALUE(__pl) (DO_WFXL_OWN(B0, __pl) | \ + DO_WFXL_OWN(B1, __pl) | \ + DO_WFXL_OWN(W0, __pl) | \ + DO_WFXL_OWN(W1, __pl)) + +#define DO_WFXL_VALUE_PL_CUR_PLUS_1 DO_WFXL_VALUE(PL_CUR_PLUS_1) +#define DO_WFXL_VALUE_PL_CUR DO_WFXL_VALUE(PL_CUR) + +/** * Misc owner configuration */ #define MO_WFXL_OWN(__field, __pl) \ @@ -160,6 +175,7 @@ PSO_WFXL_OWN(IE, __pl) | \ PSO_WFXL_OWN(HLE, __pl) | \ PSO_WFXL_OWN(SRE, __pl) | \ + PSO_WFXL_OWN(DAUS, __pl) | \ PSO_WFXL_OWN(ICE, __pl) | \ PSO_WFXL_OWN(USE, __pl) | \ PSO_WFXL_OWN(DCE, __pl) | \ diff --git a/arch/kvx/include/asm/setjmp.h b/arch/kvx/include/asm/setjmp.h new file mode 100644 index 0000000000..3c23576e6e --- /dev/null +++ b/arch/kvx/include/asm/setjmp.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-FileCopyrightText: 2021 Jules Maselbas <jmaselbas@kalray.eu>, Kalray Inc. */ + +#ifndef _ASM_KVX_SETJMP_H_ +#define _ASM_KVX_SETJMP_H_ + +#include <linux/types.h> + +typedef u64 jmp_buf[22]; + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); + +#endif /* _ASM_KVX_SETJMP_H_ */ diff --git a/arch/kvx/include/asm/sys_arch.h b/arch/kvx/include/asm/sys_arch.h index 9df32c4e72..ce07a55986 100644 --- a/arch/kvx/include/asm/sys_arch.h +++ b/arch/kvx/include/asm/sys_arch.h @@ -11,6 +11,9 @@ #define EXCEPTION_STRIDE 0x40 #define EXCEPTION_ALIGNMENT 0x100 +#define kvx_cluster_id() ((int) \ + ((kvx_sfr_get(PCR) & KVX_SFR_PCR_CID_MASK) \ + >> KVX_SFR_PCR_CID_SHIFT)) #define KVX_SFR_START(__sfr_reg) \ (KVX_SFR_## __sfr_reg ## _SHIFT) diff --git a/arch/kvx/lib/Makefile b/arch/kvx/lib/Makefile index 6e56462daa..c730e1c23f 100644 --- a/arch/kvx/lib/Makefile +++ b/arch/kvx/lib/Makefile @@ -3,4 +3,4 @@ # Copyright (C) 2019 Kalray Inc. # -obj-y += cpuinfo.o board.o dtb.o poweroff.o bootm.o +obj-y += cpuinfo.o board.o dtb.o poweroff.o bootm.o setjmp.o cache.o dma-default.o diff --git a/arch/kvx/lib/cache.c b/arch/kvx/lib/cache.c new file mode 100644 index 0000000000..bd074de79b --- /dev/null +++ b/arch/kvx/lib/cache.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: 2021 Yann Sionneau <ysionneau@kalray.eu>, Kalray Inc. + +#include <asm/cache.h> +#include <linux/kernel.h> + +#define KVX_DCACHE_LINE_SIZE (64) +#define KVX_DCACHE_SIZE (128*1024) + +void invalidate_dcache_range(unsigned long addr, unsigned long stop) +{ + long size; + + addr = ALIGN_DOWN(addr, KVX_DCACHE_LINE_SIZE); + size = stop - addr; + + if (size < KVX_DCACHE_SIZE) { + while (addr < stop) { + __builtin_kvx_dinvall((void *)addr); + addr += KVX_DCACHE_LINE_SIZE; + } + } else { + __builtin_kvx_dinval(); + } +} diff --git a/arch/kvx/lib/dma-default.c b/arch/kvx/lib/dma-default.c new file mode 100644 index 0000000000..2a4144696c --- /dev/null +++ b/arch/kvx/lib/dma-default.c @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: 2021 Yann Sionneau <ysionneau@kalray.eu>, Kalray Inc. + +#include <dma.h> +#include <asm/barrier.h> +#include <asm/io.h> +#include <asm/cache.h> +#include <asm/sfr.h> +#include <asm/sys_arch.h> + +/* + * The implementation of arch should follow the following rules: + * map for_cpu for_device unmap + * TO_DEV writeback none writeback none + * FROM_DEV invalidate invalidate(*) invalidate invalidate(*) + * BIDIR writeback invalidate writeback invalidate + * + * (*) - only necessary if the CPU speculatively prefetches. + * + * (see https://lkml.org/lkml/2018/5/18/979) + */ + +void dma_sync_single_for_device(dma_addr_t addr, size_t size, + enum dma_data_direction dir) +{ + /* dcache is Write-Through: no need to flush to force writeback */ + switch (dir) { + case DMA_FROM_DEVICE: + invalidate_dcache_range(addr, addr + size); + break; + case DMA_TO_DEVICE: + case DMA_BIDIRECTIONAL: + /* allow device to read buffer written by CPU */ + wmb(); + break; + default: + BUG(); + } +} + +void dma_sync_single_for_cpu(dma_addr_t addr, size_t size, + enum dma_data_direction dir) +{ + /* CPU does not speculatively prefetches */ + switch (dir) { + case DMA_FROM_DEVICE: + /* invalidate has been done during map/for_device */ + case DMA_TO_DEVICE: + break; + case DMA_BIDIRECTIONAL: + invalidate_dcache_range(addr, addr + size); + break; + default: + BUG(); + } +} + +#define KVX_DDR_ALIAS_OFFSET \ + (KVX_DDR_64BIT_RAM_WINDOW_BA - KVX_DDR_32BIT_RAM_WINDOW_BA) +#define KVX_DDR_ALIAS_WINDOW \ + (KVX_DDR_64BIT_RAM_WINDOW_BA + KVX_DDR_ALIAS_OFFSET) + +/* Local smem is aliased between 0 and 16MB */ +#define KVX_SMEM_LOCAL_ALIAS 0x1000000ULL + +dma_addr_t dma_map_single(struct device_d *dev, void *ptr, size_t size, + enum dma_data_direction dir) +{ + uintptr_t addr = (uintptr_t) ptr; + + dma_sync_single_for_device(addr, size, dir); + + /* Local smem alias should never be used for dma */ + if (addr < KVX_SMEM_LOCAL_ALIAS) + return addr + (1 + kvx_cluster_id()) * KVX_SMEM_LOCAL_ALIAS; + + if (dev->dma_mask && addr <= dev->dma_mask) + return addr; + + if (addr >= KVX_DDR_ALIAS_WINDOW) + return DMA_ERROR_CODE; + + addr -= KVX_DDR_ALIAS_OFFSET; + if (dev->dma_mask && addr > dev->dma_mask) + return DMA_ERROR_CODE; + + return addr; +} + +void dma_unmap_single(struct device_d *dev, dma_addr_t addr, size_t size, + enum dma_data_direction dir) +{ + dma_sync_single_for_cpu(addr, size, dir); +} diff --git a/arch/kvx/lib/dtb.c b/arch/kvx/lib/dtb.c index 54ffddaf0a..09898017c9 100644 --- a/arch/kvx/lib/dtb.c +++ b/arch/kvx/lib/dtb.c @@ -9,9 +9,6 @@ static int of_kvx_init(void) { - int ret; - struct device_node *root; - barebox_register_fdt(boot_dtb); return 0; diff --git a/arch/kvx/lib/setjmp.S b/arch/kvx/lib/setjmp.S new file mode 100644 index 0000000000..829299711d --- /dev/null +++ b/arch/kvx/lib/setjmp.S @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-FileCopyrightText: 2021 Jules Maselbas <jmaselbas@kalray.eu>, Kalray Inc. */ + +#define REG_SIZE 8 + +#include <linux/linkage.h> + +/* jmp_buf layout: + * [0] = $ra, $sp, $cs, $r14, + * [4] = $r20, $r21, $r22, $r23, + * [8] = $r24, $r25, $r26, $r27, + * [12] = $r28, $r29, $r30, $r31, + * [16] = $r18, $r19, + * [18] = $lc, $le, $ls, xxxx + */ + +/** + * int initjmp(jmp_buf jmp, void __noreturn (*func)(void), void *stack_top); + */ +ENTRY(initjmp) + /* store $ra */ + sd (0 * REG_SIZE)[$r0] = $r1 + ;; + /* store $sp */ + sd (1 * REG_SIZE)[$r0] = $r2 + make $r0 = 0 + ret + ;; +ENDPROC(initjmp) + +/** + * int setjmp(jmp_buf jmp); + */ +ENTRY(setjmp) + sq (16 * REG_SIZE)[$r0] = $r18r19 + get $r40 = $ra + copyd $r41 = $sp + ;; + so (4 * REG_SIZE)[$r0] = $r20r21r22r23 + get $r42 = $cs + copyd $r43 = $r14 + ;; + so (0 * REG_SIZE)[$r0] = $r40r41r42r43 + get $r40 = $lc + ;; + so (8 * REG_SIZE)[$r0] = $r24r25r26r27 + get $r41 = $le + ;; + so (12 * REG_SIZE)[$r0] = $r28r29r30r31 + get $r42 = $ls + ;; + so (18 * REG_SIZE)[$r0] = $r40r41r42r43 + make $r0 = 0 + ret + ;; +ENDPROC(setjmp) + +/** + * void longjmp(jmp_buf jmp, int ret); + */ +ENTRY(longjmp) + lo $r40r41r42r43 = (0 * REG_SIZE)[$r0] + ;; + lo $r44r45r46r47 = (18 * REG_SIZE)[$r0] + set $ra = $r40 + copyd $sp = $r41 + ;; + lo $r20r21r22r23 = (4 * REG_SIZE)[$r0] + set $cs = $r42 + copyd $r14 = $r43 + ;; + lo $r24r25r26r27 = (8 * REG_SIZE)[$r0] + set $lc = $r44 + ;; + lo $r28r29r30r31 = (12 * REG_SIZE)[$r0] + set $le = $r45 + ;; + lq $r18r19 = (16 * REG_SIZE)[$r0] + set $ls = $r46 + ;; + /* According to man, if retval is equal to 0, then we should return 1 */ + maxud $r0 = $r1, 1 + ret + ;; +ENDPROC(longjmp) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 48f97c4bbf..7774abe948 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -303,6 +303,7 @@ choice config 32BIT bool "32-bit barebox" depends on CPU_SUPPORTS_32BIT_KERNEL && SYS_SUPPORTS_32BIT_KERNEL + select HAS_ARCH_SJLJ help Select this option if you want to build a 32-bit barebox. diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h new file mode 100644 index 0000000000..14835f5139 --- /dev/null +++ b/arch/mips/include/asm/linkage.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#ifdef __ASSEMBLY__ +#include <asm/asm.h> +#endif + +#endif diff --git a/arch/mips/include/asm/setjmp.h b/arch/mips/include/asm/setjmp.h new file mode 100644 index 0000000000..81f4d4c15f --- /dev/null +++ b/arch/mips/include/asm/setjmp.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ + +/* + * Define the machine-dependent type `jmp_buf'. MIPS version. + * Copyright (C) 1992-2021 Free Software Foundation, Inc. + * This file is part of the GNU C Library. + */ + +#ifndef _MIPS_BITS_SETJMP_H +#define _MIPS_BITS_SETJMP_H 1 + +#include <asm/sgidefs.h> + +typedef struct __jmp_buf_internal_tag { + /* Program counter. */ + void *__pc; + + /* Stack pointer. */ + void *__sp; + + /* Callee-saved registers s0 through s7. */ + int __regs[8]; + + /* The frame pointer. */ + void *__fp; +} jmp_buf[1]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); + +#endif /* _MIPS_BITS_SETJMP_H */ diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 0761588ae8..88a2bdbd28 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -8,6 +8,7 @@ obj-y += reloc.o obj-y += sections.o obj-y += shutdown.o obj-y += dma-default.o +obj-$(CONFIG_HAS_ARCH_SJLJ) += setjmp.o obj-$(CONFIG_MIPS_OPTIMIZED_STRING_FUNCTIONS) += memcpy.o obj-$(CONFIG_MIPS_OPTIMIZED_STRING_FUNCTIONS) += memset.o diff --git a/arch/mips/lib/setjmp.S b/arch/mips/lib/setjmp.S new file mode 100644 index 0000000000..b09a7c5529 --- /dev/null +++ b/arch/mips/lib/setjmp.S @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <asm/regdef.h> +#include <asm/asm.h> +#include <linux/linkage.h> + +/* int setjmp (jmp_buf); */ +LEAF(setjmp) + sw ra, (0 * 4)(a0) + sw sp, (1 * 4)(a0) + sw s0, (2 * 4)(a0) + sw s1, (3 * 4)(a0) + sw s2, (4 * 4)(a0) + sw s3, (5 * 4)(a0) + sw s4, (6 * 4)(a0) + sw s5, (7 * 4)(a0) + sw s6, (8 * 4)(a0) + sw s7, (9 * 4)(a0) + sw fp, (10 * 4)(a0) + move v0, zero + j ra +END(setjmp) + +/* volatile void longjmp (jmp_buf, int); */ +LEAF(longjmp) + lw ra, (0 * 4)(a0) + lw sp, (1 * 4)(a0) + lw s0, (2 * 4)(a0) + lw s1, (3 * 4)(a0) + lw s2, (4 * 4)(a0) + lw s3, (5 * 4)(a0) + lw s4, (6 * 4)(a0) + lw s5, (7 * 4)(a0) + lw s6, (8 * 4)(a0) + lw s7, (9 * 4)(a0) + lw fp, (10 * 4)(a0) + bne a1, zero, 1f + li a1, 1 +1: + move v0, a1 + j ra +END(longjmp) + +/* int initjmp(jmp_buf jmp, void __noreturn (*func)(void), void *stack_top); */ +LEAF(initjmp) + sw a1, (0 * 4)(a0) + sw a2, (1 * 4)(a0) + move v0, zero + j ra +END(initjmp) diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig deleted file mode 100644 index c7c13a464b..0000000000 --- a/arch/nios2/Kconfig +++ /dev/null @@ -1,29 +0,0 @@ -config NIOS2 - bool - select HAS_KALLSYMS - select HAS_MODULES - select HAS_CACHE - select HAVE_CONFIGURABLE_MEMORY_LAYOUT - select GENERIC_FIND_NEXT_BIT - default y - -config ARCH_TEXT_BASE - hex - default 0x00000000 - -choice - prompt "Select your board" - -config GENERIC - bool "Generic" - select NIOS2 - -endchoice - -menu "Board configuration" - -config EARLY_PRINTF - default n - bool "Enable early printf functions" - -endmenu diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile deleted file mode 100644 index ef283f4143..0000000000 --- a/arch/nios2/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -KBUILD_DEFCONFIG := generic_defconfig - -KBUILD_CPPFLAGS += -fno-strict-aliasing -mno-hw-mul - -board-$(CONFIG_GENERIC) := generic - -KALLSYMS += --symbol-prefix=_ - -archprepare: maketools - - @$(kecho) " SYMLINK include/nios_sopc.h -> arch/nios2/boards/$(board-y)/nios_sopc.h" - @ln -fsn $(src)/arch/nios2/boards/$(board-y)/nios_sopc.h $(obj)/include/nios_sopc.h - -PHONY += maketools - -ifneq ($(board-y),) -BOARD := arch/nios2/boards/$(board-y)/ -else -BOARD := -endif - -common-y += $(BOARD) -common-y += arch/nios2/lib/ -common-y += arch/nios2/cpu/ - -lds-y += arch/nios2/cpu/barebox.lds - diff --git a/arch/nios2/boards/generic/Makefile b/arch/nios2/boards/generic/Makefile deleted file mode 100644 index f26283832a..0000000000 --- a/arch/nios2/boards/generic/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -obj-y += generic.o -bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-generic diff --git a/arch/nios2/boards/generic/config.h b/arch/nios2/boards/generic/config.h deleted file mode 100644 index 4bca902f75..0000000000 --- a/arch/nios2/boards/generic/config.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef _GENERIC_NAMES_H_ -#define _GENERIC_NAMES_H_ - -#include "nios_sopc.h" - -#ifndef MMU_PRESENT -#define IO_REGION_BASE 0x80000000 -#define KERNEL_REGION_BASE 0x00000000 -#endif - -/*Name of the RAM memory in your SOPC project */ -#define NIOS_SOPC_MEMORY_BASE (KERNEL_REGION_BASE | DDR_SDRAM_BASE) -#define NIOS_SOPC_MEMORY_SIZE DDR_SDRAM_SPAN - -/*Name of the timer in your SOPC project */ -#define NIOS_SOPC_TIMER_BASE (IO_REGION_BASE | SYS_CLK_TIMER_BASE) -#define NIOS_SOPC_TIMER_FREQ SYS_CLK_TIMER_FREQ - -/*Name of TSE and SGDMA in your SOPC project */ -#define NIOS_SOPC_SGDMA_RX_BASE (IO_REGION_BASE | SGDMA_RX_BASE) -#define NIOS_SOPC_SGDMA_TX_BASE (IO_REGION_BASE | SGDMA_TX_BASE) -#define NIOS_SOPC_TSE_BASE (IO_REGION_BASE | TSE_BASE) -#define NIOS_SOPC_TSE_DESC_MEM_BASE (IO_REGION_BASE | DESCRIPTOR_MEMORY_BASE) - -/*Name of the UART in your SOPC project */ -#define NIOS_SOPC_UART_BASE (IO_REGION_BASE | UART_BASE) - -/*Name of the JTAG UART in your SOPC project */ -#define NIOS_SOPC_JTAG_UART_BASE (IO_REGION_BASE | JTAG_UART_BASE) - -/*Name of the CFI flash in your SOPC project */ -#define NIOS_SOPC_FLASH_BASE (IO_REGION_BASE | CFI_FLASH_BASE) -#define NIOS_SOPC_FLASH_SIZE CFI_FLASH_SPAN - -/*Name of the EPCS flash controller in your SOPC project */ - -#define NIOS_SOPC_EPCS_BASE (IO_REGION_BASE | (EPCS_FLASH_CONTROLLER_BASE + EPCS_FLASH_CONTROLLER_REGISTER_OFFSET)) - -/* PHY MDIO Address */ -#define NIOS_SOPC_PHY_ADDR 1 - -/* We reserve 256K for barebox */ -#define BAREBOX_RESERVED_SIZE 0x80000 - -/* Barebox will be at top of main memory */ -#define NIOS_SOPC_TEXT_BASE (NIOS_SOPC_MEMORY_BASE + NIOS_SOPC_MEMORY_SIZE - BAREBOX_RESERVED_SIZE) - -/* -* TEXT_BASE is defined here because STACK_BASE definition -* in include/asm-generic/memory_layout.h uses this name -*/ - -#define TEXT_BASE NIOS_SOPC_TEXT_BASE - -/* Board banner */ - -#define BOARD_BANNER "\ -\033[44;1m***********************************************\e[0m\n\ -\033[44;1m* Altera generic board *\e[0m\n\ -\033[44;1m***********************************************\e[0m\ -\e[0m\n\n" - -#endif diff --git a/arch/nios2/boards/generic/defaultenv-generic/config b/arch/nios2/boards/generic/defaultenv-generic/config deleted file mode 100644 index 16adc49f1c..0000000000 --- a/arch/nios2/boards/generic/defaultenv-generic/config +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# can be either 'net' or 'flash' -kernel=flash -root=flash - -kernel_loc=nor - -# use 'dhcp' todo dhcp in barebox and in kernel -ip=none - -autoboot_timeout=3 - -nor_parts="256k(barebox),128k(env),4M(kernel),-(rootfs)" - -bootargs="console=ttyS0,9600" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;33mbarebox@\e[1;32mgeneric:\w\e[0m " - diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c deleted file mode 100644 index 0c2c67c567..0000000000 --- a/arch/nios2/boards/generic/generic.c +++ /dev/null @@ -1,77 +0,0 @@ -#include <common.h> -#include <init.h> -#include <driver.h> -#include <partition.h> -#include <fs.h> -#include <memory.h> -#include <envfs.h> - -static int phy_address = 1; - -static struct resource mac_resources[] = { - [0] = { - .start = NIOS_SOPC_TSE_BASE, - .end = NIOS_SOPC_TSE_BASE + 0x400 - 1, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = NIOS_SOPC_SGDMA_RX_BASE, - .end = 0x40 + NIOS_SOPC_SGDMA_RX_BASE - 1, - .flags = IORESOURCE_MEM, - }, - [2] = { - .start = NIOS_SOPC_SGDMA_TX_BASE, - .end = 0x40 + NIOS_SOPC_SGDMA_TX_BASE - 1, - .flags = IORESOURCE_MEM, - }, -}; - -static struct device_d mac_dev = { - .id = DEVICE_ID_DYNAMIC, - .name = "altera_tse", - .num_resources = ARRAY_SIZE(mac_resources), - .resource = mac_resources, - .platform_data = &phy_address, -}; - -static int mem_init(void) -{ - barebox_add_memory_bank("ram0", NIOS_SOPC_MEMORY_BASE, NIOS_SOPC_MEMORY_SIZE); - - return 0; -} -mem_initcall(mem_init); - -static int generic_devices_init(void) -{ - add_cfi_flash_device(DEVICE_ID_DYNAMIC, NIOS_SOPC_FLASH_BASE, NIOS_SOPC_FLASH_SIZE, 0); - platform_device_register(&mac_dev); - /*register_device(&epcs_flash_device);*/ - - devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); - devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); - - protect_file("/dev/env0", 1); - - if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) - defaultenv_append_directory(defaultenv_generic); - - return 0; -} - -device_initcall(generic_devices_init); - - -static int altera_console_init(void) -{ - barebox_set_model("Altera Generic Board"); - barebox_set_hostname("nios2"); - - add_generic_device("altera_serial", DEVICE_ID_DYNAMIC, NULL, - NIOS_SOPC_UART_BASE, 0x20, IORESOURCE_MEM, NULL); - - return 0; -} - -console_initcall(altera_console_init); - diff --git a/arch/nios2/boards/generic/nios_sopc.h b/arch/nios2/boards/generic/nios_sopc.h deleted file mode 100644 index 688bc44f41..0000000000 --- a/arch/nios2/boards/generic/nios_sopc.h +++ /dev/null @@ -1,406 +0,0 @@ -#ifndef _ALTERA_NIOSLINUX_H_ -#define _ALTERA_NIOSLINUX_H_ - -/* - * This file was automatically generated by the swinfo2header utility. - * - * Created from SOPC Builder system 'NiosLinux' in - * file 'NiosLinux.sopcinfo'. - */ - -/* - * This file contains macros for module 'LINUX_CPU' and devices - * connected to the following masters: - * instruction_master - * tightly_coupled_instruction_master_0 - * data_master - * tightly_coupled_data_master_0 - * - * Do not include this header file and another header file created for a - * different module or master group at the same time. - * Doing so may result in duplicate macro names. - * Instead, use the system header file which has macros with unique names. - */ - -/* - * Macros for module 'LINUX_CPU', class 'altera_nios2'. - * The macros have no prefix. - */ -#define CPU_IMPLEMENTATION "fast" -#define BIG_ENDIAN 0 -#define CPU_FREQ 100000000 -#define ICACHE_LINE_SIZE 32 -#define ICACHE_LINE_SIZE_LOG2 5 -#define ICACHE_SIZE 8192 -#define DCACHE_LINE_SIZE 32 -#define DCACHE_LINE_SIZE_LOG2 5 -#define DCACHE_SIZE 8192 -#define INITDA_SUPPORTED -#define FLUSHDA_SUPPORTED -#define HAS_JMPI_INSTRUCTION -#define MMU_PRESENT -#define KERNEL_REGION_BASE 0xc0000000 -#define IO_REGION_BASE 0xe0000000 -#define KERNEL_MMU_REGION_BASE 0x80000000 -#define USER_REGION_BASE 0x0 -#define PROCESS_ID_NUM_BITS 8 -#define TLB_NUM_WAYS 16 -#define TLB_NUM_WAYS_LOG2 4 -#define TLB_PTR_SZ 8 -#define TLB_NUM_ENTRIES 256 -#define FAST_TLB_MISS_EXCEPTION_ADDR 0xc4201000 -#define EXCEPTION_ADDR 0xc0000020 -#define RESET_ADDR 0xc30e0000 -#define BREAK_ADDR 0xc4203820 -#define HAS_DEBUG_STUB -#define HAS_DEBUG_CORE 1 -#define HAS_ILLEGAL_INSTRUCTION_EXCEPTION -#define HAS_ILLEGAL_MEMORY_ACCESS_EXCEPTION -#define HAS_EXTRA_EXCEPTION_INFO -#define CPU_ID_SIZE 1 -#define CPU_ID_VALUE 0x0 -#define HARDWARE_DIVIDE_PRESENT 0 -#define HARDWARE_MULTIPLY_PRESENT 1 -#define HARDWARE_MULX_PRESENT 0 -#define INST_ADDR_WIDTH 27 -#define DATA_ADDR_WIDTH 27 -#define NUM_OF_SHADOW_REG_SETS 0 - -/* - * Macros for device 'DDR_SDRAM', class 'altmemddr' - * The macros are prefixed with 'DDR_SDRAM_'. - * The prefix is the slave descriptor. - */ -#define DDR_SDRAM_COMPONENT_TYPE altmemddr -#define DDR_SDRAM_COMPONENT_NAME DDR_SDRAM -#define DDR_SDRAM_BASE 0x0 -#define DDR_SDRAM_SPAN 33554432 -#define DDR_SDRAM_END 0x1ffffff -#define DDR_SDRAM_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define DDR_SDRAM_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define DDR_SDRAM_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'CFI_FLASH', class 'altera_avalon_cfi_flash' - * The macros are prefixed with 'CFI_FLASH_'. - * The prefix is the slave descriptor. - */ -#define CFI_FLASH_COMPONENT_TYPE altera_avalon_cfi_flash -#define CFI_FLASH_COMPONENT_NAME CFI_FLASH -#define CFI_FLASH_BASE 0x3000000 -#define CFI_FLASH_SPAN 16777216 -#define CFI_FLASH_END 0x3ffffff -#define CFI_FLASH_SETUP_VALUE 25 -#define CFI_FLASH_WAIT_VALUE 100 -#define CFI_FLASH_HOLD_VALUE 20 -#define CFI_FLASH_TIMING_UNITS "ns" -#define CFI_FLASH_SIZE 16777216 -#define CFI_FLASH_MEMORY_INFO_MEM_INIT_DATA_WIDTH 16 -#define CFI_FLASH_MEMORY_INFO_HAS_BYTE_LANE 1 -#define CFI_FLASH_MEMORY_INFO_IS_FLASH 1 -#define CFI_FLASH_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define CFI_FLASH_MEMORY_INFO_GENERATE_FLASH 1 -#define CFI_FLASH_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR -#define CFI_FLASH_MEMORY_INFO_FLASH_INSTALL_DIR APP_DIR - -/* - * Macros for device 'SSRAM', class 'altera_avalon_cy7c1380_ssram' - * The macros are prefixed with 'SSRAM_'. - * The prefix is the slave descriptor. - */ -#define SSRAM_COMPONENT_TYPE altera_avalon_cy7c1380_ssram -#define SSRAM_COMPONENT_NAME SSRAM -#define SSRAM_BASE 0x4100000 -#define SSRAM_SPAN 1048576 -#define SSRAM_END 0x41fffff -#define SSRAM_SRAM_MEMORY_SIZE 1 -#define SSRAM_SRAM_MEMORY_UNITS 1048576 -#define SSRAM_SSRAM_DATA_WIDTH 32 -#define SSRAM_SSRAM_READ_LATENCY 2 -#define SSRAM_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define SSRAM_MEMORY_INFO_HAS_BYTE_LANE 1 -#define SSRAM_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define SSRAM_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'TLB', class 'altera_avalon_onchip_memory2' - * The macros are prefixed with 'TLB_'. - * The prefix is the slave descriptor. - */ -#define TLB_COMPONENT_TYPE altera_avalon_onchip_memory2 -#define TLB_COMPONENT_NAME TLB -#define TLB_BASE 0x4201000 -#define TLB_SPAN 4096 -#define TLB_END 0x4201fff -#define TLB_ALLOW_MRAM_SIM_CONTENTS_ONLY_FILE 0 -#define TLB_INIT_CONTENTS_FILE "TLB" -#define TLB_NON_DEFAULT_INIT_FILE_ENABLED 0 -#define TLB_GUI_RAM_BLOCK_TYPE "Automatic" -#define TLB_WRITABLE 1 -#define TLB_DUAL_PORT 1 -#define TLB_SIZE_VALUE 4096 -#define TLB_SIZE_MULTIPLE 1 -#define TLB_CONTENTS_INFO "" -#define TLB_RAM_BLOCK_TYPE "Auto" -#define TLB_INIT_MEM_CONTENT 1 -#define TLB_ALLOW_IN_SYSTEM_MEMORY_CONTENT_EDITOR 0 -#define TLB_INSTANCE_ID "NONE" -#define TLB_READ_DURING_WRITE_MODE "DONT_CARE" -#define TLB_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define TLB_MEMORY_INFO_HAS_BYTE_LANE 0 -#define TLB_MEMORY_INFO_GENERATE_HEX 1 -#define TLB_MEMORY_INFO_HEX_INSTALL_DIR QPF_DIR -#define TLB_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define TLB_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'DESCRIPTOR_MEMORY', class 'altera_avalon_onchip_memory2' - * The macros are prefixed with 'DESCRIPTOR_MEMORY_'. - * The prefix is the slave descriptor. - */ -#define DESCRIPTOR_MEMORY_COMPONENT_TYPE altera_avalon_onchip_memory2 -#define DESCRIPTOR_MEMORY_COMPONENT_NAME DESCRIPTOR_MEMORY -#define DESCRIPTOR_MEMORY_BASE 0x4202000 -#define DESCRIPTOR_MEMORY_SPAN 4096 -#define DESCRIPTOR_MEMORY_END 0x4202fff -#define DESCRIPTOR_MEMORY_ALLOW_MRAM_SIM_CONTENTS_ONLY_FILE 0 -#define DESCRIPTOR_MEMORY_INIT_CONTENTS_FILE "DESCRIPTOR_MEMORY" -#define DESCRIPTOR_MEMORY_NON_DEFAULT_INIT_FILE_ENABLED 0 -#define DESCRIPTOR_MEMORY_GUI_RAM_BLOCK_TYPE "Automatic" -#define DESCRIPTOR_MEMORY_WRITABLE 1 -#define DESCRIPTOR_MEMORY_DUAL_PORT 0 -#define DESCRIPTOR_MEMORY_SIZE_VALUE 4096 -#define DESCRIPTOR_MEMORY_SIZE_MULTIPLE 1 -#define DESCRIPTOR_MEMORY_CONTENTS_INFO "" -#define DESCRIPTOR_MEMORY_RAM_BLOCK_TYPE "Auto" -#define DESCRIPTOR_MEMORY_INIT_MEM_CONTENT 1 -#define DESCRIPTOR_MEMORY_ALLOW_IN_SYSTEM_MEMORY_CONTENT_EDITOR 0 -#define DESCRIPTOR_MEMORY_INSTANCE_ID "NONE" -#define DESCRIPTOR_MEMORY_READ_DURING_WRITE_MODE "DONT_CARE" -#define DESCRIPTOR_MEMORY_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define DESCRIPTOR_MEMORY_MEMORY_INFO_HAS_BYTE_LANE 0 -#define DESCRIPTOR_MEMORY_MEMORY_INFO_GENERATE_HEX 1 -#define DESCRIPTOR_MEMORY_MEMORY_INFO_HEX_INSTALL_DIR QPF_DIR -#define DESCRIPTOR_MEMORY_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define DESCRIPTOR_MEMORY_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'TSE', class 'triple_speed_ethernet' - * The macros are prefixed with 'TSE_'. - * The prefix is the slave descriptor. - */ -#define TSE_COMPONENT_TYPE triple_speed_ethernet -#define TSE_COMPONENT_NAME TSE -#define TSE_BASE 0x4204000 -#define TSE_SPAN 1024 -#define TSE_END 0x42043ff -#define TSE_TRANSMIT "SGDMA_TX" -#define TSE_RECEIVE "SGDMA_RX" -#define TSE_TRANSMIT_FIFO_DEPTH 2048 -#define TSE_RECEIVE_FIFO_DEPTH 2048 -#define TSE_FIFO_WIDTH 32 -#define TSE_ENABLE_MACLITE 1 -#define TSE_MACLITE_GIGE 0 -#define TSE_USE_MDIO 1 -#define TSE_NUMBER_OF_CHANNEL 1 -#define TSE_NUMBER_OF_MAC_MDIO_SHARED 1 -#define TSE_IS_MULTICHANNEL_MAC 0 -#define TSE_MDIO_SHARED 0 -#define TSE_REGISTER_SHARED 0 -#define TSE_PCS 0 -#define TSE_PCS_SGMII 0 -#define TSE_PCS_ID 0 - -/* - * Macros for device 'SGDMA_TX', class 'altera_avalon_sgdma' - * The macros are prefixed with 'SGDMA_TX_'. - * The prefix is the slave descriptor. - */ -#define SGDMA_TX_COMPONENT_TYPE altera_avalon_sgdma -#define SGDMA_TX_COMPONENT_NAME SGDMA_TX -#define SGDMA_TX_BASE 0x4204400 -#define SGDMA_TX_SPAN 64 -#define SGDMA_TX_END 0x420443f -#define SGDMA_TX_IRQ 5 -#define SGDMA_TX_READ_BLOCK_DATA_WIDTH 32 -#define SGDMA_TX_WRITE_BLOCK_DATA_WIDTH 32 -#define SGDMA_TX_STREAM_DATA_WIDTH 32 -#define SGDMA_TX_ADDRESS_WIDTH 32 -#define SGDMA_TX_HAS_READ_BLOCK 1 -#define SGDMA_TX_HAS_WRITE_BLOCK 0 -#define SGDMA_TX_READ_BURSTCOUNT_WIDTH 4 -#define SGDMA_TX_WRITE_BURSTCOUNT_WIDTH 4 -#define SGDMA_TX_BURST_TRANSFER 0 -#define SGDMA_TX_ALWAYS_DO_MAX_BURST 1 -#define SGDMA_TX_DESCRIPTOR_READ_BURST 0 -#define SGDMA_TX_UNALIGNED_TRANSFER 0 -#define SGDMA_TX_CONTROL_SLAVE_DATA_WIDTH 32 -#define SGDMA_TX_CONTROL_SLAVE_ADDRESS_WIDTH 4 -#define SGDMA_TX_DESC_DATA_WIDTH 32 -#define SGDMA_TX_CHAIN_WRITEBACK_DATA_WIDTH 32 -#define SGDMA_TX_STATUS_TOKEN_DATA_WIDTH 24 -#define SGDMA_TX_BYTES_TO_TRANSFER_DATA_WIDTH 16 -#define SGDMA_TX_BURST_DATA_WIDTH 8 -#define SGDMA_TX_CONTROL_DATA_WIDTH 8 -#define SGDMA_TX_ATLANTIC_CHANNEL_DATA_WIDTH 4 -#define SGDMA_TX_COMMAND_FIFO_DATA_WIDTH 104 -#define SGDMA_TX_SYMBOLS_PER_BEAT 4 -#define SGDMA_TX_IN_ERROR_WIDTH 0 -#define SGDMA_TX_OUT_ERROR_WIDTH 1 - -/* - * Macros for device 'DDR_SDRAM', class 'altmemddr' - * Path to the device is from the master group 'SGDMA_TX_m_read'. - * The macros are prefixed with 'SGDMA_TX_M_READ_DDR_SDRAM_'. - * The prefix is the master group descriptor and the slave descriptor. - */ -#define SGDMA_TX_M_READ_DDR_SDRAM_COMPONENT_TYPE altmemddr -#define SGDMA_TX_M_READ_DDR_SDRAM_COMPONENT_NAME DDR_SDRAM -#define SGDMA_TX_M_READ_DDR_SDRAM_BASE 0x0 -#define SGDMA_TX_M_READ_DDR_SDRAM_SPAN 33554432 -#define SGDMA_TX_M_READ_DDR_SDRAM_END 0x1ffffff -#define SGDMA_TX_M_READ_DDR_SDRAM_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define SGDMA_TX_M_READ_DDR_SDRAM_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define SGDMA_TX_M_READ_DDR_SDRAM_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'SGDMA_RX', class 'altera_avalon_sgdma' - * The macros are prefixed with 'SGDMA_RX_'. - * The prefix is the slave descriptor. - */ -#define SGDMA_RX_COMPONENT_TYPE altera_avalon_sgdma -#define SGDMA_RX_COMPONENT_NAME SGDMA_RX -#define SGDMA_RX_BASE 0x4204440 -#define SGDMA_RX_SPAN 64 -#define SGDMA_RX_END 0x420447f -#define SGDMA_RX_IRQ 3 -#define SGDMA_RX_READ_BLOCK_DATA_WIDTH 32 -#define SGDMA_RX_WRITE_BLOCK_DATA_WIDTH 32 -#define SGDMA_RX_STREAM_DATA_WIDTH 32 -#define SGDMA_RX_ADDRESS_WIDTH 32 -#define SGDMA_RX_HAS_READ_BLOCK 0 -#define SGDMA_RX_HAS_WRITE_BLOCK 1 -#define SGDMA_RX_READ_BURSTCOUNT_WIDTH 4 -#define SGDMA_RX_WRITE_BURSTCOUNT_WIDTH 4 -#define SGDMA_RX_BURST_TRANSFER 0 -#define SGDMA_RX_ALWAYS_DO_MAX_BURST 1 -#define SGDMA_RX_DESCRIPTOR_READ_BURST 0 -#define SGDMA_RX_UNALIGNED_TRANSFER 0 -#define SGDMA_RX_CONTROL_SLAVE_DATA_WIDTH 32 -#define SGDMA_RX_CONTROL_SLAVE_ADDRESS_WIDTH 4 -#define SGDMA_RX_DESC_DATA_WIDTH 32 -#define SGDMA_RX_CHAIN_WRITEBACK_DATA_WIDTH 32 -#define SGDMA_RX_STATUS_TOKEN_DATA_WIDTH 24 -#define SGDMA_RX_BYTES_TO_TRANSFER_DATA_WIDTH 16 -#define SGDMA_RX_BURST_DATA_WIDTH 8 -#define SGDMA_RX_CONTROL_DATA_WIDTH 8 -#define SGDMA_RX_ATLANTIC_CHANNEL_DATA_WIDTH 4 -#define SGDMA_RX_COMMAND_FIFO_DATA_WIDTH 104 -#define SGDMA_RX_SYMBOLS_PER_BEAT 4 -#define SGDMA_RX_IN_ERROR_WIDTH 6 -#define SGDMA_RX_OUT_ERROR_WIDTH 0 - -/* - * Macros for device 'DDR_SDRAM', class 'altmemddr' - * Path to the device is from the master group 'SGDMA_RX_m_write'. - * The macros are prefixed with 'SGDMA_RX_M_WRITE_DDR_SDRAM_'. - * The prefix is the master group descriptor and the slave descriptor. - */ -#define SGDMA_RX_M_WRITE_DDR_SDRAM_COMPONENT_TYPE altmemddr -#define SGDMA_RX_M_WRITE_DDR_SDRAM_COMPONENT_NAME DDR_SDRAM -#define SGDMA_RX_M_WRITE_DDR_SDRAM_BASE 0x0 -#define SGDMA_RX_M_WRITE_DDR_SDRAM_SPAN 33554432 -#define SGDMA_RX_M_WRITE_DDR_SDRAM_END 0x1ffffff -#define SGDMA_RX_M_WRITE_DDR_SDRAM_MEMORY_INFO_MEM_INIT_DATA_WIDTH 32 -#define SGDMA_RX_M_WRITE_DDR_SDRAM_MEMORY_INFO_GENERATE_DAT_SYM 1 -#define SGDMA_RX_M_WRITE_DDR_SDRAM_MEMORY_INFO_DAT_SYM_INSTALL_DIR SIM_DIR - -/* - * Macros for device 'UART', class 'altera_avalon_uart' - * The macros are prefixed with 'UART_'. - * The prefix is the slave descriptor. - */ -#define UART_COMPONENT_TYPE altera_avalon_uart -#define UART_COMPONENT_NAME UART -#define UART_BASE 0x4204480 -#define UART_SPAN 32 -#define UART_END 0x420449f -#define UART_IRQ 1 -#define UART_BAUD 9600 -#define UART_DATA_BITS 8 -#define UART_FIXED_BAUD 0 -#define UART_PARITY 'N' -#define UART_STOP_BITS 1 -#define UART_SYNC_REG_DEPTH 2 -#define UART_USE_CTS_RTS 0 -#define UART_USE_EOP_REGISTER 0 -#define UART_SIM_TRUE_BAUD 0 -#define UART_SIM_CHAR_STREAM "" -#define UART_FREQ 100000000 - -/* - * Macros for device 'SYS_CLK_TIMER', class 'altera_avalon_timer' - * The macros are prefixed with 'SYS_CLK_TIMER_'. - * The prefix is the slave descriptor. - */ -#define SYS_CLK_TIMER_COMPONENT_TYPE altera_avalon_timer -#define SYS_CLK_TIMER_COMPONENT_NAME SYS_CLK_TIMER -#define SYS_CLK_TIMER_BASE 0x42044a0 -#define SYS_CLK_TIMER_SPAN 32 -#define SYS_CLK_TIMER_END 0x42044bf -#define SYS_CLK_TIMER_IRQ 2 -#define SYS_CLK_TIMER_ALWAYS_RUN 0 -#define SYS_CLK_TIMER_FIXED_PERIOD 0 -#define SYS_CLK_TIMER_SNAPSHOT 1 -#define SYS_CLK_TIMER_PERIOD 1 -#define SYS_CLK_TIMER_PERIOD_UNITS "ms" -#define SYS_CLK_TIMER_RESET_OUTPUT 0 -#define SYS_CLK_TIMER_TIMEOUT_PULSE_OUTPUT 0 -#define SYS_CLK_TIMER_FREQ 100000000 -#define SYS_CLK_TIMER_LOAD_VALUE 99999ULL -#define SYS_CLK_TIMER_COUNTER_SIZE 32 -#define SYS_CLK_TIMER_MULT 0.0010 -#define SYS_CLK_TIMER_TICKS_PER_SEC 1000 - -/* - * Macros for device 'LED_STATUS', class 'altera_avalon_pio' - * The macros are prefixed with 'LED_STATUS_'. - * The prefix is the slave descriptor. - */ -#define LED_STATUS_COMPONENT_TYPE altera_avalon_pio -#define LED_STATUS_COMPONENT_NAME LED_STATUS -#define LED_STATUS_BASE 0x42044c0 -#define LED_STATUS_SPAN 16 -#define LED_STATUS_END 0x42044cf -#define LED_STATUS_DO_TEST_BENCH_WIRING 0 -#define LED_STATUS_DRIVEN_SIM_VALUE 0x0 -#define LED_STATUS_HAS_TRI 0 -#define LED_STATUS_HAS_OUT 1 -#define LED_STATUS_HAS_IN 0 -#define LED_STATUS_CAPTURE 0 -#define LED_STATUS_BIT_CLEARING_EDGE_REGISTER 0 -#define LED_STATUS_BIT_MODIFYING_OUTPUT_REGISTER 0 -#define LED_STATUS_DATA_WIDTH 2 -#define LED_STATUS_RESET_VALUE 0x3 -#define LED_STATUS_EDGE_TYPE "NONE" -#define LED_STATUS_IRQ_TYPE "NONE" -#define LED_STATUS_FREQ 100000000 - -/* - * Macros for device 'JTAG_UART', class 'altera_avalon_jtag_uart' - * The macros are prefixed with 'JTAG_UART_'. - * The prefix is the slave descriptor. - */ -#define JTAG_UART_COMPONENT_TYPE altera_avalon_jtag_uart -#define JTAG_UART_COMPONENT_NAME JTAG_UART -#define JTAG_UART_BASE 0x42044d0 -#define JTAG_UART_SPAN 8 -#define JTAG_UART_END 0x42044d7 -#define JTAG_UART_IRQ 4 -#define JTAG_UART_WRITE_DEPTH 64 -#define JTAG_UART_READ_DEPTH 64 -#define JTAG_UART_WRITE_THRESHOLD 8 -#define JTAG_UART_READ_THRESHOLD 8 - - -#endif /* _ALTERA_NIOSLINUX_H_ */ diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig deleted file mode 100644 index 44c040a61a..0000000000 --- a/arch/nios2/configs/generic_defconfig +++ /dev/null @@ -1,32 +0,0 @@ -CONFIG_EARLY_PRINTF=y -CONFIG_BAUDRATE=9600 -CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -CONFIG_BOOTM_SHOW_TYPE=y -CONFIG_BOOTM_VERBOSE=y -CONFIG_PARTITION=y -CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_LONGHELP=y -CONFIG_CMD_GO=y -CONFIG_CMD_RESET=y -CONFIG_CMD_UIMAGE=y -CONFIG_CMD_PARTITION=y -CONFIG_CMD_EXPORT=y -CONFIG_CMD_LOADENV=y -CONFIG_CMD_PRINTENV=y -CONFIG_CMD_SAVEENV=y -CONFIG_CMD_SLEEP=y -CONFIG_CMD_PING=y -CONFIG_CMD_TFTP=y -CONFIG_CMD_ECHO_E=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_READLINE=y -CONFIG_CMD_TIMEOUT=y -CONFIG_CMD_FLASH=y -CONFIG_NET=y -CONFIG_DRIVER_NET_TSE=y -CONFIG_MTD=y -CONFIG_DRIVER_CFI=y -CONFIG_FS_TFTP=y -CONFIG_ZLIB=y diff --git a/arch/nios2/cpu/.gitignore b/arch/nios2/cpu/.gitignore deleted file mode 100644 index d1165788c9..0000000000 --- a/arch/nios2/cpu/.gitignore +++ /dev/null @@ -1 +0,0 @@ -barebox.lds diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile deleted file mode 100644 index 0b59ec57c1..0000000000 --- a/arch/nios2/cpu/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -obj-y += start.o -obj-y += exceptions.o -obj-y += cpu.o -obj-y += traps.o -extra-y += barebox.lds diff --git a/arch/nios2/cpu/barebox.lds.S b/arch/nios2/cpu/barebox.lds.S deleted file mode 100644 index 8d82aa59e7..0000000000 --- a/arch/nios2/cpu/barebox.lds.S +++ /dev/null @@ -1,114 +0,0 @@ -/* - * barebox - barebox.lds.S - * - * (C) Copyright 2011, Franck JULLIEN, <elec4fun@gmail.com> - * - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * Copyright (c) 2005-2007 Analog Device Inc. - * - * (C) Copyright 2000-2004 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <config.h> -#include <asm-generic/barebox.lds.h> - -OUTPUT_FORMAT("elf32-littlenios2") -OUTPUT_ARCH("nios2") - -SECTIONS -{ - . = NIOS_SOPC_TEXT_BASE; - - . = ALIGN(4); - .text : - { - _stext = .; - __text = .; - _text = .; - __bare_init_start = .; - *(.text_entry) - __bare_init_end = .; - *(.text) - } - BAREBOX_BARE_INIT_SIZE - - . = ALIGN(4); - - .rodata : { - *(.rodata*) - RO_DATA_SECTION - } - - _etext = .; /* End of text and rodata section */ - - /* INIT DATA sections - "Small" data (see the gcc -G option) - * is always gp-relative. Here we make all init data sections - * adjacent to simplify the startup code -- and provide - * the global pointer for gp-relative access. - */ - _sdata = .; - _data = .; - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d*) - } - - . = ALIGN(16); - _gp = .; /* Global pointer addr */ - PROVIDE (gp = .); - - .sdata : - { - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - } - . = ALIGN(4); - - _edata = .; - PROVIDE (edata = .); - - /* UNINIT DATA - Small uninitialized data is first so it's - * adjacent to sdata and can be referenced via gp. The normal - * bss follows. We keep it adjacent to simplify init code. - */ - __bss_start = .; - .sbss (NOLOAD) : - { - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - } - . = ALIGN(4); - .bss (NOLOAD) : - { - *(.bss) - *(.bss.*) - *(.dynbss) - *(COMMON) - *(.scommon) - } - __bss_stop = .; - - . = ALIGN(4); - _end = .; - PROVIDE (end = .); -} diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c deleted file mode 100644 index 9f86c911cc..0000000000 --- a/arch/nios2/cpu/cpu.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <common.h> -#include <init.h> -#include <restart.h> -#include <asm/system.h> - -static void __noreturn nios2_restart_soc(struct restart_handler *rst) -{ - /* indirect call to go beyond 256MB limitation of toolchain */ - nios2_callr(RESET_ADDR); - - /* Not reached */ - hang(); -} - -static int restart_register_feature(void) -{ - return restart_handler_register_fn("vector", nios2_restart_soc); -} -coredevice_initcall(restart_register_feature); - diff --git a/arch/nios2/cpu/exceptions.S b/arch/nios2/cpu/exceptions.S deleted file mode 100644 index 8806f5cebf..0000000000 --- a/arch/nios2/cpu/exceptions.S +++ /dev/null @@ -1,144 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <config.h> -#include <asm/opcodes.h> - - - .text - .align 4 - - .global _exception - - .set noat - .set nobreak - -_exception: - /* SAVE ALL REGS -- this allows trap and unimplemented - * instruction handlers to be coded conveniently in C - */ - addi sp, sp, -(33*4) - stw r0, 0(sp) - stw r1, 4(sp) - stw r2, 8(sp) - stw r3, 12(sp) - stw r4, 16(sp) - stw r5, 20(sp) - stw r6, 24(sp) - stw r7, 28(sp) - stw r8, 32(sp) - stw r9, 36(sp) - stw r10, 40(sp) - stw r11, 44(sp) - stw r12, 48(sp) - stw r13, 52(sp) - stw r14, 56(sp) - stw r15, 60(sp) - stw r16, 64(sp) - stw r17, 68(sp) - stw r19, 72(sp) - stw r19, 76(sp) - stw r20, 80(sp) - stw r21, 84(sp) - stw r22, 88(sp) - stw r23, 92(sp) - stw r24, 96(sp) - stw r25, 100(sp) - stw r26, 104(sp) - stw r27, 108(sp) - stw r28, 112(sp) - stw r29, 116(sp) - stw r30, 120(sp) - stw r31, 124(sp) - rdctl et, estatus - stw et, 128(sp) - - /* If interrupts are disabled -- software interrupt */ - rdctl et, estatus - andi et, et, 1 - beq et, r0, 0f - - /* If no interrupts are pending -- software interrupt */ - rdctl et, ipending - beq et, r0, 0f - - br _exception_return - - /* Return address fixup: execution resumes by re-issue of - * interrupted instruction at ea-4 (ea == r29). Here we do - * simple fixup to allow common exception return. - */ - ldw r3, 116(sp) - addi r3, r3, -4 - stw r3, 116(sp) - br _exception_return - -0: - /* TRAP EXCEPTION */ - movhi r3, %hi(OPC_TRAP) - ori r3, r3, %lo(OPC_TRAP) - addi r1, ea, -4 - ldw r1, 0(r1) - bne r1, r3, 1f - movhi r3, %hi(trap_handler) - ori r3, r3, %lo(trap_handler) - mov r4, sp /* ptr to regs */ - callr r3 - br _exception_return - -1: - /* UNIMPLEMENTED INSTRUCTION EXCEPTION */ - movhi r3, %hi(soft_emulation) - ori r3, r3, %lo(soft_emulation) - mov r4, sp /* ptr to regs */ - callr r3 - - /* Restore registers and return from exception */ -_exception_return: - ldw r1, 4(sp) - ldw r2, 8(sp) - ldw r3, 12(sp) - ldw r4, 16(sp) - ldw r5, 20(sp) - ldw r6, 24(sp) - ldw r7, 28(sp) - ldw r8, 32(sp) - ldw r9, 36(sp) - ldw r10, 40(sp) - ldw r11, 44(sp) - ldw r12, 48(sp) - ldw r13, 52(sp) - ldw r14, 56(sp) - ldw r15, 60(sp) - ldw r16, 64(sp) - ldw r17, 68(sp) - ldw r19, 72(sp) - ldw r19, 76(sp) - ldw r20, 80(sp) - ldw r21, 84(sp) - ldw r22, 88(sp) - ldw r23, 92(sp) - ldw r24, 96(sp) - ldw r25, 100(sp) - ldw r26, 104(sp) - ldw r27, 108(sp) - ldw r28, 112(sp) - ldw r29, 116(sp) - ldw r30, 120(sp) - ldw r31, 124(sp) - addi sp, sp, (33*4) - eret -/*-------------------------------------------------------------*/ diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S deleted file mode 100644 index d770b0014d..0000000000 --- a/arch/nios2/cpu/start.S +++ /dev/null @@ -1,158 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <config.h> -#include <asm-generic/memory_layout.h> - -/************************************************************************* - * RESTART - ************************************************************************/ - -.section ".text_entry","ax" - -_start: - wrctl status, r0 /* Disable interrupts */ - /* ICACHE INIT -- only the icache line at the reset address - * is invalidated at reset. So the init must stay within - * the cache line size (8 words). If GERMS is used, we'll - * just be invalidating the cache a second time. If cache - * is not implemented initi behaves as nop. - */ - ori r4, r0, %lo(ICACHE_LINE_SIZE) - movhi r5, %hi(ICACHE_SIZE) - ori r5, r5, %lo(ICACHE_SIZE) -0: initi r5 - sub r5, r5, r4 - bgt r5, r0, 0b - br _except_end /* Skip the tramp */ - - /* EXCEPTION TRAMPOLINE -- the following gets copied - * to the exception address (below), but is otherwise at the - * default exception vector offset (0x0020). - */ -_except_start: - movhi et, %hi(_exception) - ori et, et, %lo(_exception) - jmp et -_except_end: - - /* INTERRUPTS -- for now, all interrupts masked and globally - * disabled. - */ - wrctl ienable, r0 /* All disabled */ - - /* DCACHE INIT -- if dcache not implemented, initd behaves as - * nop. - */ - movhi r4, %hi(DCACHE_LINE_SIZE) - ori r4, r4, %lo(DCACHE_LINE_SIZE) - movhi r5, %hi(DCACHE_SIZE) - ori r5, r5, %lo(DCACHE_SIZE) - mov r6, r0 -1: initd 0(r6) - add r6, r6, r4 - bltu r6, r5, 1b - - /* RELOCATE CODE, DATA & COMMAND TABLE -- the following code - * assumes code, data and the command table are all - * contiguous. This lets us relocate everything as a single - * block. Make sure the linker script matches this ;-) - */ - nextpc r4 -_cur: movhi r5, %hi(_cur - _start) - ori r5, r5, %lo(_cur - _start) - sub r4, r4, r5 /* r4 <- cur _start */ - mov r8, r4 - movhi r5, %hi(_start) - ori r5, r5, %lo(_start) /* r5 <- linked _start */ - beq r4, r5, 3f - - movhi r6, %hi(_edata) - ori r6, r6, %lo(_edata) -2: ldwio r7, 0(r4) - addi r4, r4, 4 - stwio r7, 0(r5) - addi r5, r5, 4 - bne r5, r6, 2b -3: - - /* ZERO BSS/SBSS -- bss and sbss are assumed to be adjacent - * and between __bss_start and _end. - */ - movhi r5, %hi(__bss_start) - ori r5, r5, %lo(__bss_start) - movhi r6, %hi(_end) - ori r6, r6, %lo(_end) - beq r5, r6, 5f - -4: stwio r0, 0(r5) - addi r5, r5, 4 - bne r5, r6, 4b -5: - - /* JUMP TO RELOC ADDR */ - movhi r4, %hi(_reloc) - ori r4, r4, %lo(_reloc) - jmp r4 -_reloc: - - /* COPY EXCEPTION TRAMPOLINE -- copy the tramp to the - * exception address. Define CONFIG_ROM_STUBS to prevent - * the copy (e.g. exception in flash or in other - * softare/firmware component). - */ -#if !defined(CONFIG_ROM_STUBS) - movhi r4, %hi(_except_start) - ori r4, r4, %lo(_except_start) - movhi r5, %hi(_except_end) - ori r5, r5, %lo(_except_end) - movhi r6, %hi(EXCEPTION_ADDR) - ori r6, r6, %lo(EXCEPTION_ADDR) - beq r4, r6, 7f /* Skip if at proper addr */ - -6: ldwio r7, 0(r4) - stwio r7, 0(r6) - addi r4, r4, 4 - addi r6, r6, 4 - bne r4, r5, 6b -7: -#endif - - /* STACK INIT -- zero top two words for call back chain. - */ - movhi sp, %hi(STACK_BASE) - ori sp, sp, %lo(STACK_BASE) - addi sp, sp, -8 - stw r0, 0(sp) - stw r0, 4(sp) - mov fp, sp - - /* Set the global pointer */ - movhi r26, %hi(_gp) - ori r26, r26, %lo(_gp) - - /* - * Call board_init -- never returns - */ - movhi r4, %hi(nios_start_barebox@h) - ori r4, r4, %lo(nios_start_barebox@h) - callr r4 - - /* NEVER RETURNS -- but branch to the _start just - * in case ;-) - */ - br _start - diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c deleted file mode 100644 index 484d007090..0000000000 --- a/arch/nios2/cpu/traps.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <asm/ptrace.h> -#include <common.h> - -void trap_handler (struct pt_regs *regs) -{ - /* Just issue warning */ - printf("\n\n*** WARNING: unimplemented trap @ %08x\n\n", - regs->reg[29] - 4); -} - -void soft_emulation(struct pt_regs *regs) -{ - /* TODO: Software emulation of mul/div etc. Until this is - * implemented, generate warning and hang. - */ - printf("\n\n*** ERROR: unimplemented instruction @ %08x\n", - regs->reg[29] - 4); - - hang(); -} diff --git a/arch/nios2/include/asm/bitops.h b/arch/nios2/include/asm/bitops.h deleted file mode 100644 index e77ab83202..0000000000 --- a/arch/nios2/include/asm/bitops.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - * - */ - -#ifndef _ASM_BITOPS_H_ -#define _ASM_BITOPS_H_ - -#include <asm-generic/bitops/__ffs.h> -#include <asm-generic/bitops/__fls.h> -#include <asm-generic/bitops/ffs.h> -#include <asm-generic/bitops/fls.h> -#include <asm-generic/bitops/ffz.h> -#include <asm-generic/bitops/hweight.h> -#include <asm-generic/bitops/fls64.h> -#include <asm-generic/bitops/find.h> -#include <asm-generic/bitops/ops.h> - -#define set_bit(x, y) __set_bit(x, y) -#define clear_bit(x, y) __clear_bit(x, y) -#define change_bit(x, y) __change_bit(x, y) -#define test_and_set_bit(x, y) __test_and_set_bit(x, y) -#define test_and_clear_bit(x, y) __test_and_clear_bit(x, y) -#define test_and_change_bit(x, y) __test_and_change_bit(x, y) - -#endif /* _ASM_BITOPS_H_ */ diff --git a/arch/nios2/include/asm/bitsperlong.h b/arch/nios2/include/asm/bitsperlong.h deleted file mode 100644 index 6dc0bb0c13..0000000000 --- a/arch/nios2/include/asm/bitsperlong.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/bitsperlong.h> diff --git a/arch/nios2/include/asm/byteorder.h b/arch/nios2/include/asm/byteorder.h deleted file mode 100644 index 9558416d57..0000000000 --- a/arch/nios2/include/asm/byteorder.h +++ /dev/null @@ -1 +0,0 @@ -#include <linux/byteorder/little_endian.h> diff --git a/arch/nios2/include/asm/cache.h b/arch/nios2/include/asm/cache.h deleted file mode 100644 index d9de8f999a..0000000000 --- a/arch/nios2/include/asm/cache.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2003 Microtronix Datacom Ltd. - * Copyright (C) 2000-2002 Greg Ungerer <gerg@snapgear.com> - * - * Ported from m68knommu. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_NIOS2_CACHEFLUSH_H -#define _ASM_NIOS2_CACHEFLUSH_H - -void flush_cache_all(void); -void flush_dcache_all(void); -void flush_icache_all(void); -void flush_icache_range(unsigned long start, unsigned long end); -void flush_dcache_range(unsigned long start, unsigned long end); - -#endif /* _ASM_NIOS2_CACHEFLUSH_H */ diff --git a/arch/nios2/include/asm/common.h b/arch/nios2/include/asm/common.h deleted file mode 100644 index 027dca2d56..0000000000 --- a/arch/nios2/include/asm/common.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_COMMON_H -#define __ASM_COMMON_H - -#endif /* _ASM_COMMON_H */ diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h deleted file mode 100644 index 5ecc1ed21e..0000000000 --- a/arch/nios2/include/asm/dma-mapping.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef __ASM_NIOS2_DMA_MAPPING_H -#define __ASM_NIOS2_DMA_MAPPING_H - -#include <common.h> -#include <xfuncs.h> - -#include <asm/cache.h> - -/* dma_alloc_coherent() return cache-line aligned allocation which is mapped - * to uncached io region. - * - * IO_REGION_BASE should be defined in board config header file - * 0x80000000 for nommu, 0xe0000000 for mmu - */ - -#if (DCACHE_SIZE != 0) -static inline void *dma_alloc_coherent(size_t len, dma_addr_t *handle) -{ - void *addr = malloc(len + DCACHE_LINE_SIZE); - if (!addr) - return 0; - flush_dcache_range((unsigned long)addr,(unsigned long)addr + len + DCACHE_LINE_SIZE); - if (handle) - *handle = ((dma_addr_t)addr + (DCACHE_LINE_SIZE - 1)) & - ~(DCACHE_LINE_SIZE - 1) & ~(IO_REGION_BASE); - return (void *)(*handle | IO_REGION_BASE); -} -#else -static inline void *dma_alloc_coherent(size_t len, dma_addr_t *handle) -{ - void *addr = malloc(len); - if (!addr) - return 0; - if (handle) - *handle = (dma_addr_t)addr; - return (void *)(*handle | IO_REGION_BASE); -} -#endif - -#if (DCACHE_SIZE != 0) -#define dma_alloc dma_alloc -static inline void *dma_alloc(size_t size) -{ - return xmemalign(DCACHE_LINE_SIZE, ALIGN(size, DCACHE_LINE_SIZE)); -} -#endif - -#endif /* __ASM_NIOS2_DMA_MAPPING_H */ diff --git a/arch/nios2/include/asm/dma.h b/arch/nios2/include/asm/dma.h deleted file mode 100644 index 8f709d2dbf..0000000000 --- a/arch/nios2/include/asm/dma.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de> - * - * This file is released under the GPLv2 - * - */ - -#include <asm/dma-mapping.h> diff --git a/arch/nios2/include/asm/early_printf.h b/arch/nios2/include/asm/early_printf.h deleted file mode 100644 index e483e345fe..0000000000 --- a/arch/nios2/include/asm/early_printf.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _EARLY_PRINTF_ -#define _EARLY_PRINTF_ - -#include <asm/nios2-io.h> - -void early_putc(char ch); -void early_puts(const char *s); -int early_printf(const char *fmt, ...); - -#endif /* _EARLY_PRINTF_ */ diff --git a/arch/nios2/include/asm/elf.h b/arch/nios2/include/asm/elf.h deleted file mode 100644 index 6060e1ee6e..0000000000 --- a/arch/nios2/include/asm/elf.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (C) 2011 Tobias Klauser <tklauser@distanz.ch> - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_NIOS2_ELF_H -#define _ASM_NIOS2_ELF_H - -/* Relocation types */ -#define R_NIOS2_NONE 0 -#define R_NIOS2_S16 1 -#define R_NIOS2_U16 2 -#define R_NIOS2_PCREL16 3 -#define R_NIOS2_CALL26 4 -#define R_NIOS2_IMM5 5 -#define R_NIOS2_CACHE_OPX 6 -#define R_NIOS2_IMM6 7 -#define R_NIOS2_IMM8 8 -#define R_NIOS2_HI16 9 -#define R_NIOS2_LO16 10 -#define R_NIOS2_HIADJ16 11 -#define R_NIOS2_BFD_RELOC_32 12 -#define R_NIOS2_BFD_RELOC_16 13 -#define R_NIOS2_BFD_RELOC_8 14 -#define R_NIOS2_GPREL 15 -#define R_NIOS2_GNU_VTINHERIT 16 -#define R_NIOS2_GNU_VTENTRY 17 -#define R_NIOS2_UJMP 18 -#define R_NIOS2_CJMP 19 -#define R_NIOS2_CALLR 20 -#define R_NIOS2_ALIGN 21 -/* Keep this the last entry. */ -#define R_NIOS2_NUM 22 - -#include <asm/ptrace.h> - -typedef unsigned long elf_greg_t; - -#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t)) -typedef elf_greg_t elf_gregset_t[ELF_NGREG]; - -typedef unsigned long elf_fpregset_t; - -/* - * This is used to ensure we don't load something for the wrong architecture. - */ -#define elf_check_arch(x) ((x)->e_machine == EM_ALTERA_NIOS2) - -/* - * These are used to set parameters in the core dumps. - */ -#define ELF_CLASS ELFCLASS32 -#define ELF_DATA ELFDATA2LSB -#define ELF_ARCH EM_ALTERA_NIOS2 - -#define ELF_PLAT_INIT(_r, load_addr) - -#define USE_ELF_CORE_DUMP -#define ELF_EXEC_PAGESIZE 4096 - -/* This is the location that an ET_DYN program is loaded if exec'ed. Typical - use of this is to invoke "./ld.so someprog" to test out a new version of - the loader. We need to make sure that it is out of the way of the program - that it will "exec", and that there is sufficient room for the brk. */ - -#define ELF_ET_DYN_BASE 0xD0000000UL - -/* regs is struct pt_regs, pr_reg is elf_gregset_t (which is - now struct_user_regs, they are different) */ - -#ifdef CONFIG_MMU -#define ELF_CORE_COPY_REGS(pr_reg, regs) \ - do { \ - pr_reg[0] = regs->r8; \ - pr_reg[1] = regs->r9; \ - pr_reg[2] = regs->r10; \ - pr_reg[3] = regs->r11; \ - pr_reg[4] = regs->r12; \ - pr_reg[5] = regs->r13; \ - pr_reg[6] = regs->r14; \ - pr_reg[7] = regs->r15; \ - pr_reg[8] = regs->r1; \ - pr_reg[9] = regs->r2; \ - pr_reg[10] = regs->r3; \ - pr_reg[11] = regs->r4; \ - pr_reg[12] = regs->r5; \ - pr_reg[13] = regs->r6; \ - pr_reg[14] = regs->r7 \ - pr_reg[15] = regs->orig_r2; \ - pr_reg[16] = regs->ra; \ - pr_reg[17] = regs->fp; \ - pr_reg[18] = regs->sp; \ - pr_reg[19] = regs->gp; \ - pr_reg[20] = regs->estatus; \ - pr_reg[21] = regs->ea; \ - pr_reg[22] = regs->orig_r7; \ - { \ - struct switch_stack *sw = ((struct switch_stack *)regs) - 1; \ - pr_reg[23] = sw->r16; \ - pr_reg[24] = sw->r17; \ - pr_reg[25] = sw->r18; \ - pr_reg[26] = sw->r19; \ - pr_reg[27] = sw->r20; \ - pr_reg[28] = sw->r21; \ - pr_reg[29] = sw->r22; \ - pr_reg[30] = sw->r23; \ - pr_reg[31] = sw->fp; \ - pr_reg[32] = sw->gp; \ - pr_reg[33] = sw->ra; \ - } \ - } while (0) -#else -#define ELF_CORE_COPY_REGS(pr_reg, regs) \ - do { \ - pr_reg[0] = regs->r1; \ - pr_reg[1] = regs->r2; \ - pr_reg[2] = regs->r3; \ - pr_reg[3] = regs->r4; \ - pr_reg[4] = regs->r5; \ - pr_reg[5] = regs->r6; \ - pr_reg[6] = regs->r7; \ - pr_reg[7] = regs->r8; \ - pr_reg[8] = regs->r9; \ - pr_reg[9] = regs->r10; \ - pr_reg[10] = regs->r11; \ - pr_reg[11] = regs->r12; \ - pr_reg[12] = regs->r13; \ - pr_reg[13] = regs->r14; \ - pr_reg[14] = regs->r15; \ - pr_reg[23] = regs->sp; \ - pr_reg[26] = regs->estatus; \ - { \ - struct switch_stack *sw = ((struct switch_stack *)regs) - 1; \ - pr_reg[15] = sw->r16; \ - pr_reg[16] = sw->r17; \ - pr_reg[17] = sw->r18; \ - pr_reg[18] = sw->r19; \ - pr_reg[19] = sw->r20; \ - pr_reg[20] = sw->r21; \ - pr_reg[21] = sw->r22; \ - pr_reg[22] = sw->r23; \ - pr_reg[24] = sw->fp; \ - pr_reg[25] = sw->gp; \ - } \ - } while (0) - -#endif /* CONFIG_MMU */ - -/* This yields a mask that user programs can use to figure out what - instruction set this cpu supports. */ - -#define ELF_HWCAP (0) - -/* This yields a string that ld.so will use to load implementation - specific libraries for optimization. This is more specific in - intent than poking at uname or /proc/cpuinfo. */ - -#define ELF_PLATFORM (NULL) - -#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT) - -#endif diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h deleted file mode 100644 index a964c695e7..0000000000 --- a/arch/nios2/include/asm/io.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#ifndef __ASM_NIOS2_IO_H_ -#define __ASM_NIOS2_IO_H_ - -#include <asm/byteorder.h> - -#define IO_SPACE_LIMIT 0 - -#define __raw_writeb(v, a) (*(volatile unsigned char *)(a) = (v)) -#define __raw_writew(v, a) (*(volatile unsigned short *)(a) = (v)) -#define __raw_writel(v, a) (*(volatile unsigned int *)(a) = (v)) - -#define __raw_readb(a) (*(volatile unsigned char *)(a)) -#define __raw_readw(a) (*(volatile unsigned short *)(a)) -#define __raw_readl(a) (*(volatile unsigned int *)(a)) - -#define readb(addr)\ - ({unsigned char val;\ - asm volatile("ldbio %0, 0(%1)" : "=r"(val) : "r" (addr)); val; }) -#define readw(addr)\ - ({unsigned short val;\ - asm volatile("ldhio %0, 0(%1)" : "=r"(val) : "r" (addr)); val; }) -#define readl(addr)\ - ({unsigned int val;\ - asm volatile("ldwio %0, 0(%1)" : "=r"(val) : "r" (addr)); val; }) - -#define writeb(val, addr)\ - asm volatile("stbio %0, 0(%1)" : : "r" (val), "r" (addr)) -#define writew(val, addr)\ - asm volatile ("sthio %0, 0(%1)" : : "r" (val), "r" (addr)) -#define writel(val, addr)\ - asm volatile("stwio %0, 0(%1)" : : "r" (val), "r" (addr)) - -#include <asm-generic/io.h> - -#endif /* __ASM_NIOS2_IO_H_ */ diff --git a/arch/nios2/include/asm/mmu.h b/arch/nios2/include/asm/mmu.h deleted file mode 100644 index 95af871420..0000000000 --- a/arch/nios2/include/asm/mmu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_MMU_H -#define __ASM_MMU_H - -#define MAP_ARCH_DEFAULT MAP_UNCACHED - -#endif /* __ASM_MMU_H */ diff --git a/arch/nios2/include/asm/nios2-io.h b/arch/nios2/include/asm/nios2-io.h deleted file mode 100644 index 6511548a55..0000000000 --- a/arch/nios2/include/asm/nios2-io.h +++ /dev/null @@ -1,175 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -/************************************************************************* - * Altera Nios2 Standard Peripherals - ************************************************************************/ - -#ifndef __NIOS2IO_H__ -#define __NIOS2IO_H__ - -/*------------------------------------------------------------------------ - * UART (http://www.altera.com/literature/ds/ds_nios_uart.pdf) - *----------------------------------------------------------------------*/ -struct nios_uart { - unsigned rxdata; /* Rx data reg */ - unsigned txdata; /* Tx data reg */ - unsigned status; /* Status reg */ - unsigned control; /* Control reg */ - unsigned divisor; /* Baud rate divisor reg */ - unsigned endofpacket; /* End-of-packet reg */ -}; - -/* status register */ -#define NIOS_UART_PE (1 << 0) /* parity error */ -#define NIOS_UART_FE (1 << 1) /* frame error */ -#define NIOS_UART_BRK (1 << 2) /* break detect */ -#define NIOS_UART_ROE (1 << 3) /* rx overrun */ -#define NIOS_UART_TOE (1 << 4) /* tx overrun */ -#define NIOS_UART_TMT (1 << 5) /* tx empty */ -#define NIOS_UART_TRDY (1 << 6) /* tx ready */ -#define NIOS_UART_RRDY (1 << 7) /* rx ready */ -#define NIOS_UART_E (1 << 8) /* exception */ -#define NIOS_UART_DCTS (1 << 10) /* cts change */ -#define NIOS_UART_CTS (1 << 11) /* cts */ -#define NIOS_UART_EOP (1 << 12) /* eop detected */ - -/* control register */ -#define NIOS_UART_IPE (1 << 0) /* parity error int ena*/ -#define NIOS_UART_IFE (1 << 1) /* frame error int ena */ -#define NIOS_UART_IBRK (1 << 2) /* break detect int ena */ -#define NIOS_UART_IROE (1 << 3) /* rx overrun int ena */ -#define NIOS_UART_ITOE (1 << 4) /* tx overrun int ena */ -#define NIOS_UART_ITMT (1 << 5) /* tx empty int ena */ -#define NIOS_UART_ITRDY (1 << 6) /* tx ready int ena */ -#define NIOS_UART_IRRDY (1 << 7) /* rx ready int ena */ -#define NIOS_UART_IE (1 << 8) /* exception int ena */ -#define NIOS_UART_TBRK (1 << 9) /* transmit break */ -#define NIOS_UART_IDCTS (1 << 10) /* cts change int ena */ -#define NIOS_UART_RTS (1 << 11) /* rts */ -#define NIOS_UART_IEOP (1 << 12) /* eop detected int ena */ - - -/*------------------------------------------------------------------------ - * TIMER (http://www.altera.com/literature/ds/ds_nios_timer.pdf) - *----------------------------------------------------------------------*/ -struct nios_timer { - unsigned status; /* Timer status reg */ - unsigned control; /* Timer control reg */ - unsigned periodl; /* Timeout period low */ - unsigned periodh; /* Timeout period high */ - unsigned snapl; /* Snapshot low */ - unsigned snaph; /* Snapshot high */ -}; - -struct nios_timer_64 { - unsigned status; /* Timer status reg */ - unsigned control; /* Timer control reg */ - unsigned period0; /* Timeout period low */ - unsigned period1; /* Timeout period high */ - unsigned period2; /* Timeout period low */ - unsigned period3; /* Timeout period high */ - unsigned snap0; /* Snapshot low */ - unsigned snap1; /* Snapshot high */ - unsigned snap2; /* Snapshot low */ - unsigned snap3; /* Snapshot high */ -}; - -/* status register */ -#define NIOS_TIMER_TO (1 << 0) /* Timeout */ -#define NIOS_TIMER_RUN (1 << 1) /* Timer running */ - -/* control register */ -#define NIOS_TIMER_ITO (1 << 0) /* Timeout int ena */ -#define NIOS_TIMER_CONT (1 << 1) /* Continuous mode */ -#define NIOS_TIMER_START (1 << 2) /* Start timer */ -#define NIOS_TIMER_STOP (1 << 3) /* Stop timer */ - - -/*------------------------------------------------------------------------ - * PIO (http://www.altera.com/literature/ds/ds_nios_pio.pdf) - *----------------------------------------------------------------------*/ -struct nios_pio { - unsigned int data; /* Data value at each PIO in/out */ - unsigned int direction; /* Data direct. for each PIO bit */ - unsigned int interruptmask; /* Per-bit IRQ enable/disable */ - unsigned int edgecapture; /* Per-bit sync. edge detect & hold */ -}; - -/* direction register */ -#define NIOS_PIO_OUT (1) /* PIO bit is output */ -#define NIOS_PIO_IN (0) /* PIO bit is input */ - - -/*------------------------------------------------------------------------ - * SPI (http://www.altera.com/literature/ds/ds_nios_spi.pdf) - *----------------------------------------------------------------------*/ -struct nios_spi { - unsigned rxdata; /* Rx data reg */ - unsigned txdata; /* Tx data reg */ - unsigned status; /* Status reg */ - unsigned control; /* Control reg */ - unsigned reserved; /* (master only) */ - unsigned slaveselect; /* SPI slave select mask (master only) */ -}; - -/* status register */ -#define NIOS_SPI_ROE (1 << 3) /* rx overrun */ -#define NIOS_SPI_TOE (1 << 4) /* tx overrun */ -#define NIOS_SPI_TMT (1 << 5) /* tx empty */ -#define NIOS_SPI_TRDY (1 << 6) /* tx ready */ -#define NIOS_SPI_RRDY (1 << 7) /* rx ready */ -#define NIOS_SPI_E (1 << 8) /* exception */ - -/* control register */ -#define NIOS_SPI_IROE (1 << 3) /* rx overrun int ena */ -#define NIOS_SPI_ITOE (1 << 4) /* tx overrun int ena */ -#define NIOS_SPI_ITRDY (1 << 6) /* tx ready int ena */ -#define NIOS_SPI_IRRDY (1 << 7) /* rx ready int ena */ -#define NIOS_SPI_IE (1 << 8) /* exception int ena */ -#define NIOS_SPI_SSO (1 << 10) /* override SS_n output */ - -/*------------------------------------------------------------------------ - * JTAG UART - *----------------------------------------------------------------------*/ -struct nios_jtag { - unsigned data; /* Data register */ - unsigned control; /* Control register */ -}; - -/* data register */ -#define NIOS_JTAG_RVALID (1<<15) /* Read valid */ -#define NIOS_JTAG_DATA(d) ((d)&0x0ff) /* Read data */ -#define NIOS_JTAG_RAVAIL(d) ((d)>>16) /* Read space avail */ - -/* control register */ -#define NIOS_JTAG_RE (1 << 0) /* read intr enable */ -#define NIOS_JTAG_WE (1 << 1) /* write intr enable */ -#define NIOS_JTAG_RI (1 << 8) /* read intr pending */ -#define NIOS_JTAG_WI (1 << 9) /* write intr pending*/ -#define NIOS_JTAG_AC (1 << 10) /* activity indicator */ -#define NIOS_JTAG_RRDY (1 << 12) /* read available */ -#define NIOS_JTAG_WSPACE(d) ((d)>>16) /* Write space avail */ - -/*------------------------------------------------------------------------ - * SYSTEM ID - *----------------------------------------------------------------------*/ -struct nios_sysid { - unsigned id; /* The system build id*/ - unsigned timestamp; /* Timestamp */ -}; - -#endif /* __NIOS2IO_H__ */ diff --git a/arch/nios2/include/asm/nios2.h b/arch/nios2/include/asm/nios2.h deleted file mode 100644 index 67e3177bad..0000000000 --- a/arch/nios2/include/asm/nios2.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#ifndef __NIOS2_H__ -#define __NIOS2_H__ - -/*------------------------------------------------------------------------ - * Control registers -- use with wrctl() & rdctl() - *----------------------------------------------------------------------*/ -#define CTL_STATUS 0 /* Processor status reg */ -#define CTL_ESTATUS 1 /* Exception status reg */ -#define CTL_BSTATUS 2 /* Break status reg */ -#define CTL_IENABLE 3 /* Interrut enable reg */ -#define CTL_IPENDING 4 /* Interrut pending reg */ - -/*------------------------------------------------------------------------ - * Access to control regs - *----------------------------------------------------------------------*/ -#define _str_(x) #x - -#define rdctl(reg)\ - ({unsigned int val;\ - asm volatile("rdctl %0, ctl" _str_(reg)\ - : "=r" (val)); val; }) - -#define wrctl(reg, val)\ - asm volatile("wrctl ctl" _str_(reg) ",%0"\ - : : "r" (val)) - -/*------------------------------------------------------------------------ - * Control reg bit masks - *----------------------------------------------------------------------*/ -#define STATUS_IE (1<<0) /* Interrupt enable */ -#define STATUS_U (1<<1) /* User-mode */ - -/*------------------------------------------------------------------------ - * Bit-31 Cache bypass -- only valid for data access. When data cache - * is not implemented, bit 31 is ignored for compatibility. - *----------------------------------------------------------------------*/ -#define CACHE_BYPASS(a) ((a) | 0x80000000) -#define CACHE_NO_BYPASS(a) ((a) & ~0x80000000) - -#endif /* __NIOS2_H__ */ diff --git a/arch/nios2/include/asm/opcodes.h b/arch/nios2/include/asm/opcodes.h deleted file mode 100644 index dc186e3a00..0000000000 --- a/arch/nios2/include/asm/opcodes.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#ifndef __ASM_NIOS2_OPCODES_H_ -#define __ASM_NIOS2_OPCODES_H_ - -#define OPCODE_OP(inst) ((inst) & 0x3f) -#define OPCODE_OPX(inst) (((inst)>>11) & 0x3f) -#define OPCODE_RA(inst) (((inst)>>27) & 01f) -#define OPCODE_RB(inst) (((inst)>>22) & 01f) -#define OPCODE_RC(inst) (((inst)>>17) & 01f) - -/* I-TYPE (immediate) and J-TYPE (jump) opcodes - */ -#define OPCODE_CALL 0x00 -#define OPCODE_LDBU 0x03 -#define OPCODE_ADDI 0x04 -#define OPCODE_STB 0x05 -#define OPCODE_BR 0x06 -#define OPCODE_LDB 0x07 -#define OPCODE_CMPGEI 0x08 -#define OPCODE_LDHU 0x0B -#define OPCODE_ANDI 0x0C -#define OPCODE_STH 0x0D -#define OPCODE_BGE 0x0E -#define OPCODE_LDH 0x0F -#define OPCODE_CMPLTI 0x10 -#define OPCODE_XORI 0x1C -#define OPCODE_ORI 0x14 -#define OPCODE_STW 0x15 -#define OPCODE_BLT 0x16 -#define OPCODE_LDW 0x17 -#define OPCODE_CMPNEI 0x18 -#define OPCODE_BNE 0x1E -#define OPCODE_CMPEQI 0x20 -#define OPCODE_LDBUIO 0x23 -#define OPCODE_MULI 0x24 -#define OPCODE_STBIO 0x25 -#define OPCODE_BEQ 0x26 -#define OPCODE_LDBIO 0x27 -#define OPCODE_CMPGEUI 0x28 -#define OPCODE_ANDHI 0x2C -#define OPCODE_STHIO 0x2D -#define OPCODE_BGEU 0x2E -#define OPCODE_LDHIO 0x2F -#define OPCODE_CMPLTUI 0x30 -#define OPCODE_CUSTOM 0x32 -#define OPCODE_INITD 0x33 -#define OPCODE_ORHI 0x34 -#define OPCODE_STWIO 0x35 -#define OPCODE_BLTU 0x36 -#define OPCODE_LDWIO 0x37 -#define OPCODE_RTYPE 0x3A -#define OPCODE_LDHUIO 0x2B -#define OPCODE_FLUSHD 0x3B -#define OPCODE_XORHI 0x3C - -/* R-Type (register) OPX field encodings - */ -#define OPCODE_ERET 0x01 -#define OPCODE_ROLI 0x02 -#define OPCODE_ROL 0x03 -#define OPCODE_FLUSHP 0x04 -#define OPCODE_RET 0x05 -#define OPCODE_NOR 0x06 -#define OPCODE_MULXUU 0x07 -#define OPCODE_CMPGE 0x08 -#define OPCODE_BRET 0x09 -#define OPCODE_ROR 0x0B -#define OPCODE_FLUSHI 0x0C -#define OPCODE_JMP 0x0D -#define OPCODE_AND 0x0E - -#define OPCODE_CMPLT 0x10 -#define OPCODE_SLLI 0x12 -#define OPCODE_SLL 0x13 -#define OPCODE_OR 0x16 -#define OPCODE_MULXSU 0x17 -#define OPCODE_CMPNE 0x18 -#define OPCODE_SRLI 0x1A -#define OPCODE_SRL 0x1B -#define OPCODE_NEXTPC 0x1C -#define OPCODE_CALLR 0x1D -#define OPCODE_XOR 0x1E -#define OPCODE_MULXSS 0x1F - -#define OPCODE_CMPEQ 0x20 -#define OPCODE_CMPLTU 0x30 -#define OPCODE_ADD 0x31 -#define OPCODE_DIVU 0x24 -#define OPCODE_DIV 0x25 -#define OPCODE_RDCTL 0x26 -#define OPCODE_MUL 0x27 -#define OPCODE_CMPGEU 0x28 -#define OPCODE_TRAP 0x2D -#define OPCODE_WRCTL 0x2E - -#define OPCODE_BREAK 0x34 -#define OPCODE_SYNC 0x36 -#define OPCODE_INITI 0x29 -#define OPCODE_SUB 0x39 -#define OPCODE_SRAI 0x3A -#define OPCODE_SRA 0x3B - -/*Full instruction encodings for R-Type, without the R's ;-) - * - * TODO: BREAK, BRET, ERET, RET, SYNC (as needed) - */ -#define OPC_TRAP 0x003b683a - -#endif /* __ASM_NIOS2_OPCODES_H_ */ diff --git a/arch/nios2/include/asm/posix_types.h b/arch/nios2/include/asm/posix_types.h deleted file mode 100644 index 22cae6230c..0000000000 --- a/arch/nios2/include/asm/posix_types.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/posix_types.h> diff --git a/arch/nios2/include/asm/ptrace.h b/arch/nios2/include/asm/ptrace.h deleted file mode 100644 index a0b137152b..0000000000 --- a/arch/nios2/include/asm/ptrace.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#ifndef __ASM_NIOS2_PTRACE_H_ -#define __ASM_NIOS2_PTRACE_H_ - -struct pt_regs { - unsigned reg[32]; - unsigned status; -}; - - -#endif /* __ASM_NIOS2_PTRACE_H_ */ diff --git a/arch/nios2/include/asm/sections.h b/arch/nios2/include/asm/sections.h deleted file mode 100644 index 2b8c516038..0000000000 --- a/arch/nios2/include/asm/sections.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/sections.h> diff --git a/arch/nios2/include/asm/spi.h b/arch/nios2/include/asm/spi.h deleted file mode 100644 index 6c5740c340..0000000000 --- a/arch/nios2/include/asm/spi.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __ALTERA_SPI_H_ -#define __ALTERA_SPI_H_ - -#include <spi/spi.h> - -struct spi_altera_master { - int num_chipselect; - int spi_mode; - int databits; - int speed; - int bus_num; -}; - -struct altera_spi { - struct spi_master master; - int databits; - int speed; - int mode; - void __iomem *regs; -}; - -#endif /*__ALTERA_SPI_H_*/ diff --git a/arch/nios2/include/asm/string.h b/arch/nios2/include/asm/string.h deleted file mode 100644 index c1b74990dc..0000000000 --- a/arch/nios2/include/asm/string.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ -#ifndef __ASM_NIOS2_STRING_H_ -#define __ASM_NIOS2_STRING_H_ -/* -#undef __HAVE_ARCH_STRRCHR -extern char *strrchr(const char * s, int c); - -#undef __HAVE_ARCH_STRCHR -extern char *strchr(const char * s, int c); -*/ -#undef __HAVE_ARCH_MEMCPY -extern void *memcpy(void *, const void *, __kernel_size_t); - -#undef __HAVE_ARCH_MEMMOVE -extern void *memmove(void *, const void *, __kernel_size_t); - -#undef __HAVE_ARCH_MEMCHR -extern void *memchr(const void *, int, __kernel_size_t); - -#undef __HAVE_ARCH_MEMSET -extern void *memset(void *, int, __kernel_size_t); - -#undef __HAVE_ARCH_MEMZERO -extern void memzero(void *ptr, __kernel_size_t n); - -#endif /* __ASM_NIOS2_STRING_H_ */ diff --git a/arch/nios2/include/asm/swab.h b/arch/nios2/include/asm/swab.h deleted file mode 100644 index b07e1d51f1..0000000000 --- a/arch/nios2/include/asm/swab.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_SWAB_H -#define _ASM_SWAB_H - -#endif /* _ASM_SWAB_H */ diff --git a/arch/nios2/include/asm/system.h b/arch/nios2/include/asm/system.h deleted file mode 100644 index 63f14f50db..0000000000 --- a/arch/nios2/include/asm/system.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * (C) Copyright 2004, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ -#ifndef __ASM_NIOS2_SYSTEM_H_ -#define __ASM_NIOS2_SYSTEM_H_ - -#define local_irq_enable() __asm__ __volatile__ ( \ - "rdctl r8, status\n" \ - "ori r8, r8, 1\n" \ - "wrctl status, r8\n" \ - : : : "r8") - -#define local_irq_disable() __asm__ __volatile__ ( \ - "rdctl r8, status\n" \ - "andi r8, r8, 0xfffe\n" \ - "wrctl status, r8\n" \ - : : : "r8") - -#define local_save_flags(x) __asm__ __volatile__ ( \ - "rdctl r8, status\n" \ - "mov %0, r8\n" \ - : "=r" (x) : : "r8", "memory") - -#define local_irq_restore(x) __asm__ __volatile__ ( \ - "mov r8, %0\n" \ - "wrctl status, r8\n" \ - : : "r" (x) : "r8", "memory") - -/* For spinlocks etc */ -#define local_irq_save(x) do { local_save_flags(x); local_irq_disable(); } \ - while (0) - -#define irqs_disabled() \ -({ \ - unsigned long flags; \ - local_save_flags(flags); \ - ((flags & NIOS2_STATUS_PIE_MSK) == 0x0); \ -}) - -/* indirect call to go beyond 256MB limitation of toolchain */ -#define nios2_callr(addr) __asm__ __volatile__ ( \ - "callr %0" \ - : : "r" (addr)) - -#endif /* __ASM_NIOS2_SYSTEM_H */ diff --git a/arch/nios2/include/asm/types.h b/arch/nios2/include/asm/types.h deleted file mode 100644 index 380ad340c3..0000000000 --- a/arch/nios2/include/asm/types.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_TYPES_H -#define __ASM_TYPES_H - -#include <asm-generic/int-ll64.h> - -#endif diff --git a/arch/nios2/include/asm/unaligned.h b/arch/nios2/include/asm/unaligned.h deleted file mode 100644 index 7615e8a85d..0000000000 --- a/arch/nios2/include/asm/unaligned.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef _ASM_NIOS_UNALIGNED_H -#define _ASM_NIOS_UNALIGNED_H - -#include <linux/unaligned/le_byteshift.h> -#include <linux/unaligned/be_byteshift.h> -#include <linux/unaligned/generic.h> - -/* - * Select endianness - */ - -#define get_unaligned __get_unaligned_le -#define put_unaligned __put_unaligned_le - -#endif /* _ASM_NIOS_UNALIGNED_H */ diff --git a/arch/nios2/lib/Makefile b/arch/nios2/lib/Makefile deleted file mode 100644 index 3affc45f48..0000000000 --- a/arch/nios2/lib/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -obj-y += board.o -obj-y += libgcc.o -obj-y += clock.o -obj-y += cache.o -obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-$(CONFIG_EARLY_PRINTF) += early_printf.o - diff --git a/arch/nios2/lib/asm-offsets.c b/arch/nios2/lib/asm-offsets.c deleted file mode 100644 index 21e4771e54..0000000000 --- a/arch/nios2/lib/asm-offsets.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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, see <http://www.gnu.org/licenses/>. - * - */ - -#include <linux/kbuild.h> - -int main(void) -{ - return 0; -} diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c deleted file mode 100644 index 0ca79f0f60..0000000000 --- a/arch/nios2/lib/board.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * (C) Copyright 2011 - Franck JULLIEN <elec4fun@gmail.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <common.h> -#include <malloc.h> -#include <memory.h> -#include <asm-generic/memory_layout.h> -#include <cache.h> - -void __noreturn nios_start_barebox(void) -{ - - mem_malloc_init((void *)(NIOS_SOPC_TEXT_BASE - MALLOC_SIZE), - (void *)(NIOS_SOPC_TEXT_BASE - 1)); - - start_barebox(); -} diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c deleted file mode 100644 index 2293cb1691..0000000000 --- a/arch/nios2/lib/bootm.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * barebox - bootm.c - * - * (C) Copyright 2011 - Franck JULLIEN <elec4fun@gmail.com> - * - * (C) Copyright 2003, Psyent Corporation <www.psyent.com> - * Scott McNutt <smcnutt@psyent.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <common.h> -#include <command.h> -#include <image.h> -#include <environment.h> -#include <init.h> -#include <boot.h> -#include <bootm.h> -#include <errno.h> -#include <asm/cache.h> - -#define NIOS_MAGIC 0x534f494e /* enable command line and initrd passing */ - -static int do_bootm_linux(struct image_data *idata) -{ - void (*kernel)(int, int, int, const char *); - const char *commandline = linux_bootargs_get(); - int ret; - - ret = bootm_load_os(idata, idata->os_address); - if (ret) - return ret; - - if (idata->dryrun) - return 0; - - kernel = (void *)(idata->os_address + idata->os_entry); - - /* kernel parameters passing - * r4 : NIOS magic - * r5 : initrd start - * r6 : initrd end or fdt - * r7 : kernel command line - * fdt is passed to kernel via r6, the same as initrd_end. fdt will be - * verified with fdt magic. when both initrd and fdt are used at the - * same time, fdt must follow immediately after initrd. - */ - - /* flushes data and instruction caches before calling the kernel */ - flush_cache_all(); - - kernel(NIOS_MAGIC, 0, 0, commandline); - /* does not return */ - - return 1; -} - -static struct image_handler handler = { - .name = "NIOS2 Linux", - .bootm = do_bootm_linux, - .filetype = filetype_uimage, - .ih_os = IH_OS_LINUX, -}; - -int nios2_register_image_handler(void) -{ - return register_image_handler(&handler); -} - -late_initcall(nios2_register_image_handler); - diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c deleted file mode 100644 index 8d2822105f..0000000000 --- a/arch/nios2/lib/cache.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2009, Wind River Systems Inc - * Implemented by fredrik.markstrom@gmail.com and ivarholmqvist@gmail.com - */ - -#include <config.h> - -static void __flush_dcache(unsigned long start, unsigned long end) -{ - unsigned long addr; - - start &= ~(DCACHE_LINE_SIZE - 1); - end += (DCACHE_LINE_SIZE - 1); - end &= ~(DCACHE_LINE_SIZE - 1); - - if (end > start + DCACHE_SIZE) - end = start + DCACHE_SIZE; - - for (addr = start; addr < end; addr += DCACHE_LINE_SIZE) { - __asm__ __volatile__ (" flushd 0(%0)\n" - : /* Outputs */ - : /* Inputs */ "r"(addr) - /* : No clobber */); - } -} - -static void __flush_icache(unsigned long start, unsigned long end) -{ - unsigned long addr; - - start &= ~(ICACHE_LINE_SIZE - 1); - end += (ICACHE_LINE_SIZE - 1); - end &= ~(ICACHE_LINE_SIZE - 1); - - if (end > start + ICACHE_SIZE) - end = start + ICACHE_SIZE; - - for (addr = start; addr < end; addr += ICACHE_LINE_SIZE) { - __asm__ __volatile__ (" flushi %0\n" - : /* Outputs */ - : /* Inputs */ "r"(addr) - /* : No clobber */); - } - __asm__ __volatile(" flushp\n"); -} - -void flush_dcache_all(void) -{ - __flush_dcache(0, DCACHE_SIZE); -} - -void flush_icache_all(void) -{ - __flush_icache(0, ICACHE_SIZE); -} - -void flush_cache_all(void) -{ - flush_dcache_all(); - flush_icache_all(); -} - -void flush_icache_range(unsigned long start, unsigned long end) -{ - __flush_icache(start, end); -} - -void flush_dcache_range(unsigned long start, unsigned long end) -{ - __flush_dcache(start, end); - /* FIXME: Maybe we should remove __flush_icache ? */ - __flush_icache(start, end); -} diff --git a/arch/nios2/lib/clock.c b/arch/nios2/lib/clock.c deleted file mode 100644 index cfd896077d..0000000000 --- a/arch/nios2/lib/clock.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * (C) Copyright 2011 - Franck JULLIEN <elec4fun@gmail.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <common.h> -#include <clock.h> -#include <init.h> -#include <asm/nios2-io.h> -#include <io.h> - -static struct nios_timer *timer = (struct nios_timer *)NIOS_SOPC_TIMER_BASE; - -static uint64_t nios_clocksource_read(void) -{ - uint64_t value; - - writew(0x5555, &timer->snapl); /* Dummy value*/ - value = (uint64_t)((readw(&timer->snaph) << 16) + readw(&timer->snapl)); - - return ~value; -} - -static struct clocksource cs = { - .read = nios_clocksource_read, - .mask = 0xffffffff, - .shift = 12, -}; - -static int clocksource_init(void) -{ - writew(0, &timer->control); - writew(0xFFFF, &timer->periodl); - writew(0xFFFF, &timer->periodh); - writew(NIOS_TIMER_CONT | NIOS_TIMER_START, &timer->control); - - cs.mult = clocksource_hz2mult(NIOS_SOPC_TIMER_FREQ, cs.shift); - - return init_clock(&cs); -} - -core_initcall(clocksource_init); - diff --git a/arch/nios2/lib/early_printf.c b/arch/nios2/lib/early_printf.c deleted file mode 100644 index 7b4ac97dcd..0000000000 --- a/arch/nios2/lib/early_printf.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * (C) Copyright 2011 - Franck JULLIEN <elec4fun@gmail.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * 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. - * - */ - -#include <stdio.h> -#include <common.h> -#include <asm/nios2-io.h> -#include <io.h> - -void early_putc(char ch) -{ - struct nios_uart *uart = (struct nios_uart *)NIOS_SOPC_UART_BASE; - - while ((readl(&uart->status) & NIOS_UART_TRDY) == 0); - writel((unsigned char)ch, &uart->txdata); -} - -void early_puts(const char *s) -{ - while (*s != 0) - early_putc(*s++); -} - -int early_printf(const char *fmt, ...) -{ - va_list args; - uint i; - char printbuffer[50]; - - va_start(args, fmt); - - i = vsprintf(printbuffer, fmt, args); - va_end(args); - - early_puts(printbuffer); - - return 0; -} diff --git a/arch/nios2/lib/libgcc.c b/arch/nios2/lib/libgcc.c deleted file mode 100644 index 814df73310..0000000000 --- a/arch/nios2/lib/libgcc.c +++ /dev/null @@ -1,524 +0,0 @@ -/* - * This file is part of GNU CC. - * - * GNU CC is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * GNU CC 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. - * - */ - - -#define W_TYPE_SIZE 32 -#define BITS_PER_UNIT 8 - -typedef unsigned int UWtype; -typedef unsigned int UHWtype; -typedef unsigned long long UDWtype; - -typedef unsigned char UQItype; -typedef long SItype; -typedef unsigned long USItype; -typedef long long DItype; -typedef unsigned long long DSItype; - -#include "longlong.h" - -typedef int word_type; -typedef long Wtype; -typedef long long DWtype; - -struct DWstruct { Wtype low, high; }; - -typedef union { - struct DWstruct s; - DWtype ll; -} DWunion; - -const UQItype __clz_tab[256] = { - 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8 -}; - - -DWtype __ashldi3(DWtype u, word_type b) -{ - const DWunion uu = {.ll = u}; - const word_type bm = (sizeof(Wtype) * BITS_PER_UNIT) - b; - DWunion w; - UWtype carries; - - if (b == 0) - return u; - - if (bm <= 0) { - w.s.low = 0; - w.s.high = (UWtype) uu.s.low << -bm; - } else { - carries = (UWtype) uu.s.low >> bm; - w.s.low = (UWtype) uu.s.low << b; - w.s.high = ((UWtype) uu.s.high << b) | carries; - } - - return w.ll; -} - -DWtype __ashrdi3(DWtype u, word_type b) -{ - const DWunion uu = {.ll = u}; - const word_type bm = (sizeof(Wtype) * BITS_PER_UNIT) - b; - DWunion w; - UWtype carries; - - if (b == 0) - return u; - - if (bm <= 0) { - w.s.high = uu.s.high >> (sizeof(Wtype) * BITS_PER_UNIT - 1); - w.s.low = uu.s.high >> -bm; - } else { - carries = (UWtype) uu.s.high << bm; - w.s.high = uu.s.high >> b; - w.s.low = ((UWtype) uu.s.low >> b) | carries; - } - - return w.ll; -} - -DWtype __lshrdi3(DWtype u, word_type b) -{ - const DWunion uu = {.ll = u}; - const word_type bm = (sizeof(Wtype) * BITS_PER_UNIT) - b; - DWunion w; - UWtype carries; - - if (b == 0) - return u; - - if (bm <= 0) { - w.s.high = 0; - w.s.low = (UWtype) uu.s.high >> -bm; - } else { - carries = (UWtype) uu.s.high << bm; - w.s.high = (UWtype) uu.s.high >> b; - w.s.low = ((UWtype) uu.s.low >> b) | carries; - } - - return w.ll; -} - -word_type __cmpdi2(DWtype a, DWtype b) -{ - const DWunion au = {.ll = a}; - const DWunion bu = {.ll = b}; - - if (au.s.high < bu.s.high) - return 0; - else if (au.s.high > bu.s.high) - return 2; - - if ((UWtype) au.s.low < (UWtype) bu.s.low) - return 0; - else if ((UWtype) au.s.low > (UWtype) bu.s.low) - return 2; - - return 1; -} - -UDWtype __udivmoddi4(UDWtype n, UDWtype d, UDWtype *rp) -{ - const DWunion nn = {.ll = n}; - const DWunion dd = {.ll = d}; - - DWunion rr; - UWtype d0, d1, n0, n1, n2; - UWtype q0, q1; - UWtype b, bm; - - DWunion ww; - - d0 = dd.s.low; - d1 = dd.s.high; - n0 = nn.s.low; - n1 = nn.s.high; - -#if !UDIV_NEEDS_NORMALIZATION - if (d1 == 0) { - if (d0 > n1) { - udiv_qrnnd(q0, n0, n1, n0, d0); - q1 = 0; - } else { - if (d0 == 0) - d0 = 1 / d0; /* Divide intentionally by zero.*/ - udiv_qrnnd(q1, n1, 0, n1, d0); - udiv_qrnnd(q0, n0, n1, n0, d0); - /* Remainder in n0. */ - } - - if (rp != 0) { - rr.s.low = n0; - rr.s.high = 0; - *rp = rr.ll; - } - } - -#else /* UDIV_NEEDS_NORMALIZATION */ - - if (d1 == 0) { - if (d0 > n1) { - count_leading_zeros(bm, d0); - if (bm != 0) { - /* Normalize, i.e. make the most significant - bit of the denominator set. */ - d0 = d0 << bm; - n1 = (n1 << bm) | (n0 >> (W_TYPE_SIZE - bm)); - n0 = n0 << bm; - } - - udiv_qrnnd(q0, n0, n1, n0, d0); - q1 = 0; - /* Remainder in n0 >> bm. */ - } else { /* qq = NN / 0d */ - if (d0 == 0) - d0 = 1 / d0; /* Divide intentionally by zero. */ - - count_leading_zeros(bm, d0); - - if (bm == 0) { - /* From (n1 >= d0) /\ (the most significant bit - of d0 is set), conclude (the most significant - bit of n1 is set) /\ (the leading quotient digit - q1 = 1). - - This special case is necessary, not an - optimization.(Shifts counts of W_TYPE_SIZE are - undefined.) */ - - n1 -= d0; - q1 = 1; - } else { /* Normalize. */ - b = W_TYPE_SIZE - bm; - - d0 = d0 << bm; - n2 = n1 >> b; - n1 = (n1 << bm) | (n0 >> b); - n0 = n0 << bm; - - udiv_qrnnd(q1, n1, n2, n1, d0); - } - - /* n1 != d0... */ - udiv_qrnnd(q0, n0, n1, n0, d0); - } - - if (rp != 0) { - rr.s.low = n0 >> bm; - rr.s.high = 0; - *rp = rr.ll; - } - } -#endif /* UDIV_NEEDS_NORMALIZATION */ - - else { - if (d1 > n1) { /* 00 = nn / DD */ - q0 = 0; - q1 = 0; - /* Remainder in n1n0. */ - if (rp != 0) { - rr.s.low = n0; - rr.s.high = n1; - *rp = rr.ll; - } - } else { /* 0q = NN / dd */ - count_leading_zeros(bm, d1); - if (bm == 0) { - /* From (n1 >= d1) /\ (the most significant bit - of d1 is set), conclude (the most significant - bit of n1 is set) /\ (the quotient digit q0 = 0 - or 1). - - This special case is necessary, - not an optimization. */ - - /* The condition on the next line takes - advantage of that n1 >= d1 (true due to program - flow). */ - - if (n1 > d1 || n0 >= d0) { - q0 = 1; - sub_ddmmss(n1, n0, n1, n0, d1, d0); - } else - q0 = 0; - - q1 = 0; - - if (rp != 0) { - rr.s.low = n0; - rr.s.high = n1; - *rp = rr.ll; - } - } else { - UWtype m1, m0; - /* Normalize. */ - b = W_TYPE_SIZE - bm; - d1 = (d1 << bm) | (d0 >> b); - d0 = d0 << bm; - n2 = n1 >> b; - n1 = (n1 << bm) | (n0 >> b); - n0 = n0 << bm; - udiv_qrnnd(q0, n1, n2, n1, d1); - umul_ppmm(m1, m0, q0, d0); - - if (m1 > n1 || (m1 == n1 && m0 > n0)) { - q0--; - sub_ddmmss(m1, m0, m1, m0, d1, d0); - } - - q1 = 0; - - /* Remainder in (n1n0 - m1m0) >> bm. */ - if (rp != 0) { - sub_ddmmss(n1, n0, n1, n0, m1, m0); - rr.s.low = (n1 << b) | (n0 >> bm); - rr.s.high = n1 >> bm; - *rp = rr.ll; - } - } - } - } - - ww.s.low = q0; - ww.s.high = q1; - - return ww.ll; -} - -DWtype __divdi3(DWtype u, DWtype v) -{ - word_type c = 0; - DWunion uu = {.ll = u}; - DWunion vv = {.ll = v}; - DWtype w; - - if (uu.s.high < 0) { - c = ~c; - uu.ll = -uu.ll; - } - - if (vv.s.high < 0) { - c = ~c; - vv.ll = -vv.ll; - } - - w = __udivmoddi4(uu.ll, vv.ll, (UDWtype *) 0); - - if (c) - w = -w; - - return w; -} - -DWtype __negdi2(DWtype u) -{ - const DWunion uu = {.ll = u}; - const DWunion w = { {.low = -uu.s.low, - .high = -uu.s.high - ((UWtype) -uu.s.low > 0) } }; - - return w.ll; -} - - -DWtype __muldi3(DWtype u, DWtype v) -{ - const DWunion uu = {.ll = u}; - const DWunion vv = {.ll = v}; - DWunion w = {.ll = __umulsidi3(uu.s.low, vv.s.low)}; - - w.s.high += ((UWtype) uu.s.low * (UWtype) vv.s.high - + (UWtype) uu.s.high * (UWtype) vv.s.low); - - return w.ll; -} - -DWtype __moddi3(DWtype u, DWtype v) -{ - word_type c = 0; - DWunion uu = {.ll = u}; - DWunion vv = {.ll = v}; - DWtype w; - - if (uu.s.high < 0) { - c = ~c; - uu.ll = -uu.ll; - } - - if (vv.s.high < 0) - vv.ll = -vv.ll; - - (void) __udivmoddi4(uu.ll, vv.ll, (UDWtype *)&w); - - if (c) - w = -w; - - return w; -} - -word_type __ucmpdi2(DWtype a, DWtype b) -{ - const DWunion au = {.ll = a}; - const DWunion bu = {.ll = b}; - - if ((UWtype) au.s.high < (UWtype) bu.s.high) - return 0; - else if ((UWtype) au.s.high > (UWtype) bu.s.high) - return 2; - if ((UWtype) au.s.low < (UWtype) bu.s.low) - return 0; - else if ((UWtype) au.s.low > (UWtype) bu.s.low) - return 2; - return 1; -} - - -UDWtype __udivdi3(UDWtype n, UDWtype d) -{ - return __udivmoddi4(n, d, (UDWtype *) 0); -} - -UDWtype __umoddi3(UDWtype u, UDWtype v) -{ - UDWtype w; - (void) __udivmoddi4(u, v, &w); - - return w; -} - -static USItype udivmodsi4(USItype num, USItype den, word_type modwanted) -{ - USItype bit = 1; - USItype res = 0; - - while (den < num && bit && !(den & (1L<<31))) { - den <<= 1; - bit <<= 1; - } - while (bit) { - if (num >= den) { - num -= den; - res |= bit; - } - - bit >>= 1; - den >>= 1; - } - - if (modwanted) - return num; - - return res; -} - -SItype __divsi3(SItype a, SItype b) -{ - word_type neg = 0; - SItype res; - - if (a < 0) { - a = -a; - neg = !neg; - } - - if (b < 0) { - b = -b; - neg = !neg; - } - - res = udivmodsi4(a, b, 0); - - if (neg) - res = -res; - - return res; -} - - -SItype __udivsi3(SItype a, SItype b) -{ - return udivmodsi4(a, b, 0); -} - - -SItype __modsi3(SItype a, SItype b) -{ - word_type neg = 0; - SItype res; - - if (a < 0) { - a = -a; - neg = 1; - } - - if (b < 0) - b = -b; - - res = udivmodsi4(a, b, 1); - - if (neg) - res = -res; - - return res; -} - -SItype __mulsi3(SItype a, SItype b) -{ - SItype res = 0; - USItype cnt = a; - - while (cnt) { - if (cnt & 1) - res += b; - b <<= 1; - cnt >>= 1; - } - - return res; -} - -SItype __umodsi3(SItype a, SItype b) -{ - return udivmodsi4(a, b, 1); -} - -int __gcc_bcmp(const unsigned char *s1, const unsigned char *s2, unsigned long size) -{ - unsigned char c1; - unsigned char c2; - - while (size > 0) { - c1 = *s1++; - c2 = *s2++; - if (c1 != c2) - return c1 - c2; - size--; - } - return 0; -} diff --git a/arch/nios2/lib/longlong.h b/arch/nios2/lib/longlong.h deleted file mode 100644 index 58b29d89e6..0000000000 --- a/arch/nios2/lib/longlong.h +++ /dev/null @@ -1,253 +0,0 @@ -/* longlong.h -- definitions for mixed size 32/64 bit arithmetic. - * Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004, - * 2005 Free Software Foundation, Inc. - * - * This definition file is free software; you can redistribute it - * and/or modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2, or (at your option) any later version. - - * This definition file 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 have to define the following before including this file: - - UWtype -- An unsigned type, default type for operations (typically a "word") - UHWtype -- An unsigned type, at least half the size of UWtype. - UDWtype -- An unsigned type, at least twice as large a UWtype - W_TYPE_SIZE -- size in bits of UWtype - - UQItype -- Unsigned 8 bit type. - SItype, USItype -- Signed and unsigned 32 bit types. - DItype, UDItype -- Signed and unsigned 64 bit types. - - On a 32 bit machine UWtype should typically be USItype; - on a 64 bit machine, UWtype should typically be UDItype. */ - -#define __BITS4 (W_TYPE_SIZE / 4) -#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2)) -#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1)) -#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2)) - -#ifndef W_TYPE_SIZE -#define W_TYPE_SIZE 32 -#define UWtype USItype -#define UHWtype USItype -#define UDWtype UDItype -#endif - -extern const UQItype __clz_tab[256]; - -/* Define auxiliary asm macros. - - 1) umul_ppmm(high_prod, low_prod, multiplier, multiplicand) multiplies two - UWtype integers MULTIPLIER and MULTIPLICAND, and generates a two UWtype - word product in HIGH_PROD and LOW_PROD. - - 2) __umulsidi3(a,b) multiplies two UWtype integers A and B, and returns a - UDWtype product. This is just a variant of umul_ppmm. - - 3) udiv_qrnnd(quotient, remainder, high_numerator, low_numerator, - denominator) divides a UDWtype, composed by the UWtype integers - HIGH_NUMERATOR and LOW_NUMERATOR, by DENOMINATOR and places the quotient - in QUOTIENT and the remainder in REMAINDER. HIGH_NUMERATOR must be less - than DENOMINATOR for correct operation. If, in addition, the most - significant bit of DENOMINATOR must be 1, then the pre-processor symbol - UDIV_NEEDS_NORMALIZATION is defined to 1. - - 4) sdiv_qrnnd(quotient, remainder, high_numerator, low_numerator, - denominator). Like udiv_qrnnd but the numbers are signed. The quotient - is rounded towards 0. - - 5) count_leading_zeros(count, x) counts the number of zero-bits from the - msb to the first nonzero bit in the UWtype X. This is the number of - steps X needs to be shifted left to set the msb. Undefined for X == 0, - unless the symbol COUNT_LEADING_ZEROS_0 is defined to some value. - - 6) count_trailing_zeros(count, x) like count_leading_zeros, but counts - from the least significant end. - - 7) add_ssaaaa(high_sum, low_sum, high_addend_1, low_addend_1, - high_addend_2, low_addend_2) adds two UWtype integers, composed by - HIGH_ADDEND_1 and LOW_ADDEND_1, and HIGH_ADDEND_2 and LOW_ADDEND_2 - respectively. The result is placed in HIGH_SUM and LOW_SUM. Overflow - (i.e. carry out) is not stored anywhere, and is lost. - - 8) sub_ddmmss(high_difference, low_difference, high_minuend, low_minuend, - high_subtrahend, low_subtrahend) subtracts two two-word UWtype integers, - composed by HIGH_MINUEND_1 and LOW_MINUEND_1, and HIGH_SUBTRAHEND_2 and - LOW_SUBTRAHEND_2 respectively. The result is placed in HIGH_DIFFERENCE - and LOW_DIFFERENCE. Overflow (i.e. carry out) is not stored anywhere, - and is lost. - - If any of these macros are left undefined for a particular CPU, - C macros are used. */ - -/* The CPUs come in alphabetical order below. - - Please add support for more CPUs here, or improve the current support - for the CPUs below! - (E.g. WE32100, IBM360.) */ - -/* Snipped per CPU support */ - -/* If this machine has no inline assembler, use C macros. */ - -#if !defined (add_ssaaaa) -#define add_ssaaaa(sh, sl, ah, al, bh, bl) \ - do { \ - UWtype __x; \ - __x = (al) + (bl); \ - (sh) = (ah) + (bh) + (__x < (al)); \ - (sl) = __x; \ - } while (0) -#endif - -#if !defined (sub_ddmmss) -#define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - do { \ - UWtype __x; \ - __x = (al) - (bl); \ - (sh) = (ah) - (bh) - (__x > (al)); \ - (sl) = __x; \ - } while (0) -#endif - -/* If we lack umul_ppmm but have smul_ppmm, define umul_ppmm in terms of - smul_ppmm. */ -#if !defined (umul_ppmm) && defined (smul_ppmm) -#define umul_ppmm(w1, w0, u, v) \ - do { \ - UWtype __w1; \ - UWtype __xm0 = (u), __xm1 = (v); \ - smul_ppmm (__w1, w0, __xm0, __xm1); \ - (w1) = __w1 + (-(__xm0 >> (W_TYPE_SIZE - 1)) & __xm1) \ - + (-(__xm1 >> (W_TYPE_SIZE - 1)) & __xm0); \ - } while (0) -#endif - -/* If we still don't have umul_ppmm, define it using plain C. */ -#if !defined (umul_ppmm) -#define umul_ppmm(w1, w0, u, v) \ - do { \ - UWtype __x0, __x1, __x2, __x3; \ - UHWtype __ul, __vl, __uh, __vh; \ - \ - __ul = __ll_lowpart (u); \ - __uh = __ll_highpart (u); \ - __vl = __ll_lowpart (v); \ - __vh = __ll_highpart (v); \ - \ - __x0 = (UWtype) __ul * __vl; \ - __x1 = (UWtype) __ul * __vh; \ - __x2 = (UWtype) __uh * __vl; \ - __x3 = (UWtype) __uh * __vh; \ - \ - __x1 += __ll_highpart (__x0);/* this can't give carry */ \ - __x1 += __x2; /* but this indeed can */ \ - if (__x1 < __x2) /* did we get it? */ \ - __x3 += __ll_B; /* yes, add it in the proper pos. */ \ - \ - (w1) = __x3 + __ll_highpart (__x1); \ - (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0); \ - } while (0) -#endif - -#if !defined (__umulsidi3) -#define __umulsidi3(u, v) \ - ({DWunion __w; \ - umul_ppmm (__w.s.high, __w.s.low, u, v); \ - __w.ll; }) -#endif - -/* Define this unconditionally, so it can be used for debugging. */ -#define __udiv_qrnnd_c(q, r, n1, n0, d) \ - do { \ - UWtype __d1, __d0, __q1, __q0; \ - UWtype __r1, __r0, __m; \ - __d1 = __ll_highpart (d); \ - __d0 = __ll_lowpart (d); \ - \ - __r1 = (n1) % __d1; \ - __q1 = (n1) / __d1; \ - __m = (UWtype) __q1 * __d0; \ - __r1 = __r1 * __ll_B | __ll_highpart (n0); \ - if (__r1 < __m) { \ - __q1--, __r1 += (d); \ - if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */ \ - if (__r1 < __m) \ - __q1--, __r1 += (d); \ - } \ - __r1 -= __m; \ - \ - __r0 = __r1 % __d1; \ - __q0 = __r1 / __d1; \ - __m = (UWtype) __q0 * __d0; \ - __r0 = __r0 * __ll_B | __ll_lowpart (n0); \ - if (__r0 < __m) { \ - __q0--, __r0 += (d); \ - if (__r0 >= (d)) \ - if (__r0 < __m) \ - __q0--, __r0 += (d); \ - } \ - __r0 -= __m; \ - \ - (q) = (UWtype) __q1 * __ll_B | __q0; \ - (r) = __r0; \ - } while (0) - -/* If the processor has no udiv_qrnnd but sdiv_qrnnd, go through - __udiv_w_sdiv (defined in libgcc or elsewhere). */ -#if !defined (udiv_qrnnd) && defined (sdiv_qrnnd) -#define udiv_qrnnd(q, r, nh, nl, d) \ - do { \ - USItype __r; \ - (q) = __udiv_w_sdiv (&__r, nh, nl, d); \ - (r) = __r; \ - } while (0) -#endif - -/* If udiv_qrnnd was not defined for this processor, use __udiv_qrnnd_c. */ -#if !defined (udiv_qrnnd) -#define UDIV_NEEDS_NORMALIZATION 1 -#define udiv_qrnnd __udiv_qrnnd_c -#endif - -#if !defined (count_leading_zeros) -#define count_leading_zeros(count, x) \ - do { \ - UWtype __xr = (x); \ - UWtype __a; \ - \ - if (W_TYPE_SIZE <= 32) { \ - __a = __xr < ((UWtype)1<<2*__BITS4) \ - ? (__xr < ((UWtype)1<<__BITS4) ? 0 : __BITS4) \ - : (__xr < ((UWtype)1<<3*__BITS4) ? 2*__BITS4 : 3*__BITS4); \ - } \ - else { \ - for (__a = W_TYPE_SIZE - 8; __a > 0; __a -= 8) \ - if (((__xr >> __a) & 0xff) != 0) \ - break; \ - } \ - (count) = W_TYPE_SIZE - (__clz_tab[__xr >> __a] + __a); \ - } while (0) -#define COUNT_LEADING_ZEROS_0 W_TYPE_SIZE -#endif - -#if !defined (count_trailing_zeros) -/* Define count_trailing_zeros using count_leading_zeros. The latter might be - defined in asm, but if it is not, the C version above is good enough. */ -#define count_trailing_zeros(count, x) \ - do { \ - UWtype __ctz_x = (x); \ - UWtype __ctz_c; \ - count_leading_zeros (__ctz_c, __ctz_x & -__ctz_x); \ - (count) = W_TYPE_SIZE - 1 - __ctz_c; \ - } while (0) -#endif - -#ifndef UDIV_NEEDS_NORMALIZATION -#define UDIV_NEEDS_NORMALIZATION 0 -#endif diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 32d23029d8..bd8851e4b3 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -4,6 +4,7 @@ config OPENRISC select HAS_CACHE select HAVE_CONFIGURABLE_MEMORY_LAYOUT select GENERIC_FIND_NEXT_BIT + select HAS_ARCH_SJLJ default y # not used diff --git a/arch/openrisc/cpu/barebox.lds.S b/arch/openrisc/cpu/barebox.lds.S index adb0c22f85..45c5f25539 100644 --- a/arch/openrisc/cpu/barebox.lds.S +++ b/arch/openrisc/cpu/barebox.lds.S @@ -17,6 +17,7 @@ #include <asm-generic/barebox.lds.h> OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k") +ENTRY(__reset) __DYNAMIC = 0; MEMORY diff --git a/arch/openrisc/cpu/start.S b/arch/openrisc/cpu/start.S index 7ac790b055..c448d3775f 100644 --- a/arch/openrisc/cpu/start.S +++ b/arch/openrisc/cpu/start.S @@ -37,10 +37,10 @@ .org 0x100 __reset: /* there is no guarantee r0 is hardwired to zero, clear it here */ - l.andi r0, r0, 0 + l.movhi r0, 0x0 /* reset stack and frame pointers */ - l.andi r1, r0, 0 - l.andi r2, r0, 0 + l.movhi r1, 0x0 + l.movhi r2, 0x0 /* set supervisor mode */ l.ori r3,r0,SPR_SR_SM diff --git a/arch/openrisc/dts/.gitignore b/arch/openrisc/dts/.gitignore new file mode 100644 index 0000000000..077903c50a --- /dev/null +++ b/arch/openrisc/dts/.gitignore @@ -0,0 +1 @@ +*dtb* diff --git a/arch/openrisc/include/asm/linkage.h b/arch/openrisc/include/asm/linkage.h new file mode 100644 index 0000000000..dbe4b4e31a --- /dev/null +++ b/arch/openrisc/include/asm/linkage.h @@ -0,0 +1,7 @@ +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 0 +#define __ALIGN_STR ".align 0" + +#endif diff --git a/arch/openrisc/include/asm/setjmp.h b/arch/openrisc/include/asm/setjmp.h new file mode 100644 index 0000000000..ee73306d18 --- /dev/null +++ b/arch/openrisc/include/asm/setjmp.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Define the machine-dependent type `jmp_buf'. OpenRISC version. + * Copyright (C) 2021 Free Software Foundation, Inc. + * This file is part of the GNU C Library. + */ + +#ifndef _OR1K_BITS_SETJMP_H +#define _OR1K_BITS_SETJMP_H 1 + +typedef long int jmp_buf[13]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); + +#endif /* _OR1K_BITS_SETJMP_H */ diff --git a/arch/openrisc/lib/Makefile b/arch/openrisc/lib/Makefile index 62082feed0..808b09f3aa 100644 --- a/arch/openrisc/lib/Makefile +++ b/arch/openrisc/lib/Makefile @@ -5,4 +5,5 @@ obj-y += muldi3.o obj-y += lshrdi3.o obj-y += ashldi3.o obj-y += ashrdi3.o +obj-y += setjmp.o obj-$(CONFIG_BUILTIN_DTB) += dtb.o diff --git a/arch/openrisc/lib/setjmp.S b/arch/openrisc/lib/setjmp.S new file mode 100644 index 0000000000..7da3477808 --- /dev/null +++ b/arch/openrisc/lib/setjmp.S @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <linux/linkage.h> + +/* int setjmp (jmp_buf); */ +ENTRY(setjmp) + l.sw 0(r3), r1 + l.sw 4(r3), r2 + l.sw 8(r3), r9 + l.sw 12(r3), r10 + l.sw 16(r3), r14 + l.sw 20(r3), r16 + l.sw 24(r3), r18 + l.sw 28(r3), r20 + l.sw 32(r3), r22 + l.sw 36(r3), r24 + l.sw 40(r3), r26 + l.sw 44(r3), r28 + l.sw 48(r3), r30 + l.jr r9 + l.movhi r11, 0x0 +END(setjmp) + +/* volatile void longjmp (jmp_buf, int); */ +ENTRY(longjmp) + l.lwz r1, 0(r3) + l.lwz r2, 4(r3) + + /* if r4 is 0, something wrong, so set it to 1 */ + l.sfeqi r4, 0x0 + l.bnf 1f /* r4 != 0, longjmp value sensible */ + l.nop + l.ori r4, r0, 0x1 /* make nonzero */ +1: + l.lwz r9, 8(r3) + l.lwz r10, 12(r3) + l.lwz r14, 16(r3) + l.lwz r16, 20(r3) + l.lwz r18, 24(r3) + l.lwz r20, 28(r3) + l.lwz r22, 32(r3) + l.lwz r24, 36(r3) + l.lwz r26, 40(r3) + l.lwz r28, 44(r3) + l.lwz r30, 48(r3) + l.jr r9 + l.addi r11, r4, 0x0 +END(longjmp) + +/* int initjmp(jmp_buf jmp, void __noreturn (*func)(void), void *stack_top); */ +ENTRY(initjmp) + l.sw 8(r3), r4 + l.sw 0(r3), r5 + l.jr r9 + l.movhi r11, 0x0 +END(initjmp) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 90ec7b1702..376c1bf42b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -6,6 +6,7 @@ config PPC select HAS_CACHE select GENERIC_FIND_NEXT_BIT select OFTREE + select HAS_ARCH_SJLJ default y choice diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/asm/linkage.h new file mode 100644 index 0000000000..370eb27728 --- /dev/null +++ b/arch/powerpc/include/asm/linkage.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_POWERPC_LINKAGE_H +#define _ASM_POWERPC_LINKAGE_H + +#endif /* _ASM_POWERPC_LINKAGE_H */ diff --git a/arch/powerpc/include/asm/setjmp.h b/arch/powerpc/include/asm/setjmp.h new file mode 100644 index 0000000000..91bfcdb7f4 --- /dev/null +++ b/arch/powerpc/include/asm/setjmp.h @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * (C) Copyright 2016 Alexander Graf <agraf@suse.de> + */ + +#ifndef _SETJMP_H_ +#define _SETJMP_H_ 1 + +#include <asm/types.h> + +typedef struct __jmp_buf_internal_tag { + long int __regs[24]; +} jmp_buf[1]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); + +#endif /* _SETJMP_H_ */ diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index ba2f078b62..405351c199 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -9,4 +9,4 @@ obj-$(CONFIG_CMD_BOOTM) += ppclinux.o obj-$(CONFIG_MODULES) += module.o obj-y += crtsavres.o obj-y += reloc.o - +obj-y += setjmp.o diff --git a/arch/powerpc/lib/setjmp.S b/arch/powerpc/lib/setjmp.S new file mode 100644 index 0000000000..021a57eebc --- /dev/null +++ b/arch/powerpc/lib/setjmp.S @@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * This is a simple version of setjmp and longjmp for the PowerPC. + * Ian Lance Taylor, Cygnus Support, 9 Feb 1994. + */ + +#include <linux/linkage.h> +#include <asm/ppc_asm.tmpl> + +ENTRY(setjmp) + addi r3,r3,7 # align to 8 byte boundary + rlwinm r3,r3,0,0,28 + stw r1,0(r3) # offset 0 + stwu r2,4(r3) # offset 4 + stwu r13,4(r3) # offset 8 + stwu r14,4(r3) # offset 12 + stwu r15,4(r3) # offset 16 + stwu r16,4(r3) # offset 20 + stwu r17,4(r3) # offset 24 + stwu r18,4(r3) # offset 28 + stwu r19,4(r3) # offset 32 + stwu r20,4(r3) # offset 36 + stwu r21,4(r3) # offset 40 + stwu r22,4(r3) # offset 44 + stwu r23,4(r3) # offset 48 + stwu r24,4(r3) # offset 52 + stwu r25,4(r3) # offset 56 + stwu r26,4(r3) # offset 60 + stwu r27,4(r3) # offset 64 + stwu r28,4(r3) # offset 68 + stwu r29,4(r3) # offset 72 + stwu r30,4(r3) # offset 76 + stwu r31,4(r3) # offset 80 + mflr r4 + stwu r4,4(r3) # offset 84 + mfcr r4 + stwu r4,4(r3) # offset 88 + + li r3,0 + blr +END(setjmp) + +ENTRY(longjmp) + addi r3,r3,7 # align to 8 byte boundary + rlwinm r3,r3,0,0,28 + lwz r1,0(r3) # offset 0 + lwzu r2,4(r3) # offset 4 + lwzu r13,4(r3) # offset 8 + lwzu r14,4(r3) # offset 12 + lwzu r15,4(r3) # offset 16 + lwzu r16,4(r3) # offset 20 + lwzu r17,4(r3) # offset 24 + lwzu r18,4(r3) # offset 28 + lwzu r19,4(r3) # offset 32 + lwzu r20,4(r3) # offset 36 + lwzu r21,4(r3) # offset 40 + lwzu r22,4(r3) # offset 44 + lwzu r23,4(r3) # offset 48 + lwzu r24,4(r3) # offset 52 + lwzu r25,4(r3) # offset 56 + lwzu r26,4(r3) # offset 60 + lwzu r27,4(r3) # offset 64 + lwzu r28,4(r3) # offset 68 + lwzu r29,4(r3) # offset 72 + lwzu r30,4(r3) # offset 76 + lwzu r31,4(r3) # offset 80 + lwzu r5,4(r3) # offset 84 + mtlr r5 + lwzu r5,4(r3) # offset 88 + mtcrf 255,r5 + + mr. r3,r4 + bclr+ 4,2 + li r3,1 + blr +END(longjmp) + +ENTRY(initjmp) + addi r3,r3,7 # align to 8 byte boundary + rlwinm r3,r3,0,0,28 + stw r5,0(r3) # offset 0 + stwu r4,88(r3) # offset 88 + li r3,0 + blr +END(initjmp) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 16c3eecce6..c8d63f99bb 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -36,6 +36,7 @@ config ARCH_RV32I select GENERIC_LIB_ASHLDI3 select GENERIC_LIB_ASHRDI3 select GENERIC_LIB_LSHRDI3 + select HAS_ARCH_SJLJ endchoice diff --git a/arch/riscv/include/asm/asm.h b/arch/riscv/include/asm/asm.h new file mode 100644 index 0000000000..9c992a88d8 --- /dev/null +++ b/arch/riscv/include/asm/asm.h @@ -0,0 +1,69 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2015 Regents of the University of California + */ + +#ifndef _ASM_RISCV_ASM_H +#define _ASM_RISCV_ASM_H + +#ifdef __ASSEMBLY__ +#define __ASM_STR(x) x +#else +#define __ASM_STR(x) #x +#endif + +#if __riscv_xlen == 64 +#define __REG_SEL(a, b) __ASM_STR(a) +#elif __riscv_xlen == 32 +#define __REG_SEL(a, b) __ASM_STR(b) +#else +#error "Unexpected __riscv_xlen" +#endif + +#define REG_L __REG_SEL(ld, lw) +#define REG_S __REG_SEL(sd, sw) +#define REG_SC __REG_SEL(sc.d, sc.w) +#define SZREG __REG_SEL(8, 4) +#define LGREG __REG_SEL(3, 2) + +#if __SIZEOF_POINTER__ == 8 +#ifdef __ASSEMBLY__ +#define RISCV_PTR .dword +#define RISCV_SZPTR 8 +#define RISCV_LGPTR 3 +#else +#define RISCV_PTR ".dword" +#define RISCV_SZPTR "8" +#define RISCV_LGPTR "3" +#endif +#elif __SIZEOF_POINTER__ == 4 +#ifdef __ASSEMBLY__ +#define RISCV_PTR .word +#define RISCV_SZPTR 4 +#define RISCV_LGPTR 2 +#else +#define RISCV_PTR ".word" +#define RISCV_SZPTR "4" +#define RISCV_LGPTR "2" +#endif +#else +#error "Unexpected __SIZEOF_POINTER__" +#endif + +#if (__SIZEOF_INT__ == 4) +#define RISCV_INT __ASM_STR(.word) +#define RISCV_SZINT __ASM_STR(4) +#define RISCV_LGINT __ASM_STR(2) +#else +#error "Unexpected __SIZEOF_INT__" +#endif + +#if (__SIZEOF_SHORT__ == 2) +#define RISCV_SHORT __ASM_STR(.half) +#define RISCV_SZSHORT __ASM_STR(2) +#define RISCV_LGSHORT __ASM_STR(1) +#else +#error "Unexpected __SIZEOF_SHORT__" +#endif + +#endif /* _ASM_RISCV_ASM_H */ diff --git a/arch/riscv/include/asm/linkage.h b/arch/riscv/include/asm/linkage.h new file mode 100644 index 0000000000..9e88ba23cd --- /dev/null +++ b/arch/riscv/include/asm/linkage.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2015 Regents of the University of California + */ + +#ifndef _ASM_RISCV_LINKAGE_H +#define _ASM_RISCV_LINKAGE_H + +#define __ALIGN .balign 4 +#define __ALIGN_STR ".balign 4" + +#endif /* _ASM_RISCV_LINKAGE_H */ diff --git a/arch/riscv/include/asm/setjmp.h b/arch/riscv/include/asm/setjmp.h new file mode 100644 index 0000000000..468fc4b10a --- /dev/null +++ b/arch/riscv/include/asm/setjmp.h @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * (C) Copyright 2016 Alexander Graf <agraf@suse.de> + */ + +#ifndef _SETJMP_H_ +#define _SETJMP_H_ 1 + +#include <asm/types.h> + +typedef struct __jmp_buf_internal_tag + { + /* Program counter. */ + long int __pc; + /* Callee-saved registers. */ + long int __regs[12]; + /* Stack pointer. */ + long int __sp; +} jmp_buf[1]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); + +#endif /* _SETJMP_H_ */ diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index a1df0b7dc7..7fe57b0b55 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -1,3 +1,4 @@ extra-y += barebox.lds obj-y += riscv_timer.o +obj-$(CONFIG_HAS_ARCH_SJLJ) += setjmp.o longjmp.o diff --git a/arch/riscv/lib/longjmp.S b/arch/riscv/lib/longjmp.S new file mode 100644 index 0000000000..7bcb5b3049 --- /dev/null +++ b/arch/riscv/lib/longjmp.S @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/* longjmp, RISC-V version. */ + +#include <linux/linkage.h> +#include <asm/asm.h> + +ENTRY (longjmp) + REG_L ra, 0*SZREG(a0) + REG_L s0, 1*SZREG(a0) + REG_L s1, 2*SZREG(a0) + REG_L s2, 3*SZREG(a0) + REG_L s3, 4*SZREG(a0) + REG_L s4, 5*SZREG(a0) + REG_L s5, 6*SZREG(a0) + REG_L s6, 7*SZREG(a0) + REG_L s7, 8*SZREG(a0) + REG_L s8, 9*SZREG(a0) + REG_L s9, 10*SZREG(a0) + REG_L s10,11*SZREG(a0) + REG_L s11,12*SZREG(a0) + REG_L sp, 13*SZREG(a0) + + seqz a0, a1 + add a0, a0, a1 # a0 = (a1 == 0) ? 1 : a1 + ret + +END (longjmp) diff --git a/arch/riscv/lib/setjmp.S b/arch/riscv/lib/setjmp.S new file mode 100644 index 0000000000..e8ad01635d --- /dev/null +++ b/arch/riscv/lib/setjmp.S @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later + +/* setjmp for RISC-V. */ + +#include <linux/linkage.h> +#include <asm/asm.h> + +ENTRY (setjmp) + REG_S ra, 0*SZREG(a0) + REG_S s0, 1*SZREG(a0) + REG_S s1, 2*SZREG(a0) + REG_S s2, 3*SZREG(a0) + REG_S s3, 4*SZREG(a0) + REG_S s4, 5*SZREG(a0) + REG_S s5, 6*SZREG(a0) + REG_S s6, 7*SZREG(a0) + REG_S s7, 8*SZREG(a0) + REG_S s8, 9*SZREG(a0) + REG_S s9, 10*SZREG(a0) + REG_S s10,11*SZREG(a0) + REG_S s11,12*SZREG(a0) + REG_S sp, 13*SZREG(a0) + + li a0, 0 + ret + +END (setjmp) + +ENTRY (initjmp) + REG_S a1, 0*SZREG(a0) + REG_S a2, 13*SZREG(a0) + li a0, 0 + ret + +END (initjmp) diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index 1a4e3bacf6..01078bca97 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -13,6 +13,7 @@ config SANDBOX select PARTITION_DISK select ARCH_HAS_STACK_DUMP if ASAN select GENERIC_FIND_NEXT_BIT + select HAS_ARCH_SJLJ default y config ARCH_TEXT_BASE @@ -42,6 +43,9 @@ config 64BIT select ARCH_DMA_ADDR_T_64BIT select PHYS_ADDR_T_64BIT +config 32BIT + def_bool !64BIT + config SANDBOX_LINUX_I386 bool "32-bit x86 barebox" if CC_HAS_LINUX_I386_SUPPORT diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index ea594944e4..5fc7e227be 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -27,7 +27,8 @@ KBUILD_CFLAGS += -Dmalloc=barebox_malloc -Dcalloc=barebox_calloc \ -Dftruncate=barebox_ftruncate -Dasprintf=barebox_asprintf \ -Dopendir=barebox_opendir -Dreaddir=barebox_readdir \ -Dclosedir=barebox_closedir -Dreadlink=barebox_readlink \ - -Doptarg=barebox_optarg -Doptind=barebox_optind + -Doptarg=barebox_optarg -Doptind=barebox_optind \ + -Dsetjmp=barebox_setjmp -Dlongjmp=barebox_longjmp machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) @@ -64,7 +65,7 @@ endif BAREBOX_LDFLAGS += \ -Wl,-T,$(BAREBOX_LDS) \ -Wl,--whole-archive $(BAREBOX_OBJS) -Wl,--no-whole-archive \ - -lrt $(SDL_LIBS) $(FTDI1_LIBS) \ + -lrt -pthread $(SDL_LIBS) $(FTDI1_LIBS) \ $(SANITIZER_LIBS) cmd_barebox__ = $(CC) -o $@ $(BAREBOX_LDFLAGS) diff --git a/arch/sandbox/include/asm/setjmp.h b/arch/sandbox/include/asm/setjmp.h new file mode 100644 index 0000000000..a300758c3d --- /dev/null +++ b/arch/sandbox/include/asm/setjmp.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __SETJMP_H_ +#define __SETJMP_H_ + +struct jmp_buf_data { + unsigned char opaque[512] __aligned(16); +}; + +typedef struct jmp_buf_data jmp_buf[1]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)); +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)); + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top); + +#endif diff --git a/arch/sandbox/os/Makefile b/arch/sandbox/os/Makefile index fb2c3cfd86..5d0c938ce6 100644 --- a/arch/sandbox/os/Makefile +++ b/arch/sandbox/os/Makefile @@ -4,7 +4,8 @@ machdirs := $(patsubst %,arch/sandbox/mach-%/,$(machine-y)) KBUILD_CPPFLAGS = $(patsubst %,-I$(srctree)/%include,$(machdirs)) -KBUILD_CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE) -D_FILE_OFFSET_BITS=64 +KBUILD_CPPFLAGS += -DCONFIG_MALLOC_SIZE=$(CONFIG_MALLOC_SIZE) -D_FILE_OFFSET_BITS=64 \ + -DCONFIG_STACK_SIZE=$(CONFIG_STACK_SIZE) KBUILD_CFLAGS := -Wall @@ -14,7 +15,7 @@ ifeq ($(CONFIG_SANDBOX_LINUX_I386),y) KBUILD_CFLAGS += -m32 endif -obj-y = common.o tap.o +obj-y = common.o tap.o setjmp.o obj-$(CONFIG_MALLOC_LIBC) += libc_malloc.o CFLAGS_sdl.o = $(shell pkg-config sdl2 --cflags) diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index f6b352f2d6..4eb6d37fff 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -321,7 +321,7 @@ int linux_open_hostfile(struct hf_info *hf) { char *buf = NULL; struct stat s; - int fd; + int fd = -1; printf("add %s %sbacked by file %s%s\n", hf->devname, hf->filename ? "" : "initially un", hf->filename ?: "", @@ -408,7 +408,7 @@ int linux_open_hostfile(struct hf_info *hf) return 0; err_out: - if (fd > 0) + if (fd >= 0) close(fd); free(buf); return -1; diff --git a/arch/sandbox/os/setjmp.c b/arch/sandbox/os/setjmp.c new file mode 100644 index 0000000000..7f686b0fc6 --- /dev/null +++ b/arch/sandbox/os/setjmp.c @@ -0,0 +1,180 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later +/* + * sigaltstack coroutine initialization code + * + * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws> + * Copyright (C) 2011 Kevin Wolf <kwolf@redhat.com> + * Copyright (C) 2012 Alex Barcelo <abarcelo@ac.upc.edu> + * Copyright (C) 2021 Ahmad Fatoum, Pengutronix + * This file is partly based on pth_mctx.c, from the GNU Portable Threads + * Copyright (c) 1999-2006 Ralf S. Engelschall <rse@engelschall.com> + */ + +/* XXX Is there a nicer way to disable glibc's stack check for longjmp? */ +#ifdef _FORTIFY_SOURCE +#undef _FORTIFY_SOURCE +#endif + +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <setjmp.h> +#include <signal.h> + +typedef sigjmp_buf _jmp_buf __attribute__((aligned((16)))); +_Static_assert(sizeof(_jmp_buf) <= 512, "sigjmp_buf size exceeds expectation"); + +/* + * Information for the signal handler (trampoline) + */ +static struct { + _jmp_buf *reenter; + void (*entry)(void); + volatile sig_atomic_t called; +} tr_state; + +/* + * "boot" function + * This is what starts the coroutine, is called from the trampoline + * (from the signal handler when it is not signal handling, read ahead + * for more information). + */ +static void __attribute__((noinline, noreturn)) +coroutine_bootstrap(void (*entry)(void)) +{ + for (;;) + entry(); +} + +/* + * This is used as the signal handler. This is called with the brand new stack + * (thanks to sigaltstack). We have to return, given that this is a signal + * handler and the sigmask and some other things are changed. + */ +static void coroutine_trampoline(int signal) +{ + /* Get the thread specific information */ + tr_state.called = 1; + + /* + * Here we have to do a bit of a ping pong between the caller, given that + * this is a signal handler and we have to do a return "soon". Then the + * caller can reestablish everything and do a siglongjmp here again. + */ + if (!sigsetjmp(*tr_state.reenter, 0)) { + return; + } + + /* + * Ok, the caller has siglongjmp'ed back to us, so now prepare + * us for the real machine state switching. We have to jump + * into another function here to get a new stack context for + * the auto variables (which have to be auto-variables + * because the start of the thread happens later). Else with + * PIC (i.e. Position Independent Code which is used when PTH + * is built as a shared library) most platforms would + * horrible core dump as experience showed. + */ + coroutine_bootstrap(tr_state.entry); +} + +int initjmp(_jmp_buf jmp, void (*func)(void), void *stack_top) +{ + struct sigaction sa; + struct sigaction osa; + stack_t ss; + stack_t oss; + sigset_t sigs; + sigset_t osigs; + + /* The way to manipulate stack is with the sigaltstack function. We + * prepare a stack, with it delivering a signal to ourselves and then + * put sigsetjmp/siglongjmp where needed. + * This has been done keeping coroutine-ucontext (from the QEMU project) + * as a model and with the pth ideas (GNU Portable Threads). + * See coroutine-ucontext for the basics of the coroutines and see + * pth_mctx.c (from the pth project) for the + * sigaltstack way of manipulating stacks. + */ + + tr_state.entry = func; + tr_state.reenter = (void *)jmp; + + /* + * Preserve the SIGUSR2 signal state, block SIGUSR2, + * and establish our signal handler. The signal will + * later transfer control onto the signal stack. + */ + sigemptyset(&sigs); + sigaddset(&sigs, SIGUSR2); + pthread_sigmask(SIG_BLOCK, &sigs, &osigs); + sa.sa_handler = coroutine_trampoline; + sigfillset(&sa.sa_mask); + sa.sa_flags = SA_ONSTACK; + if (sigaction(SIGUSR2, &sa, &osa) != 0) { + return -1; + } + + /* + * Set the new stack. + */ + ss.ss_sp = stack_top - CONFIG_STACK_SIZE; + ss.ss_size = CONFIG_STACK_SIZE; + ss.ss_flags = 0; + if (sigaltstack(&ss, &oss) < 0) { + return -1; + } + + /* + * Now transfer control onto the signal stack and set it up. + * It will return immediately via "return" after the sigsetjmp() + * was performed. Be careful here with race conditions. The + * signal can be delivered the first time sigsuspend() is + * called. + */ + tr_state.called = 0; + pthread_kill(pthread_self(), SIGUSR2); + sigfillset(&sigs); + sigdelset(&sigs, SIGUSR2); + while (!tr_state.called) { + sigsuspend(&sigs); + } + + /* + * Inform the system that we are back off the signal stack by + * removing the alternative signal stack. Be careful here: It + * first has to be disabled, before it can be removed. + */ + sigaltstack(NULL, &ss); + ss.ss_flags = SS_DISABLE; + if (sigaltstack(&ss, NULL) < 0) { + return -1; + } + sigaltstack(NULL, &ss); + if (!(oss.ss_flags & SS_DISABLE)) { + sigaltstack(&oss, NULL); + } + + /* + * Restore the old SIGUSR2 signal handler and mask + */ + sigaction(SIGUSR2, &osa, NULL); + pthread_sigmask(SIG_SETMASK, &osigs, NULL); + + /* + * jmp can now be used to enter the trampoline again, but not as a + * signal handler. Instead it's longjmp'd to directly. + */ + + return 0; +} + +int __attribute__((returns_twice)) barebox_setjmp(_jmp_buf jmp) +{ + return sigsetjmp(jmp, 0); +} + +void __attribute((noreturn)) barebox_longjmp(_jmp_buf jmp, int ret) +{ + siglongjmp(jmp, ret); +} diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 0e3e5d6187..e942c79cbd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -36,10 +36,12 @@ config 64BIT config X86_32 def_bool y depends on !64BIT + select HAS_ARCH_SJLJ config X86_64 def_bool y depends on 64BIT + select HAS_ARCH_SJLJ endmenu diff --git a/arch/x86/include/asm/setjmp.h b/arch/x86/include/asm/setjmp.h new file mode 100644 index 0000000000..5af5e62489 --- /dev/null +++ b/arch/x86/include/asm/setjmp.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Written by H. Peter Anvin <hpa@zytor.com> + * Brought in from Linux v4.4 and modified for U-Boot + * From Linux arch/um/sys-i386/setjmp.S + */ + +#ifndef __setjmp_h +#define __setjmp_h + +#include <linux/compiler.h> + +struct jmp_buf_data { +#if defined CONFIG_X86_64 +#define __sjlj_attr + unsigned long __rip; + unsigned long __rsp; + unsigned long __rbp; + unsigned long __rbx; + unsigned long __r12; + unsigned long __r13; + unsigned long __r14; + unsigned long __r15; +#elif defined CONFIG_X86_32 +#define __sjlj_attr __attribute__((regparm(3))) + unsigned int __ebx; + unsigned int __esp; + unsigned int __ebp; + unsigned int __esi; + unsigned int __edi; + unsigned int __eip; +#else +#error "Unsupported configuration" +#endif +}; + +typedef struct jmp_buf_data jmp_buf[1]; + +int setjmp(jmp_buf jmp) __attribute__((returns_twice)) __sjlj_attr; +void longjmp(jmp_buf jmp, int ret) __attribute__((noreturn)) __sjlj_attr; + +int initjmp(jmp_buf jmp, void __attribute__((noreturn)) (*func)(void), void *stack_top) __sjlj_attr; + +#endif diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 05e43f0f2b..6a8fa7c0ff 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -4,5 +4,8 @@ obj-y += memory.o obj-y += gdt.o endif +obj-$(CONFIG_X86_32) += setjmp_32.o +obj-$(CONFIG_X86_64) += setjmp_64.o + # needed, when running via a 16 bit BIOS obj-$(CONFIG_CMD_LINUX16) += linux_start.o diff --git a/arch/x86/lib/setjmp_32.S b/arch/x86/lib/setjmp_32.S new file mode 100644 index 0000000000..38dcb68c1b --- /dev/null +++ b/arch/x86/lib/setjmp_32.S @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Written by H. Peter Anvin <hpa@zytor.com> + * Brought in from Linux v4.4 and modified for U-Boot + * From Linux arch/um/sys-i386/setjmp.S + */ + +#define _REGPARM + +#include <linux/linkage.h> + +.text +.align 8 + +/* + * The jmp_buf is assumed to contain the following, in order: + * %ebx + * %esp + * %ebp + * %esi + * %edi + * <return address> + */ + +ENTRY(setjmp) + + movl %eax, %edx + popl %ecx /* Return address, and adjust the stack */ + xorl %eax, %eax /* Return value */ + movl %ebx, (%edx) + movl %esp, 4(%edx) /* Post-return %esp! */ + pushl %ecx /* Make the call/return stack happy */ + movl %ebp, 8(%edx) + movl %esi, 12(%edx) + movl %edi, 16(%edx) + movl %ecx, 20(%edx) /* Return address */ + ret + +ENDPROC(setjmp) + +ENTRY(longjmp) + + xchgl %eax, %edx + movl (%edx), %ebx + movl 4(%edx), %esp + movl 8(%edx), %ebp + movl 12(%edx), %esi + movl 16(%edx), %edi + jmp *20(%edx) + +ENDPROC(longjmp) + +ENTRY(initjmp) + + movl %edx, 20(%eax) /* Return address */ + movl %ecx, 4(%eax) /* Post-return %esp! */ + xorl %eax, %eax /* Return value */ + ret + +ENDPROC(initjmp) diff --git a/arch/x86/lib/setjmp_64.S b/arch/x86/lib/setjmp_64.S new file mode 100644 index 0000000000..28ea576cd2 --- /dev/null +++ b/arch/x86/lib/setjmp_64.S @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2018 Intel Corporation + * + * See arch/x86/include/asm/setjmp.h for jmp_buf format + */ + +#include <linux/linkage.h> + +.text +.align 8 + +ENTRY(setjmp) + + pop %rcx + movq %rcx, (%rdi) /* Return address */ + movq %rsp, 8(%rdi) + movq %rbp, 16(%rdi) + movq %rbx, 24(%rdi) + movq %r12, 32(%rdi) + movq %r13, 40(%rdi) + movq %r14, 48(%rdi) + movq %r15, 56(%rdi) + xorq %rax, %rax /* Direct invocation returns 0 */ + jmpq *%rcx + +ENDPROC(setjmp) + +.align 8 + +ENTRY(longjmp) + + movq (%rdi), %rcx /* Return address */ + movq 8(%rdi), %rsp + movq 16(%rdi), %rbp + movq 24(%rdi), %rbx + movq 32(%rdi), %r12 + movq 40(%rdi), %r13 + movq 48(%rdi), %r14 + movq 56(%rdi), %r15 + + movq %rsi, %rax /* Value to be returned by setjmp() */ + testq %rax, %rax /* cannot be 0 in this case */ + jnz 1f + incq %rax /* Return 1 instead */ +1: + jmpq *%rcx + +ENDPROC(longjmp) + +.align 8 + +ENTRY(initjmp) + + movq %rsi, (%rdi) /* Return address */ + movq %rdx, 8(%rdi) /* Stack top */ + xorq %rax, %rax + ret + +ENDPROC(initjmp) |