q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/net/wireless/iwlwifi
History
Linus Torvalds 193c0d6825 PCI changes for the v3.8 merge window: 
Host bridge hotplug:
     - Untangle _PRT from struct pci_bus (Bjorn Helgaas)
     - Request _OSC control before scanning root bus (Taku Izumi)
     - Assign resources when adding host bridge (Yinghai Lu)
     - Remove root bus when removing host bridge (Yinghai Lu)
     - Remove _PRT during hot remove (Yinghai Lu)
 
   SRIOV
     - Add sysfs knobs to control numVFs (Don Dutile)
 
   Power management
     - Notify devices when power resource turned on (Huang Ying)
 
   Bug fixes
     - Work around broken _SEG on HP xw9300 (Bjorn Helgaas)
     - Keep runtime PM enabled for unbound PCI devices (Huang Ying)
     - Fix Optimus dual-GPU runtime D3 suspend issue (Dave Airlie)
     - Fix xen frontend shutdown issue (David Vrabel)
     - Work around PLX PCI 9050 BAR alignment erratum (Ian Abbott)
 
   Miscellaneous
     - Add GPL license for drivers/pci/ioapic (Andrew Cooks)
     - Add standard PCI-X, PCIe ASPM register #defines (Bjorn Helgaas)
     - NumaChip remote PCI support (Daniel Blueman)
     - Fix PCIe Link Capabilities Supported Link Speed definition (Jingoo Han)
     - Convert dev_printk() to dev_info(), etc (Joe Perches)
     - Add support for non PCI BAR ROM data (Matthew Garrett)
     - Add x86 support for host bridge translation offset (Mike Yoknis)
     - Report success only when every driver supports AER (Vijay Pandarathil)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyKwSAAoJEPGMOI97Hn6zScgQAJZK2VDfCv74mKrgSDNokIzH
 5nVDrc9AHKJm7CUODs6keJK5d4TD/za3Zao68zrYHsJJKes2ni2Z3W34HP2RXKK2
 eOmePXOHYPPZMlimP9r9cVxNu1ZJCyp/yWSBcsPF4zUgWhBWLRaSj85I049gQ0sz
 +05nZYfLjVd3HNiaXsG4CQyMrNF46XEsLhF9vs+Nr2GHPwrpzhfScgYv63oDS86C
 3ICKsjmiRUZcNelxIFYmyxa5u89QdW5XHjzc9eHGQuus24Vxw+TZzsdfc17sUJEE
 HTyXY+RjDpOVhdtwwUjrCEOiyZYvy3g9+3sKxoxgt/76ghdUaR7fxITwB97qVMFD
 T0ESlKjSV/Qv5QYdyy5uP4zwNs/PXCWXkTg/L1m71F30BxKWDa7tgiA6uK7Z7fl5
 1aokKBdk3mtJJJIDJG1YkxPXx/JItTGCNYrx7CcFj49rSjrUWLQdmrYahersRIsB
 3wiD2xTi9e4dXeP/+VGzGOWB/sHk+73jvrvZe/REa1FCnMINDz4+9V9WaGROMqyq
 MQ8kX0KfYcNVNxy1GOXjU5wLpMN/t/QbvI7gwzRP1DAUCJPoOgFy7AjvSTVG3zuy
 8CtdOFttVkUn5dqsbQR0gVbyQVTS3PGSKz5XC/s8kVDWhja0xZTBYwrskM/4zdSD
 Xf48OyYV5EjpC3FYUSiU
 =OE3Q
 -----END PGP SIGNATURE-----

Merge tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI update from Bjorn Helgaas:
 "Host bridge hotplug:
   - Untangle _PRT from struct pci_bus (Bjorn Helgaas)
   - Request _OSC control before scanning root bus (Taku Izumi)
   - Assign resources when adding host bridge (Yinghai Lu)
   - Remove root bus when removing host bridge (Yinghai Lu)
   - Remove _PRT during hot remove (Yinghai Lu)

  SRIOV
    - Add sysfs knobs to control numVFs (Don Dutile)

  Power management
   - Notify devices when power resource turned on (Huang Ying)

  Bug fixes
   - Work around broken _SEG on HP xw9300 (Bjorn Helgaas)
   - Keep runtime PM enabled for unbound PCI devices (Huang Ying)
   - Fix Optimus dual-GPU runtime D3 suspend issue (Dave Airlie)
   - Fix xen frontend shutdown issue (David Vrabel)
   - Work around PLX PCI 9050 BAR alignment erratum (Ian Abbott)

  Miscellaneous
   - Add GPL license for drivers/pci/ioapic (Andrew Cooks)
   - Add standard PCI-X, PCIe ASPM register #defines (Bjorn Helgaas)
   - NumaChip remote PCI support (Daniel Blueman)
   - Fix PCIe Link Capabilities Supported Link Speed definition (Jingoo
     Han)
   - Convert dev_printk() to dev_info(), etc (Joe Perches)
   - Add support for non PCI BAR ROM data (Matthew Garrett)
   - Add x86 support for host bridge translation offset (Mike Yoknis)
   - Report success only when every driver supports AER (Vijay
     Pandarathil)"

