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

Commit ae6130fc authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

iwlwifi: move device_pointers from iwl_priv to iwl_shared 



Move the low level ucode device_pointers structure to iwl_shared.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent ab36eab2

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

+1 −1
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ int iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, 
				pkt->hdr.cmd);

			w->triggered = true;

			if (w->fn)

				w->fn(priv, pkt, w->fn_data);

				w->fn(trans(priv), pkt, w->fn_data);

		}

		spin_unlock(&priv->shrd->notif_wait_lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv) 
	u32 num_wraps;  /* # times uCode wrapped to top of log */

	u32 next_entry; /* index of next entry to be written by uCode */



	base = priv->device_pointers.error_event_table;

	base = priv->shrd->device_pointers.error_event_table;

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		capacity = iwl_read_targ_mem(bus(priv), base);

		num_wraps = iwl_read_targ_mem(bus(priv),

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

+0 −5
Original line number Diff line number Diff line
@@ -865,11 +865,6 @@ struct iwl_priv { 


	__le16 switch_channel;



	struct {

		u32 error_event_table;

		u32 log_event_table;

	} device_pointers;



	u16 active_rate;



	u8 start_calib;

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

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) 
	iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,

			  CSR_UCODE_DRV_GP1_BIT_D3_CFG_COMPLETE);



	base = priv->device_pointers.error_event_table;

	base = priv->shrd->device_pointers.error_event_table;

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		spin_lock_irqsave(&bus(priv)->reg_lock, flags);

		ret = iwl_grab_nic_access_silent(bus(priv));

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

+10 −2
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
struct iwl_cfg;

struct iwl_bus;

struct iwl_priv;

struct iwl_trans;

struct iwl_sensitivity_ranges;

struct iwl_trans_ops;
@@ -294,7 +295,7 @@ enum iwl_ucode_type { 
struct iwl_notification_wait {

	struct list_head list;



	void (*fn)(struct iwl_priv *priv, struct iwl_rx_packet *pkt,

	void (*fn)(struct iwl_trans *trans, struct iwl_rx_packet *pkt,

		   void *data);

	void *fn_data;
@@ -323,6 +324,7 @@ struct iwl_notification_wait { 
 * @notif_waits: things waiting for notification

 * @notif_wait_lock: lock protecting notification

 * @notif_waitq: head of notification wait queue

 * @device_pointers: pointers to ucode event tables

 */

struct iwl_shared {

#ifdef CONFIG_IWLWIFI_DEBUG
@@ -361,6 +363,12 @@ struct iwl_shared { 
	struct list_head notif_waits;

	spinlock_t notif_wait_lock;

	wait_queue_head_t notif_waitq;



	struct {

		u32 error_event_table;

		u32 log_event_table;

	} device_pointers;



};



/*Whatever _m is (iwl_trans, iwl_priv, iwl_bus, these macros will work */
@@ -510,7 +518,7 @@ void __acquires(wait_entry) 
iwl_init_notification_wait(struct iwl_shared *shrd,

			      struct iwl_notification_wait *wait_entry,

			      u8 cmd,

			      void (*fn)(struct iwl_priv *priv,

			      void (*fn)(struct iwl_trans *trans,

					 struct iwl_rx_packet *pkt,

					 void *data),

			      void *fn_data);