This patch addresses a kernel bugzilla report and two recent mail threads. The kernel bugzilla report is https://bugzilla.kernel.org/show_bug.cgi?id=42632, which reports a udev timeout on boot. The first mail thread, which was on LKML (http://lkml.indiana.edu/hypermail/ linux/kernel/1112.3/00965.html) was for a WARNING that occurs after a suspend/resume cycle for rtl8192cu. The scond mail thread (http://marc.info/?l=linux-wireless&m=132655490826766&w=2) concerned changes in udev that break drivers that delay while firmware is loaded on modprobe. This patch converts all rtlwifi-based drivers to use the asynchronous firmware loading mechanism. Drivers rtl8192ce, rtl8192cu and rtl8192de share a common callback routine. Driver rtl8192se needs different handling of the firmware, thus it has its own code. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Stable <stable@vger.kernel.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
		
			
				
	
	
		
			274 lines
		
	
	
	
		
			7.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			274 lines
		
	
	
	
		
			7.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/******************************************************************************
 | 
						|
 *
 | 
						|
 * Copyright(c) 2009-2012  Realtek Corporation.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify it
 | 
						|
 * under the terms of version 2 of the GNU General Public License as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful, but WITHOUT
 | 
						|
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 | 
						|
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 | 
						|
 * more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License along with
 | 
						|
 * this program; if not, write to the Free Software Foundation, Inc.,
 | 
						|
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
 | 
						|
 *
 | 
						|
 * The full GNU General Public License is included in this distribution in the
 | 
						|
 * file called LICENSE.
 | 
						|
 *
 | 
						|
 * Contact Information:
 | 
						|
 * wlanfae <wlanfae@realtek.com>
 | 
						|
 * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
 | 
						|
 * Hsinchu 300, Taiwan.
 | 
						|
 *
 | 
						|
 * Larry Finger <Larry.Finger@lwfinger.net>
 | 
						|
 *
 | 
						|
 *****************************************************************************/
 | 
						|
 | 
						|
#ifndef __RTL_PCI_H__
 | 
						|
#define __RTL_PCI_H__
 | 
						|
 | 
						|
#include <linux/pci.h>
 | 
						|
/*
 | 
						|
1: MSDU packet queue,
 | 
						|
2: Rx Command Queue
 | 
						|
*/
 | 
						|
#define RTL_PCI_RX_MPDU_QUEUE			0
 | 
						|
#define RTL_PCI_RX_CMD_QUEUE			1
 | 
						|
#define RTL_PCI_MAX_RX_QUEUE			2
 | 
						|
 | 
						|
#define RTL_PCI_MAX_RX_COUNT			64
 | 
						|
#define RTL_PCI_MAX_TX_QUEUE_COUNT		9
 | 
						|
 | 
						|
#define RT_TXDESC_NUM				128
 | 
						|
#define RT_TXDESC_NUM_BE_QUEUE			256
 | 
						|
 | 
						|
#define BK_QUEUE				0
 | 
						|
#define BE_QUEUE				1
 | 
						|
#define VI_QUEUE				2
 | 
						|
#define VO_QUEUE				3
 | 
						|
#define BEACON_QUEUE				4
 | 
						|
#define TXCMD_QUEUE				5
 | 
						|
#define MGNT_QUEUE				6
 | 
						|
#define HIGH_QUEUE				7
 | 
						|
#define HCCA_QUEUE				8
 | 
						|
 | 
						|
#define RTL_PCI_DEVICE(vend, dev, cfg)  \
 | 
						|
	.vendor = (vend), \
 | 
						|
	.device = (dev), \
 | 
						|
	.subvendor = PCI_ANY_ID, \
 | 
						|
	.subdevice = PCI_ANY_ID,\
 | 
						|
	.driver_data = (kernel_ulong_t)&(cfg)
 | 
						|
 | 
						|
#define PCI_MAX_BRIDGE_NUMBER			255
 | 
						|
#define PCI_MAX_DEVICES				32
 | 
						|
#define PCI_MAX_FUNCTION			8
 | 
						|
 | 
						|
#define PCI_CONF_ADDRESS	0x0CF8	/*PCI Configuration Space Address */
 | 
						|
#define PCI_CONF_DATA		0x0CFC	/*PCI Configuration Space Data */
 | 
						|
 | 
						|
#define U1DONTCARE			0xFF
 | 
						|
#define U2DONTCARE			0xFFFF
 | 
						|
#define U4DONTCARE			0xFFFFFFFF
 | 
						|
 | 
						|
#define RTL_PCI_8192_DID	0x8192	/*8192 PCI-E */
 | 
						|
#define RTL_PCI_8192SE_DID	0x8192	/*8192 SE */
 | 
						|
#define RTL_PCI_8174_DID	0x8174	/*8192 SE */
 | 
						|
#define RTL_PCI_8173_DID	0x8173	/*8191 SE Crab */
 | 
						|
#define RTL_PCI_8172_DID	0x8172	/*8191 SE RE */
 | 
						|
#define RTL_PCI_8171_DID	0x8171	/*8191 SE Unicron */
 | 
						|
