aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Collapse)AuthorAge
* Merge branch 'hysdn' of ↵Linus Torvalds2007-10-12
|\ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'hysdn' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: [ISDN] hysdn: convert to PCI hotplug API
| * [ISDN] hysdn: convert to PCI hotplug APIJeff Garzik2007-10-12
| | | | | | | | Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2007-10-12
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc: use correct unregister function for led trigger
| * | mmc: use correct unregister function for led triggerPierre Ossman2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | We register a simple trigger so make sure we use the corresponding unregister function. (Also means we get a dummy function when triggers aren't compiled in) Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
* | | Merge branch 'master' of ↵Linus Torvalds2007-10-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: [BNX2]: Refine napi poll loop. [TG3]: Refine napi poll loop.
| * | | [BNX2]: Refine napi poll loop.Michael Chan2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to read and store sblk->status_idx before checking for more work. The status idx is later written back to the hardware when enabling interrupts to acknowledge how much work has been processed. If the order is reversed, we can end up acknowledging work we haven't processed. When completing bnx2_poll(), we should always break out of the while loop and return work_done instead of returning 0. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [TG3]: Refine napi poll loop.Michael Chan2007-10-12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to read and store sblk->status_tag before checking for more work. The status tag is later written back to the hardware when enabling interrupts to acknowledge how much work has been processed. If the order is reversed, we can end up acknowledging work we haven't processed. When we detect tx error, it is more correct to return the rx work_done so far instead of 0. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [S390] xpram: fix bio_end{_,}io typoMartin Schwidefsky2007-10-12
| | | | | | | | | | | | Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] 3215: Handle special console device.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The early console device is special as it already has all needed data set and raw3215[0] allocated from con3215_init(). Therefore, it needs special treatment in the probe function so it can be matched with the 3215 driver which is already owning it. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] vmwatchdog: fix broken inline assembly.Heiko Carstens2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Constraint for err is wrong since it is preinitialized and the code relies on it in case of an exception. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] tape: Fix medium state handlingMichael Holzheu2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there are situations, where the tape medium state (loaded, unloaded, unknown) is not set correctly. The reason is that the medium association field is used to determine the medium state. This not always leads to correct results. To fix that we use another field of the medium sense data instead. Signed-off-by: Michael Holzheu <holzheu@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] zcore: fix inline assembly in memcpy_real()Michael Holzheu2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memcpy_real uses the mvcle instruction. This instruction alters all used registers (source, destination and 2 x count). Therefore we have to flag those registers as input/output registers (+d). In addition to that, we have to specify, that we read from memory designated by "src" and write to memory designated by "dest". Signed-off-by: Michael Holzheu <holzheu@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] Remove obsolete recommendation for 8M ramdisk size.Robert P. J. Day2007-10-12
| | | | | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] qdio: change QDIO performance_stats error message priorityUrsula Braun2007-10-12
| | | | | | | | | | | | | | | | | | Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] is_power_of_2 in drivers/s390/block/dasd_int.hvignesh babu2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Replacing n & (n - 1) for power of 2 check by is_power_of_2(n) Signed-off-by: vignesh babu <vignesh.babu@wipro.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] qdio: dont cast function pointers and use them to call functions.Heiko Carstens2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to C99 6.3.2.3 it's undefined what happens if a converted pointer is used to call a function whose type is not compatible with the pointed-to type. That's what the qdio code is doing, so fix it. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] Get rid of a bunch of sparse warnings again.Heiko Carstens2007-10-12
| | | | | | | | | | | | | | | | | | | | | Also removes a bunch of ^L in drivers/s390/cio/cmf.c Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] zcrypt: fix PCIXCC/CEX2C error recoveryRalph Wuerthner2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symptom: zcrypt fails by setting all PCIXCC/CEX2C cards offline for a certain type of invalid keys. Problem: zcrypt does not handle rc=12/rs=769 request responses correctly Solution: modify convert_type86_ica() to handle these error codes correctly Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] zcrypt: fix ap_reset_domain()Ralph Wuerthner2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Resetting of a all queues within a domain requires that a domain must be selected first. Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] zcrypt: remove duplicated struct CPRBX definitionRalph Wuerthner2007-10-12
| | | | | | | | | | | | Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
* | | [S390] zcrypt: make init/exit functions static.Heiko Carstens2007-10-12
| | | | | | | | | | | | | | | Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Avoid machine check vs. not operational races.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was the possibilty that an action like ccw_device_set_offline() triggered by a device gone machine check might trigger a not oper event. Unfortunately, this could lead to the situation that we tried to unregister a subchannel twice: Once from the slow path evaluation, and once via the not oper event. Fix this by always using the same mechanism (css_schedule_eval()) for triggering the unregister. This makes sure that unregistration will only be done once. As an added bonus, it also simplyfies the code. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Fix device attributes for early devices.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Don't forget to set dev->groups for early ccw devices like the console device so the default attributes are created. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Disable channel measurements (cmf) on shutdown/reboot.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable channel measurements for all ccw devices via the ccw bus's shutdown method. Clear residual cmf related information that may be in the schib when setting up a new subchannel. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Introduce ccw_bus_type.shutdown.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a shutdown method for the ccw bus that calls the driver specific shutdown method in struct ccw_driver. Switch zfcp to the new ccw_driver shutdown method. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Disable channel path measurements on shutdown/reboot.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure channel path measurements are disabled via a reboot notifier since we cannot rely on userspace to disable it again after enabling it. This is 1. clean and 2. makes sure that channel path measurements do not stay enabled after a reboot not involving a subsystem reset (which would lead to the channel subsystem scribbling onto random memory). Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Minor style fixes.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* | | [S390] cio: Add docbook comments.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Comment a bunch of function in docbook style and convert existing comments on structures to docbook. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] cio: Kerneldoc comments for cmf.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix existing kerneldoc-style comments. - Move descriptions of functions from cmb.h to cmf.c. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] cio: Fix some coding style issues in cmf.Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Fix some formatting and correct a comment. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] cio: remove subchannel_add_files()Cornelia Huck2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | subchannel_add_files() no longer exists, remove from header. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | | [S390] cio: rename css to channel_subsystemsCornelia Huck2007-10-12
|/ / | | | | | | | | | | | | | | Rename css[] to channel_subsystems[] to avoid name clashes. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* | [TG3]: Fix APE induced regressionMatt Carlson2007-10-12
| | | | | | | | | | | | | | | | This patch fixes a bug caused by the recent APE support added for 5761 devices. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SKY2]: version 1.19Stephen Hemminger2007-10-12
| | | | | | | | | | | | | | Update version to keep track of new changes. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SKY2]: use netdevice stats structStephen Hemminger2007-10-12
| | | | | | | | | | | | | | Use builtin statistics structure from net device. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SKY2]: fiber advertise bits initialization (trivial)Stephen Hemminger2007-10-12
| | | | | | | | | | | | | | Put initialization in sequential order (same as other constants). Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SKY2]: fix power settings on Yukon XLStephen Hemminger2007-10-12
| | | | | | | | | | | | | | Make sure PCI register for PHY power gets set correctly. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [SKY2]: ethtool register reserved area blackoutStephen Hemminger2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure and not dump reserved areas of device space. Touching some of these causes machine check exceptions on boards like D-Link DGE-550SX. Coding note, used a complex switch statement rather than bitmap because it is easier to relate the block values to the documentation rather than looking at a encoded bitmask. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'master' of ↵Linus Torvalds2007-10-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits) [POWERPC] Add memchr() to the bootwrapper [POWERPC] Implement logging of unhandled signals [POWERPC] Add legacy serial support for OPB with flattened device tree [POWERPC] Use 1TB segments [POWERPC] XilinxFB: Allow fixed framebuffer base address [POWERPC] XilinxFB: Add support for custom screen resolution [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci [POWERPC] 4xx: Kilauea defconfig file [POWERPC] 4xx: Kilauea DTS [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x [POWERPC] 4xx: Add AMCC 405EX support to cputable.c [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig [POWERPC] 85xx: Killed <asm/mpc85xx.h> [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding. [POWERPC] mpc8272ads: Remove muram from the CPM reg property. [POWERPC] Make clockevents work on PPC601 processors ... Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.
| * | [POWERPC] XilinxFB: Allow fixed framebuffer base addressGrant Likely2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Allow a fixed framebuffer address to be assigned to the framebuffer device instead of allocating the framebuffer from the consistent memory pool. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] XilinxFB: Add support for custom screen resolutionGrant Likely2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some custom implementations of the xilinx fb can use resolutions other than 640x480. This patch allows the resolution to be specified in the device tree or the xilinx_platform_data structure. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [POWERPC] XilinxFB: Use pdata to pass around framebuffer parametersGrant Likely2007-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to xilinxfb_assign is getting unwieldy when adding features to the Xilinx framebuffer driver. Change xilinxfb_assign() to accept a pointer to a xilinxfb_platform_data structure to prepare for adding additition configuration options. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | Merge branch 'virtex-for-2.6.24' of ↵Josh Boyer2007-10-11
| |\ \ | | | | | | | | | | | | git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.24-4xx
| | * | [POWERPC] XilinxFB: sparse fixesGrant Likely2007-10-10
| | | | | | | | | | | | | | | | Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| | * | [POWERPC] XilinxFB: Make missing pdata structure non-fatalGrant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing pdata structure is not a fatal error. The device can still be initialized without it. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
| | * | [POWERPC] XilinxFB: add of_platform bus bindingGrant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the of_platform bus binding to the xilinxfb driver. Needed to use framebuffer devices described in the OF device tree (used by arch/powerpc). Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
| | * | [POWERPC] XilinxFB: cleanup platform_bus binding to use platform bus API.Grant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the platform bus binding to make use of the established platform_bus API. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
| | * | [POWERPC] XilinxFB: Split device setup from bus bindingGrant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the device setup code away from the platform bus binding. This is in preparation for adding the of_platform bus binding to this driver and most of the setup code is common between the two busses. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
| | * | [POWERPC] XilinxFB: rename failout labels to reflect failureGrant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels and gotos are used in xilinxfb_assign to unwind allocations on device registration failures. Rename the labels to reflect the error which occured. This change is being made to make it easier to add new failout paths (which occurs in a subsuquent patch) and to make reviewing the failout path easier. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
| | * | [POWERPC] XilinxFB: Replace calls to printk with dev_dbg, dev_err, etc.Grant Likely2007-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dev_dbg, dev_err, etc functions provide more context that plain vanilla printk which is useful for debugging. Where appropriate, change printk calls to the appropriate dev_*() call. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Andrei Konovalov <akonovalov@ru.mvista.com>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-22 22:55:57 -0500