Eric Lee / smarc-fsl-linux-kernel

10 Mar, 2011

1 commit

09 Feb, 2011

1 commit

  • b8cf0e0e5   cdrom: support devices that have check_events but not media_changed ... Browse Code »

    Commit 93aae17af1172c40c6f74b7294e93a90c3cfaa5d ("sr: implement
    sr_check_events()") replaced the media_changed op with the
    check_events op in drivers/scsi/sr.c

    All users that check for the CDC_MEDIA_CHANGED capbility try both
    the check_events op and the media_changed op, but register_cdrom()
    was requiring media_changed.

    This patch fixes the capability checking.

    The cdrom_select_disc ioctl is also using the two operations, so
    they should be required for CDC_SELECT_DISC too.

    Signed-off-by: Simon Arlott
    Cc: Tejun Heo
    Cc: Kay Sievers
    Tested-by: Chris Clayton
    Signed-off-by: Jens Axboe

    Simon Arlott
     

14 Jan, 2011

1 commit

  • 275220f0f   Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block ... Browse Code »

    * 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits)
    block: ensure that completion error gets properly traced
    blktrace: add missing probe argument to block_bio_complete
    block cfq: don't use atomic_t for cfq_group
    block cfq: don't use atomic_t for cfq_queue
    block: trace event block fix unassigned field
    block: add internal hd part table references
    block: fix accounting bug on cross partition merges
    kref: add kref_test_and_get
    bio-integrity: mark kintegrityd_wq highpri and CPU intensive
    block: make kblockd_workqueue smarter
    Revert "sd: implement sd_check_events()"
    block: Clean up exit_io_context() source code.
    Fix compile warnings due to missing removal of a 'ret' variable
    fs/block: type signature of major_to_index(int) to major_to_index(unsigned)
    block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
    cfq-iosched: don't check cfqg in choose_service_tree()
    fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
    cdrom: export cdrom_check_events()
    sd: implement sd_check_events()
    sr: implement sr_check_events()
    ...

    Linus Torvalds
     

24 Dec, 2010

1 commit

17 Dec, 2010

2 commits

  • 30a7caabb   cdrom: export cdrom_check_events() ... Browse Code »

    It's used by sr, so we need to export it.

    Signed-off-by: Jens Axboe

    Jens Axboe
     
  • 2d9217296   cdrom: add ->check_events() support ... Browse Code »

    In principle, cdrom just needs to pass through ->check_events() but
    CDROM_MEDIA_CHANGED ioctl makes things a bit more complex. Just as
    with ->media_changed() support, cdrom code needs to buffer the events
    and serve them to ioctl and vfs as requested.

    As the code has to deal with both ->check_events() and
    ->media_changed(), and vfs and ioctl event buffering, this patch adds
    check_events caching on top of the existing cdi->mc_flags buffering.

    It may be a good idea to deprecate CDROM_MEDIA_CHANGED ioctl and
    remove all this mess.

    Signed-off-by: Tejun Heo
    Signed-off-by: Jens Axboe

    Tejun Heo
     

27 Oct, 2010

1 commit

05 Oct, 2010

1 commit

  • 2a48fc0ab   block: autoconvert trivial BKL users to private mutex ... Browse Code »

    The block device drivers have all gained new lock_kernel
    calls from a recent pushdown, and some of the drivers
    were already using the BKL before.

    This turns the BKL into a set of per-driver mutexes.
    Still need to check whether this is safe to do.

    file=$1
    name=$2
    if grep -q lock_kernel ${file} ; then
    if grep -q 'include.*linux.mutex.h' ${file} ; then
    sed -i '/include.*/d' ${file}
    else
    sed -i 's/include.*.*$/include /g' ${file}
    fi
    sed -i ${file} \
    -e "/^#include.*linux.mutex.h/,$ {
    1,/^\(static\|int\|long\)/ {
    /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex);

    } }" \
    -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \
    -e '/[ ]*cycle_kernel_lock();/d'
    else
    sed -i -e '/include.*\/d' ${file} \
    -e '/cycle_kernel_lock()/d'
    fi

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

