hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

STAGING: Octeon: Properly enable/disable SSO WQE interrupts 

The Octeon models with SSO instead of POW need to use a different register
for configuring the WQE interrupt thresholds.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Janne Huttunen <janne.huttunen@nokia.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org
Patchwork: https://patchwork.linux-mips.org/patch/10964/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Aaro Koskinen 2015-08-13 16:21:39 +03:00 committed by Ralf Baechle
parent 70b4e2ed43
commit bcbb13964d
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/staging/octeon/ethernet-rx.c
View File

@ -195,12 +195,19 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
prefetch(work); prefetch(work);
did_work_request = 0; did_work_request = 0;
if (work == NULL) { if (work == NULL) {
union cvmx_pow_wq_int wq_int; if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {
cvmx_write_csr(CVMX_SSO_WQ_IQ_DIS,
1ull << pow_receive_group);
cvmx_write_csr(CVMX_SSO_WQ_INT,
1ull << pow_receive_group);
} else {
union cvmx_pow_wq_int wq_int;
wq_int.u64 = 0; wq_int.u64 = 0;
wq_int.s.iq_dis = 1 << pow_receive_group; wq_int.s.iq_dis = 1 << pow_receive_group;
wq_int.s.wq_int = 1 << pow_receive_group; wq_int.s.wq_int = 1 << pow_receive_group;
cvmx_write_csr(CVMX_POW_WQ_INT, wq_int.u64); cvmx_write_csr(CVMX_POW_WQ_INT, wq_int.u64);
}
break; break;
} }
pskb = (struct sk_buff **)(cvm_oct_get_buffer_ptr(work->packet_ptr) - pskb = (struct sk_buff **)(cvm_oct_get_buffer_ptr(work->packet_ptr) -
@ -422,8 +429,6 @@ void cvm_oct_rx_initialize(void)
{ {
int i; int i;
struct net_device *dev_for_napi = NULL; struct net_device *dev_for_napi = NULL;
union cvmx_pow_wq_int_thrx int_thr;
union cvmx_pow_wq_int_pc int_pc;
for (i = 0; i < TOTAL_NUMBER_OF_PORTS; i++) { for (i = 0; i < TOTAL_NUMBER_OF_PORTS; i++) {
if (cvm_oct_device[i]) { if (cvm_oct_device[i]) {
@ -449,15 +454,34 @@ void cvm_oct_rx_initialize(void)
disable_irq_nosync(OCTEON_IRQ_WORKQ0 + pow_receive_group); disable_irq_nosync(OCTEON_IRQ_WORKQ0 + pow_receive_group);
int_thr.u64 = 0;
int_thr.s.tc_en = 1;
int_thr.s.tc_thr = 1;
/* Enable POW interrupt when our port has at least one packet */ /* Enable POW interrupt when our port has at least one packet */
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), int_thr.u64); if (OCTEON_IS_MODEL(OCTEON_CN68XX)) {
union cvmx_sso_wq_int_thrx int_thr;
union cvmx_pow_wq_int_pc int_pc;
int_pc.u64 = 0; int_thr.u64 = 0;
int_pc.s.pc_thr = 5; int_thr.s.tc_en = 1;
cvmx_write_csr(CVMX_POW_WQ_INT_PC, int_pc.u64); int_thr.s.tc_thr = 1;
cvmx_write_csr(CVMX_SSO_WQ_INT_THRX(pow_receive_group),
int_thr.u64);
int_pc.u64 = 0;
int_pc.s.pc_thr = 5;
cvmx_write_csr(CVMX_SSO_WQ_INT_PC, int_pc.u64);
} else {
union cvmx_pow_wq_int_thrx int_thr;
union cvmx_pow_wq_int_pc int_pc;
int_thr.u64 = 0;
int_thr.s.tc_en = 1;
int_thr.s.tc_thr = 1;
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group),
int_thr.u64);
int_pc.u64 = 0;
int_pc.s.pc_thr = 5;
cvmx_write_csr(CVMX_POW_WQ_INT_PC, int_pc.u64);
}
/* Schedule NAPI now. This will indirectly enable the interrupt. */ /* Schedule NAPI now. This will indirectly enable the interrupt. */
napi_schedule(&cvm_oct_napi); napi_schedule(&cvm_oct_napi);

5
drivers/staging/octeon/ethernet.c
View File

@ -859,7 +859,10 @@ static int cvm_oct_remove(struct platform_device *pdev)
int port; int port;
/* Disable POW interrupt */ /* Disable POW interrupt */
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0); if (OCTEON_IS_MODEL(OCTEON_CN68XX))
cvmx_write_csr(CVMX_SSO_WQ_INT_THRX(pow_receive_group), 0);
else
cvmx_write_csr(CVMX_POW_WQ_INT_THRX(pow_receive_group), 0);
cvmx_ipd_disable(); cvmx_ipd_disable();