summaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon/ethernet.c
diff options
context:
space:
mode:
authorAaro Koskinen2016-08-31 22:57:43 +0200
committerGreg Kroah-Hartman2016-09-02 14:46:53 +0200
commite971a119f713ae3bedbd7fb45efb1121537d9f26 (patch)
tree7450263f03f92b5a0cd74cbe34ad83028989f7b0 /drivers/staging/octeon/ethernet.c
parentstaging: octeon: move group number into rx group data (diff)
downloadkernel-qcow2-linux-e971a119f713ae3bedbd7fb45efb1121537d9f26.tar.gz
kernel-qcow2-linux-e971a119f713ae3bedbd7fb45efb1121537d9f26.tar.xz
kernel-qcow2-linux-e971a119f713ae3bedbd7fb45efb1121537d9f26.zip
staging: octeon: support enabling multiple rx groups
Support enabling multiple RX groups. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon/ethernet.c')
-rw-r--r--drivers/staging/octeon/ethernet.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 1e2e1efadb7b..7d487452bddb 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(num_packet_buffers, "\n"
"\tNumber of packet buffers to allocate and store in the\n"
"\tFPA. By default, 1024 packet buffers are used.\n");
-int pow_receive_group = 15;
+static int pow_receive_group = 15;
module_param(pow_receive_group, int, 0444);
MODULE_PARM_DESC(pow_receive_group, "\n"
"\tPOW group to receive packets from. All ethernet hardware\n"
@@ -86,6 +86,8 @@ int rx_napi_weight = 32;
module_param(rx_napi_weight, int, 0444);
MODULE_PARM_DESC(rx_napi_weight, "The NAPI WEIGHT parameter.");
+/* Mask indicating which receive groups are in use. */
+int pow_receive_groups;
/*
* cvm_oct_poll_queue_stopping - flag to indicate polling should stop.
@@ -678,6 +680,8 @@ static int cvm_oct_probe(struct platform_device *pdev)
cvmx_helper_initialize_packet_io_global();
+ pow_receive_groups = BIT(pow_receive_group);
+
/* Change the input group for all ports before input is enabled */
num_interfaces = cvmx_helper_get_number_of_interfaces();
for (interface = 0; interface < num_interfaces; interface++) {