aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-4.14
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-01-08 20:09:38 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-01-08 20:14:57 +0200
commit56767dfa4232d3045136cf6c02956bfd4451af5e (patch)
tree7deccb3a855fe9d7ed83fda381eaa2b9bdb55bb2 /target/linux/octeon/patches-4.14
parentaa399b4e279f450ed0ccd7a763a275f4b5f96695 (diff)
downloadupstream-56767dfa4232d3045136cf6c02956bfd4451af5e.tar.gz
upstream-56767dfa4232d3045136cf6c02956bfd4451af5e.tar.bz2
upstream-56767dfa4232d3045136cf6c02956bfd4451af5e.zip
octeon: add support for kernel 4.14
Tested on EdgeRouter Lite. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/octeon/patches-4.14')
-rw-r--r--target/linux/octeon/patches-4.14/100-ubnt_edgerouter2_support.patch31
-rw-r--r--target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch34
-rw-r--r--target/linux/octeon/patches-4.14/160-cmdline-hack.patch47
-rw-r--r--target/linux/octeon/patches-4.14/170-cisco-hack.patch31
4 files changed, 143 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-4.14/100-ubnt_edgerouter2_support.patch b/target/linux/octeon/patches-4.14/100-ubnt_edgerouter2_support.patch
new file mode 100644
index 0000000000..991eb56ce2
--- /dev/null
+++ b/target/linux/octeon/patches-4.14/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.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
new file mode 100644
index 0000000000..1df3f6a675
--- /dev/null
+++ b/target/linux/octeon/patches-4.14/110-er200-ethernet_probe_order.patch
@@ -0,0 +1,34 @@
+--- a/drivers/staging/octeon/ethernet.c
++++ b/drivers/staging/octeon/ethernet.c
+@@ -684,6 +684,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;
+
+ octeon_mdiobus_force_mod_depencency();
+@@ -800,13 +801,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.14/160-cmdline-hack.patch b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
new file mode 100644
index 0000000000..2a4ad1dc73
--- /dev/null
+++ b/target/linux/octeon/patches-4.14/160-cmdline-hack.patch
@@ -0,0 +1,47 @@
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -656,6 +656,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
+ */
+@@ -900,6 +929,8 @@ void __init prom_init(void)
+ }
+ }
+
++ octeon_use_image_cmdline();
++
+ if (strstr(arcs_cmdline, "console=") == NULL) {
+ #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
+ strcat(arcs_cmdline, " console=ttyS0,115200");
diff --git a/target/linux/octeon/patches-4.14/170-cisco-hack.patch b/target/linux/octeon/patches-4.14/170-cisco-hack.patch
new file mode 100644
index 0000000000..124bcfd7a7
--- /dev/null
+++ b/target/linux/octeon/patches-4.14/170-cisco-hack.patch
@@ -0,0 +1,31 @@
+From patchwork Wed Jun 8 13:49:26 2016
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Subject: [LEDE-DEV] cavium: Ignore MEM boot param when too small
+From: =?utf-8?q?Micha=C5=82_Osowiecki?= <michal.osowiecki@gmail.com>
+X-Patchwork-Id: 632273
+Message-Id: <57582266.8020105@gmail.com>
+To: lede-dev@lists.infradead.org
+Date: Wed, 8 Jun 2016 15:49:26 +0200
+
+Cisco RV0XX u-boot sets MEM=2048 as boot param. We assume that at least
+4MB (mem_alloc_size) of ram is needed to run linux on cavium boards, so
+if mem < 4M - ignore it and set default value
+
+
+Signed-off-by: MichaƂ Osowiecki <michal.osowiecki@gmail.com>
+
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -1005,6 +1005,10 @@ void __init plat_mem_setup(void)
+ if (mem_alloc_size > max_memory)
+ mem_alloc_size = max_memory;
+
++ /* Ignore bootarg MEM <= 4MB - cisco uses a b0rked uboot env on their products */
++ if (max_memory <= mem_alloc_size)
++ max_memory = 512ull << 20;
++
+ /* Crashkernel ignores bootmem list. It relies on mem=X@Y option */
+ #ifdef CONFIG_CRASH_DUMP
+ add_memory_region(reserve_low_mem, max_memory, BOOT_MEM_RAM);