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

Commit c47a601d authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: et131x: quick tidy of the debug code 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e5cf1b75

drivers/staging/et131x/et131x_debug.c

+38 −47
Original line number Diff line number Diff line 
/*

 * Agere Systems Inc.

 * 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs

 *
@@ -108,22 +107,22 @@ extern dbg_info_t *et131x_dbginfo; 
 * DumpTxQueueContents - Dump out the tx queue and the shadow pointers

 * @etdev: pointer to our adapter structure

 */

void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev)

void DumpTxQueueContents(int debug, struct et131x_adapter *etdev)

{

	MMC_t __iomem *mmc = &etdev->regs->mmc;

	uint32_t TxQueueAddr;

	u32 txq_addr;



	if (DBG_FLAGS(et131x_dbginfo) & dbgLvl) {

		for (TxQueueAddr = 0x200; TxQueueAddr < 0x3ff; TxQueueAddr++) {

	if (DBG_FLAGS(et131x_dbginfo) & debug) {

		for (txq_addr = 0x200; txq_addr < 0x3ff; txq_addr++) {

			u32 sram_access = readl(&mmc->sram_access);

			sram_access &= 0xFFFF;

			sram_access |= (TxQueueAddr << 16) | ET_SRAM_REQ_ACCESS;

			sram_access |= (txq_addr << 16) | ET_SRAM_REQ_ACCESS;

			writel(sram_access, &mmc->sram_access);



			DBG_PRINT("Addr 0x%x, Access 0x%08x\t"

				  "Value 1 0x%08x, Value 2 0x%08x, "

				  "Value 3 0x%08x, Value 4 0x%08x, \n",

				  TxQueueAddr,

				  txq_addr,

				  readl(&mmc->sram_access),

				  readl(&mmc->sram_word1),

				  readl(&mmc->sram_word2),
@@ -136,6 +135,12 @@ void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev) 
	}

}



static const char *BlockNames[NUM_BLOCKS] = {

	"Global", "Tx DMA", "Rx DMA", "Tx MAC",

	"Rx MAC", "MAC", "MAC Stat", "MMC"

};





/**

 * DumpDeviceBlock

 * @etdev: pointer to our adapter
@@ -144,30 +149,23 @@ void DumpTxQueueContents(int dbgLvl, struct et131x_adapter *etdev) 
 * mapped to a new page, each page is 4096 bytes).

 */

#define NUM_BLOCKS 8

void DumpDeviceBlock(int dbgLvl, struct et131x_adapter *etdev,

		     uint32_t Block)

void DumpDeviceBlock(int debug, struct et131x_adapter *etdev,

		     u32 block)

{

	uint32_t Address1, Address2;

	uint32_t __iomem *BigDevicePointer =

		(uint32_t __iomem *) etdev->regs;

	const char *BlockNames[NUM_BLOCKS] = {

		"Global", "Tx DMA", "Rx DMA", "Tx MAC",

		"Rx MAC", "MAC", "MAC Stat", "MMC"

	};

	u32 addr1, addr2;

	u32 __iomem *regs = (u32 __iomem *) etdev->regs;



	/* Output the debug counters to the debug terminal */

	if (DBG_FLAGS(et131x_dbginfo) & dbgLvl) {

		DBG_PRINT("%s block\n", BlockNames[Block]);

		BigDevicePointer += Block * 1024;

		for (Address1 = 0; Address1 < 8; Address1++) {

			for (Address2 = 0; Address2 < 8; Address2++) {

				if (Block == 0 &&

				    (Address1 * 8 + Address2) == 6) {

	if (DBG_FLAGS(et131x_dbginfo) & debug) {

		DBG_PRINT("%s block\n", BlockNames[block]);

		regs += block * 1024;

		for (addr1 = 0; addr1 < 8; addr1++) {

			for (addr2 = 0; addr2 < 8; addr2++) {

				if (block == 0 &&

				    (addr1 * 8 + addr2) == 6)

					DBG_PRINT("  ISR    , ");

				} else {

					DBG_PRINT("0x%08x, ",

						  readl(BigDevicePointer++));

				}

				else

					DBG_PRINT("0x%08x, ", readl(regs++));

			}

			DBG_PRINT("\n");

		}
@@ -182,29 +180,22 @@ void DumpDeviceBlock(int dbgLvl, struct et131x_adapter *etdev, 
 * Dumps the first 64 regs of each block of the et-1310 (each block is

 * mapped to a new page, each page is 4096 bytes).

 */

void DumpDeviceReg(int dbgLvl, struct et131x_adapter *etdev)

void DumpDeviceReg(int debug, struct et131x_adapter *etdev)

{

	uint32_t Address1, Address2;

	uint32_t Block;

	uint32_t __iomem *BigDevicePointer =

		(uint32_t __iomem *) etdev->regs;

	uint32_t __iomem *Pointer;

	const char *BlockNames[NUM_BLOCKS] = {

		"Global", "Tx DMA", "Rx DMA", "Tx MAC",

		"Rx MAC", "MAC", "MAC Stat", "MMC"

	};

	u32 addr1, addr2;

	u32 block;

	u32 __iomem *regs = (u32 __iomem *)etdev->regs;

	u32 __iomem *p;



	/* Output the debug counters to the debug terminal */

	if (DBG_FLAGS(et131x_dbginfo) & dbgLvl) {

		for (Block = 0; Block < NUM_BLOCKS; Block++) {

			DBG_PRINT("%s block\n", BlockNames[Block]);

			Pointer = BigDevicePointer + (Block * 1024);



			for (Address1 = 0; Address1 < 8; Address1++) {

				for (Address2 = 0; Address2 < 8; Address2++) {

					DBG_PRINT("0x%08x, ",

						  readl(Pointer++));

				}

	if (DBG_FLAGS(et131x_dbginfo) & debug) {

		for (block = 0; block < NUM_BLOCKS; block++) {

			DBG_PRINT("%s block\n", BlockNames[block]);

			p = regs + block * 1024;



			for (addr1 = 0; addr1 < 8; addr1++) {

				for (addr2 = 0; addr2 < 8; addr2++)

					DBG_PRINT("0x%08x, ", readl(p++));

				DBG_PRINT("\n");

			}

			DBG_PRINT("\n");