08 Aug, 2010

4 commits

  • 6e9624b8c   block: push down BKL into .open and .release ... Browse Code »

    The open and release block_device_operations are currently
    called with the BKL held. In order to change that, we must
    first make sure that all drivers that currently rely
    on this have no regressions.

    This blindly pushes the BKL into all .open and .release
    operations for all block drivers to prepare for the
    next step. The drivers can subsequently replace the BKL
    with their own locks or remove it completely when it can
    be shown that it is not needed.

    The functions blkdev_get and blkdev_put are the only
    remaining users of the big kernel lock in the block
    layer, besides a few uses in the ioctl code, none
    of which need to serialize with blkdev_{get,put}.

    Most of these two functions is also under the protection
    of bdev->bd_mutex, including the actual calls to
    ->open and ->release, and the common code does not
    access any global data structures that need the BKL.

    Signed-off-by: Arnd Bergmann
    Acked-by: Christoph Hellwig
    Signed-off-by: Jens Axboe

    Arnd Bergmann
     
  • 8a6cfeb6d   block: push down BKL into .locked_ioctl ... Browse Code »

    As a preparation for the removal of the big kernel
    lock in the block layer, this removes the BKL
    from the common ioctl handling code, moving it
    into every single driver still using it.

    Signed-off-by: Arnd Bergmann
    Acked-by: Christoph Hellwig
    Signed-off-by: Jens Axboe

    Arnd Bergmann
     
  • e597cd09f   drivers/cdrom: use pr_<level> ... Browse Code »

    - add pr_fmt.

    - convert printks to pr_

    - add if (0) and printf argument checking to cdinfo

    - coalesce consecutive printks to single pr_

    - fix a typo "back ground" to "background"

    - convert printks without level to pr_info

    - remove VIOCD_ prefixes and use pr_fmt/pr_

    - add a missing newline to an OS/400 message

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton

    Folded in tab indentation fix from Andrew.

    Signed-off-by: Jens Axboe

    Joe Perches
     
  • 33659ebba   block: remove wrappers for request type/flags ... Browse Code »

    Remove all the trivial wrappers for the cmd_type and cmd_flags fields in
    struct requests. This allows much easier grepping for different request
    types instead of unwinding through macros.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Jens Axboe

    Christoph Hellwig
     

19 May, 2010

1 commit

26 Feb, 2010

2 commits

10 Dec, 2009

1 commit

  • 3a43aaa31   Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits)
    sh: include empty zero page in romImage
    sh: Make associative cache writes fatal on all SH-4A parts.
    sh: Drop associative writes for SH-4 cache flushes.
    sh: Partial revert of copy/clear_user_highpage() optimizations.
    sh: Add default uImage rule for se7724, ap325rxa, and migor.
    sh: allow runtime pm without suspend/resume callbacks
    sh: mach-ecovec24: Remove un-defined settings for VPU
    sh: mach-ecovec24: LCDC drive ability become high
    sh: fix sh7724 VEU3F resource size
    serial: sh-sci: Fix too early port disabling.
    sh: pfc: pr_info() -> pr_debug() cleanups.
    sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.
    sh: Improve kfr2r09 serial port setup code
    sh: Break out SuperH PFC code
    sh: Move KEYSC header file
    sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file
    sh: Add CPG save/restore code for sh7724 R-standby
    sh: Add SDHI power control support to Ecovec
    mfd: Add power control platform data to SDHI driver
    sh: mach-ecovec24: modify address map
    ...

    Linus Torvalds
     

19 Nov, 2009

1 commit

12 Nov, 2009

