octeon: set Linux 6.6 as the default kernel
And remove support for 6.1 while at it. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15838 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rui Salvaterra
Robert Marko
parent
c366f63c40
commit
2cfcb90882
10 changed files with 1 additions and 558 deletions
|
|
@ -10,8 +10,7 @@ BOARDNAME:=Cavium Networks Octeon
|
||||||
FEATURES:=squashfs ramdisk pci usb
|
FEATURES:=squashfs ramdisk pci usb
|
||||||
CPU_TYPE:=octeonplus
|
CPU_TYPE:=octeonplus
|
||||||
|
|
||||||
KERNEL_PATCHVER:=6.1
|
KERNEL_PATCHVER:=6.6
|
||||||
KERNEL_TESTING_PATCHVER:=6.6
|
|
||||||
|
|
||||||
define Target/Description
|
define Target/Description
|
||||||
Build firmware images for Cavium Networks Octeon-based boards.
|
Build firmware images for Cavium Networks Octeon-based boards.
|
||||||
|
|
|
||||||
|
|
@ -1,274 +0,0 @@
|
||||||
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_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_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_POLY1305_RSIZE=2
|
|
||||||
CONFIG_CRYPTO_LIB_SHA1=y
|
|
||||||
CONFIG_CRYPTO_LIB_UTILS=y
|
|
||||||
# CONFIG_CRYPTO_MD5_OCTEON is not set
|
|
||||||
CONFIG_CRYPTO_RNG2=y
|
|
||||||
# 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_FWNODE_MDIO=y
|
|
||||||
CONFIG_FW_LOADER_PAGED_BUF=y
|
|
||||||
CONFIG_FW_LOADER_SYSFS=y
|
|
||||||
CONFIG_GCC11_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_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_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_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_MEMFD_CREATE=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_LD_CAN_LINK_VDSO=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_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_NET_DEVLINK=y
|
|
||||||
CONFIG_NET_DSA=y
|
|
||||||
CONFIG_NET_FLOW_LIMIT=y
|
|
||||||
CONFIG_NET_SELFTESTS=y
|
|
||||||
CONFIG_NET_SWITCHDEV=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_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_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_SRCU=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
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
From: John Crispin <john@phrozen.org>
|
|
||||||
Subject: hack: kernel: add generic image_cmdline hack to MIPS targets
|
|
||||||
|
|
||||||
lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
|
|
||||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
---
|
|
||||||
arch/mips/Kconfig | 4 ++++
|
|
||||||
arch/mips/kernel/head.S | 6 ++++++
|
|
||||||
2 files changed, 10 insertions(+)
|
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
|
||||||
+++ b/arch/mips/Kconfig
|
|
||||||
@@ -1115,6 +1115,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
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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;
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
--- 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);
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
--- a/arch/mips/cavium-octeon/setup.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/setup.c
|
|
||||||
@@ -653,6 +653,35 @@ void octeon_user_io_init(void)
|
|
||||||
write_c0_derraddr1(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
|
||||||
+extern char __image_cmdline[];
|
|
||||||
+
|
|
||||||
+static int __init octeon_use_image_cmdline(void)
|
|
||||||
+{
|
|
||||||
+ char *p = __image_cmdline;
|
|
||||||
+ int replace = 0;
|
|
||||||
+
|
|
||||||
+ if (*p == '-') {
|
|
||||||
+ replace = 1;
|
|
||||||
+ p++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (*p == '\0')
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ if (replace) {
|
|
||||||
+ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
||||||
+ } else {
|
|
||||||
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
|
|
||||||
+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+static inline int octeon_use_image_cmdline(void) { return 0; }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* prom_init - Early entry point for arch setup
|
|
||||||
*/
|
|
||||||
@@ -896,6 +925,8 @@ void __init prom_init(void)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ octeon_use_image_cmdline();
|
|
||||||
+
|
|
||||||
if (strstr(arcs_cmdline, "console=") == NULL) {
|
|
||||||
if (octeon_uart == 1)
|
|
||||||
strcat(arcs_cmdline, " console=ttyS1,115200");
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
|
||||||
@@ -774,7 +774,7 @@ int __init octeon_prune_device_tree(void
|
|
||||||
if (fdt_check_header(initial_boot_params))
|
|
||||||
panic("Corrupt Device Tree.");
|
|
||||||
|
|
||||||
- WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N,
|
|
||||||
+ WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_ITUS_SHIELD,
|
|
||||||
"Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.",
|
|
||||||
cvmx_board_type_to_string(octeon_bootinfo->board_type));
|
|
||||||
|
|
||||||
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
@@ -298,7 +298,7 @@ enum cvmx_board_types_enum {
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
||||||
- CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
|
|
||||||
+ CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E300 = 20300,
|
|
||||||
CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
|
|
||||||
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
|
||||||
@@ -403,7 +403,7 @@ static inline const char *cvmx_board_typ
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
||||||
- ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
|
|
||||||
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E300)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
|
||||||
--- a/arch/mips/pci/pci-octeon.c
|
|
||||||
+++ b/arch/mips/pci/pci-octeon.c
|
|
||||||
@@ -211,7 +211,7 @@ const char *octeon_get_pci_interrupts(vo
|
|
||||||
return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
|
|
||||||
case CVMX_BOARD_TYPE_BBGW_REF:
|
|
||||||
return "AABCD";
|
|
||||||
- case CVMX_BOARD_TYPE_CUST_DSR1000N:
|
|
||||||
+ case CVMX_BOARD_TYPE_ITUS_SHIELD:
|
|
||||||
return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";
|
|
||||||
case CVMX_BOARD_TYPE_THUNDER:
|
|
||||||
case CVMX_BOARD_TYPE_EBH3000:
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
||||||
@@ -297,6 +297,7 @@ enum cvmx_board_types_enum {
|
|
||||||
CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
||||||
+ CVMX_BOARD_TYPE_UBNT_USG = 20004,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
||||||
CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
|
||||||
CVMX_BOARD_TYPE_UBNT_E300 = 20300,
|
|
||||||
@@ -401,6 +402,7 @@ static inline const char *cvmx_board_typ
|
|
||||||
/* Customer private range */
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
||||||
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_USG)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
||||||
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
|
||||||
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
|
||||||
@@ -635,6 +635,7 @@ static void __init octeon_rx_tx_delay(in
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
||||||
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
||||||
if (iface == 0 && port <= 2) {
|
|
||||||
_octeon_rx_tx_delay(eth, 0x0, 0x10);
|
|
||||||
return;
|
|
||||||
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
||||||
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
|
|
||||||
@@ -170,6 +170,7 @@ int cvmx_helper_board_get_mii_address(in
|
|
||||||
else
|
|
||||||
return -1;
|
|
||||||
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
||||||
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
||||||
if (ipd_port >= 0 && ipd_port <= 2)
|
|
||||||
return 7 - ipd_port;
|
|
||||||
else
|
|
||||||
@@ -337,6 +338,7 @@ enum cvmx_helper_board_usb_clock_types _
|
|
||||||
case CVMX_BOARD_TYPE_LANAI2_G:
|
|
||||||
case CVMX_BOARD_TYPE_NIC10E_66:
|
|
||||||
case CVMX_BOARD_TYPE_UBNT_E100:
|
|
||||||
+ case CVMX_BOARD_TYPE_UBNT_USG:
|
|
||||||
return USB_CLOCK_TYPE_CRYSTAL_12;
|
|
||||||
case CVMX_BOARD_TYPE_NIC10E:
|
|
||||||
return USB_CLOCK_TYPE_REF_12;
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
From: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
||||||
Date: Wed, 28 Oct 2020 19:00:00 +0000
|
|
||||||
Subject: [PATCH] staging: octeon: add net-labels support
|
|
||||||
|
|
||||||
With this patch, device name can be set within dts file
|
|
||||||
in the same way as dsa port can.
|
|
||||||
|
|
||||||
Add label to pip interface node to use this feature:
|
|
||||||
label = "lan0";
|
|
||||||
|
|
||||||
Tested-by: Johannes Kimmel <fff@bareminimum.eu>
|
|
||||||
Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
||||||
--- a/drivers/staging/octeon/ethernet.c
|
|
||||||
+++ b/drivers/staging/octeon/ethernet.c
|
|
||||||
@@ -407,8 +407,12 @@ static int cvm_oct_common_set_mac_addres
|
|
||||||
int cvm_oct_common_init(struct net_device *dev)
|
|
||||||
{
|
|
||||||
struct octeon_ethernet *priv = netdev_priv(dev);
|
|
||||||
+ const u8 *label = NULL;
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
+ if (priv->of_node)
|
|
||||||
+ label = of_get_property(priv->of_node, "label", NULL);
|
|
||||||
+
|
|
||||||
ret = of_get_ethdev_address(priv->of_node, dev);
|
|
||||||
if (ret)
|
|
||||||
eth_hw_addr_random(dev);
|
|
||||||
@@ -441,6 +445,9 @@ int cvm_oct_common_init(struct net_devic
|
|
||||||
if (dev->netdev_ops->ndo_stop)
|
|
||||||
dev->netdev_ops->ndo_stop(dev);
|
|
||||||
|
|
||||||
+ if (!IS_ERR_OR_NULL(label))
|
|
||||||
+ dev_alloc_name(dev, label);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
From: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
||||||
Date: Sun, 01 Nov 2020 19:00:00 +0000
|
|
||||||
Subject: [PATCH] staging: octeon: sgmii to honor disabled dt node status
|
|
||||||
|
|
||||||
With this patch, sgmii interface device tree node could be disabled and
|
|
||||||
that disabled interface will not be unnecessarily initialized.
|
|
||||||
|
|
||||||
It solves the problem with Octeon boards that have 8 sgmii or more ports
|
|
||||||
initialized but have nothing connected to them.
|
|
||||||
|
|
||||||
Tested-by: Johannes Kimmel <fff@bareminimum.eu>
|
|
||||||
Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
|
|
||||||
--- a/drivers/staging/octeon/ethernet.c
|
|
||||||
+++ b/drivers/staging/octeon/ethernet.c
|
|
||||||
@@ -877,8 +877,10 @@ static int cvm_oct_probe(struct platform
|
|
||||||
|
|
||||||
case CVMX_HELPER_INTERFACE_MODE_SGMII:
|
|
||||||
priv->phy_mode = PHY_INTERFACE_MODE_SGMII;
|
|
||||||
- dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
|
|
||||||
- strscpy(dev->name, "eth%d", sizeof(dev->name));
|
|
||||||
+ if (of_device_is_available(priv->of_node)) {
|
|
||||||
+ dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
|
|
||||||
+ strscpy(dev->name, "eth%d", sizeof(dev->name));
|
|
||||||
+ }
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CVMX_HELPER_INTERFACE_MODE_SPI:
|
|
||||||
Loading…
Reference in a new issue