projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i40e: Fix use-after-free in i40e_client_subtask()
[linux-2.6-microblaze.git]
/
drivers
/
scsi
/
pmcraid.c
diff --git
a/drivers/scsi/pmcraid.c
b/drivers/scsi/pmcraid.c
index
834556e
..
bffd9a9
100644
(file)
--- a/
drivers/scsi/pmcraid.c
+++ b/
drivers/scsi/pmcraid.c
@@
-443,15
+443,14
@@
static void pmcraid_disable_interrupts(
* pmcraid_enable_interrupts - Enables specified interrupts
*
* @pinstance: pointer to per adapter instance structure
* pmcraid_enable_interrupts - Enables specified interrupts
*
* @pinstance: pointer to per adapter instance structure
- * @intr: interrupts to enable
+ * @intr
s
: interrupts to enable
*
* Return Value
* None
*/
static void pmcraid_enable_interrupts(
struct pmcraid_instance *pinstance,
*
* Return Value
* None
*/
static void pmcraid_enable_interrupts(
struct pmcraid_instance *pinstance,
- u32 intrs
-)
+ u32 intrs)
{
u32 gmask = ioread32(pinstance->int_regs.global_interrupt_mask_reg);
u32 nmask = gmask & (~GLOBAL_INTERRUPT_MASK);
{
u32 gmask = ioread32(pinstance->int_regs.global_interrupt_mask_reg);
u32 nmask = gmask & (~GLOBAL_INTERRUPT_MASK);
@@
-533,15
+532,13
@@
static void pmcraid_reset_type(struct pmcraid_instance *pinstance)
pinstance->ioa_unit_check = 1;
}
pinstance->ioa_unit_check = 1;
}
+static void pmcraid_ioa_reset(struct pmcraid_cmd *);
/**
* pmcraid_bist_done - completion function for PCI BIST
/**
* pmcraid_bist_done - completion function for PCI BIST
- * @
cmd
: pointer to reset command
+ * @
t
: pointer to reset command
* Return Value
* none
*/
* Return Value
* none
*/
-
-static void pmcraid_ioa_reset(struct pmcraid_cmd *);
-
static void pmcraid_bist_done(struct timer_list *t)
{
struct pmcraid_cmd *cmd = from_timer(cmd, t, timer);
static void pmcraid_bist_done(struct timer_list *t)
{
struct pmcraid_cmd *cmd = from_timer(cmd, t, timer);
@@
-595,7
+592,7
@@
static void pmcraid_start_bist(struct pmcraid_cmd *cmd)
/**
* pmcraid_reset_alert_done - completion routine for reset_alert
/**
* pmcraid_reset_alert_done - completion routine for reset_alert
- * @
cmd
: pointer to command block used in reset sequence
+ * @
t
: pointer to command block used in reset sequence
* Return value
* None
*/
* Return value
* None
*/
@@
-626,16
+623,16
@@
static void pmcraid_reset_alert_done(struct timer_list *t)
}
}
}
}
+static void pmcraid_notify_ioastate(struct pmcraid_instance *, u32);
/**
* pmcraid_reset_alert - alerts IOA for a possible reset
/**
* pmcraid_reset_alert - alerts IOA for a possible reset
- * @cmd
: command block to be used for reset sequence.
+ * @cmd: command block to be used for reset sequence.
*
* Return Value
* returns 0 if pci config-space is accessible and RESET_DOORBELL is
* successfully written to IOA. Returns non-zero in case pci_config_space
* is not accessible
*/
*
* Return Value
* returns 0 if pci config-space is accessible and RESET_DOORBELL is
* successfully written to IOA. Returns non-zero in case pci_config_space
* is not accessible
*/
-static void pmcraid_notify_ioastate(struct pmcraid_instance *, u32);
static void pmcraid_reset_alert(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
static void pmcraid_reset_alert(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
@@
-676,7
+673,7
@@
static void pmcraid_reset_alert(struct pmcraid_cmd *cmd)
/**
* pmcraid_timeout_handler - Timeout handler for internally generated ops
*
/**
* pmcraid_timeout_handler - Timeout handler for internally generated ops
*
- * @
cmd
: pointer to command structure, that got timedout
+ * @
t
: pointer to command structure, that got timedout
*
* This function blocks host requests and initiates an adapter reset.
*
*
* This function blocks host requests and initiates an adapter reset.
*
@@
-844,7
+841,7
@@
static void pmcraid_erp_done(struct pmcraid_cmd *cmd)
}
/**
}
/**
- * pmcraid_fire_command - sends an IOA command to adapter
+ *
_
pmcraid_fire_command - sends an IOA command to adapter
*
* This function adds the given block into pending command list
* and returns without waiting
*
* This function adds the given block into pending command list
* and returns without waiting
@@
-961,6
+958,7
@@
static void pmcraid_ioa_shutdown(struct pmcraid_cmd *cmd)
pmcraid_timeout_handler);
}
pmcraid_timeout_handler);
}
+static void pmcraid_querycfg(struct pmcraid_cmd *);
/**
* pmcraid_get_fwversion_done - completion function for get_fwversion
*
/**
* pmcraid_get_fwversion_done - completion function for get_fwversion
*
@@
-969,8
+967,6
@@
static void pmcraid_ioa_shutdown(struct pmcraid_cmd *cmd)
* Return Value
* none
*/
* Return Value
* none
*/
-static void pmcraid_querycfg(struct pmcraid_cmd *);
-
static void pmcraid_get_fwversion_done(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
static void pmcraid_get_fwversion_done(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
@@
-1382,10
+1378,9
@@
static void pmcraid_netlink_release(void)
genl_unregister_family(&pmcraid_event_family);
}
genl_unregister_family(&pmcraid_event_family);
}
-/*
*
+/*
* pmcraid_notify_aen - sends event msg to user space application
* @pinstance: pointer to adapter instance structure
* pmcraid_notify_aen - sends event msg to user space application
* @pinstance: pointer to adapter instance structure
- * @type: HCAM type
*
* Return value:
* 0 if success, error value in case of any failure.
*
* Return value:
* 0 if success, error value in case of any failure.
@@
-1393,8
+1388,7
@@
static void pmcraid_netlink_release(void)
static int pmcraid_notify_aen(
struct pmcraid_instance *pinstance,
struct pmcraid_aen_msg *aen_msg,
static int pmcraid_notify_aen(
struct pmcraid_instance *pinstance,
struct pmcraid_aen_msg *aen_msg,
- u32 data_size
-)
+ u32 data_size)
{
struct sk_buff *skb;
void *msg_header;
{
struct sk_buff *skb;
void *msg_header;
@@
-1771,6
+1765,8
@@
static void pmcraid_process_ccn(struct pmcraid_cmd *cmd)
}
}
}
}
+static void pmcraid_initiate_reset(struct pmcraid_instance *);
+static void pmcraid_set_timestamp(struct pmcraid_cmd *cmd);
/**
* pmcraid_process_ldn - op done function for an LDN
* @cmd: pointer to command block
/**
* pmcraid_process_ldn - op done function for an LDN
* @cmd: pointer to command block
@@
-1778,9
+1774,6
@@
static void pmcraid_process_ccn(struct pmcraid_cmd *cmd)
* Return value
* none
*/
* Return value
* none
*/
-static void pmcraid_initiate_reset(struct pmcraid_instance *);
-static void pmcraid_set_timestamp(struct pmcraid_cmd *cmd);
-
static void pmcraid_process_ldn(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
static void pmcraid_process_ldn(struct pmcraid_cmd *cmd)
{
struct pmcraid_instance *pinstance = cmd->drv_inst;
@@
-1878,14
+1871,14
@@
static void pmcraid_unregister_hcams(struct pmcraid_cmd *cmd)
pmcraid_cancel_ldn(cmd);
}
pmcraid_cancel_ldn(cmd);
}
+static void pmcraid_reinit_buffers(struct pmcraid_instance *);
+
/**
* pmcraid_reset_enable_ioa - re-enable IOA after a hard reset
* @pinstance: pointer to adapter instance structure
* Return Value
* 1 if TRANSITION_TO_OPERATIONAL is active, otherwise 0
*/
/**
* pmcraid_reset_enable_ioa - re-enable IOA after a hard reset
* @pinstance: pointer to adapter instance structure
* Return Value
* 1 if TRANSITION_TO_OPERATIONAL is active, otherwise 0
*/
-static void pmcraid_reinit_buffers(struct pmcraid_instance *);
-
static int pmcraid_reset_enable_ioa(struct pmcraid_instance *pinstance)
{
u32 intrs;
static int pmcraid_reset_enable_ioa(struct pmcraid_instance *pinstance)
{
u32 intrs;
@@
-2687,6
+2680,7
@@
static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
* pmcraid_reset_device - device reset handler functions
*
* @scsi_cmd: scsi command struct
* pmcraid_reset_device - device reset handler functions
*
* @scsi_cmd: scsi command struct
+ * @timeout: command timeout
* @modifier: reset modifier indicating the reset sequence to be performed
*
* This function issues a device reset to the affected device.
* @modifier: reset modifier indicating the reset sequence to be performed
*
* This function issues a device reset to the affected device.
@@
-2699,8
+2693,7
@@
static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
static int pmcraid_reset_device(
struct scsi_cmnd *scsi_cmd,
unsigned long timeout,
static int pmcraid_reset_device(
struct scsi_cmnd *scsi_cmd,
unsigned long timeout,
- u8 modifier
-)
+ u8 modifier)
{
struct pmcraid_cmd *cmd;
struct pmcraid_instance *pinstance;
{
struct pmcraid_cmd *cmd;
struct pmcraid_instance *pinstance;
@@
-3008,7
+3001,7
@@
static int pmcraid_eh_abort_handler(struct scsi_cmnd *scsi_cmd)
}
/**
}
/**
- * pmcraid_eh_
xxxx
_reset_handler - bus/target/device reset handler callbacks
+ * pmcraid_eh_
device
_reset_handler - bus/target/device reset handler callbacks
*
* @scmd: pointer to scsi_cmd that was sent to the resource to be reset.
*
*
* @scmd: pointer to scsi_cmd that was sent to the resource to be reset.
*
@@
-3307,7
+3300,7
@@
static int pmcraid_copy_sglist(
}
/**
}
/**
- * pmcraid_queuecommand - Queue a mid-layer request
+ * pmcraid_queuecommand
_lck
- Queue a mid-layer request
* @scsi_cmd: scsi command struct
* @done: done function
*
* @scsi_cmd: scsi command struct
* @done: done function
*
@@
-3430,7
+3423,7
@@
static int pmcraid_queuecommand_lck(
static DEF_SCSI_QCMD(pmcraid_queuecommand)
static DEF_SCSI_QCMD(pmcraid_queuecommand)
-/*
*
+/*
* pmcraid_open -char node "open" entry, allowed only users with admin access
*/
static int pmcraid_chr_open(struct inode *inode, struct file *filep)
* pmcraid_open -char node "open" entry, allowed only users with admin access
*/
static int pmcraid_chr_open(struct inode *inode, struct file *filep)
@@
-3447,7
+3440,7
@@
static int pmcraid_chr_open(struct inode *inode, struct file *filep)
return 0;
}
return 0;
}
-/*
*
+/*
* pmcraid_fasync - Async notifier registration from applications
*
* This function adds the calling process to a driver global queue. When an
* pmcraid_fasync - Async notifier registration from applications
*
* This function adds the calling process to a driver global queue. When an
@@
-3559,7
+3552,8
@@
static void pmcraid_release_passthrough_ioadls(
* pmcraid_ioctl_passthrough - handling passthrough IOCTL commands
*
* @pinstance: pointer to adapter instance structure
* pmcraid_ioctl_passthrough - handling passthrough IOCTL commands
*
* @pinstance: pointer to adapter instance structure
- * @cmd: ioctl code
+ * @ioctl_cmd: ioctl code
+ * @buflen: unused
* @arg: pointer to pmcraid_passthrough_buffer user buffer
*
* Return value
* @arg: pointer to pmcraid_passthrough_buffer user buffer
*
* Return value
@@
-3894,7
+3888,7
@@
static int pmcraid_check_ioctl_buffer(
return 0;
}
return 0;
}
-/*
*
+/*
* pmcraid_ioctl - char node ioctl entry point
*/
static long pmcraid_chr_ioctl(
* pmcraid_ioctl - char node ioctl entry point
*/
static long pmcraid_chr_ioctl(
@@
-3963,7
+3957,7
@@
static long pmcraid_chr_ioctl(
return retval;
}
return retval;
}
-/*
*
+/*
* File operations structure for management interface
*/
static const struct file_operations pmcraid_fops = {
* File operations structure for management interface
*/
static const struct file_operations pmcraid_fops = {
@@
-3981,6
+3975,7
@@
static const struct file_operations pmcraid_fops = {
/**
* pmcraid_show_log_level - Display adapter's error logging level
* @dev: class device struct
/**
* pmcraid_show_log_level - Display adapter's error logging level
* @dev: class device struct
+ * @attr: unused
* @buf: buffer
*
* Return value:
* @buf: buffer
*
* Return value:
@@
-4000,6
+3995,7
@@
static ssize_t pmcraid_show_log_level(
/**
* pmcraid_store_log_level - Change the adapter's error logging level
* @dev: class device struct
/**
* pmcraid_store_log_level - Change the adapter's error logging level
* @dev: class device struct
+ * @attr: unused
* @buf: buffer
* @count: not used
*
* @buf: buffer
* @count: not used
*
@@
-4042,6
+4038,7
@@
static struct device_attribute pmcraid_log_level_attr = {
/**
* pmcraid_show_drv_version - Display driver version
* @dev: class device struct
/**
* pmcraid_show_drv_version - Display driver version
* @dev: class device struct
+ * @attr: unused
* @buf: buffer
*
* Return value:
* @buf: buffer
*
* Return value:
@@
-4066,8
+4063,9
@@
static struct device_attribute pmcraid_driver_version_attr = {
};
/**
};
/**
- * pmcraid_show_
io_
adapter_id - Display driver assigned adapter id
+ * pmcraid_show_adapter_id - Display driver assigned adapter id
* @dev: class device struct
* @dev: class device struct
+ * @attr: unused
* @buf: buffer
*
* Return value:
* @buf: buffer
*
* Return value:
@@
-4589,7
+4587,7
@@
pmcraid_release_control_blocks(
/**
* pmcraid_allocate_cmd_blocks - allocate memory for cmd block structures
/**
* pmcraid_allocate_cmd_blocks - allocate memory for cmd block structures
- * @pinstance
-
pointer to per adapter instance structure
+ * @pinstance
:
pointer to per adapter instance structure
*
* Allocates memory for command blocks using kernel slab allocator.
*
*
* Allocates memory for command blocks using kernel slab allocator.
*
@@
-5134,7
+5132,7
@@
static void pmcraid_shutdown(struct pci_dev *pdev)
}
}
-/*
*
+/*
* pmcraid_get_minor - returns unused minor number from minor number bitmap
*/
static unsigned short pmcraid_get_minor(void)
* pmcraid_get_minor - returns unused minor number from minor number bitmap
*/
static unsigned short pmcraid_get_minor(void)
@@
-5146,7
+5144,7
@@
static unsigned short pmcraid_get_minor(void)
return minor;
}
return minor;
}
-/*
*
+/*
* pmcraid_release_minor - releases given minor back to minor number bitmap
*/
static void pmcraid_release_minor(unsigned short minor)
* pmcraid_release_minor - releases given minor back to minor number bitmap
*/
static void pmcraid_release_minor(unsigned short minor)