---

yaml
---
r: 327694
b: refs/heads/master
c: 7668ff9
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85c21049fc588e0a51b443fe2bad348d18f4992c
+refs/heads/master: 7668ff9c2ad7d354655e23afa836a92d54d2ea63

trunk/drivers/bcma/Kconfig

@@ -48,12 +48,12 @@ config BCMA_DRIVER_MIPS
 
 config BCMA_SFLASH
 	bool
-	depends on BCMA_DRIVER_MIPS
+	depends on BCMA_DRIVER_MIPS && BROKEN
 	default y
 
 config BCMA_NFLASH
 	bool
-	depends on BCMA_DRIVER_MIPS
+	depends on BCMA_DRIVER_MIPS && BROKEN
 	default y
 
 config BCMA_DRIVER_GMAC_CMN

trunk/drivers/bcma/bcma_private.h

@@ -54,7 +54,6 @@ u32 bcma_pmu_get_clockcpu(struct bcma_drv_cc *cc);
 #ifdef CONFIG_BCMA_SFLASH
 /* driver_chipcommon_sflash.c */
 int bcma_sflash_init(struct bcma_drv_cc *cc);
-extern struct platform_device bcma_sflash_dev;
 #else
 static inline int bcma_sflash_init(struct bcma_drv_cc *cc)
 {
@@ -66,7 +65,6 @@ static inline int bcma_sflash_init(struct bcma_drv_cc *cc)
 #ifdef CONFIG_BCMA_NFLASH
 /* driver_chipcommon_nflash.c */
 int bcma_nflash_init(struct bcma_drv_cc *cc);
-extern struct platform_device bcma_nflash_dev;
 #else
 static inline int bcma_nflash_init(struct bcma_drv_cc *cc)
 {

trunk/drivers/bcma/driver_chipcommon_nflash.c

@@ -5,37 +5,15 @@
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 
-#include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
+#include <linux/bcma/bcma_driver_chipcommon.h>
+#include <linux/delay.h>
 
 #include "bcma_private.h"
 
-struct platform_device bcma_nflash_dev = {
-	.name		= "bcma_nflash",
-	.num_resources	= 0,
-};
-
 /* Initialize NAND flash access */
 int bcma_nflash_init(struct bcma_drv_cc *cc)
 {
-	struct bcma_bus *bus = cc->core->bus;
-
-	if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4706 &&
-	    cc->core->id.rev != 0x38) {
-		bcma_err(bus, "NAND flash on unsupported board!\n");
-		return -ENOTSUPP;
-	}
-
-	if (!(cc->capabilities & BCMA_CC_CAP_NFLASH)) {
-		bcma_err(bus, "NAND flash not present according to ChipCommon\n");
-		return -ENODEV;
-	}
-
-	cc->nflash.present = true;
-
-	/* Prepare platform device, but don't register it yet. It's too early,
-	 * malloc (required by device_private_init) is not available yet. */
-	bcma_nflash_dev.dev.platform_data = &cc->nflash;
-
+	bcma_err(cc->core->bus, "NAND flash support is broken\n");
 	return 0;
 }

trunk/drivers/bcma/driver_chipcommon_sflash.c

@@ -5,132 +5,15 @@
  * Licensed under the GNU/GPL. See COPYING for details.
  */
 
-#include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
+#include <linux/bcma/bcma_driver_chipcommon.h>
+#include <linux/delay.h>
 
 #include "bcma_private.h"
 
-static struct resource bcma_sflash_resource = {
-	.name	= "bcma_sflash",
-	.start	= BCMA_SFLASH,
-	.end	= 0,
-	.flags  = IORESOURCE_MEM | IORESOURCE_READONLY,
-};
-
-struct platform_device bcma_sflash_dev = {
-	.name		= "bcma_sflash",
-	.resource	= &bcma_sflash_resource,
-	.num_resources	= 1,
-};
-
-struct bcma_sflash_tbl_e {
-	char *name;
-	u32 id;
-	u32 blocksize;
-	u16 numblocks;
-};
-
-static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = {
-	{ "", 0x14, 0x10000, 32, },
-	{ 0 },
-};
-
-static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
-	{ 0 },
-};
-
-static struct bcma_sflash_tbl_e bcma_sflash_at_tbl[] = {
-	{ 0 },
-};
-
-static void bcma_sflash_cmd(struct bcma_drv_cc *cc, u32 opcode)
-{
-	int i;
-	bcma_cc_write32(cc, BCMA_CC_FLASHCTL,
-			BCMA_CC_FLASHCTL_START | opcode);
-	for (i = 0; i < 1000; i++) {
-		if (!(bcma_cc_read32(cc, BCMA_CC_FLASHCTL) &
-		      BCMA_CC_FLASHCTL_BUSY))
-			return;
-		cpu_relax();
-	}
-	bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
-}
-
 /* Initialize serial flash access */
 int bcma_sflash_init(struct bcma_drv_cc *cc)
 {
-	struct bcma_bus *bus = cc->core->bus;
-	struct bcma_sflash *sflash = &cc->sflash;
-	struct bcma_sflash_tbl_e *e;
-	u32 id, id2;
-
-	switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
-	case BCMA_CC_FLASHT_STSER:
-		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_DP);
-
-		bcma_cc_write32(cc, BCMA_CC_FLASHADDR, 0);
-		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_RES);
-		id = bcma_cc_read32(cc, BCMA_CC_FLASHDATA);
-
-		bcma_cc_write32(cc, BCMA_CC_FLASHADDR, 1);
-		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_ST_RES);
-		id2 = bcma_cc_read32(cc, BCMA_CC_FLASHDATA);
-
-		switch (id) {
-		case 0xbf:
-			for (e = bcma_sflash_sst_tbl; e->name; e++) {
-				if (e->id == id2)
-					break;
-			}
-			break;
-		default:
-			for (e = bcma_sflash_st_tbl; e->name; e++) {
-				if (e->id == id)
-					break;
-			}
-			break;
-		}
-		if (!e->name) {
-			bcma_err(bus, "Unsupported ST serial flash (id: 0x%X, id2: 0x%X)\n", id, id2);
-			return -ENOTSUPP;
-		}
-
-		break;
-	case BCMA_CC_FLASHT_ATSER:
-		bcma_sflash_cmd(cc, BCMA_CC_FLASHCTL_AT_STATUS);
-		id = bcma_cc_read32(cc, BCMA_CC_FLASHDATA) & 0x3c;
-
-		for (e = bcma_sflash_at_tbl; e->name; e++) {
-			if (e->id == id)
-				break;
-		}
-		if (!e->name) {
-			bcma_err(bus, "Unsupported Atmel serial flash (id: 0x%X)\n", id);
-			return -ENOTSUPP;
-		}
-
-		break;
-	default:
-		bcma_err(bus, "Unsupported flash type\n");
-		return -ENOTSUPP;
-	}
-
-	sflash->window = BCMA_SFLASH;
-	sflash->blocksize = e->blocksize;
-	sflash->numblocks = e->numblocks;
-	sflash->size = sflash->blocksize * sflash->numblocks;
-	sflash->present = true;
-
-	bcma_info(bus, "Found %s serial flash (size: %dKiB, blocksize: 0x%X, blocks: %d)\n",
-		  e->name, sflash->size / 1024, sflash->blocksize,
-		  sflash->numblocks);
-
-	/* Prepare platform device, but don't register it yet. It's too early,
-	 * malloc (required by device_private_init) is not available yet. */
-	bcma_sflash_dev.resource[0].end = bcma_sflash_dev.resource[0].start +
-					  sflash->size;
-	bcma_sflash_dev.dev.platform_data = sflash;
-
+	bcma_err(cc->core->bus, "Serial flash support is broken\n");
 	return 0;
 }

