From 6c22545225cdcc6b635ff94ce00a07663b254dbf Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Thu, 7 Feb 2019 23:41:47 +0000 Subject: target/octeon: Add Linux 4.19 support This commit adds support for Linux 4.19 kernel, various cleanups listed below. Drop 170-cisco-hack.patch as these devices never seems to have been supported. Unset kernel symbols: * CONFIG_CAVIUM_CN63XXP1=y No supported hardware uses CN63XXP1 and it causes "slight decrease in performance" Source: https://cateee.net/lkddb/web-lkddb/CAVIUM_CN63XXP1.html * CONFIG_USB_OCTEON_EHCI=y CONFIG_USB_OCTEON_OHCI=y Deprecated Source: https://cateee.net/lkddb/web-lkddb/USB_OCTEON_EHCI.html https://cateee.net/lkddb/web-lkddb/USB_OCTEON_OHCI.html Removed kernel symbols: * # CONFIG_ARCH_HIBERNATION_POSSIBLE=y * CONFIG_ARCH_SUSPEND_POSSIBLE=y These are not in if you do a vanilla config of a MIPS Octeon kernel and I can't find any references about support on this platform. * # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set * CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 No need to have this in by default, not defined in most other targets * CONFIG_CRASH_CORE=y Can't find any documentation why this should be enabled by default * CONFIG_DEBUG_INFO=y Set by https://github.com/openwrt/openwrt/blob/master/config/Config-kernel.in#L134 * CONFIG_DEBUG_SPINLOCK=y No need to have this in by default * CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 Already set by default Source: https://cateee.net/lkddb/web-lkddb/DEFAULT_HUNG_TASK_TIMEOUT.html * CONFIG_DETECT_HUNG_TASK=y No need to have this in by default, not defined in most other targets * CONFIG_HAVE_DEBUG_KMEMLEAK=y No need to have this in by default, not defined in most other targets * CONFIG_HAVE_DEBUG_STACKOVERFLOW=y No need to have this in by default * CONFIG_HAVE_IDE=y None of the supported devices have IDE * CONFIG_HZ=250 * # CONFIG_HZ_100 is not set * CONFIG_HZ_250=y This is broken with generic config * CONFIG_KALLSYMS=y No need to have this in by default, not defined in most other targets * CONFIG_KEXEC=y * CONFIG_KEXEC_CORE=y No need to have this in by default, not defined in most other targets * CONFIG_HAVE_KVM=y No need to have this in by default * CONFIG_SCHED_DEBUG=y No need to have this in by default, not defined in most other targets * CONFIG_SYSFS_DEPRECATED=y Deprecated symbol Source: https://cateee.net/lkddb/web-lkddb/SYSFS_DEPRECATED.html * CONFIG_SYSFS_DEPRECATED_V2=y Discouraged usage in general Source: https://cateee.net/lkddb/web-lkddb/SYSFS_DEPRECATED_V2.html * CONFIG_UNINLINE_SPIN_UNLOCK=y No need to have this in by default, not defined in most other targets Source: https://github.com/openSUSE/kernel/blob/master/lib/Kconfig.debug#L1137 * CONFIG_ZLIB_INFLATE=y No need to have this in by default, not defined in most other targets Signed-off-by: Daniel Engberg --- .../100-ubnt_edgerouter2_support.patch | 31 ++++++++++++++ .../110-er200-ethernet_probe_order.patch | 34 ++++++++++++++++ .../octeon/patches-4.19/120-cmdline-hack.patch | 47 ++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch create mode 100644 target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch create mode 100644 target/linux/octeon/patches-4.19/120-cmdline-hack.patch (limited to 'target/linux/octeon/patches-4.19') diff --git a/target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch new file mode 100644 index 0000000000..991eb56ce2 --- /dev/null +++ b/target/linux/octeon/patches-4.19/100-ubnt_edgerouter2_support.patch @@ -0,0 +1,31 @@ +--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h ++++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h +@@ -295,6 +295,8 @@ 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_E220 = 20005, + CVMX_BOARD_TYPE_CUST_DSR1000N = 20006, + CVMX_BOARD_TYPE_KONTRON_S1901 = 21901, + CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000, +@@ -396,6 +398,8 @@ 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_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_KONTRON_S1901) + ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX) +--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c ++++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c +@@ -173,6 +173,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; diff --git a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch new file mode 100644 index 0000000000..6b1eaf92a2 --- /dev/null +++ b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch @@ -0,0 +1,34 @@ +--- a/drivers/staging/octeon/ethernet.c ++++ b/drivers/staging/octeon/ethernet.c +@@ -673,6 +673,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; + +@@ -796,13 +797,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); diff --git a/target/linux/octeon/patches-4.19/120-cmdline-hack.patch b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch new file mode 100644 index 0000000000..e902e853e8 --- /dev/null +++ b/target/linux/octeon/patches-4.19/120-cmdline-hack.patch @@ -0,0 +1,47 @@ +--- a/arch/mips/cavium-octeon/setup.c ++++ b/arch/mips/cavium-octeon/setup.c +@@ -650,6 +650,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 ++ + /** + * Early entry point for arch setup + */ +@@ -894,6 +923,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"); -- cgit v1.2.3