mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
bf6002e74b
octeon/patches-5.10 -> octeon/patches-5.15 Removed 140-octeon_e300_support.patch as E300 support appears to be upstreamed. Reworked 130-add_itus_support.patch to compensate for the upstreaming of E300 octeon/config-5.15 The following Kernel Symbols were ADDED: Line 5: +CONFIG_AF_UNIX_OOB=y Line 6: +CONFIG_AHCI_OCTEON=y Line 9: +CONFIG_ARCH_KEEP_MEMBLOCK=y Line 16: +CONFIG_ATA=y Line 17: +CONFIG_BINARY_PRINTF=y Line 29: +CONFIG_CPU_R4K_FPU=y Line 45: +CONFIG_FWNODE_MDIO=y Line 51: +CONFIG_GENERIC_FIND_FIRST_BIT=y Line 59: +CONFIG_GLOB=y Line 61: +CONFIG_GPIO_CDEV=y Line 77: +CONFIG_LTO_NONE=y Line 85: +CONFIG_MIPS_FP_SUPPORT=y Line 93: +CONFIG_NET_SELFTESTS=y Line 94: +CONFIG_NET_SOCK_MSG=y Line 105: +CONFIG_PATA_OCTEON_CF=y Line 106: +CONFIG_PATA_TIMINGS=y Line 114: +CONFIG_PTP_1588_CLOCK_OPTIONAL=y Line 121: +CONFIG_SATA_AHCI_PLATFORM=y Line 122: +CONFIG_SATA_HOST=y Line 124: +CONFIG_SCSI_COMMON=y Line 132: +CONFIG_SOCK_RX_QUEUE_MAPPING=y Line 157: +CONFIG_USB_XHCI_HCD=y Line 158: +CONFIG_USB_XHCI_PLATFORM=y The following kernel symbols were REMOVED: Line 21: -CONFIG_BLK_SCSI_REQUEST=y Line 37: -CONFIG_ENABLE_MUST_CHECK=y Line 69: -CONFIG_HOLES_IN_ZONE=y Line 102: -CONFIG_OF_NET=y Line 140: -CONFIG_SYS_SUPPORTS_HUGETLBFS=y Compiled for Itus Shield, Boots successfully, continuing to test for existing 5.10 memory leak. Signed-off-by: Donald Hoskins <grommish@gmail.com> [refresh patches] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
--- 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);
|