Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7652918c authored Nov 29, 2011 by Geoff Levand Committed by Benjamin Herrenschmidt Dec 08, 2011

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>

parent 32b9074b

arch/powerpc/include/asm/lv1call.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -294,9 +294,9 @@ LV1_CALL(unmap_device_dma_region, 4, 0, 177 )
		LV1_CALL(net_add_multicast_address, 4, 0, 185 )
		LV1_CALL(net_remove_multicast_address, 4, 0, 186 )
		LV1_CALL(net_start_tx_dma, 4, 0, 187 )
		LV1_CALL(net_stop_tx_dma, 3, 0, 188 )
		LV1_CALL(net_stop_tx_dma, 2, 0, 188 )
		LV1_CALL(net_start_rx_dma, 4, 0, 189 )
		LV1_CALL(net_stop_rx_dma, 3, 0, 190 )
		LV1_CALL(net_stop_rx_dma, 2, 0, 190 )
		LV1_CALL(net_set_interrupt_status_indicator, 4, 0, 191 )
		LV1_CALL(net_set_interrupt_mask, 4, 0, 193 )
		LV1_CALL(net_control, 6, 2, 194 )

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -640,7 +640,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
		int status;

		/* this hvc blocks until the DMA in progress really stopped */
		status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0);
		status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card));
		if (status)
		dev_err(ctodev(card),
		"lv1_net_stop_rx_dma failed, %d\n", status);
		@@ -658,7 +658,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card)
		int status;

		/* this hvc blocks until the DMA in progress really stopped */
		status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0);
		status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card));
		if (status)
		dev_err(ctodev(card),
		"lv1_net_stop_tx_dma failed, status=%d\n", status);