#define RTL_PCI_0045_DID	0x0045	/*8190 PCI for Ceraga */
 | 
						|
#define RTL_PCI_0046_DID	0x0046	/*8190 Cardbus for Ceraga */
 | 
						|
#define RTL_PCI_0044_DID	0x0044	/*8192e PCIE for Ceraga */
 | 
						|
#define RTL_PCI_0047_DID	0x0047	/*8192e Express Card for Ceraga */
 | 
						|
#define RTL_PCI_700F_DID	0x700F
 | 
						|
#define RTL_PCI_701F_DID	0x701F
 | 
						|
#define RTL_PCI_DLINK_DID	0x3304
 | 
						|
#define RTL_PCI_8192CET_DID	0x8191	/*8192ce */
 | 
						|
#define RTL_PCI_8192CE_DID	0x8178	/*8192ce */
 | 
						|
#define RTL_PCI_8191CE_DID	0x8177	/*8192ce */
 | 
						|
#define RTL_PCI_8188CE_DID	0x8176	/*8192ce */
 | 
						|
#define RTL_PCI_8192CU_DID	0x8191	/*8192ce */
 | 
						|
#define RTL_PCI_8192DE_DID	0x8193	/*8192de */
 | 
						|
#define RTL_PCI_8192DE_DID2	0x002B	/*92DE*/
 | 
						|
 | 
						|
/*8192 support 16 pages of IO registers*/
 | 
						|
#define RTL_MEM_MAPPED_IO_RANGE_8190PCI		0x1000
 | 
						|
#define RTL_MEM_MAPPED_IO_RANGE_8192PCIE	0x4000
 | 
						|
#define RTL_MEM_MAPPED_IO_RANGE_8192SE		0x4000
 | 
						|
#define RTL_MEM_MAPPED_IO_RANGE_8192CE		0x4000
 | 
						|
#define RTL_MEM_MAPPED_IO_RANGE_8192DE		0x4000
 | 
						|
 | 
						|
#define RTL_PCI_REVISION_ID_8190PCI		0x00
 | 
						|
#define RTL_PCI_REVISION_ID_8192PCIE		0x01
 | 
						|
#define RTL_PCI_REVISION_ID_8192SE		0x10
 | 
						|
#define RTL_PCI_REVISION_ID_8192CE		0x1
 | 
						|
#define RTL_PCI_REVISION_ID_8192DE		0x0
 | 
						|
 | 
						|
#define RTL_DEFAULT_HARDWARE_TYPE	HARDWARE_TYPE_RTL8192CE
 | 
						|
 | 
						|
enum pci_bridge_vendor {
 | 
						|
	PCI_BRIDGE_VENDOR_INTEL = 0x0,	/*0b'0000,0001 */
 | 
						|
	PCI_BRIDGE_VENDOR_ATI,		/*0b'0000,0010*/
 | 
						|
	PCI_BRIDGE_VENDOR_AMD,		/*0b'0000,0100*/
 | 
						|
	PCI_BRIDGE_VENDOR_SIS,		/*0b'0000,1000*/
 | 
						|
	PCI_BRIDGE_VENDOR_UNKNOWN,	/*0b'0100,0000*/
 | 
						|
	PCI_BRIDGE_VENDOR_MAX,
 | 
						|
};
 | 
						|
 | 
						|
struct rtl_pci_capabilities_header {
 | 
						|
	u8 capability_id;
 | 
						|
	u8 next;
 | 
						|
};
 | 
						|
 | 
						|
struct rtl_rx_desc {
 | 
						|
	u32 dword[8];
 | 
						|
} __packed;
 | 
						|
 | 
						|
struct rtl_tx_desc {
 | 
						|
	u32 dword[16];
 | 
						|
} __packed;
 | 
						|
 | 
						|
struct rtl_tx_cmd_desc {
 | 
						|
	u32 dword[16];
 | 
						|
} __packed;
 | 
						|
 | 
						|
struct rtl8192_tx_ring {
 | 
						|
	struct rtl_tx_desc *desc;
 | 
						|
	dma_addr_t dma;
 | 
						|
	unsigned int idx;
 | 
						|
	unsigned int entries;
 | 
						|
	struct sk_buff_head queue;
 | 
						|
};
 | 
						|
 | 
						|
struct rtl8192_rx_ring {
 | 
						|
	struct rtl_rx_desc *desc;
 | 
						|
	dma_addr_t dma;
 | 
						|
	unsigned int idx;
 | 
						|
	struct sk_buff *rx_buf[RTL_PCI_MAX_RX_COUNT];
 | 
						|
};
 | 
						|
 | 
						|
