2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/drivers/net/wireless/b43
Linus Torvalds 8ceafbfa91 Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm
Pull DMA mask updates from Russell King:
 "This series cleans up the handling of DMA masks in a lot of drivers,
  fixing some bugs as we go.

  Some of the more serious errors include:
   - drivers which only set their coherent DMA mask if the attempt to
     set the streaming mask fails.
   - drivers which test for a NULL dma mask pointer, and then set the
     dma mask pointer to a location in their module .data section -
     which will cause problems if the module is reloaded.

  To counter these, I have introduced two helper functions:
   - dma_set_mask_and_coherent() takes care of setting both the
     streaming and coherent masks at the same time, with the correct
     error handling as specified by the API.
   - dma_coerce_mask_and_coherent() which resolves the problem of
     drivers forcefully setting DMA masks.  This is more a marker for
     future work to further clean these locations up - the code which
     creates the devices really should be initialising these, but to fix
     that in one go along with this change could potentially be very
     disruptive.

  The last thing this series does is prise away some of Linux's addition
  to "DMA addresses are physical addresses and RAM always starts at
  zero".  We have ARM LPAE systems where all system memory is above 4GB
  physical, hence having DMA masks interpreted by (eg) the block layers
  as describing physical addresses in the range 0..DMAMASK fails on
  these platforms.  Santosh Shilimkar addresses this in this series; the
  patches were copied to the appropriate people multiple times but were
  ignored.

  Fixing this also gets rid of some ARM weirdness in the setup of the
  max*pfn variables, and brings ARM into line with every other Linux
  architecture as far as those go"

* 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm: (52 commits)
  ARM: 7805/1: mm: change max*pfn to include the physical offset of memory
  ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations
  ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations
  ARM: 7795/1: mm: dma-mapping: Add dma_max_pfn(dev) helper function
  ARM: 7794/1: block: Rename parameter dma_mask to max_addr for blk_queue_bounce_limit()
  ARM: DMA-API: better handing of DMA masks for coherent allocations
  ARM: 7857/1: dma: imx-sdma: setup dma mask
  DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks
  DMA-API: dcdbas: update DMA mask handing
  DMA-API: dma: edma.c: no need to explicitly initialize DMA masks
  DMA-API: usb: musb: use platform_device_register_full() to avoid directly messing with dma masks
  DMA-API: crypto: remove last references to 'static struct device *dev'
  DMA-API: crypto: fix ixp4xx crypto platform device support
  DMA-API: others: use dma_set_coherent_mask()
  DMA-API: staging: use dma_set_coherent_mask()
  DMA-API: usb: use new dma_coerce_mask_and_coherent()
  DMA-API: usb: use dma_set_coherent_mask()
  DMA-API: parport: parport_pc.c: use dma_coerce_mask_and_coherent()
  DMA-API: net: octeon: use dma_coerce_mask_and_coherent()
  DMA-API: net: nxp/lpc_eth: use dma_coerce_mask_and_coherent()
  ...
2013-11-14 07:55:21 +09:00
..
b43.h Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2013-04-10 14:09:54 -04:00
bus.c
bus.h
debugfs.c
debugfs.h
dma.c DMA-API: net: b43: replace dma_set_mask()+dma_set_coherent_mask() with new helper 2013-09-21 21:02:22 +01:00
dma.h B43: Handle DMA RX descriptor underrun 2013-05-08 17:15:06 -04:00
Kconfig b43: replace B43_BCMA_EXTRA with modparam allhwsupport 2013-06-27 13:42:15 -04:00
leds.c
leds.h
lo.c
lo.h
main.c b43: call PCIe up and down functions 2013-08-26 14:09:04 -04:00
main.h b43: Fix firmware loading when driver is built into the kernel 2013-01-07 14:34:45 -05:00
Makefile b43: N-PHY: init 0x2057 radio 2012-08-06 14:56:35 -04:00
pcmcia.c drivers/net: use module_pcmcia_driver() in pcmcia drivers 2013-03-15 12:27:33 -07:00
pcmcia.h
phy_a.c
phy_a.h
phy_common.c b43: add helper waiting for given value in radio reg 2012-08-06 14:56:35 -04:00
phy_common.h b43: add helper waiting for given value in radio reg 2012-08-06 14:56:35 -04:00
phy_g.c
phy_g.h
phy_ht.c b43: HT-PHY: use enum for RSSI types 2013-04-23 12:27:56 +02:00
phy_ht.h b43: HT-PHY: define regs for power estimation 2013-04-23 12:27:56 +02:00
phy_lcn.c mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan 2013-03-25 19:19:35 +01:00
phy_lcn.h
phy_lp.c b43: use defines for board_type 2013-04-23 12:27:57 +02:00
phy_lp.h
phy_n.c drivers: net: wireless: b43: Fix possible NULL ptr dereference 2013-10-18 13:41:11 -04:00
phy_n.h b43: N-PHY: define missing registers 2013-04-23 12:27:57 +02:00
pio.c b43: fix tx path skb leaks 2012-12-10 15:49:59 -05:00
pio.h
radio_2055.c
radio_2055.h
radio_2056.c b43: make struct b2056_inittabs_pts const 2013-04-01 16:06:50 -04:00
radio_2056.h
radio_2057.c b43: N-PHY: init 0x2057 radio 2012-08-06 14:56:35 -04:00
radio_2057.h b43: N-PHY: init 0x2057 radio 2012-08-06 14:56:35 -04:00
radio_2059.c b43: HT-PHY: tables: don't duplicate core-generic regs 2013-04-23 12:27:55 +02:00
radio_2059.h b43: HT-PHY: tables: don't duplicate core-generic regs 2013-04-23 12:27:55 +02:00
rfkill.c
rfkill.h
sdio.c b43: remove __dev* attributes 2012-12-06 15:04:56 -05:00
sdio.h b43: mark some functions and structs static 2013-04-01 16:06:50 -04:00
sysfs.c
sysfs.h
tables_lpphy.c
tables_lpphy.h
tables_nphy.c b43: N-PHY: clean init tables 2013-04-23 12:27:58 +02:00
tables_nphy.h b43: N-PHY: clean init tables 2013-04-23 12:27:58 +02:00
tables_phy_ht.c
tables_phy_ht.h
tables_phy_lcn.c b43: mark some functions and structs static 2013-04-01 16:06:50 -04:00
tables_phy_lcn.h
tables.c
tables.h
wa.c
wa.h
xmit.c net:drivers/net: Miscellaneous conversions to ETH_ALEN 2013-10-02 17:04:45 -04:00
xmit.h