aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-05-24 04:39:02 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-06-18 11:05:23 -0400
commit48d1a2110ad9cb86e5cb0d790729824fa3cca83b (patch)
tree873a8c8840d0c2257ece3960043c080a95c8e422 /drivers
parent7299751df36c02adafb5b897c56de71f0d7e2cb5 (diff)
iwlagn: add a iwl_pci.[ch] files that will contain all PCI specific code
Move some PCI functionality to the new iwl_pci.[ch] files: * the PCI_DEVICE_TABLE * the pci_driver struct definition * the PCI probe / remove functions * the PCI suspend / resume functions All these functions are now split: the trigger comes from the PCI layer which calls to the bus generic code located in the other files. This is the beginning only. There are still a lot of PCI related code needs to be gathered. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c219
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.h3
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c24
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h17
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.c340
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.h69
8 files changed, 427 insertions, 248 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 822660483f9..9a56ce54671 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -13,6 +13,7 @@ iwlagn-objs += iwl-5000.o
13iwlagn-objs += iwl-6000.o 13iwlagn-objs += iwl-6000.o
14iwlagn-objs += iwl-1000.o 14iwlagn-objs += iwl-1000.o
15iwlagn-objs += iwl-2000.o 15iwlagn-objs += iwl-2000.o
16iwlagn-objs += iwl-pci.o
16 17
17iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o 18iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
18iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o 19iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 0c747c3de6f..d5eeb3e19b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -32,6 +32,7 @@
32#include <linux/kernel.h> 32#include <linux/kernel.h>
33#include <linux/module.h> 33#include <linux/module.h>
34#include <linux/init.h> 34#include <linux/init.h>
35/* TODO: remove include to PCI*.h when no PCI will be needed here */
35#include <linux/pci.h> 36#include <linux/pci.h>
36#include <linux/pci-aspm.h> 37#include <linux/pci-aspm.h>
37#include <linux/slab.h> 38#include <linux/slab.h>
@@ -49,8 +50,6 @@
49 50
50#include <asm/div64.h> 51#include <asm/div64.h>
51 52
52#define DRV_NAME "iwlagn"
53
54#include "iwl-eeprom.h" 53#include "iwl-eeprom.h"
55#include "iwl-dev.h" 54#include "iwl-dev.h"
56#include "iwl-core.h" 55#include "iwl-core.h"
@@ -59,6 +58,7 @@
59#include "iwl-sta.h" 58#include "iwl-sta.h"
60#include "iwl-agn-calib.h" 59#include "iwl-agn-calib.h"
61#include "iwl-agn.h" 60#include "iwl-agn.h"
61#include "iwl-pci.h"
62 62
63 63
64/****************************************************************************** 64/******************************************************************************
@@ -3479,12 +3479,11 @@ static void iwl_init_context(struct iwl_priv *priv)
3479 BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2); 3479 BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
3480} 3480}
3481 3481
3482static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 3482int iwl_probe(struct pci_dev *pdev, struct iwl_cfg *cfg)
3483{ 3483{
3484 int err = 0; 3484 int err = 0;
3485 struct iwl_priv *priv; 3485 struct iwl_priv *priv;
3486 struct ieee80211_hw *hw; 3486 struct ieee80211_hw *hw;
3487 struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
3488 u16 pci_cmd, num_mac; 3487 u16 pci_cmd, num_mac;
3489 u32 hw_rev; 3488 u32 hw_rev;
3490 3489
@@ -3717,7 +3716,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3717 return err; 3716 return err;
3718} 3717}
3719 3718
3720static void __devexit iwl_pci_remove(struct pci_dev *pdev) 3719void __devexit iwl_remove(struct pci_dev *pdev)
3721{ 3720{
3722 struct iwl_priv *priv = pci_get_drvdata(pdev); 3721 struct iwl_priv *priv = pci_get_drvdata(pdev);
3723 unsigned long flags; 3722 unsigned long flags;
@@ -3801,206 +3800,6 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
3801 * driver and module entry point 3800 * driver and module entry point
3802 * 3801 *
3803 *****************************************************************************/ 3802 *****************************************************************************/
3804
3805/* Hardware specific file defines the PCI IDs table for that hardware module */
3806static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
3807 {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */
3808 {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */
3809 {IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */
3810 {IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */
3811 {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */
3812 {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */
3813 {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */
3814 {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */
3815 {IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */
3816 {IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */
3817 {IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */
3818 {IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */
3819 {IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */
3820 {IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */
3821 {IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */
3822 {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */
3823 {IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */
3824 {IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */
3825 {IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */
3826 {IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */
3827 {IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */
3828 {IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */
3829 {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */
3830 {IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */
3831
3832/* 5300 Series WiFi */
3833 {IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */
3834 {IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */
3835 {IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */
3836 {IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */
3837 {IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */
3838 {IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */
3839 {IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */
3840 {IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */
3841 {IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */
3842 {IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */
3843 {IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */
3844 {IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */
3845
3846/* 5350 Series WiFi/WiMax */
3847 {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */
3848 {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */
3849 {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */
3850
3851/* 5150 Series Wifi/WiMax */
3852 {IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */
3853 {IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */
3854 {IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */
3855 {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */
3856 {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */
3857 {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */
3858
3859 {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */
3860 {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */
3861 {IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */
3862 {IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */
3863
3864/* 6x00 Series */
3865 {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)},
3866 {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)},
3867 {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)},
3868 {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)},
3869 {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)},
3870 {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)},
3871 {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)},
3872 {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)},
3873 {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)},
3874 {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},
3875
3876/* 6x05 Series */
3877 {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)},
3878 {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)},
3879 {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)},
3880 {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)},
3881 {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)},
3882 {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)},
3883 {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)},
3884
3885/* 6x30 Series */
3886 {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)},
3887 {IWL_PCI_DEVICE(0x008A, 0x5307, iwl1030_bg_cfg)},
3888 {IWL_PCI_DEVICE(0x008A, 0x5325, iwl1030_bgn_cfg)},
3889 {IWL_PCI_DEVICE(0x008A, 0x5327, iwl1030_bg_cfg)},
3890 {IWL_PCI_DEVICE(0x008B, 0x5315, iwl1030_bgn_cfg)},
3891 {IWL_PCI_DEVICE(0x008B, 0x5317, iwl1030_bg_cfg)},
3892 {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_2agn_cfg)},
3893 {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_2bgn_cfg)},
3894 {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_2abg_cfg)},
3895 {IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_2agn_cfg)},
3896 {IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_2bgn_cfg)},
3897 {IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_2abg_cfg)},
3898 {IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_2bg_cfg)},
3899 {IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_2agn_cfg)},
3900 {IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_2bgn_cfg)},
3901 {IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_2abg_cfg)},
3902
3903/* 6x50 WiFi/WiMax Series */
3904 {IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},
3905 {IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)},
3906 {IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)},
3907 {IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)},
3908 {IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},
3909 {IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},
3910
3911/* 6150 WiFi/WiMax Series */
3912 {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},
3913 {IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)},
3914 {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},
3915 {IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)},
3916 {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},
3917 {IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)},
3918
3919/* 1000 Series WiFi */
3920 {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},
3921 {IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)},
3922 {IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_bgn_cfg)},
3923 {IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_bgn_cfg)},
3924 {IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_bgn_cfg)},
3925 {IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_bgn_cfg)},
3926 {IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_bg_cfg)},
3927 {IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_bg_cfg)},
3928 {IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_bg_cfg)},
3929 {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)},
3930 {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},
3931 {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},
3932
3933/* 100 Series WiFi */
3934 {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},
3935 {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},
3936 {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},
3937 {IWL_PCI_DEVICE(0x08AF, 0x1017, iwl100_bg_cfg)},
3938 {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},
3939 {IWL_PCI_DEVICE(0x08AE, 0x1027, iwl100_bg_cfg)},
3940
3941/* 130 Series WiFi */
3942 {IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)},
3943 {IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)},
3944 {IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)},
3945 {IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)},
3946 {IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)},
3947 {IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)},
3948
3949/* 2x00 Series */
3950 {IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)},
3951 {IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)},
3952 {IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)},
3953 {IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)},
3954 {IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)},
3955 {IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)},
3956
3957/* 2x30 Series */
3958 {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)},
3959 {IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)},
3960 {IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)},
3961 {IWL_PCI_DEVICE(0x0887, 0x4066, iwl2030_2bg_cfg)},
3962 {IWL_PCI_DEVICE(0x0888, 0x4266, iwl2030_2bg_cfg)},
3963 {IWL_PCI_DEVICE(0x0887, 0x4466, iwl2030_2bg_cfg)},
3964
3965/* 6x35 Series */
3966 {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},
3967 {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},
3968 {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},
3969 {IWL_PCI_DEVICE(0x088E, 0x4064, iwl6035_2abg_cfg)},
3970 {IWL_PCI_DEVICE(0x088F, 0x4264, iwl6035_2abg_cfg)},
3971 {IWL_PCI_DEVICE(0x088E, 0x4464, iwl6035_2abg_cfg)},
3972 {IWL_PCI_DEVICE(0x088E, 0x4066, iwl6035_2bg_cfg)},
3973 {IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)},
3974 {IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)},
3975
3976/* 105 Series */
3977 {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},
3978 {IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)},
3979 {IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)},
3980 {IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)},
3981 {IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)},
3982 {IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)},
3983
3984/* 135 Series */
3985 {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},
3986 {IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)},
3987 {IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)},
3988 {IWL_PCI_DEVICE(0x0892, 0x0066, iwl135_bg_cfg)},
3989 {IWL_PCI_DEVICE(0x0893, 0x0266, iwl135_bg_cfg)},
3990 {IWL_PCI_DEVICE(0x0892, 0x0466, iwl135_bg_cfg)},
3991
3992 {0}
3993};
3994MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
3995
3996static struct pci_driver iwl_driver = {
3997 .name = DRV_NAME,
3998 .id_table = iwl_hw_card_ids,
3999 .probe = iwl_pci_probe,
4000 .remove = __devexit_p(iwl_pci_remove),
4001 .driver.pm = IWL_PM_OPS,
4002};
4003
4004static int __init iwl_init(void) 3803static int __init iwl_init(void)
4005{ 3804{
4006 3805
@@ -4014,12 +3813,10 @@ static int __init iwl_init(void)
4014 return ret; 3813 return ret;
4015 } 3814 }
4016 3815
4017 ret = pci_register_driver(&iwl_driver); 3816 ret = iwl_pci_register_driver();
4018 if (ret) {
4019 pr_err("Unable to initialize PCI module\n");
4020 goto error_register;
4021 }
4022 3817
3818 if (ret)
3819 goto error_register;
4023 return ret; 3820 return ret;
4024 3821
4025error_register: 3822error_register:
@@ -4029,7 +3826,7 @@ error_register:
4029 3826
4030static void __exit iwl_exit(void) 3827static void __exit iwl_exit(void)
4031{ 3828{
4032 pci_unregister_driver(&iwl_driver); 3829 iwl_pci_unregister_driver();
4033 iwlagn_rate_control_unregister(); 3830 iwlagn_rate_control_unregister();
4034} 3831}
4035 3832
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.h b/drivers/net/wireless/iwlwifi/iwl-agn.h
index 5d8b2db82a9..9dab387753a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -379,4 +379,7 @@ void iwl_testmode_cleanup(struct iwl_priv *priv)
379} 379}
380#endif 380#endif
381 381
382int iwl_probe(struct pci_dev *pdev, struct iwl_cfg *cfg);
383void iwl_remove(struct pci_dev *pdev);
384
382#endif /* __iwl_agn_h__ */ 385#endif /* __iwl_agn_h__ */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 445ddac0654..4268a3f4141 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1948,11 +1948,8 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
1948 1948
1949#ifdef CONFIG_PM 1949#ifdef CONFIG_PM
1950 1950
1951int iwl_pci_suspend(struct device *device) 1951int iwl_suspend(struct iwl_priv *priv)
1952{ 1952{
1953 struct pci_dev *pdev = to_pci_dev(device);
1954 struct iwl_priv *priv = pci_get_drvdata(pdev);
1955
1956 /* 1953 /*
1957 * This function is called when system goes into suspend state 1954 * This function is called when system goes into suspend state
1958 * mac80211 will call iwl_mac_stop() from the mac80211 suspend function 1955 * mac80211 will call iwl_mac_stop() from the mac80211 suspend function
@@ -1965,18 +1962,10 @@ int iwl_pci_suspend(struct device *device)
1965 return 0; 1962 return 0;
1966} 1963}
1967 1964
1968int iwl_pci_resume(struct device *device) 1965int iwl_resume(struct iwl_priv *priv)
1969{ 1966{
1970 struct pci_dev *pdev = to_pci_dev(device);
1971 struct iwl_priv *priv = pci_get_drvdata(pdev);
1972 bool hw_rfkill = false; 1967 bool hw_rfkill = false;
1973 1968
1974 /*
1975 * We disable the RETRY_TIMEOUT register (0x41) to keep
1976 * PCI Tx retries from interfering with C3 CPU state.
1977 */
1978 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
1979
1980 iwl_enable_interrupts(priv); 1969 iwl_enable_interrupts(priv);
1981 1970
1982 if (!(iwl_read32(priv, CSR_GP_CNTRL) & 1971 if (!(iwl_read32(priv, CSR_GP_CNTRL) &
@@ -1993,13 +1982,4 @@ int iwl_pci_resume(struct device *device)
1993 return 0; 1982 return 0;
1994} 1983}
1995 1984
1996const struct dev_pm_ops iwl_pm_ops = {
1997 .suspend = iwl_pci_suspend,
1998 .resume = iwl_pci_resume,
1999 .freeze = iwl_pci_suspend,
2000 .thaw = iwl_pci_resume,
2001 .poweroff = iwl_pci_suspend,
2002 .restore = iwl_pci_resume,
2003};
2004
2005#endif /* CONFIG_PM */ 1985#endif /* CONFIG_PM */
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 84f28e10631..84032bbfefd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -76,11 +76,6 @@ struct iwl_cmd;
76#define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation" 76#define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation"
77#define DRV_AUTHOR "<ilw@linux.intel.com>" 77#define DRV_AUTHOR "<ilw@linux.intel.com>"
78 78
79#define IWL_PCI_DEVICE(dev, subdev, cfg) \
80 .vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \
81 .subvendor = PCI_ANY_ID, .subdevice = (subdev), \
82 .driver_data = (kernel_ulong_t)&(cfg)
83
84#define TIME_UNIT 1024 79#define TIME_UNIT 1024
85 80
86#define IWL_CMD(x) case x: return #x 81#define IWL_CMD(x) case x: return #x
@@ -495,16 +490,8 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
495 u32 addon, u32 beacon_interval); 490 u32 addon, u32 beacon_interval);
496 491
497#ifdef CONFIG_PM 492#ifdef CONFIG_PM
498int iwl_pci_suspend(struct device *device); 493int iwl_suspend(struct iwl_priv *priv);
499int iwl_pci_resume(struct device *device); 494int iwl_resume(struct iwl_priv *priv);
500extern const struct dev_pm_ops iwl_pm_ops;
501
502#define IWL_PM_OPS (&iwl_pm_ops)
503
504#else /* !CONFIG_PM */
505
506#define IWL_PM_OPS NULL
507
508#endif /* !CONFIG_PM */ 495#endif /* !CONFIG_PM */
509 496
510/***************************************************** 497/*****************************************************
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index ffed30207e9..59316fb1e8c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -48,6 +48,8 @@
48#include "iwl-agn-rs.h" 48#include "iwl-agn-rs.h"
49#include "iwl-agn-tt.h" 49#include "iwl-agn-tt.h"
50 50
51#define DRV_NAME "iwlagn"
52
51struct iwl_tx_queue; 53struct iwl_tx_queue;
52 54
53/* CT-KILL constants */ 55/* CT-KILL constants */
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
new file mode 100644
index 00000000000..d930be41cff
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -0,0 +1,340 @@
1/******************************************************************************
2 *
3 * This file is provided under a dual BSD/GPLv2 license. When using or
4 * redistributing this file, you may do so under either license.
5 *
6 * GPL LICENSE SUMMARY
7 *
8 * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation.
13 *
14 * This program is distributed in the hope that it will be useful, but
15 * WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
22 * USA
23 *
24 * The full GNU General Public License is included in this distribution
25 * in the file called LICENSE.GPL.
26 *
27 * Contact Information:
28 * Intel Linux Wireless <ilw@linux.intel.com>
29 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
30 *
31 * BSD LICENSE
32 *
33 * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
34 * All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions
38 * are met:
39 *
40 * * Redistributions of source code must retain the above copyright
41 * notice, this list of conditions and the following disclaimer.
42 * * Redistributions in binary form must reproduce the above copyright
43 * notice, this list of conditions and the following disclaimer in
44 * the documentation and/or other materials provided with the
45 * distribution.
46 * * Neither the name Intel Corporation nor the names of its
47 * contributors may be used to endorse or promote products derived
48 * from this software without specific prior written permission.
49 *
50 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
51 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
52 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
53 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
54 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
60 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 *
62 *****************************************************************************/
63#include <linux/pci.h>
64#include <linux/pci-aspm.h>
65
66#include "iwl-pci.h"
67#include "iwl-agn.h"
68#include "iwl-core.h"
69
70#define IWL_PCI_DEVICE(dev, subdev, cfg) \
71 .vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \
72 .subvendor = PCI_ANY_ID, .subdevice = (subdev), \
73 .driver_data = (kernel_ulong_t)&(cfg)
74
75/* Hardware specific file defines the PCI IDs table for that hardware module */
76static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = {
77 {IWL_PCI_DEVICE(0x4232, 0x1201, iwl5100_agn_cfg)}, /* Mini Card */
78 {IWL_PCI_DEVICE(0x4232, 0x1301, iwl5100_agn_cfg)}, /* Half Mini Card */
79 {IWL_PCI_DEVICE(0x4232, 0x1204, iwl5100_agn_cfg)}, /* Mini Card */
80 {IWL_PCI_DEVICE(0x4232, 0x1304, iwl5100_agn_cfg)}, /* Half Mini Card */
81 {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bgn_cfg)}, /* Mini Card */
82 {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bgn_cfg)}, /* Half Mini Card */
83 {IWL_PCI_DEVICE(0x4232, 0x1206, iwl5100_abg_cfg)}, /* Mini Card */
84 {IWL_PCI_DEVICE(0x4232, 0x1306, iwl5100_abg_cfg)}, /* Half Mini Card */
85 {IWL_PCI_DEVICE(0x4232, 0x1221, iwl5100_agn_cfg)}, /* Mini Card */
86 {IWL_PCI_DEVICE(0x4232, 0x1321, iwl5100_agn_cfg)}, /* Half Mini Card */
87 {IWL_PCI_DEVICE(0x4232, 0x1224, iwl5100_agn_cfg)}, /* Mini Card */
88 {IWL_PCI_DEVICE(0x4232, 0x1324, iwl5100_agn_cfg)}, /* Half Mini Card */
89 {IWL_PCI_DEVICE(0x4232, 0x1225, iwl5100_bgn_cfg)}, /* Mini Card */
90 {IWL_PCI_DEVICE(0x4232, 0x1325, iwl5100_bgn_cfg)}, /* Half Mini Card */
91 {IWL_PCI_DEVICE(0x4232, 0x1226, iwl5100_abg_cfg)}, /* Mini Card */
92 {IWL_PCI_DEVICE(0x4232, 0x1326, iwl5100_abg_cfg)}, /* Half Mini Card */
93 {IWL_PCI_DEVICE(0x4237, 0x1211, iwl5100_agn_cfg)}, /* Mini Card */
94 {IWL_PCI_DEVICE(0x4237, 0x1311, iwl5100_agn_cfg)}, /* Half Mini Card */
95 {IWL_PCI_DEVICE(0x4237, 0x1214, iwl5100_agn_cfg)}, /* Mini Card */
96 {IWL_PCI_DEVICE(0x4237, 0x1314, iwl5100_agn_cfg)}, /* Half Mini Card */
97 {IWL_PCI_DEVICE(0x4237, 0x1215, iwl5100_bgn_cfg)}, /* Mini Card */
98 {IWL_PCI_DEVICE(0x4237, 0x1315, iwl5100_bgn_cfg)}, /* Half Mini Card */
99 {IWL_PCI_DEVICE(0x4237, 0x1216, iwl5100_abg_cfg)}, /* Mini Card */
100 {IWL_PCI_DEVICE(0x4237, 0x1316, iwl5100_abg_cfg)}, /* Half Mini Card */
101
102/* 5300 Series WiFi */
103 {IWL_PCI_DEVICE(0x4235, 0x1021, iwl5300_agn_cfg)}, /* Mini Card */
104 {IWL_PCI_DEVICE(0x4235, 0x1121, iwl5300_agn_cfg)}, /* Half Mini Card */
105 {IWL_PCI_DEVICE(0x4235, 0x1024, iwl5300_agn_cfg)}, /* Mini Card */
106 {IWL_PCI_DEVICE(0x4235, 0x1124, iwl5300_agn_cfg)}, /* Half Mini Card */
107 {IWL_PCI_DEVICE(0x4235, 0x1001, iwl5300_agn_cfg)}, /* Mini Card */
108 {IWL_PCI_DEVICE(0x4235, 0x1101, iwl5300_agn_cfg)}, /* Half Mini Card */
109 {IWL_PCI_DEVICE(0x4235, 0x1004, iwl5300_agn_cfg)}, /* Mini Card */
110 {IWL_PCI_DEVICE(0x4235, 0x1104, iwl5300_agn_cfg)}, /* Half Mini Card */
111 {IWL_PCI_DEVICE(0x4236, 0x1011, iwl5300_agn_cfg)}, /* Mini Card */
112 {IWL_PCI_DEVICE(0x4236, 0x1111, iwl5300_agn_cfg)}, /* Half Mini Card */
113 {IWL_PCI_DEVICE(0x4236, 0x1014, iwl5300_agn_cfg)}, /* Mini Card */
114 {IWL_PCI_DEVICE(0x4236, 0x1114, iwl5300_agn_cfg)}, /* Half Mini Card */
115
116/* 5350 Series WiFi/WiMax */
117 {IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)}, /* Mini Card */
118 {IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)}, /* Mini Card */
119 {IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)}, /* Mini Card */
120
121/* 5150 Series Wifi/WiMax */
122 {IWL_PCI_DEVICE(0x423C, 0x1201, iwl5150_agn_cfg)}, /* Mini Card */
123 {IWL_PCI_DEVICE(0x423C, 0x1301, iwl5150_agn_cfg)}, /* Half Mini Card */
124 {IWL_PCI_DEVICE(0x423C, 0x1206, iwl5150_abg_cfg)}, /* Mini Card */
125 {IWL_PCI_DEVICE(0x423C, 0x1306, iwl5150_abg_cfg)}, /* Half Mini Card */
126 {IWL_PCI_DEVICE(0x423C, 0x1221, iwl5150_agn_cfg)}, /* Mini Card */
127 {IWL_PCI_DEVICE(0x423C, 0x1321, iwl5150_agn_cfg)}, /* Half Mini Card */
128
129 {IWL_PCI_DEVICE(0x423D, 0x1211, iwl5150_agn_cfg)}, /* Mini Card */
130 {IWL_PCI_DEVICE(0x423D, 0x1311, iwl5150_agn_cfg)}, /* Half Mini Card */
131 {IWL_PCI_DEVICE(0x423D, 0x1216, iwl5150_abg_cfg)}, /* Mini Card */
132 {IWL_PCI_DEVICE(0x423D, 0x1316, iwl5150_abg_cfg)}, /* Half Mini Card */
133
134/* 6x00 Series */
135 {IWL_PCI_DEVICE(0x422B, 0x1101, iwl6000_3agn_cfg)},
136 {IWL_PCI_DEVICE(0x422B, 0x1121, iwl6000_3agn_cfg)},
137 {IWL_PCI_DEVICE(0x422C, 0x1301, iwl6000i_2agn_cfg)},
138 {IWL_PCI_DEVICE(0x422C, 0x1306, iwl6000i_2abg_cfg)},
139 {IWL_PCI_DEVICE(0x422C, 0x1307, iwl6000i_2bg_cfg)},
140 {IWL_PCI_DEVICE(0x422C, 0x1321, iwl6000i_2agn_cfg)},
141 {IWL_PCI_DEVICE(0x422C, 0x1326, iwl6000i_2abg_cfg)},
142 {IWL_PCI_DEVICE(0x4238, 0x1111, iwl6000_3agn_cfg)},
143 {IWL_PCI_DEVICE(0x4239, 0x1311, iwl6000i_2agn_cfg)},
144 {IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},
145
146/* 6x05 Series */
147 {IWL_PCI_DEVICE(0x0082, 0x1301, iwl6005_2agn_cfg)},
148 {IWL_PCI_DEVICE(0x0082, 0x1306, iwl6005_2abg_cfg)},
149 {IWL_PCI_DEVICE(0x0082, 0x1307, iwl6005_2bg_cfg)},
150 {IWL_PCI_DEVICE(0x0082, 0x1321, iwl6005_2agn_cfg)},
151 {IWL_PCI_DEVICE(0x0082, 0x1326, iwl6005_2abg_cfg)},
152 {IWL_PCI_DEVICE(0x0085, 0x1311, iwl6005_2agn_cfg)},
153 {IWL_PCI_DEVICE(0x0085, 0x1316, iwl6005_2abg_cfg)},
154
155/* 6x30 Series */
156 {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1030_bgn_cfg)},
157 {IWL_PCI_DEVICE(0x008A, 0x5307, iwl1030_bg_cfg)},
158 {IWL_PCI_DEVICE(0x008A, 0x5325, iwl1030_bgn_cfg)},
159 {IWL_PCI_DEVICE(0x008A, 0x5327, iwl1030_bg_cfg)},
160 {IWL_PCI_DEVICE(0x008B, 0x5315, iwl1030_bgn_cfg)},
161 {IWL_PCI_DEVICE(0x008B, 0x5317, iwl1030_bg_cfg)},
162 {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_2agn_cfg)},
163 {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_2bgn_cfg)},
164 {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_2abg_cfg)},
165 {IWL_PCI_DEVICE(0x0091, 0x5201, iwl6030_2agn_cfg)},
166 {IWL_PCI_DEVICE(0x0091, 0x5205, iwl6030_2bgn_cfg)},
167 {IWL_PCI_DEVICE(0x0091, 0x5206, iwl6030_2abg_cfg)},
168 {IWL_PCI_DEVICE(0x0091, 0x5207, iwl6030_2bg_cfg)},
169 {IWL_PCI_DEVICE(0x0091, 0x5221, iwl6030_2agn_cfg)},
170 {IWL_PCI_DEVICE(0x0091, 0x5225, iwl6030_2bgn_cfg)},
171 {IWL_PCI_DEVICE(0x0091, 0x5226, iwl6030_2abg_cfg)},
172
173/* 6x50 WiFi/WiMax Series */
174 {IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},
175 {IWL_PCI_DEVICE(0x0087, 0x1306, iwl6050_2abg_cfg)},
176 {IWL_PCI_DEVICE(0x0087, 0x1321, iwl6050_2agn_cfg)},
177 {IWL_PCI_DEVICE(0x0087, 0x1326, iwl6050_2abg_cfg)},
178 {IWL_PCI_DEVICE(0x0089, 0x1311, iwl6050_2agn_cfg)},
179 {IWL_PCI_DEVICE(0x0089, 0x1316, iwl6050_2abg_cfg)},
180
181/* 6150 WiFi/WiMax Series */
182 {IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},
183 {IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)},
184 {IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},
185 {IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)},
186 {IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},
187 {IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)},
188
189/* 1000 Series WiFi */
190 {IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},
191 {IWL_PCI_DEVICE(0x0083, 0x1305, iwl1000_bgn_cfg)},
192 {IWL_PCI_DEVICE(0x0083, 0x1225, iwl1000_bgn_cfg)},
193 {IWL_PCI_DEVICE(0x0083, 0x1325, iwl1000_bgn_cfg)},
194 {IWL_PCI_DEVICE(0x0084, 0x1215, iwl1000_bgn_cfg)},
195 {IWL_PCI_DEVICE(0x0084, 0x1315, iwl1000_bgn_cfg)},
196 {IWL_PCI_DEVICE(0x0083, 0x1206, iwl1000_bg_cfg)},
197 {IWL_PCI_DEVICE(0x0083, 0x1306, iwl1000_bg_cfg)},
198 {IWL_PCI_DEVICE(0x0083, 0x1226, iwl1000_bg_cfg)},
199 {IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)},
200 {IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},
201 {IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},
202
203/* 100 Series WiFi */
204 {IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},
205 {IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},
206 {IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},
207 {IWL_PCI_DEVICE(0x08AF, 0x1017, iwl100_bg_cfg)},
208 {IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},
209 {IWL_PCI_DEVICE(0x08AE, 0x1027, iwl100_bg_cfg)},
210
211/* 130 Series WiFi */
212 {IWL_PCI_DEVICE(0x0896, 0x5005, iwl130_bgn_cfg)},
213 {IWL_PCI_DEVICE(0x0896, 0x5007, iwl130_bg_cfg)},
214 {IWL_PCI_DEVICE(0x0897, 0x5015, iwl130_bgn_cfg)},
215 {IWL_PCI_DEVICE(0x0897, 0x5017, iwl130_bg_cfg)},
216 {IWL_PCI_DEVICE(0x0896, 0x5025, iwl130_bgn_cfg)},
217 {IWL_PCI_DEVICE(0x0896, 0x5027, iwl130_bg_cfg)},
218
219/* 2x00 Series */
220 {IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_2bgn_cfg)},
221 {IWL_PCI_DEVICE(0x0891, 0x4222, iwl2000_2bgn_cfg)},
222 {IWL_PCI_DEVICE(0x0890, 0x4422, iwl2000_2bgn_cfg)},
223 {IWL_PCI_DEVICE(0x0890, 0x4026, iwl2000_2bg_cfg)},
224 {IWL_PCI_DEVICE(0x0891, 0x4226, iwl2000_2bg_cfg)},
225 {IWL_PCI_DEVICE(0x0890, 0x4426, iwl2000_2bg_cfg)},
226
227/* 2x30 Series */
228 {IWL_PCI_DEVICE(0x0887, 0x4062, iwl2030_2bgn_cfg)},
229 {IWL_PCI_DEVICE(0x0888, 0x4262, iwl2030_2bgn_cfg)},
230 {IWL_PCI_DEVICE(0x0887, 0x4462, iwl2030_2bgn_cfg)},
231 {IWL_PCI_DEVICE(0x0887, 0x4066, iwl2030_2bg_cfg)},
232 {IWL_PCI_DEVICE(0x0888, 0x4266, iwl2030_2bg_cfg)},
233 {IWL_PCI_DEVICE(0x0887, 0x4466, iwl2030_2bg_cfg)},
234
235/* 6x35 Series */
236 {IWL_PCI_DEVICE(0x088E, 0x4060, iwl6035_2agn_cfg)},
237 {IWL_PCI_DEVICE(0x088F, 0x4260, iwl6035_2agn_cfg)},
238 {IWL_PCI_DEVICE(0x088E, 0x4460, iwl6035_2agn_cfg)},
239 {IWL_PCI_DEVICE(0x088E, 0x4064, iwl6035_2abg_cfg)},
240 {IWL_PCI_DEVICE(0x088F, 0x4264, iwl6035_2abg_cfg)},
241 {IWL_PCI_DEVICE(0x088E, 0x4464, iwl6035_2abg_cfg)},
242 {IWL_PCI_DEVICE(0x088E, 0x4066, iwl6035_2bg_cfg)},
243 {IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)},
244 {IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)},
245
246/* 105 Series */
247 {IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},
248 {IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)},
249 {IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)},
250 {IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)},
251 {IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)},
252 {IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)},
253
254/* 135 Series */
255 {IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},
256 {IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)},
257 {IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)},
258 {IWL_PCI_DEVICE(0x0892, 0x0066, iwl135_bg_cfg)},
259 {IWL_PCI_DEVICE(0x0893, 0x0266, iwl135_bg_cfg)},
260 {IWL_PCI_DEVICE(0x0892, 0x0466, iwl135_bg_cfg)},
261
262 {0}
263};
264MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
265
266static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
267{
268 struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
269
270 return iwl_probe(pdev, cfg);
271}
272
273static void __devexit iwl_pci_remove(struct pci_dev *pdev)
274{
275 iwl_remove(pdev);
276}
277
278#ifdef CONFIG_PM
279
280static int iwl_pci_suspend(struct device *device)
281{
282 struct pci_dev *pdev = to_pci_dev(device);
283 struct iwl_priv *priv = pci_get_drvdata(pdev);
284
285 return iwl_suspend(priv);
286}
287
288static int iwl_pci_resume(struct device *device)
289{
290 struct pci_dev *pdev = to_pci_dev(device);
291 struct iwl_priv *priv = pci_get_drvdata(pdev);
292
293 /*
294 * We disable the RETRY_TIMEOUT register (0x41) to keep
295 * PCI Tx retries from interfering with C3 CPU state.
296 */
297 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
298
299 return iwl_resume(priv);
300}
301
302static const struct dev_pm_ops iwl_dev_pm_ops = {
303 .suspend = iwl_pci_suspend,
304 .resume = iwl_pci_resume,
305 .freeze = iwl_pci_suspend,
306 .thaw = iwl_pci_resume,
307 .poweroff = iwl_pci_suspend,
308 .restore = iwl_pci_resume,
309};
310
311#define IWL_PM_OPS (&iwl_dev_pm_ops)
312
313#else
314
315#define IWL_PM_OPS NULL
316
317#endif
318
319static struct pci_driver iwl_pci_driver = {
320 .name = DRV_NAME,
321 .id_table = iwl_hw_card_ids,
322 .probe = iwl_pci_probe,
323 .remove = __devexit_p(iwl_pci_remove),
324 .driver.pm = IWL_PM_OPS,
325};
326
327int __must_check iwl_pci_register_driver(void)
328{
329 int ret;
330 ret = pci_register_driver(&iwl_pci_driver);
331 if (ret)
332 pr_err("Unable to initialize PCI module\n");
333
334 return ret;
335}
336
337void iwl_pci_unregister_driver(void)
338{
339 pci_unregister_driver(&iwl_pci_driver);
340}
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.h b/drivers/net/wireless/iwlwifi/iwl-pci.h
new file mode 100644
index 00000000000..9396c7c8d6a
--- /dev/null
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.h
@@ -0,0 +1,69 @@
1/******************************************************************************
2 *
3 * This file is provided under a dual BSD/GPLv2 license. When using or
4 * redistributing this file, you may do so under either license.
5 *
6 * GPL LICENSE SUMMARY
7 *
8 * Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of version 2 of the GNU General Public License as
12 * published by the Free Software Foundation.
13 *
14 * This program is distributed in the hope that it will be useful, but
15 * WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
22 * USA
23 *
24 * The full GNU General Public License is included in this distribution
25 * in the file called LICENSE.GPL.
26 *
27 * Contact Information:
28 * Intel Linux Wireless <ilw@linux.intel.com>
29 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
30 *
31 * BSD LICENSE
32 *
33 * Copyright(c) 2005 - 2011 Intel Corporation. All rights reserved.
34 * All rights reserved.
35 *
36 * Redistribution and use in source and binary forms, with or without
37 * modification, are permitted provided that the following conditions
38 * are met:
39 *
40 * * Redistributions of source code must retain the above copyright
41 * notice, this list of conditions and the following disclaimer.
42 * * Redistributions in binary form must reproduce the above copyright
43 * notice, this list of conditions and the following disclaimer in
44 * the documentation and/or other materials provided with the
45 * distribution.
46 * * Neither the name Intel Corporation nor the names of its
47 * contributors may be used to endorse or promote products derived
48 * from this software without specific prior written permission.
49 *
50 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
51 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
52 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
53 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
54 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
57 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
58 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
59 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
60 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61 *
62 *****************************************************************************/
63#ifndef __iwl_pci_h__
64#define __iwl_pci_h__
65
66int __must_check iwl_pci_register_driver(void);
67void iwl_pci_unregister_driver(void);
68
69#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 07:56:45 -0400