Skip to content

Commit

Permalink
MIPS: cavium-octeon: export symbols needed by octeon-ethernet
Browse files Browse the repository at this point in the history
Export symbols needed by the octeon-ethernet driver. The patch fixes a
build failure with CONFIG_OCTEON_ETHERNET=m.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6166/
  • Loading branch information
Aaro Koskinen authored and Ralf Baechle committed Jan 23, 2014
1 parent 63238f2 commit ce4126c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
* state. It points to a bootmem named block.
*/
__cvmx_cmd_queue_all_state_t *__cvmx_cmd_queue_state_ptr;
EXPORT_SYMBOL_GPL(__cvmx_cmd_queue_state_ptr);

/**
* Initialize the Global queue state pointer.
Expand Down
4 changes: 4 additions & 0 deletions arch/mips/cavium-octeon/executive/cvmx-helper-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ int cvmx_helper_setup_red(int pass_thresh, int drop_thresh)

return 0;
}
EXPORT_SYMBOL_GPL(cvmx_helper_setup_red);

/**
* Setup the common GMX settings that determine the number of
Expand Down Expand Up @@ -384,6 +385,7 @@ int cvmx_helper_get_ipd_port(int interface, int port)
}
return -1;
}
EXPORT_SYMBOL_GPL(cvmx_helper_get_ipd_port);

/**
* Returns the interface number for an IPD/PKO port number.
Expand All @@ -408,6 +410,7 @@ int cvmx_helper_get_interface_num(int ipd_port)

return -1;
}
EXPORT_SYMBOL_GPL(cvmx_helper_get_interface_num);

/**
* Returns the interface index number for an IPD/PKO port
Expand All @@ -431,3 +434,4 @@ int cvmx_helper_get_interface_index_num(int ipd_port)

return -1;
}
EXPORT_SYMBOL_GPL(cvmx_helper_get_interface_index_num);
8 changes: 8 additions & 0 deletions arch/mips/cavium-octeon/executive/cvmx-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ int cvmx_helper_get_number_of_interfaces(void)
else
return 3;
}
EXPORT_SYMBOL_GPL(cvmx_helper_get_number_of_interfaces);

/**
* Return the number of ports on an interface. Depending on the
Expand All @@ -102,6 +103,7 @@ int cvmx_helper_ports_on_interface(int interface)
{
return interface_port_count[interface];
}
EXPORT_SYMBOL_GPL(cvmx_helper_ports_on_interface);

/**
* Get the operating mode of an interface. Depending on the Octeon
Expand Down Expand Up @@ -179,6 +181,7 @@ cvmx_helper_interface_mode_t cvmx_helper_interface_get_mode(int interface)
return CVMX_HELPER_INTERFACE_MODE_RGMII;
}
}
EXPORT_SYMBOL_GPL(cvmx_helper_interface_get_mode);

/**
* Configure the IPD/PIP tagging and QoS options for a specific
Expand Down Expand Up @@ -825,6 +828,7 @@ int cvmx_helper_ipd_and_packet_input_enable(void)
__cvmx_helper_errata_fix_ipd_ptr_alignment();
return 0;
}
EXPORT_SYMBOL_GPL(cvmx_helper_ipd_and_packet_input_enable);

/**
* Initialize the PIP, IPD, and PKO hardware to support
Expand Down Expand Up @@ -903,6 +907,7 @@ int cvmx_helper_initialize_packet_io_global(void)
#endif
return result;
}
EXPORT_SYMBOL_GPL(cvmx_helper_initialize_packet_io_global);

/**
* Does core local initialization for packet io
Expand Down Expand Up @@ -947,6 +952,7 @@ cvmx_helper_link_info_t cvmx_helper_link_autoconf(int ipd_port)
*/
return port_link_info[ipd_port];
}
EXPORT_SYMBOL_GPL(cvmx_helper_link_autoconf);

/**
* Return the link state of an IPD/PKO port as returned by
Expand Down Expand Up @@ -1005,6 +1011,7 @@ cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port)
}
return result;
}
EXPORT_SYMBOL_GPL(cvmx_helper_link_get);

/**
* Configure an IPD/PKO port for the specified link state. This
Expand Down Expand Up @@ -1060,6 +1067,7 @@ int cvmx_helper_link_set(int ipd_port, cvmx_helper_link_info_t link_info)
port_link_info[ipd_port].u64 = link_info.u64;
return result;
}
EXPORT_SYMBOL_GPL(cvmx_helper_link_set);

/**
* Configure a port for internal and/or external loopback. Internal loopback
Expand Down
3 changes: 2 additions & 1 deletion arch/mips/cavium-octeon/executive/cvmx-pko.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ void cvmx_pko_disable(void)
pko_reg_flags.s.ena_pko = 0;
cvmx_write_csr(CVMX_PKO_REG_FLAGS, pko_reg_flags.u64);
}

EXPORT_SYMBOL_GPL(cvmx_pko_disable);

/**
* Reset the packet output.
Expand Down Expand Up @@ -182,6 +182,7 @@ void cvmx_pko_shutdown(void)
}
__cvmx_pko_reset();
}
EXPORT_SYMBOL_GPL(cvmx_pko_shutdown);

/**
* Configure a output port and the associated queues for use.
Expand Down
1 change: 1 addition & 0 deletions arch/mips/cavium-octeon/executive/cvmx-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ int cvmx_spi_restart_interface(int interface, cvmx_spi_mode_t mode, int timeout)

return res;
}
EXPORT_SYMBOL_GPL(cvmx_spi_restart_interface);

/**
* Callback to perform SPI4 reset
Expand Down

0 comments on commit ce4126c

Please sign in to comment.