← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/scsi/aacraid/linit.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/scsi/aacraid/linit.c
5
5
 * based on the old aacraid driver that is..
6
6
 * Adaptec aacraid device driver for Linux.
7
7
 *
8
 
 * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
 
8
 * Copyright (c) 2000-2010 Adaptec, Inc.
 
9
 *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
9
10
 *
10
11
 * This program is free software; you can redistribute it and/or modify
11
12
 * it under the terms of the GNU General Public License as published by
54
55
 
55
56
#include "aacraid.h"
56
57
 
57
 
#define AAC_DRIVER_VERSION              "1.1-5"
 
58
#define AAC_DRIVER_VERSION              "1.1-7"
58
59
#ifndef AAC_DRIVER_BRANCH
59
60
#define AAC_DRIVER_BRANCH               ""
60
61
#endif
61
 
#define AAC_DRIVER_BUILD_DATE           __DATE__ " " __TIME__
62
62
#define AAC_DRIVERNAME                  "aacraid"
63
63
 
64
64
#ifdef AAC_DRIVER_BUILD
66
66
#define str(x) _str(x)
67
67
#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH
68
68
#else
69
 
#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH " " AAC_DRIVER_BUILD_DATE
 
69
#define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH
70
70
#endif
71
71
 
72
72
MODULE_AUTHOR("Red Hat Inc and Adaptec");
161
161
        { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
162
162
        { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
163
163
        { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */
 
164
        { 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Catch All */
164
165
        { 0,}
165
166
};
166
167
MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
235
236
        { aac_rx_init, "aacraid",  "Legend  ", "RAID            ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG | AAC_QUIRK_SCSI_32 }, /* Legend Catchall */
236
237
        { aac_rx_init, "aacraid",  "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Catch All */
237
238
        { aac_rkt_init, "aacraid", "ADAPTEC ", "RAID            ", 2 }, /* Adaptec Rocket Catch All */
238
 
        { aac_nark_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec NEMER/ARK Catch All */
 
239
        { aac_nark_init, "aacraid", "ADAPTEC ", "RAID           ", 2 }, /* Adaptec NEMER/ARK Catch All */
 
240
        { aac_src_init, "aacraid", "ADAPTEC ", "RAID            ", 2 } /* Adaptec PMC Catch All */
239
241
};
240
242
 
241
243
/**
653
655
         * This adapter needs a blind reset, only do so for Adapters that
654
656
         * support a register, instead of a commanded, reset.
655
657
         */
656
 
        if ((aac->supplement_adapter_info.SupportedOptions2 &
657
 
           AAC_OPTION_MU_RESET) &&
 
658
        if (((aac->supplement_adapter_info.SupportedOptions2 &
 
659
          AAC_OPTION_MU_RESET) ||
 
660
          (aac->supplement_adapter_info.SupportedOptions2 &
 
661
          AAC_OPTION_DOORBELL_RESET)) &&
658
662
          aac_check_reset &&
659
663
          ((aac_check_reset != 1) ||
660
664
           !(aac->supplement_adapter_info.SupportedOptions2 &