struct rtl_pci {
 | 
						|
	struct pci_dev *pdev;
 | 
						|
 | 
						|
	bool driver_is_goingto_unload;
 | 
						|
	bool up_first_time;
 | 
						|
	bool first_init;
 | 
						|
	bool being_init_adapter;
 | 
						|
	bool init_ready;
 | 
						|
 | 
						|
	/*Tx */
 | 
						|
	struct rtl8192_tx_ring tx_ring[RTL_PCI_MAX_TX_QUEUE_COUNT];
 | 
						|
	int txringcount[RTL_PCI_MAX_TX_QUEUE_COUNT];
 | 
						|
	u32 transmit_config;
 | 
						|
 | 
						|
	/*Rx */
 | 
						|
	struct rtl8192_rx_ring rx_ring[RTL_PCI_MAX_RX_QUEUE];
 | 
						|
	int rxringcount;
 | 
						|
	u16 rxbuffersize;
 | 
						|
	u32 receive_config;
 | 
						|
 | 
						|
	/*irq */
 | 
						|
	u8 irq_alloc;
 | 
						|
	u32 irq_mask[2];
 | 
						|
 | 
						|
	/*Bcn control register setting */
 | 
						|
	u32 reg_bcn_ctrl_val;
 | 
						|
 | 
						|
	 /*ASPM*/ u8 const_pci_aspm;
 | 
						|
	u8 const_amdpci_aspm;
 | 
						|
	u8 const_hwsw_rfoff_d3;
 | 
						|
	u8 const_support_pciaspm;
 | 
						|
	/*pci-e bridge */
 | 
						|
	u8 const_hostpci_aspm_setting;
 | 
						|
	/*pci-e device */
 | 
						|
	u8 const_devicepci_aspm_setting;
 | 
						|
	/*If it supports ASPM, Offset[560h] = 0x40,
 | 
						|
	   otherwise Offset[560h] = 0x00. */
 | 
						|
	bool support_aspm;
 | 
						|
	bool support_backdoor;
 | 
						|
 | 
						|
	/*QOS & EDCA */
 | 
						|
	enum acm_method acm_method;
 | 
						|
 | 
						|
	u16 shortretry_limit;
 | 
						|
	u16 longretry_limit;
 | 
						|
};
 | 
						|
 | 
						|
struct mp_adapter {
 | 
						|
	u8 linkctrl_reg;
 | 
						|
 | 
						|
	u8 busnumber;
 | 
						|
	u8 devnumber;
 | 
						|
	u8 funcnumber;
 | 
						|
 | 
						|
	u8 pcibridge_busnum;
 | 
						|
	u8 pcibridge_devnum;
 | 
						|
	u8 pcibridge_funcnum;
 | 
						|
 | 
						|
	u8 pcibridge_vendor;
 | 
						|
	u16 pcibridge_vendorid;
 | 
						|
	u16 pcibridge_deviceid;
 | 
						|
 | 
						|
	u8 num4bytes;
 | 
						|
 | 
						|
	u8 pcibridge_pciehdr_offset;
 | 
						|
	u8 pcibridge_linkctrlreg;
 | 
						|
 | 
						|
	bool amd_l1_patch;
 | 
						|
};
 | 
						|
 | 
						|
struct rtl_pci_priv {
 | 
						|
	struct rtl_pci dev;
 | 
						|
	struct mp_adapter ndis_adapter;
 | 
						|
	struct rtl_led_ctl ledctl;
 | 
						|
	struct bt_coexist_info bt_coexist;
 | 
						|
};
 | 
						|
 | 
						|
#define rtl_pcipriv(hw)		(((struct rtl_pci_priv *)(rtl_priv(hw))->priv))
 | 
						|
#define rtl_pcidev(pcipriv)	(&((pcipriv)->dev))
 | 
						|
 | 
						|
int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw);
 | 
						|
 | 
						|
extern struct rtl_intf_ops rtl_pci_ops;
 | 
						|
 | 
						|
int __devinit rtl_pci_probe(struct pci_dev *pdev,
 | 
						|
			    const struct pci_device_id *id);
 | 
						|
void rtl_pci_disconnect(struct pci_dev *pdev);
 | 
						|
int rtl_pci_suspend(struct device *dev);
 | 
						|
int rtl_pci_resume(struct device *dev);
 | 
						|
static inline u8 pci_read8_sync(struct rtl_priv *rtlpriv, u32 addr)
 | 
						|
{
 | 
						|
	return readb((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
static inline u16 pci_read16_sync(struct rtl_priv *rtlpriv, u32 addr)
 | 
						|
{
 | 
						|
	return readw((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
static inline u32 pci_read32_sync(struct rtl_priv *rtlpriv, u32 addr)
 | 
						|
{
 | 
						|
	return readl((u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
static inline void pci_write8_async(struct rtl_priv *rtlpriv, u32 addr, u8 val)
 | 
						|
{
 | 
						|
	writeb(val, (u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
static inline void pci_write16_async(struct rtl_priv *rtlpriv,
 | 
						|
				     u32 addr, u16 val)
 | 
						|
{
 | 
						|
	writew(val, (u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
static inline void pci_write32_async(struct rtl_priv *rtlpriv,
 | 
						|
				     u32 addr, u32 val)
 | 
						|
{
 | 
						|
	writel(val, (u8 __iomem *) rtlpriv->io.pci_mem_start + addr);
 | 
						|
}
 | 
						|
 | 
						|
#endif
 |