1 commit

  • 894d24911   sysctl drivers: Remove dead binary sysctl support ... Browse Code »

    Now that sys_sysctl is a wrapper around /proc/sys all of
    the binary sysctl support elsewhere in the tree is
    dead code.

    Cc: Jens Axboe
    Cc: Corey Minyard
    Cc: Greg Kroah-Hartman
    Cc: Matt Mackall
    Cc: Herbert Xu
    Cc: Neil Brown
    Cc: "James E.J. Bottomley"
    Acked-by: Clemens Ladisch for drivers/char/hpet.c
    Signed-off-by: Eric W. Biederman

    Eric W. Biederman
     

13 Oct, 2009

1 commit

  • 54d5102fa   cdrom: gdrom: Kill off PHYSADDR use. ... Browse Code »

    PHYSADDR() is gone, and completely unecessary in all of the cases the
    gdrom driver was using it. Kill off all references to it, and change the
    one legitimate use over to virt_to_phys() instead.

    Signed-off-by: Paul Mundt

    Paul Mundt
     

24 Sep, 2009

1 commit

  • 8d65af789   sysctl: remove "struct file *" argument of ->proc_handler ... Browse Code »

    It's unused.

    It isn't needed -- read or write flag is already passed and sysctl
    shouldn't care about the rest.

    It _was_ used in two places at arch/frv for some reason.

    Signed-off-by: Alexey Dobriyan
    Cc: David Howells
    Cc: "Eric W. Biederman"
    Cc: Al Viro
    Cc: Ralf Baechle
    Cc: Martin Schwidefsky
    Cc: Ingo Molnar
    Cc: "David S. Miller"
    Cc: James Morris
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

22 Sep, 2009

1 commit

23 May, 2009

3 commits

20 May, 2009

1 commit

11 May, 2009

