Commit f36fa558 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ps3_gelic_net-fixes' 



Geoff Levand says:

====================
net/ps3_gelic_net: DMA related fixes

v9: Make rx_skb_size local to gelic_descr_prepare_rx.
v8: Add more cpu_to_be32 calls.
v7: Remove all cleanups, sync to spider net.
v6: Reworked and cleaned up patches.
v5: Some additional patch cleanups.
v4: More patch cleanups.
v3: Cleaned up patches as requested.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d722c98 bebe933d

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+22 −19
Original line number Diff line number Diff line
@@ -317,15 +317,17 @@ static int gelic_card_init_chain(struct gelic_card *card, 


	/* set up the hardware pointers in each descriptor */

	for (i = 0; i < no; i++, descr++) {

		dma_addr_t cpu_addr;



		gelic_descr_set_status(descr, GELIC_DESCR_DMA_NOT_IN_USE);

		descr->bus_addr =

			dma_map_single(ctodev(card), descr,

				       GELIC_DESCR_SIZE,

				       DMA_BIDIRECTIONAL);



		if (!descr->bus_addr)

		cpu_addr = dma_map_single(ctodev(card), descr,

					  GELIC_DESCR_SIZE, DMA_BIDIRECTIONAL);



		if (dma_mapping_error(ctodev(card), cpu_addr))

			goto iommu_error;



		descr->bus_addr = cpu_to_be32(cpu_addr);

		descr->next = descr + 1;

		descr->prev = descr - 1;

	}
@@ -365,26 +367,28 @@ static int gelic_card_init_chain(struct gelic_card *card, 
 *

 * allocates a new rx skb, iommu-maps it and attaches it to the descriptor.

 * Activate the descriptor state-wise

 *

 * Gelic RX sk_buffs must be aligned to GELIC_NET_RXBUF_ALIGN and the length

 * must be a multiple of GELIC_NET_RXBUF_ALIGN.

 */

static int gelic_descr_prepare_rx(struct gelic_card *card,

				  struct gelic_descr *descr)

{

	static const unsigned int rx_skb_size =

		ALIGN(GELIC_NET_MAX_FRAME, GELIC_NET_RXBUF_ALIGN) +

		GELIC_NET_RXBUF_ALIGN - 1;

	dma_addr_t cpu_addr;

	int offset;

	unsigned int bufsize;



	if (gelic_descr_get_status(descr) !=  GELIC_DESCR_DMA_NOT_IN_USE)

		dev_info(ctodev(card), "%s: ERROR status\n", __func__);

	/* we need to round up the buffer size to a multiple of 128 */

	bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN);



	/* and we need to have it 128 byte aligned, therefore we allocate a

	 * bit more */

	descr->skb = dev_alloc_skb(bufsize + GELIC_NET_RXBUF_ALIGN - 1);

	descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size);

	if (!descr->skb) {

		descr->buf_addr = 0; /* tell DMAC don't touch memory */

		return -ENOMEM;

	}

	descr->buf_size = cpu_to_be32(bufsize);

	descr->buf_size = cpu_to_be32(rx_skb_size);

	descr->dmac_cmd_status = 0;

	descr->result_size = 0;

	descr->valid_size = 0;
@@ -395,11 +399,10 @@ static int gelic_descr_prepare_rx(struct gelic_card *card, 
	if (offset)

		skb_reserve(descr->skb, GELIC_NET_RXBUF_ALIGN - offset);

	/* io-mmu-map the skb */

	descr->buf_addr = cpu_to_be32(dma_map_single(ctodev(card),

						     descr->skb->data,

						     GELIC_NET_MAX_MTU,

						     DMA_FROM_DEVICE));

	if (!descr->buf_addr) {

	cpu_addr = dma_map_single(ctodev(card), descr->skb->data,

				  GELIC_NET_MAX_FRAME, DMA_FROM_DEVICE);

	descr->buf_addr = cpu_to_be32(cpu_addr);

	if (dma_mapping_error(ctodev(card), cpu_addr)) {

		dev_kfree_skb_any(descr->skb);

		descr->skb = NULL;

		dev_info(ctodev(card),
@@ -779,7 +782,7 @@ static int gelic_descr_prepare_tx(struct gelic_card *card, 


	buf = dma_map_single(ctodev(card), skb->data, skb->len, DMA_TO_DEVICE);



	if (!buf) {

	if (dma_mapping_error(ctodev(card), buf)) {

		dev_err(ctodev(card),

			"dma map 2 failed (%p, %i). Dropping packet\n",

			skb->data, skb->len);
@@ -915,7 +918,7 @@ static void gelic_net_pass_skb_up(struct gelic_descr *descr, 
	data_error = be32_to_cpu(descr->data_error);

	/* unmap skb buffer */

	dma_unmap_single(ctodev(card), be32_to_cpu(descr->buf_addr),

			 GELIC_NET_MAX_MTU,

			 GELIC_NET_MAX_FRAME,

			 DMA_FROM_DEVICE);



	skb_put(skb, be32_to_cpu(descr->valid_size)?

drivers/net/ethernet/toshiba/ps3_gelic_net.h

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
#define GELIC_NET_RX_DESCRIPTORS        128 /* num of descriptors */

#define GELIC_NET_TX_DESCRIPTORS        128 /* num of descriptors */



#define GELIC_NET_MAX_MTU               VLAN_ETH_FRAME_LEN

#define GELIC_NET_MIN_MTU               VLAN_ETH_ZLEN

#define GELIC_NET_MAX_FRAME             2312

#define GELIC_NET_MAX_MTU               2294

#define GELIC_NET_MIN_MTU               64

#define GELIC_NET_RXBUF_ALIGN           128

#define GELIC_CARD_RX_CSUM_DEFAULT      1 /* hw chksum */

#define GELIC_NET_WATCHDOG_TIMEOUT      5*HZ