aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c219
1 files changed, 8 insertions, 211 deletions
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
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 14:51:36 -0400