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

Commit 02a7fa00 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: move IO functions out of line 



This generates a massive reduction in module size:
with debug:
   text	   data	    bss	    dec	    hex	filename
 670300	  13136	    420	 683856	  a6f50	iwlagn.ko (before)
 388347	  13136	    408	 401891	  621e3	iwlagn.ko (after)

without debug:
   text	   data	    bss	    dec	    hex	filename
 528575	  13072	    420	 542067	  84573	iwlagn.ko (before)
 294192	  13072	    408	 307672	  4b1d8	iwlagn.ko (after)

This also removes all the IO debug functionality since
it can easily be replaced by tracing, and makes the
code unnecessarily complex.

I haven't done any CPU utilisation measurements, but
given that the hotpaths don't use much IO it is not
likely to have a negative impact; in fact, the size
reduction will reduce cache pressure which possibly
improves performance.

Finally, an unused function or two were removed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 519d8abd

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o

iwlagn-objs		+= iwl-agn-ucode.o iwl-agn-tx.o

iwlagn-objs		+= iwl-agn-lib.o iwl-agn-calib.o

iwlagn-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o

iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o



iwlagn-objs 		+= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv) 
				CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM,

				EEPROM_SEM_TIMEOUT);

		if (ret >= 0) {

			IWL_DEBUG_IO(priv,

			IWL_DEBUG_EEPROM(priv,

				"Acquired semaphore after %d tries.\n",

				count+1);

			return ret;

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

+2 −4
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, 
		 * if IWL_DL_IO is set */

		iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,

			i + IWLAGN_RTC_INST_LOWER_BOUND);

		val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		val = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		if (val != le32_to_cpu(*image))

			return -EIO;

	}
@@ -587,9 +587,7 @@ static void iwl_print_mismatch_inst(struct iwl_priv *priv, 
	     offs < len && errors < 20;

	     offs += sizeof(u32), image++) {

		/* read data comes through single port, auto-incr addr */

		/* NOTE: Use the debugless read so we don't flood kernel log

		 * if IWL_DL_IO is set */

		val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		val = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		if (val != le32_to_cpu(*image)) {

			IWL_ERR(priv, "uCode INST section at "

				"offset 0x%x, is 0x%x, s/b 0x%x\n",

drivers/net/wireless/iwlwifi/iwl-agn.c

+9 −9
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base, 
	}



	/* Set starting address; reads will auto-increment */

	_iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, ptr);

	iwl_write32(priv, HBUS_TARG_MEM_RADDR, ptr);

	rmb();



	/*
@@ -566,13 +566,13 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base, 
	 * place event id # at far right for easier visual parsing.

	 */

	for (i = 0; i < num_events; i++) {

		ev = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		time = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		ev = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		time = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		if (mode == 0) {

			trace_iwlwifi_dev_ucode_cont_event(priv,

							0, time, ev);

		} else {

			data = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

			data = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

			trace_iwlwifi_dev_ucode_cont_event(priv,

						time, data, ev);

		}
@@ -1963,14 +1963,14 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 
	iwl_grab_nic_access(priv);



	/* Set starting address; reads will auto-increment */

	_iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, ptr);

	iwl_write32(priv, HBUS_TARG_MEM_RADDR, ptr);

	rmb();



	/* "time" is actually "data" for mode 0 (no timestamp).

	* place event id # at far right for easier visual parsing. */

	for (i = 0; i < num_events; i++) {

		ev = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		time = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

		ev = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		time = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

		if (mode == 0) {

			/* data, ev */

			if (bufsz) {
@@ -1984,7 +1984,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx, 
					time, ev);

			}

		} else {

			data = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);

			data = iwl_read32(priv, HBUS_TARG_MEM_RDAT);

			if (bufsz) {

				pos += scnprintf(*buf + pos, bufsz - pos,

						"EVT_LOGT:%010u:0x%08x:%04u\n",
@@ -3689,7 +3689,7 @@ static u32 iwl_hw_detect(struct iwl_priv *priv) 


	pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id);

	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);

	return _iwl_read32(priv, CSR_HW_REV);

	return iwl_read32(priv, CSR_HW_REV);

}



static int iwl_set_hw_params(struct iwl_priv *priv)

drivers/net/wireless/iwlwifi/iwl-debug.h

+0 −2
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) 
#define IWL_DL_RX		(1 << 24)

#define IWL_DL_ISR		(1 << 25)

#define IWL_DL_HT		(1 << 26)

#define IWL_DL_IO		(1 << 27)

/* 0xF0000000 - 0x10000000 */

#define IWL_DL_11H		(1 << 28)

#define IWL_DL_STATS		(1 << 29)
@@ -174,7 +173,6 @@ static inline void iwl_dbgfs_unregister(struct iwl_priv *priv) 
		IWL_DEBUG_LIMIT(p, IWL_DL_DROP, f, ## a)

#define IWL_DEBUG_AP(p, f, a...)	IWL_DEBUG(p, IWL_DL_AP, f, ## a)

#define IWL_DEBUG_TXPOWER(p, f, a...)	IWL_DEBUG(p, IWL_DL_TXPOWER, f, ## a)

#define IWL_DEBUG_IO(p, f, a...)	IWL_DEBUG(p, IWL_DL_IO, f, ## a)

#define IWL_DEBUG_RATE(p, f, a...)	IWL_DEBUG(p, IWL_DL_RATE, f, ## a)

#define IWL_DEBUG_RATE_LIMIT(p, f, a...)	\

		IWL_DEBUG_LIMIT(p, IWL_DL_RATE, f, ## a)