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

Commit 65e50381 authored by Dan Williams's avatar Dan Williams
Browse files

iop-adma: use iop_paranoia() for debug BUG_ONs 



Now that the critical read back to flush the next descriptor address is
fixed we can downgrade some BUG_ONs that need only be enabled when testing
changes to the driver.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 137cb55c

arch/arm/include/asm/hardware/iop3xx-adma.h

+3 −2
Original line number Diff line number Diff line
@@ -730,7 +730,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc, 
{

	/* hw_desc->next_desc is the same location for all channels */

	union iop3xx_desc hw_desc = { .ptr = desc->hw_desc, };

	BUG_ON(hw_desc.dma->next_desc);



	iop_paranoia(hw_desc.dma->next_desc);

	hw_desc.dma->next_desc = next_desc_addr;

}
@@ -760,7 +761,7 @@ static inline int iop_desc_get_zero_result(struct iop_adma_desc_slot *desc) 
	struct iop3xx_desc_aau *hw_desc = desc->hw_desc;

	struct iop3xx_aau_desc_ctrl desc_ctrl = hw_desc->desc_ctrl_field;



	BUG_ON(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));

	iop_paranoia(!(desc_ctrl.tx_complete && desc_ctrl.zero_result_en));

	return desc_ctrl.zero_result_err;

}

arch/arm/include/asm/hardware/iop_adma.h

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ 


#define IOP_ADMA_SLOT_SIZE 32

#define IOP_ADMA_THRESHOLD 4

#ifdef DEBUG

#define IOP_PARANOIA 1

#else

#define IOP_PARANOIA 0

#endif

#define iop_paranoia(x) BUG_ON(IOP_PARANOIA && (x))



/**

 * struct iop_adma_device - internal representation of an ADMA device

arch/arm/mach-iop13xx/include/mach/adma.h

+2 −1
Original line number Diff line number Diff line
@@ -404,7 +404,8 @@ static inline void iop_desc_set_next_desc(struct iop_adma_desc_slot *desc, 
					u32 next_desc_addr)

{

	struct iop13xx_adma_desc_hw *hw_desc = desc->hw_desc;

	BUG_ON(hw_desc->next_desc);



	iop_paranoia(hw_desc->next_desc);

	hw_desc->next_desc = next_desc_addr;

}

drivers/dma/iop-adma.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ iop_adma_tx_submit(struct dma_async_tx_descriptor *tx) 
	BUG_ON(iop_desc_get_next_desc(old_chain_tail) != next_dma); /* flush */



	/* check for pre-chained descriptors */

	BUG_ON(iop_desc_get_next_desc(sw_desc));

	iop_paranoia(iop_desc_get_next_desc(sw_desc));



	/* increment the pending count by the number of slots

	 * memcpy operations have a 1:1 (slot:operation) relation