aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-10Blackfin: bf533: merge fio_flag back into normal mach headersMike Frysinger2-55/+41
We don't want the BF533 to be different in terms of its MMR headers, so merge the FIO_FLAG helpers back into the normal place. To avoid circular dependencies with headers, turn the inline C funcs into CPP defines. Not like there will be any code size differences. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bf561-ezkit: add SMP defconfigMike Frysinger1-0/+113
Since the SMP code paths tend to compile fail a lot, start a SMP defconfig so our nightly build tools will automatically test it. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bf533: convert boards to gpio frameworkMike Frysinger3-22/+22
We don't want people banging on MMRs directly. As for the ip0x board, it shouldn't need to muck with the CS pin directly as the Blackfin SPI bus master driver takes care of driving this. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: push gpio (port) defines into common headersMike Frysinger24-601/+282
Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bf54x: drop unused legacy MMR namesMike Frysinger2-24/+0
Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: dma: constify MMR pointer arrayMike Frysinger8-8/+8
The array of pointers is never written, so constify it. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: standardize DMAC traffic control MMRs & MDMA MMRsMike Frysinger15-973/+698
Use the same naming convention for DMA traffic MMRs (most were legacy anyways) so we can avoid useless ifdef trees. Same goes for MDMA names -- this actually allows us to undo a bunch of ifdef redirects that existed for this purpose alone. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bfin_dma.h: start a header for DMA MMR layoutMike Frysinger2-34/+92
Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: switch to asm-generic/io.hMike Frysinger1-201/+37
Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10asm-generic/io.h: add reads[bwl]/writes[bwl] helpersMike Frysinger2-30/+30
A bunch of arches define reads[bwl]/writes[bwl] helpers for accessing memory mapped registers. Since the Blackfin ones aren't specific to Blackfin code, move them to the common asm-generic/io.h for people. Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10net/irda: bfin_sir: back out transitional definesMike Frysinger1-3/+0
Now that the common header is sane, we can drop the transitional cruft. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: bfin_serial.h: unify heavily duplicated serial codeMike Frysinger29-1024/+377
Each Blackfin port has been duplicating UART structures and defines when there really is no need for it. So start a new bfin_serial.h header to unify all these pieces and give ourselves a fresh start. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10net/irda: bfin_sir: pull in serial headers for definesMike Frysinger1-0/+5
We're in the process of cleaning up the global Blackfin namespace, so the bfin_sir driver needs to pull in the serial header explicitly now. This does add a little transitional cruft to keep things compiling, but a follow up patch in this series will cull that. Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: musb-boards: push clkin value to platform resourcesBob Liu6-0/+6
In order to not touch the driver file for different xtal usage, push the clkin value to board file and calculate the register value instead of hardcoding it. Signed-off-by: Bob Liu <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10Blackfin: SMP: fix hotplug building after irq header shuffleGraf Yang1-0/+2
Signed-off-by: Graf Yang <[email protected]> Signed-off-by: Mike Frysinger <[email protected]>
2011-01-10x86, lapic-timer: Increase the max_delta to 31 bitsPierre Tardy1-1/+1
Latest atom socs(penwell) does not have hpet timer. As their local APIC timer is clocked at 400KHZ, and the current code limit their Initial Counter register to 23 bits, they cannot sleep more than 1.34 seconds which leads to ~2 spurious wakeup per second (1 per thread) These SOCs support 32bit timer so we change the max_delta to at least 31bits. So we can at least sleep for 300 seconds. We could not find any previous chip errata where lapic would only have 23 bit precision As powertop is suggesting to activate HPET to "sleep longer", this could mean this problem is already known. Problem is here since very first implementation of lapic timer as a clock event e9e2cdb [PATCH] clockevents: i386 drivers. Signed-off-by: Suresh Siddha <[email protected]> Signed-off-by: Pierre Tardy <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Cc: Arjan van de Ven <[email protected]> Cc: Adrian Bunk <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: john stultz <[email protected]> Cc: Roman Zippel <[email protected]> Cc: Andi Kleen <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2011-01-10Merge branch 'x86/numa' into x86/urgentIngo Molnar6-63/+225
Merge reason: Topic is ready for upstream. Signed-off-by: Ingo Molnar <[email protected]>
2011-01-10Merge branch 'x86/apic-cleanups' into x86/urgentIngo Molnar9-228/+75
Merge reason: Topic is ready for upstream. Signed-off-by: Ingo Molnar <[email protected]>
2011-01-10microblaze: remove obsolete DEBUG_BOOTMEMAmerigo Wang2-5/+0
"git grep" shows this is the last piece of code using DEBUG_BOOTMEM, so remove it. Signed-off-by: WANG Cong <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2011-01-10Merge commit 'v2.6.37' into nextMichal Simek1628-13553/+24995
2011-01-09ixgbe: update ntuple filter configurationAlexander Duyck5-371/+250
This change fixes several issues found in ntuple filtering while I was doing the ATR refactor. Specifically I updated the masks to work correctly with the latest version of ethtool, I cleaned up the exception handling and added detailed error output when a filter is rejected, and corrected several bits that were set incorrectly in ixgbe_type.h. The previous version of this patch included a printk that was left over from me fixing the filter setup. This patch does not include that printk. Signed-off-by: Alexander Duyck <[email protected]> Tested-by: Stephen Ko <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09ixgbe: further flow director performance optimizationsAlexander Duyck4-44/+194
This change adds a compressed input type for atr signature hash computation. It also drops the use of the set functions when setting up the ATR input since we can then directly setup the hash input as two dwords that can be stored and passed as registers. With these changes the cost of computing the has is low enough that we can perform a hash computation on each TCP SYN flagged packet allowing us to drop the number of flow director misses considerably in tests such as netperf TCP_CRR. Signed-off-by: Alexander Duyck <[email protected]> Tested-by: Stephen Ko <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09ixgbe: cleanup flow director hash computation to improve performanceAlexander Duyck5-253/+182
This change cleans up the layout of the flow director data, and the algorithm used to calculate the hash resulting in a 35x / 3500% performance increase versus the old flow director hash computation. The overall effect is only a 1% increase in transactions per second though due to the fact that only 1 packet in 20 are actually hashed upon. TCP_RR before: Socket Size Request Resp. Elapsed Trans. Send Recv Size Size Time Rate bytes Bytes bytes bytes secs. per sec 16384 87380 1 1 60.00 23059.27 16384 87380 TCP_RR after: Socket Size Request Resp. Elapsed Trans. Send Recv Size Size Time Rate bytes Bytes bytes bytes secs. per sec 16384 87380 1 1 60.00 23239.98 16384 87380 Signed-off-by: Alexander Duyck <[email protected]> Tested-by: Stephen Ko <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09ixgbe: make sure per Rx queue is disabled before unmapping the receive bufferYi Zou3-7/+39
When disable the Rx logic globally, we would also want to disable the per Rx queue receive logic by per queue Rx control register RXDCTL so no more DMA is happening from the packet buffer to the receive buffer associated with the Rx ring, before we start unmapping Rx ring receive buffer. The hardware may take max of 100us before the corresponding Rx queue is really disabled. Added ixgbe_disable_rx_queue() for this purpose. Signed-off-by: Yi Zou <[email protected]> Tested-by: Stephen Ko <[email protected]> Tested-by: Ross Brattain <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000: Add support for the CE4100 reference platformDirk Brandewie4-76/+365
This patch adds support for the gigabit phys present on the CE4100 reference platforms. Signed-off-by: Dirk Brandewie <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574Bruce Allan2-0/+57
82574 needs to configure Low Power Link Up (or LPLU) differently than the other parts in the 8257x family supported by the driver. Signed-off-by: Bruce Allan <[email protected]> Tested-by: Emil Tantilov <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: power off PHY after reset when interface is downBruce Allan3-35/+53
Some Phys supported by the driver do not remain powered off across a reset of the device when the interface is down, e.g. on 82571, but not on 82574. This patch powers down (only when WoL is disabled) the PHY after a reset if the interface is down and the ethtool diagnostics are not currently running. The ethtool diagnostic function required a minor re-factor as a result, and the e1000_[get|put]_hw_control() functions are renamed since they are no longer static to netdev.c as they are needed by the ethtool diagnostics. A couple minor whitespace issues were cleaned up, too. Reported-by: Arthur Jones <[email protected]> Signed-off-by: Bruce Allan <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: use either_crc_le() rather than re-write itBruce Allan2-18/+2
For the 82579 jumbo frame workaround, there is no need to re-write the CRC calculation functionality already found in the kernel's ether_crc_le(). Signed-off-by: Bruce Allan <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: properly bounds-check string functionsBruce Allan2-7/+11
Use string functions with bounds checking rather than their non-bounds checking counterparts, and do not hard code these boundaries. Signed-off-by: Bruce Allan <[email protected]> Tested-by: Emil Tantilov <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phyBruce Allan3-53/+44
Cleans up the code a bit by using the driver-specific e1e_rphy and e1e_wphy macros instead of the full function pointer variants. Fix a couple whitespace issue with two already existing calls to e1e_wphy. Signed-off-by: Bruce Allan <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09e1000e: cleanup variables set but not usedBruce Allan4-11/+21
The ICR register is clear on read and we don't care what the returned value is when resetting the hardware so the icr variable(s) can be removed. We should not ignore the return from e1000_lv_jumbo_workaround_ich8lan() and from e1000_get_phy_id_82571() (dump a debug message when it fails and when an unknown Phy id is returned). Signed-off-by: Bruce Allan <[email protected]> Tested-by: Emil Tantilov <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Convert checksums to use centrally computed features.Jesse Gross1-28/+12
In order to compute the features for other offloads (primarily scatter/gather), we need to first check the ability of the NIC to offload the checksum for the packet. Since we have already computed this, we can directly use the result instead of figuring it out again. Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Convert skb_need_linearize() to use precomputed features.Jesse Gross1-15/+6
This switches skb_need_linearize() to use the features that have been centrally computed. In doing so, this fixes a problem where scatter/gather should not be used because the card does not support checksum offloading on that type of packet. On device registration we only check that some form of checksum offloading is available if scatter/gatther is enabled but we must also check at transmission time. Examples of this include IPv6 or vlan packets on a NIC that only supports IPv4 offloading. Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Convert dev_gso_segment() to use precomputed features.Jesse Gross1-5/+3
This switches dev_gso_segment() to use the device features computed by the centralized routine. In doing so, it fixes a problem where it would always use dev->features, instead of those appropriate to the number of vlan tags if any are present. Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Pass features into netif_needs_gso().Jesse Gross3-12/+10
Now that there is a single function that can compute the device features relevant to a packet, we don't want to run it for each offload. This converts netif_needs_gso() to take the features of the device, rather than computing them itself. Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Generalize netif_get_vlan_features().Jesse Gross2-10/+29
netif_get_vlan_features() is currently only used by netif_needs_gso(), so it only concerns itself with GSO features. However, several other places also should take into account the contents of the packet when deciding whether to offload to hardware. This generalizes the function to return features about all of the various forms of offloading. Since offloads tend to be linked together, this avoids duplicating the logic in each location (i.e. the scatter/gather code also needs the checksum logic). Suggested-by: Michał Mirosław <[email protected]> Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-09net offloading: Accept NETIF_F_HW_CSUM for all protocols.Jesse Gross1-1/+1
We currently only have software fallback for one type of checksum: the TCP/UDP one's complement. This means that a protocol that uses hardware offloading for a different type of checksum (FCoE, SCTP) must directly check the device's features and do the right thing ahead of time. By the time we get to dev_can_checksum(), we're only deciding whether to apply the one algorithm in software or hardware. NETIF_F_HW_CSUM has the same capabilities as the software version, so we should always use it if present. The primary advantage of this is multiply tagged vlans can use hardware checksumming. Signed-off-by: Jesse Gross <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-01-10nilfs2: unfold nilfs_dat_inode functionRyusuke Konishi7-30/+19
nilfs_dat_inode function was a wrapper to switch between normal dat inode and gcdat, a clone of the dat inode for garbage collection. This function got obsolete when the gcdat inode was removed, and now we can access the dat inode directly from a nilfs object. So, we will unfold the wrapper and remove it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: do not pass sbi to functions which can get it from inodeRyusuke Konishi4-17/+12
This removes argument for passing nilfs_sb_info structure from nilfs_set_file_dirty and nilfs_load_inode_block functions. We can get a pointer to the structure from inodes. [Stephen Rothwell <[email protected]>: fix conflict with commit b74c79e99389cd79b31fcc08f82c24e492e63c7e] Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: get rid of nilfs_mount_options structureRyusuke Konishi2-11/+3
Only mount_opt member is used in the nilfs_mount_options structure, and we can simplify it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: simplify nilfs_mdt_freeze_bufferRyusuke Konishi1-14/+12
nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer() always returns a valid buffer head, so its validity check can be removed. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: get rid of loaded flag from nilfs objectRyusuke Konishi2-4/+0
NILFS_LOADED flag of the nilfs object is not used now, so this will remove it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: fix a checkpatch error in page.cRyusuke Konishi1-1/+1
Will correct the following checkpatch error: ERROR: trailing whitespace #494: FILE: page.c:494: + $ Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: fiemap supportRyusuke Konishi6-0/+222
This adds fiemap to nilfs. Two new functions, nilfs_fiemap and nilfs_find_uncommitted_extent are added. nilfs_fiemap() implements the fiemap inode operation, and nilfs_find_uncommitted_extent() helps to get a range of data blocks whose physical location has not been determined. nilfs_fiemap() collects extent information by looping through nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: mark buffer heads as delayed until the data is written to diskRyusuke Konishi2-0/+3
Nilfs does not allocate new blocks on disk until they are actually written to. To implement fiemap, we need to deal with such blocks. To allow successive fiemap patch to distinguish mapped but unallocated regions, this marks buffer heads of those new blocks as delayed and clears the flag after the blocks are written to disk. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10nilfs2: call nilfs_error inside bmap routinesRyusuke Konishi5-63/+48
Some functions using nilfs bmap routines can wrongly return invalid argument error (i.e. -EINVAL) that bmap returns as an internal code for btree corruption. This fixes the issue by catching and converting the internal EINVAL to EIO and calling nilfs_error function inside bmap routines. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10fs/nilfs2/super.c: Use printf extension %pVJoe Perches1-7/+16
Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10MAINTAINERS: add nilfs2 git tree entryRyusuke Konishi1-0/+1
NILFS2 filesystem section of the MAINTAINERS file lacks an entry of scm tree. This adds it. Signed-off-by: Ryusuke Konishi <[email protected]>
2011-01-10drm/radeon/kms: disable underscan by defaultAlex Deucher1-3/+3
Lots of HDMI TVs overscan the incoming image by default. The underscan option was added as a way to compensate for that by underscanning the image so that the edges would not be cut off on an overscanning TV. However, the TV provides no way of knowing whether it is overscanning or not. If the user has disabled overscan on their TV or has a TV that does not overscan, you will get black bars around the edges of your screen. Prior to the patch we got complaints and bug reports from users with overscanning TVs, now with the patch, we get lots of complaints and bug reports from users with non-overscanning TVs. There's no good default, but on average there have been more users complaining about it being on by default than off, so change it to off. This will probably result in a new deluge of overscanning TV user complaints. There's no winning. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-01-10drm/radeon/kms: only enable hdmi features if the monitor supports audioAlex Deucher1-3/+3
This avoids some issues in the current hdmi audio code for monitors without audio. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>