4 commits

  • 9934c8c04   block: implement and enforce request peek/start/fetch ... Browse Code »

    Till now block layer allowed two separate modes of request execution.
    A request is always acquired from the request queue via
    elv_next_request(). After that, drivers are free to either dequeue it
    or process it without dequeueing. Dequeue allows elv_next_request()
    to return the next request so that multiple requests can be in flight.

    Executing requests without dequeueing has its merits mostly in
    allowing drivers for simpler devices which can't do sg to deal with
    segments only without considering request boundary. However, the
    benefit this brings is dubious and declining while the cost of the API
    ambiguity is increasing. Segment based drivers are usually for very
    old or limited devices and as converting to dequeueing model isn't
    difficult, it doesn't justify the API overhead it puts on block layer
    and its more modern users.

    Previous patches converted all block low level drivers to dequeueing
    model. This patch completes the API transition by...

    * renaming elv_next_request() to blk_peek_request()

    * renaming blkdev_dequeue_request() to blk_start_request()

    * adding blk_fetch_request() which is combination of peek and start

    * disallowing completion of queued (not started) requests

    * applying new API to all LLDs

    Renamings are for consistency and to break out of tree code so that
    it's apparent that out of tree drivers need updating.

    [ Impact: block request issue API cleanup, no functional change ]

    Signed-off-by: Tejun Heo
    Cc: Rusty Russell
    Cc: James Bottomley
    Cc: Mike Miller
    Cc: unsik Kim
    Cc: Paul Clements
    Cc: Tim Waugh
    Cc: Geert Uytterhoeven
    Cc: David S. Miller
    Cc: Laurent Vivier
    Cc: Jeff Garzik
    Cc: Jeremy Fitzhardinge
    Cc: Grant Likely
    Cc: Adrian McMenamin
    Cc: Stephen Rothwell
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Borislav Petkov
    Cc: Sergei Shtylyov
    Cc: Alex Dubov
    Cc: Pierre Ossman
    Cc: David Woodhouse
    Cc: Markus Lidel
    Cc: Stefan Weinhuber
    Cc: Martin Schwidefsky
    Cc: Pete Zaitcev
    Cc: FUJITA Tomonori
    Signed-off-by: Jens Axboe

    Tejun Heo
     
  • 234304682   gdrom: dequeue in-flight request ... Browse Code »

    gdrom already dequeues and fully completes requests on normal path and
    the error paths can be easily converted to do so too. Clean it up and
    dequeue requests on error paths too.

    While at it remove superflous blk_fs_request() && !blk_rq_sectors()
    condition check.

    [ Impact: dequeue in-flight request, cleanup ]

    Signed-off-by: Tejun Heo
    Cc: Adrian McMenamin
    Signed-off-by: Jens Axboe

    Tejun Heo
     
  • 296b2f6ae   block: convert to dequeueing model (easy ones) ... Browse Code »

    plat-omap/mailbox, floppy, viocd, mspro_block, i2o_block and
    mmc/card/queue are already pretty close to dequeueing model and can be
    converted with simple changes. Convert them.

    While at it,

    * xen-blkfront: !fs check moved downwards to share dequeue call with
    normal path.

    * mspro_block: __blk_end_request(..., blk_rq_cur_byte()) converted to
    __blk_end_request_cur()

    * mmc/card/queue: loop of __blk_end_request() converted to
    __blk_end_request_all()

    [ Impact: dequeue in-flight request ]

    Signed-off-by: Tejun Heo
    Cc: Rusty Russell
    Cc: Jeremy Fitzhardinge
    Cc: Stephen Rothwell
    Cc: Alex Dubov
    Cc: Markus Lidel
    Cc: Pierre Ossman
    Signed-off-by: Jens Axboe

    Tejun Heo
     
  • 83096ebf1   block: convert to pos and nr_sectors accessors ... Browse Code »

    With recent cleanups, there is no place where low level driver
    directly manipulates request fields. This means that the 'hard'
    request fields always equal the !hard fields. Convert all
    rq->sectors, nr_sectors and current_nr_sectors references to
    accessors.

    While at it, drop superflous blk_rq_pos() < 0 test in swim.c.

    [ Impact: use pos and nr_sectors accessors ]

    Signed-off-by: Tejun Heo
    Acked-by: Geert Uytterhoeven
    Tested-by: Grant Likely
    Acked-by: Grant Likely
    Tested-by: Adrian McMenamin
    Acked-by: Adrian McMenamin
    Acked-by: Mike Miller
    Cc: James Bottomley
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Borislav Petkov
    Cc: Sergei Shtylyov
    Cc: Eric Moore
    Cc: Alan Stern
    Cc: FUJITA Tomonori
    Cc: Pete Zaitcev
    Cc: Stephen Rothwell
    Cc: Paul Clements
    Cc: Tim Waugh
    Cc: Jeff Garzik
    Cc: Jeremy Fitzhardinge
    Cc: Alex Dubov
    Cc: David Woodhouse
    Cc: Martin Schwidefsky
    Cc: Dario Ballabio
    Cc: David S. Miller
    Cc: Rusty Russell
    Cc: unsik Kim
    Cc: Laurent Vivier
    Signed-off-by: Jens Axboe

    Tejun Heo
     

28 Apr, 2009

