int isci_host_scan_finished(struct Scsi_Host *shost, unsigned long time)
{
- struct isci_host *ihost = isci_host_from_sas_ha(SHOST_TO_SAS_HA(shost));
+ struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha;
if (test_bit(IHOST_START_PENDING, &ihost->flags))
return 0;
void isci_host_scan_start(struct Scsi_Host *shost)
{
- struct isci_host *ihost = isci_host_from_sas_ha(SHOST_TO_SAS_HA(shost));
+ struct isci_host *ihost = SHOST_TO_SAS_HA(shost)->lldd_ha;
struct scic_sds_controller *scic = ihost->core_controller;
unsigned long tmo = scic_controller_get_suggested_start_timeout(scic);
wait_event(ihost->eventq, !test_bit(IDEV_STOP_PENDING, &idev->flags));
}
-/**
- * isci_host_from_sas_ha() - This accessor retrieves the isci_host object
- * reference from the Linux sas_ha_struct reference.
- * @ha_struct,: This parameter points to the Linux sas_ha_struct object
- *
- * A reference to the associated isci_host structure.
- */
-#define isci_host_from_sas_ha(ha_struct) \
- ((struct isci_host *)(ha_struct)->lldd_ha)
+static inline struct isci_host *dev_to_ihost(struct domain_device *dev)
+{
+ return dev->port->ha->lldd_ha;
+}
/**
* isci_host_scan_finished() -
return -ENODEV;
/* Perform the port reset. */
- ret = isci_port_perform_hard_reset(iport, iphy);
+ ret = isci_port_perform_hard_reset(ihost, iport, iphy);
break;
complete_all(&isci_port->hard_reset_complete);
}
-/**
- * isci_port_perform_hard_reset() - This function is one of the SAS Domain
- * Template functions. This is a phy management function.
- * @isci_port:
- * @isci_phy:
- *
- * status, TMF_RESP_FUNC_COMPLETE indicates success.
- */
-int isci_port_perform_hard_reset(
- struct isci_port *isci_port,
- struct isci_phy *isci_phy)
+
+int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport,
+ struct isci_phy *iphy)
{
+ unsigned long flags;
enum sci_status status;
int ret = TMF_RESP_FUNC_COMPLETE;
- unsigned long flags;
+ dev_dbg(&ihost->pdev->dev, "%s: iport = %p\n",
+ __func__, iport);
- dev_dbg(&isci_port->isci_host->pdev->dev,
- "%s: isci_port = %p\n",
- __func__, isci_port);
-
- BUG_ON(isci_port == NULL);
-
- init_completion(&isci_port->hard_reset_complete);
+ init_completion(&iport->hard_reset_complete);
- spin_lock_irqsave(&isci_port->isci_host->scic_lock, flags);
+ spin_lock_irqsave(&ihost->scic_lock, flags);
#define ISCI_PORT_RESET_TIMEOUT SCIC_SDS_SIGNATURE_FIS_TIMEOUT
- status = scic_port_hard_reset(isci_port->sci_port_handle,
+ status = scic_port_hard_reset(iport->sci_port_handle,
ISCI_PORT_RESET_TIMEOUT);
- spin_unlock_irqrestore(&isci_port->isci_host->scic_lock, flags);
+ spin_unlock_irqrestore(&ihost->scic_lock, flags);
if (status == SCI_SUCCESS) {
- wait_for_completion(&isci_port->hard_reset_complete);
+ wait_for_completion(&iport->hard_reset_complete);
- dev_dbg(&isci_port->isci_host->pdev->dev,
- "%s: isci_port = %p; hard reset completion\n",
- __func__, isci_port);
+ dev_dbg(&ihost->pdev->dev,
+ "%s: iport = %p; hard reset completion\n",
+ __func__, iport);
- if (isci_port->hard_reset_status != SCI_SUCCESS)
+ if (iport->hard_reset_status != SCI_SUCCESS)
ret = TMF_RESP_FUNC_FAILED;
} else {
ret = TMF_RESP_FUNC_FAILED;
- dev_err(&isci_port->isci_host->pdev->dev,
- "%s: isci_port = %p; scic_port_hard_reset call"
+ dev_err(&ihost->pdev->dev,
+ "%s: iport = %p; scic_port_hard_reset call"
" failed 0x%x\n",
- __func__, isci_port, status);
+ __func__, iport, status);
}
* the same as link failures on all phys in the port.
*/
if (ret != TMF_RESP_FUNC_COMPLETE) {
- BUG_ON(isci_port->isci_host == NULL);
-
- dev_err(&isci_port->isci_host->pdev->dev,
- "%s: isci_port = %p; hard reset failed "
+ dev_err(&ihost->pdev->dev,
+ "%s: iport = %p; hard reset failed "
"(0x%x) - sending link down to libsas for phy %p\n",
- __func__,
- isci_port,
- isci_port->hard_reset_status,
- isci_phy);
-
- isci_port_link_down(isci_port->isci_host,
- isci_phy,
- isci_port);
+ __func__, iport, iport->hard_reset_status, iphy);
+
+ isci_port_link_down(ihost, iphy, iport);
}
return ret;
struct scic_sds_port *sci_port,
struct scic_sds_phy *phy)
{
- struct isci_host *ihost =
- (struct isci_host *)sci_object_get_association(scic);
+ struct isci_host *ihost = sci_object_get_association(scic);
dev_warn(&ihost->pdev->dev, "Invalid link up!\n");
}
struct isci_port *isci_port,
enum sci_status completion_status);
-int isci_port_perform_hard_reset(
- struct isci_port *isci_port_ptr,
- struct isci_phy *isci_phy_ptr);
+int isci_port_perform_hard_reset(struct isci_host *ihost, struct isci_port *iport,
+ struct isci_phy *iphy);
void isci_port_invalid_link_up(
struct scic_sds_controller *scic,
return status;
}
-
-/**
- * isci_remote_device_nuke_requests() - This function terminates all requests
- * for a given remote device.
- * @isci_device: This parameter specifies the remote device
- *
- */
-void isci_remote_device_nuke_requests(
- struct isci_remote_device *isci_device)
+void isci_remote_device_nuke_requests(struct isci_host *ihost, struct isci_remote_device *idev)
{
DECLARE_COMPLETION_ONSTACK(aborted_task_completion);
- struct isci_host *isci_host;
- isci_host = isci_device->isci_port->isci_host;
-
- dev_dbg(&isci_host->pdev->dev,
- "%s: isci_device = %p\n", __func__, isci_device);
+ dev_dbg(&ihost->pdev->dev,
+ "%s: idev = %p\n", __func__, idev);
/* Cleanup all requests pending for this device. */
- isci_terminate_pending_requests(isci_host, isci_device, terminating);
+ isci_terminate_pending_requests(ihost, idev, terminating);
- dev_dbg(&isci_host->pdev->dev,
- "%s: isci_device = %p, done\n", __func__, isci_device);
+ dev_dbg(&ihost->pdev->dev,
+ "%s: idev = %p, done\n", __func__, idev);
}
-
-
/**
* This function builds the isci_remote_device when a libsas dev_found message
* is received.
isci_remote_device_change_state(idev, isci_stopping);
/* Kill all outstanding requests. */
- isci_remote_device_nuke_requests(idev);
+ isci_remote_device_nuke_requests(ihost, idev);
set_bit(IDEV_STOP_PENDING, &idev->flags);
*/
void isci_remote_device_gone(struct domain_device *dev)
{
- struct isci_host *ihost = dev->port->ha->lldd_ha;
+ struct isci_host *ihost = dev_to_ihost(dev);
struct isci_remote_device *idev = dev->lldd_dev;
dev_dbg(&ihost->pdev->dev,
*/
int isci_remote_device_found(struct domain_device *domain_dev)
{
- struct isci_host *isci_host;
+ struct isci_host *isci_host = dev_to_ihost(domain_dev);
struct isci_port *isci_port;
struct isci_phy *isci_phy;
struct asd_sas_port *sas_port;
struct isci_remote_device *isci_device;
enum sci_status status;
- isci_host = isci_host_from_sas_ha(domain_dev->port->ha);
-
dev_dbg(&isci_host->pdev->dev,
"%s: domain_device = %p\n", __func__, domain_dev);
*
* true if there is a reset pending for the device.
*/
-void isci_device_clear_reset_pending(struct isci_remote_device *isci_device)
+void isci_device_clear_reset_pending(struct isci_host *ihost, struct isci_remote_device *idev)
{
struct isci_request *isci_request;
struct isci_request *tmp_req;
- struct isci_host *isci_host = NULL;
unsigned long flags = 0;
- /* FIXME more port gone confusion, and this time it makes the
- * locking "fun"
- */
- if (isci_device->isci_port != NULL)
- isci_host = isci_device->isci_port->isci_host;
-
- /*
- * FIXME when the isci_host gets sorted out
- * use dev_dbg()
- */
- pr_debug("%s: isci_device=%p, isci_host=%p\n",
- __func__, isci_device, isci_host);
+ dev_dbg(&ihost->pdev->dev, "%s: idev=%p, ihost=%p\n",
+ __func__, idev, ihost);
- if (isci_host != NULL)
- spin_lock_irqsave(&isci_host->scic_lock, flags);
- else
- pr_err("%s: isci_device %p; isci_host == NULL!\n",
- __func__, isci_device);
+ spin_lock_irqsave(&ihost->scic_lock, flags);
/* Clear reset pending on all pending requests. */
list_for_each_entry_safe(isci_request, tmp_req,
- &isci_device->reqs_in_process, dev_node) {
- /*
- * FIXME when the conditional spinlock is gone
- * change to dev_dbg()
- */
- pr_debug("%s: isci_device = %p request = %p\n",
- __func__, isci_device, isci_request);
+ &idev->reqs_in_process, dev_node) {
+ dev_dbg(&ihost->pdev->dev, "%s: idev = %p request = %p\n",
+ __func__, idev, isci_request);
if (isci_request->ttype == io_task) {
spin_unlock_irqrestore(&task->task_state_lock, flags2);
}
}
-
- if (isci_host != NULL)
- spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+ spin_unlock_irqrestore(&ihost->scic_lock, flags);
}
/**
return (struct scic_sds_remote_device *) &idev[1];
}
-#define to_isci_remote_device(p) \
- container_of(p, struct isci_remote_device, sci_remote_device);
-
#define ISCI_REMOTE_DEVICE_START_TIMEOUT 5000
-
-/**
- * isci_dev_from_domain_dev() - This accessor retrieves the remote_device
- * object reference from the Linux domain_device reference.
- * @domdev,: This parameter points to the Linux domain_device object .
- *
- * A reference to the associated isci remote device.
- */
-#define isci_dev_from_domain_dev(domdev) \
- ((struct isci_remote_device *)(domdev)->lldd_dev)
-
-void isci_remote_device_start_complete(
- struct isci_host *,
- struct isci_remote_device *,
- enum sci_status);
-
-void isci_remote_device_stop_complete(
- struct isci_host *,
- struct isci_remote_device *,
- enum sci_status);
-
+void isci_remote_device_start_complete(struct isci_host *ihost,
+ struct isci_remote_device *idev,
+ enum sci_status);
+void isci_remote_device_stop_complete(struct isci_host *ihost,
+ struct isci_remote_device *idev,
+ enum sci_status);
enum sci_status isci_remote_device_stop(struct isci_host *ihost,
struct isci_remote_device *idev);
-void isci_remote_device_nuke_requests(
- struct isci_remote_device *isci_device);
-
+void isci_remote_device_nuke_requests(struct isci_host *ihost,
+ struct isci_remote_device *idev);
void isci_remote_device_ready(struct isci_host *ihost,
struct isci_remote_device *idev);
-
void isci_remote_device_not_ready(struct isci_host *ihost,
struct isci_remote_device *idev, u32 reason);
-
-void isci_remote_device_gone(
- struct domain_device *domain_dev);
-
-int isci_remote_device_found(
- struct domain_device *domain_dev);
-
-bool isci_device_is_reset_pending(
- struct isci_host *isci_host,
- struct isci_remote_device *isci_device);
-
-void isci_device_clear_reset_pending(
- struct isci_remote_device *isci_device);
-
-void isci_remote_device_change_state(
- struct isci_remote_device *isci_device,
- enum isci_status status);
+void isci_remote_device_gone(struct domain_device *domain_dev);
+int isci_remote_device_found(struct domain_device *domain_dev);
+bool isci_device_is_reset_pending(struct isci_host *ihost,
+ struct isci_remote_device *idev);
+void isci_device_clear_reset_pending(struct isci_host *ihost,
+ struct isci_remote_device *idev);
+void isci_remote_device_change_state(struct isci_remote_device *idev,
+ enum isci_status status);
#endif /* !defined(_ISCI_REMOTE_DEVICE_H_) */
-
struct isci_request *request;
unsigned long flags;
- isci_device = isci_dev_from_domain_dev(task->dev);
+ isci_device = task->dev->lldd_dev;
sci_device = to_sci_dev(isci_device);
/* do common allocation and init of request object. */
*/
int isci_task_execute_task(struct sas_task *task, int num, gfp_t gfp_flags)
{
- struct isci_host *ihost = task->dev->port->ha->lldd_ha;
+ struct isci_host *ihost = dev_to_ihost(task->dev);
struct isci_request *request = NULL;
struct isci_remote_device *device;
unsigned long flags;
"task = %p, num = %d; dev = %p; cmd = %p\n",
task, num, task->dev, task->uldd_task);
- device = isci_dev_from_domain_dev(task->dev);
+ device = task->dev->lldd_dev;
if (device)
device_status = device->status;
static struct isci_request *isci_task_get_request_from_task(
struct sas_task *task,
- struct isci_host **isci_host,
struct isci_remote_device **isci_device)
{
(task->task_state_flags & SAS_TASK_AT_INITIATOR) &&
(request != NULL)) {
- if (isci_host != NULL)
- *isci_host = request->isci_host;
-
if (isci_device != NULL)
*isci_device = request->isci_device;
}
*
* status, zero indicates success.
*/
-int isci_task_lu_reset(
- struct domain_device *domain_device,
- u8 *lun)
+int isci_task_lu_reset(struct domain_device *domain_device, u8 *lun)
{
- struct isci_host *isci_host = NULL;
+ struct isci_host *isci_host = dev_to_ihost(domain_device);
struct isci_remote_device *isci_device = NULL;
int ret;
bool device_stopping = false;
- if (domain_device == NULL) {
- pr_warn("%s: domain_device == NULL\n", __func__);
- return TMF_RESP_FUNC_FAILED;
- }
-
- isci_device = isci_dev_from_domain_dev(domain_device);
-
- if (domain_device->port != NULL)
- isci_host = isci_host_from_sas_ha(domain_device->port->ha);
+ isci_device = domain_device->lldd_dev;
- pr_debug("%s: domain_device=%p, isci_host=%p; isci_device=%p\n",
+ dev_dbg(&isci_host->pdev->dev,
+ "%s: domain_device=%p, isci_host=%p; isci_device=%p\n",
__func__, domain_device, isci_host, isci_device);
if (isci_device != NULL)
* device's list, fail this LUN reset request in order to
* escalate to the device reset.
*/
- if ((isci_device == NULL) ||
- (isci_host == NULL) ||
- ((isci_host != NULL) &&
- (isci_device != NULL) &&
- (device_stopping ||
- (isci_device_is_reset_pending(isci_host, isci_device))))) {
+ if (!isci_device || device_stopping ||
+ isci_device_is_reset_pending(isci_host, isci_device)) {
dev_warn(&isci_host->pdev->dev,
- "%s: No dev (%p), no host (%p), or "
+ "%s: No dev (%p), or "
"RESET PENDING: domain_device=%p\n",
- __func__, isci_device, isci_host, domain_device);
+ __func__, isci_device, domain_device);
return TMF_RESP_FUNC_FAILED;
}
/* Send the task management part of the reset. */
if (sas_protocol_ata(domain_device->tproto)) {
- ret = isci_task_send_lu_reset_sata(
- isci_host, isci_device, lun
- );
+ ret = isci_task_send_lu_reset_sata(isci_host, isci_device, lun);
} else
ret = isci_task_send_lu_reset_sas(isci_host, isci_device, lun);
*/
int isci_task_abort_task(struct sas_task *task)
{
+ struct isci_host *isci_host = dev_to_ihost(task->dev);
DECLARE_COMPLETION_ONSTACK(aborted_io_completion);
struct isci_request *old_request = NULL;
enum isci_request_status old_state;
struct isci_remote_device *isci_device = NULL;
- struct isci_host *isci_host = NULL;
struct isci_tmf tmf;
int ret = TMF_RESP_FUNC_FAILED;
unsigned long flags;
* in the device, because tasks driving resets may land here
* after completion in the core.
*/
- old_request = isci_task_get_request_from_task(task, &isci_host,
- &isci_device);
+ old_request = isci_task_get_request_from_task(task, &isci_device);
dev_dbg(&isci_host->pdev->dev,
"%s: task = %p\n", __func__, task);
*/
int isci_bus_reset_handler(struct scsi_cmnd *cmd)
{
+ struct domain_device *dev = cmd_to_domain_dev(cmd);
+ struct isci_host *isci_host = dev_to_ihost(dev);
unsigned long flags = 0;
- struct isci_host *isci_host = NULL;
enum sci_status status;
int base_status;
- struct isci_remote_device *isci_dev
- = isci_dev_from_domain_dev(
- sdev_to_domain_dev(cmd->device));
+ struct isci_remote_device *isci_dev = dev->lldd_dev;
- dev_dbg(&cmd->device->sdev_gendev,
+ dev_dbg(&isci_host->pdev->dev,
"%s: cmd %p, isci_dev %p\n",
__func__, cmd, isci_dev);
if (!isci_dev) {
- dev_warn(&cmd->device->sdev_gendev,
+ dev_warn(&isci_host->pdev->dev,
"%s: isci_dev is GONE!\n",
__func__);
return TMF_RESP_FUNC_COMPLETE; /* Nothing to reset. */
}
- if (isci_dev->isci_port != NULL)
- isci_host = isci_dev->isci_port->isci_host;
-
- if (isci_host != NULL)
- spin_lock_irqsave(&isci_host->scic_lock, flags);
-
+ spin_lock_irqsave(&isci_host->scic_lock, flags);
status = scic_remote_device_reset(to_sci_dev(isci_dev));
if (status != SCI_SUCCESS) {
-
- if (isci_host != NULL)
- spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+ spin_unlock_irqrestore(&isci_host->scic_lock, flags);
scmd_printk(KERN_WARNING, cmd,
"%s: scic_remote_device_reset(%p) returned %d!\n",
return TMF_RESP_FUNC_FAILED;
}
- if (isci_host != NULL)
- spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+ spin_unlock_irqrestore(&isci_host->scic_lock, flags);
/* Make sure all pending requests are able to be fully terminated. */
- isci_device_clear_reset_pending(isci_dev);
+ isci_device_clear_reset_pending(isci_host, isci_dev);
/* Terminate in-progress I/O now. */
- isci_remote_device_nuke_requests(isci_dev);
+ isci_remote_device_nuke_requests(isci_host, isci_dev);
/* Call into the libsas default handler (which calls sas_phy_reset). */
base_status = sas_eh_bus_reset_handler(cmd);
}
/* WHAT TO DO HERE IF sas_phy_reset FAILS? */
-
- if (isci_host != NULL)
- spin_lock_irqsave(&isci_host->scic_lock, flags);
+ spin_lock_irqsave(&isci_host->scic_lock, flags);
status = scic_remote_device_reset_complete(to_sci_dev(isci_dev));
-
- if (isci_host != NULL)
- spin_unlock_irqrestore(&isci_host->scic_lock, flags);
+ spin_unlock_irqrestore(&isci_host->scic_lock, flags);
if (status != SCI_SUCCESS) {
scmd_printk(KERN_WARNING, cmd,
}
/* WHAT TO DO HERE IF scic_remote_device_reset_complete FAILS? */
- dev_dbg(&cmd->device->sdev_gendev,
+ dev_dbg(&isci_host->pdev->dev,
"%s: cmd %p, isci_dev %p complete.\n",
__func__, cmd, isci_dev);
git.samba.org / sfrench / cifs-2.6.git / commitdiff