Fix up trivial conflicts.

* tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)
  PCI: Use phys_addr_t for physical ROM address
  x86/PCI: Add NumaChip remote PCI support
  ath9k: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: collapse wrapper for pcie_capability_read_word()
  iwlegacy: Use standard #defines for PCIe Capability ASPM fields
  iwlegacy: collapse wrapper for pcie_capability_read_word()
  cxgb3: Use standard #defines for PCIe Capability ASPM fields
  PCI: Add standard PCIe Capability Link ASPM field names
  PCI/portdrv: Use PCI Express Capability accessors
  PCI: Use standard PCIe Capability Link register field names
  x86: Use PCI setup data
  PCI: Add support for non-BAR ROMs
  PCI: Add pcibios_add_device
  EFI: Stash ROMs if they're not in the PCI BAR
  PCI: Add and use standard PCI-X Capability register names
  PCI/PM: Keep runtime PM enabled for unbound PCI devices
  xen-pcifront: Handle backend CLOSED without CLOSING
  PCI: SRIOV control and status via sysfs (documentation)
  PCI/AER: Report success only when every device has AER-aware driver
  ...
2012-12-13 12:14:47 -08:00
..
dvm Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next 2012-12-11 16:03:03 -05:00
pcie PCI changes for the v3.8 merge window: 2012-12-13 12:14:47 -08:00
iwl-agn-hw.h iwlwifi: move OTP defines 2012-04-23 14:30:01 -07:00
iwl-config.h iwlwifi: Change define and struct names in iwl-eeprom-parse.h 2012-12-06 22:21:38 +01:00
iwl-csr.h iwlwifi: configure the SKU in the HW 2012-06-06 13:22:30 +02:00
iwl-debug.c iwlwifi: fix debug message level 2012-06-29 14:28:59 +02:00
iwl-debug.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-devtrace.c iwlwifi: implement dynamic opmode loading 2012-06-05 15:32:13 -04:00
iwl-devtrace.h iwlwifi: move prph handling into the transport 2012-12-06 22:24:03 +01:00
iwl-drv.c iwlwifi: return real info in probe failure 2012-11-29 16:04:27 +01:00
iwl-drv.h iwlwifi: s/iwl_ucode_callback/iwl_req_fw_callback 2012-07-26 08:53:22 +02:00
iwl-eeprom-parse.c iwlwifi: Change define and struct names in iwl-eeprom-parse.h 2012-12-06 22:21:38 +01:00
iwl-eeprom-parse.h iwlwifi: Change define and struct names in iwl-eeprom-parse.h 2012-12-06 22:21:38 +01:00
iwl-eeprom-read.c iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-eeprom-read.h iwlwifi: refactor EEPROM reading/parsing 2012-06-06 13:24:19 +02:00
iwl-fh.h iwlwifi: update the RB_TIMEOUT to 0x11 2012-11-19 15:07:48 +01:00
iwl-fw-file.h
iwl-fw.h iwlwifi: load firmware in chunks 2012-09-10 19:14:30 +02:00
iwl-io.c iwlwifi: move prph handling into the transport 2012-12-06 22:24:03 +01:00
iwl-io.h iwlwifi: move prph handling into the transport 2012-12-06 22:24:03 +01:00
iwl-modparams.h iwlwifi: remove the iwl_shared reference 2012-05-08 21:53:44 -04:00
iwl-notif-wait.c iwlwifi: don't disable interrupt in iwl_abort_notification_waits 2012-06-18 10:46:37 +02:00
iwl-notif-wait.h
iwl-op-mode.h iwlwifi: rework the iwlwifi debugfs structure 2012-07-26 08:59:28 +02:00
iwl-prph.h iwlwifi: wipe out the status of the SCD when we disable a queue 2012-10-16 16:31:53 +02:00
iwl-test.c iwlwifi: iwl_{read,write}_targ_mem_words takes dwords 2012-06-13 09:01:01 +02:00
iwl-test.h iwlwifi: decouple testmode and iwl-test 2012-06-11 11:41:18 +02:00
iwl-testmode.h iwlwifi: refactor testmode 2012-06-11 11:37:21 +02:00
iwl-trans.h iwlwifi: move prph handling into the transport 2012-12-06 22:24:03 +01:00
Kconfig iwlwifi: remove MFP Kconfig option 2012-10-23 15:27:25 +02:00
Makefile iwlwifi: Fix Makefile build order for built-in driver 2012-06-13 09:01:05 +02:00