2 commits

  • f06d9a2b5   block: replace end_request() with [__]blk_end_request_cur() ... Browse Code »

    end_request() has been kept around for backward compatibility;
    however, it's about time for it to go away.

    * There aren't too many users left.

    * Its use of @updtodate is pretty confusing.

    * In some cases, newer code ends up using mixture of end_request() and
    [__]blk_end_request[_all](), which is way too confusing.

    So, add [__]blk_end_request_cur() and replace end_request() with it.
    Most conversions are straightforward. Noteworthy ones are...

    * paride/pcd: next_request() updated to take 0/-errno instead of 1/0.

    * paride/pf: pf_end_request() and next_request() updated to take
    0/-errno instead of 1/0.

    * xd: xd_readwrite() updated to return 0/-errno instead of 1/0.

    * mtd/mtd_blkdevs: blktrans_discard_request() updated to return
    0/-errno instead of 1/0. Unnecessary local variable res
    initialization removed from mtd_blktrans_thread().

    [ Impact: cleanup ]

    Signed-off-by: Tejun Heo
    Acked-by: Joerg Dorchain
    Acked-by: Geert Uytterhoeven
    Acked-by: Grant Likely
    Acked-by: Laurent Vivier
    Cc: Tim Waugh
    Cc: Stephen Rothwell
    Cc: Paul Mackerras
    Cc: Jeremy Fitzhardinge
    Cc: Markus Lidel
    Cc: David Woodhouse
    Cc: Pete Zaitcev
    Cc: unsik Kim

    Tejun Heo
     
  • 40cbbb781   block: implement and use [__]blk_end_request_all() ... Browse Code »

    There are many [__]blk_end_request() call sites which call it with
    full request length and expect full completion. Many of them ensure
    that the request actually completes by doing BUG_ON() the return
    value, which is awkward and error-prone.

    This patch adds [__]blk_end_request_all() which takes @rq and @error
    and fully completes the request. BUG_ON() is added to to ensure that
    this actually happens.

    Most conversions are simple but there are a few noteworthy ones.

    * cdrom/viocd: viocd_end_request() replaced with direct calls to
    __blk_end_request_all().

    * s390/block/dasd: dasd_end_request() replaced with direct calls to
    __blk_end_request_all().

    * s390/char/tape_block: tapeblock_end_request() replaced with direct
    calls to blk_end_request_all().

    [ Impact: cleanup ]

    Signed-off-by: Tejun Heo
    Cc: Russell King
    Cc: Stephen Rothwell
    Cc: Mike Miller
    Cc: Martin Schwidefsky
    Cc: Jeff Garzik
    Cc: Rusty Russell
    Cc: Jeremy Fitzhardinge
    Cc: Alex Dubov
    Cc: James Bottomley

    Tejun Heo
     

29 Dec, 2008

2 commits

  • d194139c1   cdrom: reduce stack usage of mmc_ioctl_dvd_read_struct ... Browse Code »

    1. kmalloc 192 bytes in dvd_read_bca (which is inlined into dvd_read_struct)
    2. Pass struct packet_command to all dvd_read_* functions.

    Checkstack output:
    Before: mmc_ioctl_dvd_read_struct: 280
    After: mmc_ioctl_dvd_read_struct: 56

    Signed-off-by: Marcin Slusarz
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Andrew Morton
    Cc: Jens Axboe
    Signed-off-by: Jens Axboe

    Marcin Slusarz
     
  • 3147c531b   cdrom: split mmc_ioctl to lower stack usage ... Browse Code »

    Checkstack output:

    Before:
    mmc_ioctl: 584

    After:
    mmc_ioctl_dvd_read_struct: 280
    mmc_ioctl_cdrom_subchannel: 152
    mmc_ioctl_cdrom_read_data: 120
    mmc_ioctl_cdrom_volume: 104
    mmc_ioctl_cdrom_read_audio: 104
    (mmc_ioctl is inlined into cdrom_ioctl - 104 bytes)

    Signed-off-by: Marcin Slusarz
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Andrew Morton
    Cc: Jens Axboe
    Signed-off-by: Jens Axboe

    Marcin Slusarz
     

12 Dec, 2008

1 commit

  • febd7a5c1   Commands needing to be retried require a complete re-initialization. ... Browse Code »

    The test-unit-ready portion of this patch was causing boots to fail on
    my test machine (as in http://lkml.org/lkml/2008/12/5/161). With this
    patch in place, the system is booting reliably.

    Mike Anderson found the same problem in the hp_hw_start_stop code,
    and I applied the same solution in cdrom_read_cdda_bpc.

    Signed-off-by: Alan D. Brunelle
    Cc: Mike Anderson
    Signed-off-by: Jens Axboe

    Alan D. Brunelle
     

28 Oct, 2008

1 commit

21 Oct, 2008

5 commits