tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc/ps3: Fix hcall lv1_net_stop_rx_dma

The lv1_net_stop_tx_dma and net_stop_rx_dma hcalls take 2, not 3 input
arguments. Adjust the lv1 hcall table and all calls.

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Geoff Levand and committed by
Benjamin Herrenschmidt 7652918c 32b9074b

+4 -4
+2 -2
arch/powerpc/include/asm/lv1call.h
··· 294 294 LV1_CALL(net_add_multicast_address, 4, 0, 185 ) 295 295 LV1_CALL(net_remove_multicast_address, 4, 0, 186 ) 296 296 LV1_CALL(net_start_tx_dma, 4, 0, 187 ) 297 - LV1_CALL(net_stop_tx_dma, 3, 0, 188 ) 297 + LV1_CALL(net_stop_tx_dma, 2, 0, 188 ) 298 298 LV1_CALL(net_start_rx_dma, 4, 0, 189 ) 299 - LV1_CALL(net_stop_rx_dma, 3, 0, 190 ) 299 + LV1_CALL(net_stop_rx_dma, 2, 0, 190 ) 300 300 LV1_CALL(net_set_interrupt_status_indicator, 4, 0, 191 ) 301 301 LV1_CALL(net_set_interrupt_mask, 4, 0, 193 ) 302 302 LV1_CALL(net_control, 6, 2, 194 )
+2 -2
drivers/net/ethernet/toshiba/ps3_gelic_net.c
··· 640 640 int status; 641 641 642 642 /* this hvc blocks until the DMA in progress really stopped */ 643 - status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0); 643 + status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card)); 644 644 if (status) 645 645 dev_err(ctodev(card), 646 646 "lv1_net_stop_rx_dma failed, %d\n", status); ··· 658 658 int status; 659 659 660 660 /* this hvc blocks until the DMA in progress really stopped */ 661 - status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0); 661 + status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card)); 662 662 if (status) 663 663 dev_err(ctodev(card), 664 664 "lv1_net_stop_tx_dma failed, status=%d\n", status);