← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/message/fusion/mptsas.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/message/fusion/mptsas.c
307
307
        spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
308
308
}
309
309
 
310
 
/* free memory assoicated to a sas firmware event */
 
310
/* free memory associated to a sas firmware event */
311
311
static void
312
312
mptsas_free_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event)
313
313
{
1094
1094
/**
1095
1095
 * mptsas_target_reset_queue
1096
1096
 *
1097
 
 * Receive request for TARGET_RESET after recieving an firmware
 
1097
 * Receive request for TARGET_RESET after receiving an firmware
1098
1098
 * event NOT_RESPONDING_EVENT, then put command in link list
1099
1099
 * and queue if task_queue already in use.
1100
1100
 *
1403
1403
/**
1404
1404
 *      mptsas_add_end_device - report a new end device to sas transport layer
1405
1405
 *      @ioc: Pointer to MPT_ADAPTER structure
1406
 
 *      @phy_info: decribes attached device
 
1406
 *      @phy_info: describes attached device
1407
1407
 *
1408
1408
 *      return (0) success (1) failure
1409
1409
 *
1481
1481
/**
1482
1482
 *      mptsas_del_end_device - report a deleted end device to sas transport layer
1483
1483
 *      @ioc: Pointer to MPT_ADAPTER structure
1484
 
 *      @phy_info: decribes attached device
 
1484
 *      @phy_info: describes attached device
1485
1485
 *
1486
1486
 **/
1487
1487
static void
1973
1973
        .change_queue_depth             = mptscsih_change_queue_depth,
1974
1974
        .eh_abort_handler               = mptscsih_abort,
1975
1975
        .eh_device_reset_handler        = mptscsih_dev_reset,
1976
 
        .eh_bus_reset_handler           = mptscsih_bus_reset,
1977
1976
        .eh_host_reset_handler          = mptscsih_host_reset,
1978
1977
        .bios_param                     = mptscsih_bios_param,
1979
1978
        .can_queue                      = MPT_SAS_CAN_QUEUE,
3063
3062
        case MPI_SAS_IOUNIT0_RATE_3_0:
3064
3063
                phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;
3065
3064
                break;
 
3065
        case MPI_SAS_IOUNIT0_RATE_6_0:
 
3066
                phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;
 
3067
                break;
3066
3068
        case MPI_SAS_IOUNIT0_RATE_SATA_OOB_COMPLETE:
3067
3069
        case MPI_SAS_IOUNIT0_RATE_UNKNOWN:
3068
3070
        default:
3691
3693
        }
3692
3694
 
3693
3695
        if (link_rate == MPI_SAS_IOUNIT0_RATE_1_5 ||
3694
 
            link_rate == MPI_SAS_IOUNIT0_RATE_3_0) {
 
3696
            link_rate == MPI_SAS_IOUNIT0_RATE_3_0 ||
 
3697
            link_rate == MPI_SAS_IOUNIT0_RATE_6_0) {
3695
3698
 
3696
3699
                if (!port_info) {
3697
3700
                        if (ioc->old_sas_discovery_protocal) {
5009
5012
                        (ioc_stat & MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE)) {
5010
5013
                        VirtTarget *vtarget = NULL;
5011
5014
                        u8              id, channel;
5012
 
                        u32      log_info = le32_to_cpu(reply->IOCLogInfo);
5013
5015
 
5014
5016
                        id = sas_event_data->TargetID;
5015
5017
                        channel = sas_event_data->Bus;
5020
5022
                                    "LogInfo (0x%x) available for "
5021
5023
                                   "INTERNAL_DEVICE_RESET"
5022
5024
                                   "fw_id %d fw_channel %d\n", ioc->name,
5023
 
                                   log_info, id, channel));
 
5025
                                   le32_to_cpu(reply->IOCLogInfo),
 
5026
                                   id, channel));
5024
5027
                                if (vtarget->raidVolume) {
5025
5028
                                        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
5026
5029
                                        "Skipping Raid Volume for inDMD\n",