hg changesets 607a5b46a793..b706c96317c3
Fix ncpus for early boot config
Purge the ack to the interrupt before exiting mptsas_intr()
Changes from code review
Changes to enable driver to compile.
Header paths, object lists, etc.

          --- old/usr/src/uts/common/sys/scsi/adapters/mpt_sas3/mptsas3_smhba.h
          +++ new/usr/src/uts/common/sys/scsi/adapters/mpt_sas3/mptsas3_smhba.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
       25 + * Copyright (c) 2014, Tegile Systems Inc. All rights reserved.
  25   26   */
  26   27  
  27   28  /*
  28   29   * SM-HBA interfaces/definitions for MPT SAS driver.
  29   30   */
  30   31  
  31      -#ifndef _MPTSAS_SMHBA_H
  32      -#define _MPTSAS_SMHBA_H
       32 +#ifndef _MPTSAS3_SMHBA_H
       33 +#define _MPTSAS3_SMHBA_H
  33   34  #ifdef  __cplusplus
  34   35  extern "C" {
  35   36  #endif
  36   37  
  37   38  /* Leverage definition of data_type_t in nvpair.h */
  38   39  #include <sys/nvpair.h>
  39      -#include <sys/scsi/adapters/mpt_sas/mptsas_var.h>
       40 +#include <sys/scsi/adapters/mpt_sas3/mptsas3_var.h>
  40   41  
  41   42  #define MPTSAS_NUM_PHYS         "num-phys"
  42   43  #define MPTSAS_NUM_PHYS_HBA     "num-phys-hba"
  43   44  #define MPTSAS_SMHBA_SUPPORTED  "sm-hba-supported"
  44   45  #define MPTSAS_DRV_VERSION      "driver-version"
  45   46  #define MPTSAS_HWARE_VERSION    "hardware-version"
  46   47  #define MPTSAS_FWARE_VERSION    "firmware-version"
  47   48  #define MPTSAS_SUPPORTED_PROTOCOL       "supported-protocol"
  48   49  #define MPTSAS_VIRTUAL_PORT     "virtual-port"
  49   50  

  50   51  #define MPTSAS_MANUFACTURER     "Manufacturer"
  51   52  #define MPTSAS_SERIAL_NUMBER    "SerialNumber"
  52   53  #define MPTSAS_MODEL_NAME       "ModelName"
  53   54  #define MPTSAS_VARIANT          "variant"
  54   55  
  55   56  #define IS_ATAPI_DEVICE(x)      ((x) & 0x2000)
  56   57  #define IS_SATA_DEVICE(x)       ((x) & 0x80)
  57   58  #define DEVINFO_DIRECT_ATTACHED 0x0800
  58   59  
  59   60  /*
  60   61   * Interfaces to add properties required for SM-HBA
  61   62   *
  62   63   * _add_xxx_prop() interfaces add only 1 prop that is specified in the args.
  63   64   * _set_xxx_props() interfaces add more than 1 prop for a set of phys/devices.
  64   65   */
  65   66  int mptsas_smhba_setup(mptsas_t *);
  66   67  void mptsas_smhba_show_phy_info(mptsas_t *);
  67   68  void mptsas_smhba_set_all_phy_props(mptsas_t *mpt, dev_info_t *dip,
  68   69      uint8_t phy_nums, mptsas_phymask_t phy_mask, uint16_t *attached_devhdl);
  69   70  void mptsas_smhba_set_one_phy_props(mptsas_t *mpt, dev_info_t *dip,
  70   71      uint8_t phy_id, uint16_t *attached_devhdl);
  71   72  void mptsas_smhba_log_sysevent(mptsas_t *mpt, char *subclass, char *etype,

  72   73      smhba_info_t *phyp);
  73   74  void
  74   75  mptsas_create_phy_stats(mptsas_t *mpt, char *iport, dev_info_t *dip);
  75   76  int mptsas_update_phy_stats(kstat_t *ks, int rw);
  76   77  void mptsas_destroy_phy_stats(mptsas_t *mpt);
  77   78  int mptsas_smhba_phy_init(mptsas_t *mpt);
  78   79  int mptsas_smhba_phy_state_update(mptsas_t *mpt, uint8_t phy);
  79   80  #ifdef  __cplusplus
  80   81  }
  81   82  #endif
  82      -#endif  /* _MPTSAS_SMHBA_H */
       83 +#endif  /* _MPTSAS3_SMHBA_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX