Commit 5b461209 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull follow-up block updates from Jens Axboe:
 "Includes the fix from Eric to resolve the infinite loop in looking up
  or creating an IO context for an exiting task.

  Also a bunch of mtip32xx patches.  Fairly trivial stuff.  It's fairly
  new though, but no point in keeping it out of the tree until 3.6 imho.
  I've thrown it through basic testing locally as well, works fine.  The
  one contentious part is the patch that Greg complained about (sysfs
  file with multiple values, should be a debugfs file), which is
  perfectly valid, but not a regression from what the file contains now.
  That will be fixed up separately."

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: avoid infinite loop in get_task_io_context()
  mtip32xx: Changes to sysfs entries
  mtip32xx: Convert macro definitions for flag bits to enum
  mtip32xx: minor performance tweak
  mtip32xx: Fix to support more than one sector in exec_drive_command()
  mtip32xx: Use plain spinlock for 'cmd_issue_lock'
  mtip32xx: Set block queue boundary variables
  mtip32xx: Fix to handle TFE for PIO(IOCTL/internal) commands
  mtip32xx: Change HDIO_GET_IDENTITY to return stored data
  mtip32xx: Set custom timeouts for PIO commands
  mtip32xx: fix clearing an incorrect register in mtip_init_port
parents fde86d31 3c9c708c
...@@ -6,13 +6,21 @@ Description: This is a read-only file. Dumps below driver information and ...@@ -6,13 +6,21 @@ Description: This is a read-only file. Dumps below driver information and
hardware registers. hardware registers.
- S ACTive - S ACTive
- Command Issue - Command Issue
- Allocated
- Completed - Completed
- PORT IRQ STAT - PORT IRQ STAT
- HOST IRQ STAT - HOST IRQ STAT
- Allocated
- Commands in Q
What: /sys/block/rssd*/status What: /sys/block/rssd*/status
Date: April 2012 Date: April 2012
KernelVersion: 3.4 KernelVersion: 3.4
Contact: Asai Thambi S P <asamymuthupa@micron.com> Contact: Asai Thambi S P <asamymuthupa@micron.com>
Description: This is a read-only file. Indicates the status of the device. Description: This is a read-only file. Indicates the status of the device.
What: /sys/block/rssd*/flags
Date: May 2012
KernelVersion: 3.5
Contact: Asai Thambi S P <asamymuthupa@micron.com>
Description: This is a read-only file. Dumps the flags in port and driver
data structure
...@@ -235,6 +235,7 @@ void ioc_clear_queue(struct request_queue *q) ...@@ -235,6 +235,7 @@ void ioc_clear_queue(struct request_queue *q)
int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node) int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node)
{ {
struct io_context *ioc; struct io_context *ioc;
int ret;
ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags | __GFP_ZERO, ioc = kmem_cache_alloc_node(iocontext_cachep, gfp_flags | __GFP_ZERO,
node); node);
...@@ -262,9 +263,12 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node) ...@@ -262,9 +263,12 @@ int create_task_io_context(struct task_struct *task, gfp_t gfp_flags, int node)
task->io_context = ioc; task->io_context = ioc;
else else
kmem_cache_free(iocontext_cachep, ioc); kmem_cache_free(iocontext_cachep, ioc);
ret = task->io_context ? 0 : -EBUSY;
task_unlock(task); task_unlock(task);
return 0; return ret;
} }
/** /**
......
This diff is collapsed.
...@@ -113,33 +113,35 @@ ...@@ -113,33 +113,35 @@
#define __force_bit2int (unsigned int __force) #define __force_bit2int (unsigned int __force)
/* below are bit numbers in 'flags' defined in mtip_port */ enum {
#define MTIP_PF_IC_ACTIVE_BIT 0 /* pio/ioctl */ /* below are bit numbers in 'flags' defined in mtip_port */
#define MTIP_PF_EH_ACTIVE_BIT 1 /* error handling */ MTIP_PF_IC_ACTIVE_BIT = 0, /* pio/ioctl */
#define MTIP_PF_SE_ACTIVE_BIT 2 /* secure erase */ MTIP_PF_EH_ACTIVE_BIT = 1, /* error handling */
#define MTIP_PF_DM_ACTIVE_BIT 3 /* download microcde */ MTIP_PF_SE_ACTIVE_BIT = 2, /* secure erase */
#define MTIP_PF_PAUSE_IO ((1 << MTIP_PF_IC_ACTIVE_BIT) | \ MTIP_PF_DM_ACTIVE_BIT = 3, /* download microcde */
MTIP_PF_PAUSE_IO = ((1 << MTIP_PF_IC_ACTIVE_BIT) | \
(1 << MTIP_PF_EH_ACTIVE_BIT) | \ (1 << MTIP_PF_EH_ACTIVE_BIT) | \
(1 << MTIP_PF_SE_ACTIVE_BIT) | \ (1 << MTIP_PF_SE_ACTIVE_BIT) | \
(1 << MTIP_PF_DM_ACTIVE_BIT)) (1 << MTIP_PF_DM_ACTIVE_BIT)),
#define MTIP_PF_SVC_THD_ACTIVE_BIT 4 MTIP_PF_SVC_THD_ACTIVE_BIT = 4,
#define MTIP_PF_ISSUE_CMDS_BIT 5 MTIP_PF_ISSUE_CMDS_BIT = 5,
#define MTIP_PF_REBUILD_BIT 6 MTIP_PF_REBUILD_BIT = 6,
#define MTIP_PF_SVC_THD_STOP_BIT 8 MTIP_PF_SVC_THD_STOP_BIT = 8,
/* below are bit numbers in 'dd_flag' defined in driver_data */ /* below are bit numbers in 'dd_flag' defined in driver_data */
#define MTIP_DDF_REMOVE_PENDING_BIT 1 MTIP_DDF_REMOVE_PENDING_BIT = 1,
#define MTIP_DDF_OVER_TEMP_BIT 2 MTIP_DDF_OVER_TEMP_BIT = 2,
#define MTIP_DDF_WRITE_PROTECT_BIT 3 MTIP_DDF_WRITE_PROTECT_BIT = 3,
#define MTIP_DDF_STOP_IO ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \ MTIP_DDF_STOP_IO = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \
(1 << MTIP_DDF_OVER_TEMP_BIT) | \ (1 << MTIP_DDF_OVER_TEMP_BIT) | \
(1 << MTIP_DDF_WRITE_PROTECT_BIT)) (1 << MTIP_DDF_WRITE_PROTECT_BIT)),
#define MTIP_DDF_CLEANUP_BIT 5 MTIP_DDF_CLEANUP_BIT = 5,
#define MTIP_DDF_RESUME_BIT 6 MTIP_DDF_RESUME_BIT = 6,
#define MTIP_DDF_INIT_DONE_BIT 7 MTIP_DDF_INIT_DONE_BIT = 7,
#define MTIP_DDF_REBUILD_FAILED_BIT 8 MTIP_DDF_REBUILD_FAILED_BIT = 8,
};
__packed struct smart_attr{ __packed struct smart_attr{
u8 attr_id; u8 attr_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment