Print this page
hg changesets 607a5b46a793..b706c96317c3
Fix ncpus for early boot config
Purge the ack to the interrupt before exiting mptsas_intr()
Changes from code review
Initial modifications using the code changes present between
the LSI source code for FreeBSD drivers. Specifically the changes
between from mpslsi-source-17.00.00.00 -> mpslsi-source-03.00.00.00.
This mainly involves using a different scatter/gather element in
frame setup.
Changes to enable driver to compile.
Header paths, object lists, etc.

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/scsi/adapters/mpt_sas3/mptsas3_ioctl.h
          +++ new/usr/src/uts/common/sys/scsi/adapters/mpt_sas3/mptsas3_ioctl.h
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   */
  26   26  /*
  27   27   * Copyright (c) 2013, Joyent, Inc. All rights reserved.
       28 + * Copyright (c) 2014, Tegile Systems Inc. All rights reserved.
  28   29   */
  29   30  
  30   31  /*
  31   32   * Copyright (c) 2000 to 2010, LSI Corporation.
  32   33   * All rights reserved.
  33   34   *
  34   35   * Redistribution and use in source and binary forms of all code within
  35   36   * this file that is exclusively owned by LSI, with or without
  36   37   * modification, is permitted provided that, in addition to the CDDL 1.0
  37   38   * License requirements, the following conditions are met:
↓ open down ↓ 9 lines elided ↑ open up ↑
  47   48   * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  48   49   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  49   50   * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  50   51   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  51   52   * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  52   53   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  53   54   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  54   55   * DAMAGE.
  55   56   */
  56   57  
  57      -#ifndef _MPTSAS_IOCTL_H
  58      -#define _MPTSAS_IOCTL_H
       58 +#ifndef _MPTSAS3_IOCTL_H
       59 +#define _MPTSAS3_IOCTL_H
  59   60  
  60   61  #ifdef  __cplusplus
  61   62  extern "C" {
  62   63  #endif
  63   64  
  64   65  #include <sys/types.h>
  65   66  
  66   67  #define MPTIOCTL                        ('I' << 8)
  67   68  #define MPTIOCTL_GET_ADAPTER_DATA       (MPTIOCTL | 1)
  68   69  #define MPTIOCTL_UPDATE_FLASH           (MPTIOCTL | 2)
↓ open down ↓ 26 lines elided ↑ open up ↑
  95   96                  } bits;
  96   97                  uint32_t        AsDWORD;
  97   98          } u;
  98   99          uint32_t        PciSegmentId;
  99  100  } mptsas_pci_bits_t;
 100  101  /*
 101  102   *  The following is the MPTIOCTL_GET_ADAPTER_DATA data structure.  This data
 102  103   *  structure is setup so that we hopefully are properly aligned for both
 103  104   *  32-bit and 64-bit mode applications.
 104  105   *
 105      - *  Adapter Type - Value = 4 = SCSI Protocol through SAS-2 adapter
      106 + *  Adapter Type - Value = 6 = SCSI Protocol through SAS-3 adapter
 106  107   *
 107  108   *  MPI Port Number - The PCI Function number for this device
 108  109   *
 109  110   *  PCI Device HW Id - The PCI device number for this device
 110  111   *
 111  112   */
 112      -#define MPTIOCTL_ADAPTER_TYPE_SAS2      4
      113 +#define MPTIOCTL_ADAPTER_TYPE_SAS3      6
 113  114  typedef struct mptsas_adapter_data
 114  115  {
 115  116          uint32_t                StructureLength;
 116  117          uint32_t                AdapterType;
 117  118          uint32_t                MpiPortNumber;
 118  119          uint32_t                PCIDeviceHwId;
 119  120          uint32_t                PCIDeviceHwRev;
 120  121          uint32_t                SubSystemId;
 121  122          uint32_t                SubsystemVendorId;
 122  123          uint32_t                Reserved1;
↓ open down ↓ 227 lines elided ↑ open up ↑
 350  351  #define MPTSAS_LEDCTL_LED_FAIL          2
 351  352  #define MPTSAS_LEDCTL_LED_OK2RM         3
 352  353  
 353  354  #define MPTSAS_LEDCTL_LED_MIN           MPTSAS_LEDCTL_LED_IDENT
 354  355  #define MPTSAS_LEDCTL_LED_MAX           MPTSAS_LEDCTL_LED_OK2RM
 355  356  
 356  357  #ifdef  __cplusplus
 357  358  }
 358  359  #endif
 359  360  
 360      -#endif  /* _MPTSAS_IOCTL_H */
      361 +#endif  /* _MPTSAS3_IOCTL_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX