forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
target/octeon: add support for testing kernel 6.6
A rather trivial addition. Patches automatically rebased. Signed-off-by: Rui Salvaterra <[email protected]>
- Loading branch information
1 parent
1ddb0fc
commit cfdf4ce
Showing
10 changed files
with
568 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,285 @@ | ||
CONFIG_64BIT=y | ||
CONFIG_AHCI_OCTEON=y | ||
CONFIG_ARCH_DMA_ADDR_T_64BIT=y | ||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
CONFIG_ARCH_KEEP_MEMBLOCK=y | ||
CONFIG_ARCH_MMAP_RND_BITS=12 | ||
CONFIG_ARCH_MMAP_RND_BITS_MAX=18 | ||
CONFIG_ARCH_MMAP_RND_BITS_MIN=12 | ||
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 | ||
CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
CONFIG_ATA=y | ||
CONFIG_BLK_DEV_LOOP=y | ||
CONFIG_BLK_DEV_SD=y | ||
CONFIG_BLK_MQ_PCI=y | ||
CONFIG_BUFFER_HEAD=y | ||
CONFIG_BUILTIN_DTB=y | ||
CONFIG_CAVIUM_CN63XXP1=y | ||
CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=0 | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2=y | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT=y | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2_MEMCPY=y | ||
CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y | ||
CONFIG_CAVIUM_OCTEON_SOC=y | ||
CONFIG_CAVIUM_RESERVE32=0 | ||
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" | ||
CONFIG_CC_NO_ARRAY_BOUNDS=y | ||
CONFIG_CEVT_R4K=y | ||
CONFIG_CLONE_BACKWARDS=y | ||
# CONFIG_COMMON_CLK is not set | ||
CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 | ||
CONFIG_COMPAT_32BIT_TIME=y | ||
CONFIG_CONTEXT_TRACKING=y | ||
CONFIG_CONTEXT_TRACKING_IDLE=y | ||
CONFIG_CPU_BIG_ENDIAN=y | ||
CONFIG_CPU_CAVIUM_OCTEON=y | ||
CONFIG_CPU_GENERIC_DUMP_TLB=y | ||
CONFIG_CPU_HAS_DIEI=y | ||
CONFIG_CPU_HAS_PREFETCH=y | ||
CONFIG_CPU_HAS_RIXI=y | ||
CONFIG_CPU_HAS_SYNC=y | ||
CONFIG_CPU_MIPS64=y | ||
CONFIG_CPU_MIPSR2=y | ||
CONFIG_CPU_MITIGATIONS=y | ||
CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y | ||
CONFIG_CPU_R4K_FPU=y | ||
CONFIG_CPU_RMAP=y | ||
CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | ||
CONFIG_CPU_SUPPORTS_HIGHMEM=y | ||
CONFIG_CPU_SUPPORTS_HUGEPAGES=y | ||
CONFIG_CRAMFS=y | ||
CONFIG_CRC16=y | ||
CONFIG_CRYPTO_CRC32=y | ||
CONFIG_CRYPTO_CRC32C=y | ||
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y | ||
CONFIG_CRYPTO_LIB_GF128MUL=y | ||
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2 | ||
CONFIG_CRYPTO_LIB_SHA1=y | ||
CONFIG_CRYPTO_LIB_UTILS=y | ||
# CONFIG_CRYPTO_MD5_OCTEON is not set | ||
# CONFIG_CRYPTO_SHA1_OCTEON is not set | ||
# CONFIG_CRYPTO_SHA256_OCTEON is not set | ||
# CONFIG_CRYPTO_SHA512_OCTEON is not set | ||
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set | ||
CONFIG_DEBUG_INFO_NONE=y | ||
CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE=y | ||
CONFIG_DNOTIFY=y | ||
CONFIG_DTC=y | ||
CONFIG_EARLY_PRINTK=y | ||
CONFIG_EDAC=y | ||
CONFIG_EDAC_ATOMIC_SCRUB=y | ||
# CONFIG_EDAC_DEBUG is not set | ||
CONFIG_EDAC_LEGACY_SYSFS=y | ||
CONFIG_EDAC_OCTEON_L2C=y | ||
CONFIG_EDAC_OCTEON_LMC=y | ||
CONFIG_EDAC_OCTEON_PC=y | ||
CONFIG_EDAC_OCTEON_PCI=y | ||
CONFIG_EDAC_SUPPORT=y | ||
CONFIG_EEPROM_AT24=y | ||
CONFIG_EXCLUSIVE_SYSTEM_RAM=y | ||
CONFIG_EXT4_FS=y | ||
CONFIG_F2FS_FS=y | ||
CONFIG_FAT_FS=y | ||
CONFIG_FIXED_PHY=y | ||
CONFIG_FS_IOMAP=y | ||
CONFIG_FS_MBCACHE=y | ||
CONFIG_FUNCTION_ALIGNMENT=0 | ||
CONFIG_FWNODE_MDIO=y | ||
CONFIG_FW_LOADER_PAGED_BUF=y | ||
CONFIG_FW_LOADER_SYSFS=y | ||
CONFIG_GCC10_NO_ARRAY_BOUNDS=y | ||
CONFIG_GENERIC_ALLOCATOR=y | ||
CONFIG_GENERIC_CLOCKEVENTS=y | ||
CONFIG_GENERIC_CMOS_UPDATE=y | ||
CONFIG_GENERIC_CPU_AUTOPROBE=y | ||
CONFIG_GENERIC_GETTIMEOFDAY=y | ||
CONFIG_GENERIC_IDLE_POLL_SETUP=y | ||
CONFIG_GENERIC_IOMAP=y | ||
CONFIG_GENERIC_IRQ_SHOW=y | ||
CONFIG_GENERIC_LIB_ASHLDI3=y | ||
CONFIG_GENERIC_LIB_ASHRDI3=y | ||
CONFIG_GENERIC_LIB_CMPDI2=y | ||
CONFIG_GENERIC_LIB_LSHRDI3=y | ||
CONFIG_GENERIC_LIB_UCMPDI2=y | ||
CONFIG_GENERIC_PCI_IOMAP=y | ||
CONFIG_GENERIC_SMP_IDLE_THREAD=y | ||
CONFIG_GENERIC_TIME_VSYSCALL=y | ||
CONFIG_GLOB=y | ||
CONFIG_GPIO_CDEV=y | ||
CONFIG_GPIO_OCTEON=y | ||
CONFIG_GRO_CELLS=y | ||
CONFIG_HARDWARE_WATCHPOINTS=y | ||
CONFIG_HAS_DMA=y | ||
CONFIG_HAS_IOMEM=y | ||
CONFIG_HAS_IOPORT=y | ||
CONFIG_HAS_IOPORT_MAP=y | ||
CONFIG_HW_RANDOM=y | ||
CONFIG_HW_RANDOM_OCTEON=y | ||
CONFIG_HZ_PERIODIC=y | ||
CONFIG_I2C=y | ||
CONFIG_I2C_BOARDINFO=y | ||
CONFIG_I2C_OCTEON=y | ||
CONFIG_IMAGE_CMDLINE_HACK=y | ||
CONFIG_INITRAMFS_SOURCE="" | ||
CONFIG_IRQCHIP=y | ||
CONFIG_IRQ_DOMAIN=y | ||
CONFIG_IRQ_FORCED_THREADING=y | ||
CONFIG_IRQ_WORK=y | ||
CONFIG_JBD2=y | ||
CONFIG_LEGACY_DIRECT_IO=y | ||
CONFIG_LIBFDT=y | ||
CONFIG_LOCK_DEBUGGING_SUPPORT=y | ||
CONFIG_MDIO_BUS=y | ||
CONFIG_MDIO_CAVIUM=y | ||
CONFIG_MDIO_DEVICE=y | ||
CONFIG_MDIO_DEVRES=y | ||
CONFIG_MDIO_OCTEON=y | ||
CONFIG_MIGRATION=y | ||
CONFIG_MIPS=y | ||
CONFIG_MIPS_ASID_BITS=8 | ||
CONFIG_MIPS_ASID_SHIFT=0 | ||
CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y | ||
CONFIG_MIPS_ELF_APPENDED_DTB=y | ||
CONFIG_MIPS_FP_SUPPORT=y | ||
CONFIG_MIPS_L1_CACHE_SHIFT=7 | ||
CONFIG_MIPS_L1_CACHE_SHIFT_7=y | ||
# CONFIG_MIPS_NO_APPENDED_DTB is not set | ||
CONFIG_MIPS_NR_CPU_NR_MAP=1024 | ||
CONFIG_MIPS_NR_CPU_NR_MAP_1024=y | ||
CONFIG_MIPS_PGD_C0_CONTEXT=y | ||
CONFIG_MIPS_SPRAM=y | ||
CONFIG_MMC=y | ||
CONFIG_MMC_BLOCK=y | ||
CONFIG_MMC_CAVIUM_OCTEON=y | ||
CONFIG_MMU_LAZY_TLB_REFCOUNT=y | ||
CONFIG_MODULES_USE_ELF_REL=y | ||
CONFIG_MODULES_USE_ELF_RELA=y | ||
# CONFIG_MTD_CFI_INTELEXT is not set | ||
CONFIG_MTD_CMDLINE_PARTS=y | ||
CONFIG_MTD_PHYSMAP=y | ||
CONFIG_MTD_SPI_NOR=y | ||
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y | ||
CONFIG_NEED_DMA_MAP_STATE=y | ||
CONFIG_NEED_SRCU_NMI_SAFE=y | ||
CONFIG_NET_DEVLINK=y | ||
CONFIG_NET_DSA=y | ||
CONFIG_NET_EGRESS=y | ||
CONFIG_NET_FLOW_LIMIT=y | ||
CONFIG_NET_INGRESS=y | ||
CONFIG_NET_SELFTESTS=y | ||
CONFIG_NET_SWITCHDEV=y | ||
CONFIG_NET_XGRESS=y | ||
CONFIG_NLS=y | ||
CONFIG_NLS_CODEPAGE_437=y | ||
CONFIG_NLS_ISO8859_1=y | ||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y | ||
CONFIG_NR_CPUS=16 | ||
CONFIG_NR_CPUS_DEFAULT_64=y | ||
CONFIG_NVMEM=y | ||
CONFIG_NVMEM_LAYOUTS=y | ||
CONFIG_NVMEM_SYSFS=y | ||
CONFIG_OCTEON_ETHERNET=y | ||
CONFIG_OCTEON_ILM=y | ||
CONFIG_OCTEON_MGMT_ETHERNET=y | ||
CONFIG_OCTEON_WDT=y | ||
CONFIG_OF=y | ||
CONFIG_OF_ADDRESS=y | ||
CONFIG_OF_EARLY_FLATTREE=y | ||
CONFIG_OF_FLATTREE=y | ||
CONFIG_OF_GPIO=y | ||
CONFIG_OF_IRQ=y | ||
CONFIG_OF_KOBJ=y | ||
CONFIG_OF_MDIO=y | ||
CONFIG_PADATA=y | ||
CONFIG_PAGE_POOL=y | ||
CONFIG_PAGE_SIZE_LESS_THAN_256KB=y | ||
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y | ||
# CONFIG_PARTITION_ADVANCED is not set | ||
CONFIG_PATA_OCTEON_CF=y | ||
CONFIG_PATA_TIMINGS=y | ||
CONFIG_PCI=y | ||
CONFIG_PCIEAER=y | ||
CONFIG_PCIEPORTBUS=y | ||
CONFIG_PCI_DOMAINS=y | ||
CONFIG_PCI_DRIVERS_LEGACY=y | ||
CONFIG_PERF_USE_VMALLOC=y | ||
CONFIG_PGTABLE_LEVELS=3 | ||
CONFIG_PHYLIB=y | ||
CONFIG_PHYLIB_LEDS=y | ||
CONFIG_PHYLINK=y | ||
CONFIG_PHYS_ADDR_T_64BIT=y | ||
CONFIG_POSIX_MQUEUE=y | ||
CONFIG_POSIX_MQUEUE_SYSCTL=y | ||
CONFIG_PREEMPT_NONE_BUILD=y | ||
CONFIG_PTP_1588_CLOCK_OPTIONAL=y | ||
CONFIG_QUEUED_RWLOCKS=y | ||
CONFIG_QUEUED_SPINLOCKS=y | ||
CONFIG_RANDSTRUCT_NONE=y | ||
CONFIG_RAS=y | ||
CONFIG_REGMAP=y | ||
CONFIG_REGMAP_I2C=y | ||
CONFIG_RELAY=y | ||
CONFIG_RFS_ACCEL=y | ||
CONFIG_RPS=y | ||
CONFIG_SATA_AHCI_PLATFORM=y | ||
CONFIG_SATA_HOST=y | ||
CONFIG_SCSI=y | ||
CONFIG_SCSI_COMMON=y | ||
CONFIG_SECCOMP=y | ||
CONFIG_SECCOMP_FILTER=y | ||
CONFIG_SERIAL_8250_DW=y | ||
CONFIG_SERIAL_8250_DWLIB=y | ||
CONFIG_SERIAL_MCTRL_GPIO=y | ||
CONFIG_SG_POOL=y | ||
CONFIG_SMP=y | ||
CONFIG_SOCK_RX_QUEUE_MAPPING=y | ||
CONFIG_SPARSEMEM=y | ||
CONFIG_SPARSEMEM_EXTREME=y | ||
CONFIG_SPI=y | ||
CONFIG_SPI_MASTER=y | ||
CONFIG_SPI_MEM=y | ||
CONFIG_SPI_OCTEON=y | ||
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y | ||
CONFIG_SWIOTLB=y | ||
CONFIG_SWPHY=y | ||
CONFIG_SYSCTL_EXCEPTION_TRACE=y | ||
CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON=y | ||
CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | ||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | ||
CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y | ||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | ||
CONFIG_SYS_SUPPORTS_RELOCATABLE=y | ||
CONFIG_SYS_SUPPORTS_SMP=y | ||
CONFIG_TARGET_ISA_REV=2 | ||
CONFIG_TICK_CPU_ACCOUNTING=y | ||
CONFIG_TREE_RCU=y | ||
CONFIG_TREE_SRCU=y | ||
CONFIG_USB=y | ||
CONFIG_USB_COMMON=y | ||
CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y | ||
CONFIG_USB_EHCI_HCD=y | ||
CONFIG_USB_EHCI_HCD_PLATFORM=y | ||
# CONFIG_USB_OCTEON_EHCI is not set | ||
CONFIG_USB_OCTEON_HCD=y | ||
# CONFIG_USB_OCTEON_OHCI is not set | ||
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | ||
CONFIG_USB_OHCI_HCD=y | ||
CONFIG_USB_OHCI_HCD_PLATFORM=y | ||
CONFIG_USB_STORAGE=y | ||
CONFIG_USB_SUPPORT=y | ||
CONFIG_USB_XHCI_HCD=y | ||
CONFIG_USB_XHCI_PLATFORM=y | ||
CONFIG_USE_OF=y | ||
CONFIG_VFAT_FS=y | ||
CONFIG_VITESSE_PHY=y | ||
CONFIG_VM_EVENT_COUNTERS=y | ||
CONFIG_WATCHDOG_CORE=y | ||
CONFIG_WEAK_ORDERING=y | ||
CONFIG_XPS=y | ||
CONFIG_ZLIB_INFLATE=y | ||
CONFIG_ZONE_DMA32=y |
38 changes: 38 additions & 0 deletions
38
target/linux/octeon/patches-6.6/100-mips_image_cmdline_hack.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
From: John Crispin <[email protected]> | ||
Subject: hack: kernel: add generic image_cmdline hack to MIPS targets | ||
|
||
lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976 | ||
Signed-off-by: Gabor Juhos <[email protected]> | ||
--- | ||
arch/mips/Kconfig | 4 ++++ | ||
arch/mips/kernel/head.S | 6 ++++++ | ||
2 files changed, 10 insertions(+) | ||
|
||
--- a/arch/mips/Kconfig | ||
+++ b/arch/mips/Kconfig | ||
@@ -1090,6 +1090,10 @@ config MIPS_MSC | ||
config SYNC_R4K | ||
bool | ||
|
||
+config IMAGE_CMDLINE_HACK | ||
+ bool "OpenWrt specific image command line hack" | ||
+ default n | ||
+ | ||
config NO_IOPORT_MAP | ||
def_bool n | ||
|
||
--- a/arch/mips/kernel/head.S | ||
+++ b/arch/mips/kernel/head.S | ||
@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry) | ||
j kernel_entry | ||
#endif /* CONFIG_BOOT_RAW */ | ||
|
||
+#ifdef CONFIG_IMAGE_CMDLINE_HACK | ||
+ .ascii "CMDLINE:" | ||
+EXPORT(__image_cmdline) | ||
+ .fill 0x400 | ||
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */ | ||
+ | ||
__REF | ||
|
||
NESTED(kernel_entry, 16, sp) # kernel entry point |
11 changes: 11 additions & 0 deletions
11
target/linux/octeon/patches-6.6/100-ubnt_edgerouter2_support.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c | ||
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c | ||
@@ -174,6 +174,8 @@ int cvmx_helper_board_get_mii_address(in | ||
return 7 - ipd_port; | ||
else | ||
return -1; | ||
+ case CVMX_BOARD_TYPE_UBNT_E200: | ||
+ return -1; | ||
case CVMX_BOARD_TYPE_KONTRON_S1901: | ||
if (ipd_port == CVMX_HELPER_BOARD_MGMT_IPD_PORT) | ||
return 1; |
34 changes: 34 additions & 0 deletions
34
target/linux/octeon/patches-6.6/110-er200-ethernet_probe_order.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- a/drivers/staging/octeon/ethernet.c | ||
+++ b/drivers/staging/octeon/ethernet.c | ||
@@ -676,6 +676,7 @@ static int cvm_oct_probe(struct platform | ||
int interface; | ||
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; | ||
int qos; | ||
+ int i; | ||
struct device_node *pip; | ||
int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; | ||
|
||
@@ -797,13 +798,19 @@ static int cvm_oct_probe(struct platform | ||
} | ||
|
||
num_interfaces = cvmx_helper_get_number_of_interfaces(); | ||
- for (interface = 0; interface < num_interfaces; interface++) { | ||
- cvmx_helper_interface_mode_t imode = | ||
- cvmx_helper_interface_get_mode(interface); | ||
- int num_ports = cvmx_helper_ports_on_interface(interface); | ||
+ for (i = 0; i < num_interfaces; i++) { | ||
+ cvmx_helper_interface_mode_t imode; | ||
+ int interface; | ||
+ int num_ports; | ||
int port; | ||
int port_index; | ||
|
||
+ interface = i; | ||
+ if (cvmx_sysinfo_get()->board_type == CVMX_BOARD_TYPE_UBNT_E200) | ||
+ interface = num_interfaces - (i + 1); | ||
+ | ||
+ num_ports = cvmx_helper_ports_on_interface(interface); | ||
+ imode = cvmx_helper_interface_get_mode(interface); | ||
for (port_index = 0, | ||
port = cvmx_helper_get_ipd_port(interface, 0); | ||
port < cvmx_helper_get_ipd_port(interface, num_ports); |
Oops, something went wrong.