trunk/drivers/bcma/main.c

@@ -7,7 +7,6 @@
 
 #include "bcma_private.h"
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/bcma/bcma.h>
 #include <linux/slab.h>
 
@@ -137,22 +136,6 @@ static int bcma_register_cores(struct bcma_bus *bus)
 		dev_id++;
 	}
 
-#ifdef CONFIG_BCMA_SFLASH
-	if (bus->drv_cc.sflash.present) {
-		err = platform_device_register(&bcma_sflash_dev);
-		if (err)
-			bcma_err(bus, "Error registering serial flash\n");
-	}
-#endif
-
-#ifdef CONFIG_BCMA_NFLASH
-	if (bus->drv_cc.nflash.present) {
-		err = platform_device_register(&bcma_nflash_dev);
-		if (err)
-			bcma_err(bus, "Error registering NAND flash\n");
-	}
-#endif
-
 	return 0;
 }
 

trunk/drivers/net/ethernet/sfc/net_driver.h

@@ -91,29 +91,30 @@ struct efx_special_buffer {
 };
 
 /**
- * struct efx_tx_buffer - An Efx TX buffer
- * @skb: The associated socket buffer.
- *	Set only on the final fragment of a packet; %NULL for all other
- *	fragments.  When this fragment completes, then we can free this
- *	skb.
- * @tsoh: The associated TSO header structure, or %NULL if this
- *	buffer is not a TSO header.
+ * struct efx_tx_buffer - buffer state for a TX descriptor
+ * @skb: When @flags & %EFX_TX_BUF_SKB, the associated socket buffer to be
+ *	freed when descriptor completes
+ * @tsoh: When @flags & %EFX_TX_BUF_TSOH, the associated TSO header structure.
  * @dma_addr: DMA address of the fragment.
+ * @flags: Flags for allocation and DMA mapping type
  * @len: Length of this fragment.
  *	This field is zero when the queue slot is empty.
- * @continuation: True if this fragment is not the end of a packet.
- * @unmap_single: True if dma_unmap_single should be used.
  * @unmap_len: Length of this fragment to unmap
  */
 struct efx_tx_buffer {
-	const struct sk_buff *skb;
-	struct efx_tso_header *tsoh;
+	union {
+		const struct sk_buff *skb;
+		struct efx_tso_header *tsoh;
+	};
 	dma_addr_t dma_addr;
+	unsigned short flags;
 	unsigned short len;
-	bool continuation;
-	bool unmap_single;
 	unsigned short unmap_len;
 };
+#define EFX_TX_BUF_CONT		1	/* not last descriptor of packet */
+#define EFX_TX_BUF_SKB		2	/* buffer is last part of skb */
+#define EFX_TX_BUF_TSOH		4	/* buffer is TSO header */
+#define EFX_TX_BUF_MAP_SINGLE	8	/* buffer was mapped with dma_map_single() */
 
 /**
  * struct efx_tx_queue - An Efx TX queue

trunk/drivers/net/ethernet/sfc/nic.c

@@ -401,8 +401,10 @@ void efx_nic_push_buffers(struct efx_tx_queue *tx_queue)
 		++tx_queue->write_count;
 
 		/* Create TX descriptor ring entry */
+		BUILD_BUG_ON(EFX_TX_BUF_CONT != 1);
 		EFX_POPULATE_QWORD_4(*txd,
-				     FSF_AZ_TX_KER_CONT, buffer->continuation,
+				     FSF_AZ_TX_KER_CONT,
+				     buffer->flags & EFX_TX_BUF_CONT,
 				     FSF_AZ_TX_KER_BYTE_COUNT, buffer->len,
 				     FSF_AZ_TX_KER_BUF_REGION, 0,
 				     FSF_AZ_TX_KER_BUF_ADDR, buffer->dma_addr);