From owner-svn-src-all@freebsd.org Tue Sep 1 22:07:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7CBA37E90E; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1Px6F36z4fT8; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A0AA62032F; Tue, 1 Sep 2020 22:07:01 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081M71Q1055791; Tue, 1 Sep 2020 22:07:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081M70Qa055785; Tue, 1 Sep 2020 22:07:00 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012207.081M70Qa055785@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:07:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365203 - in head/sys/dev/mps: . mpi X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev/mps: . mpi X-SVN-Commit-Revision: 365203 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:07:02 -0000 Author: mjg Date: Tue Sep 1 22:07:00 2020 New Revision: 365203 URL: https://svnweb.freebsd.org/changeset/base/365203 Log: mps: clean up empty lines in .c and .h files Modified: head/sys/dev/mps/mpi/mpi2.h head/sys/dev/mps/mpi/mpi2_cnfg.h head/sys/dev/mps/mpi/mpi2_hbd.h head/sys/dev/mps/mpi/mpi2_init.h head/sys/dev/mps/mpi/mpi2_ioc.h head/sys/dev/mps/mpi/mpi2_ra.h head/sys/dev/mps/mpi/mpi2_raid.h head/sys/dev/mps/mpi/mpi2_sas.h head/sys/dev/mps/mpi/mpi2_targ.h head/sys/dev/mps/mpi/mpi2_tool.h head/sys/dev/mps/mpi/mpi2_type.h head/sys/dev/mps/mps.c head/sys/dev/mps/mps_config.c head/sys/dev/mps/mps_ioctl.h head/sys/dev/mps/mps_mapping.c head/sys/dev/mps/mps_mapping.h head/sys/dev/mps/mps_pci.c head/sys/dev/mps/mps_sas.c head/sys/dev/mps/mps_sas_lsi.c head/sys/dev/mps/mps_table.c head/sys/dev/mps/mps_user.c head/sys/dev/mps/mpsvar.h Modified: head/sys/dev/mps/mpi/mpi2.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:07:00 2020 (r365203) @@ -106,7 +106,6 @@ #ifndef MPI2_H #define MPI2_H - /***************************************************************************** * * MPI Version Definitions @@ -133,7 +132,6 @@ #define MPI2_HEADER_VERSION_DEV_SHIFT (0) #define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | MPI2_HEADER_VERSION_DEV) - /***************************************************************************** * * IOC State Definitions @@ -152,7 +150,6 @@ #define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x0000) #define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF) - /***************************************************************************** * * System Interface Register Definitions @@ -206,7 +203,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF0000) #define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16) - /* * Defines for the WriteSequence register */ @@ -302,7 +298,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS #define MPI2_REQUEST_DESCRIPTOR_POST_LOW_OFFSET (0x000000C0) #define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET (0x000000C4) - /***************************************************************************** * * Message Descriptors @@ -333,7 +328,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR #define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01) - /* High Priority Request Descriptor */ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR { @@ -347,7 +341,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR Mpi2HighPriorityRequestDescriptor_t, MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t; - /* SCSI IO Request Descriptor */ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR { @@ -360,7 +353,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR, Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t; - /* SCSI Target Request Descriptor */ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR { @@ -374,7 +366,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR Mpi2SCSITargetRequestDescriptor_t, MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t; - /* RAID Accelerator Request Descriptor */ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR { @@ -388,7 +379,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR Mpi2RAIDAcceleratorRequestDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t; - /* union of Request Descriptors */ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION { @@ -401,7 +391,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION } MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER PTR_MPI2_REQUEST_DESCRIPTOR_UNION, Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t; - /* Reply Descriptors */ /* Default Reply Descriptor */ @@ -439,7 +428,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR #define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00) - /* SCSI IO Success Reply Descriptor */ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR { @@ -453,7 +441,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR Mpi2SCSIIOSuccessReplyDescriptor_t, MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t; - /* TargetAssist Success Reply Descriptor */ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR { @@ -468,7 +455,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRI Mpi2TargetAssistSuccessReplyDescriptor_t, MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t; - /* Target Command Buffer Reply Descriptor */ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR { @@ -486,7 +472,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCR /* defines for Flags field */ #define MPI2_RPY_DESCRIPT_TCB_FLAGS_PHYNUM_MASK (0x3F) - /* RAID Accelerator Success Reply Descriptor */ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DESCRIPTOR { @@ -499,7 +484,6 @@ typedef struct _MPI2_RAID_ACCELERATOR_SUCCESS_REPLY_DE Mpi2RAIDAcceleratorSuccessReplyDescriptor_t, MPI2_POINTER pMpi2RAIDAcceleratorSuccessReplyDescriptor_t; - /* union of Reply Descriptors */ typedef union _MPI2_REPLY_DESCRIPTORS_UNION { @@ -513,8 +497,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION } MPI2_REPLY_DESCRIPTORS_UNION, MPI2_POINTER PTR_MPI2_REPLY_DESCRIPTORS_UNION, Mpi2ReplyDescriptorsUnion_t, MPI2_POINTER pMpi2ReplyDescriptorsUnion_t; - - /***************************************************************************** * * Message Functions @@ -552,13 +534,10 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC (0xF0) /* beginning of product-specific range */ #define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC (0xFF) /* end of product-specific range */ - - /* Doorbell functions */ #define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET (0x40) #define MPI2_FUNCTION_HANDSHAKE (0x42) - /***************************************************************************** * * IOC Status Values @@ -672,7 +651,6 @@ typedef union _MPI2_REPLY_DESCRIPTORS_UNION #define MPI2_IOCLOGINFO_TYPE_ISCSI (0x4) #define MPI2_IOCLOGINFO_LOG_DATA_MASK (0x0FFFFFFF) - /***************************************************************************** * * Standard Message Structures @@ -697,7 +675,6 @@ typedef struct _MPI2_REQUEST_HEADER } MPI2_REQUEST_HEADER, MPI2_POINTER PTR_MPI2_REQUEST_HEADER, MPI2RequestHeader_t, MPI2_POINTER pMPI2RequestHeader_t; - /**************************************************************************** * Default Reply ****************************************************************************/ @@ -719,7 +696,6 @@ typedef struct _MPI2_DEFAULT_REPLY } MPI2_DEFAULT_REPLY, MPI2_POINTER PTR_MPI2_DEFAULT_REPLY, MPI2DefaultReply_t, MPI2_POINTER pMPI2DefaultReply_t; - /* common version structure/union used in messages and configuration pages */ typedef struct _MPI2_VERSION_STRUCT @@ -736,7 +712,6 @@ typedef union _MPI2_VERSION_UNION U32 Word; } MPI2_VERSION_UNION; - /* LUN field defines, common to many structures */ #define MPI2_LUN_FIRST_LEVEL_ADDRESSING (0x0000FFFF) #define MPI2_LUN_SECOND_LEVEL_ADDRESSING (0xFFFF0000) @@ -745,7 +720,6 @@ typedef union _MPI2_VERSION_UNION #define MPI2_LUN_LEVEL_1_WORD (0xFF00) #define MPI2_LUN_LEVEL_1_DWORD (0x0000FF00) - /***************************************************************************** * * Fusion-MPT MPI Scatter Gather Elements @@ -781,7 +755,6 @@ typedef struct _MPI2_SGE_SIMPLE_UNION } MPI2_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_SIMPLE_UNION, Mpi2SGESimpleUnion_t, MPI2_POINTER pMpi2SGESimpleUnion_t; - /**************************************************************************** * MPI Chain Element structures ****************************************************************************/ @@ -817,7 +790,6 @@ typedef struct _MPI2_SGE_CHAIN_UNION } MPI2_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_SGE_CHAIN_UNION, Mpi2SGEChainUnion_t, MPI2_POINTER pMpi2SGEChainUnion_t; - /**************************************************************************** * MPI Transaction Context Element structures ****************************************************************************/ @@ -883,7 +855,6 @@ typedef struct _MPI2_SGE_TRANSACTION_UNION } MPI2_SGE_TRANSACTION_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANSACTION_UNION, Mpi2SGETransactionUnion_t, MPI2_POINTER pMpi2SGETransactionUnion_t; - /**************************************************************************** * MPI SGE union for IO SGL's ****************************************************************************/ @@ -898,7 +869,6 @@ typedef struct _MPI2_MPI_SGE_IO_UNION } MPI2_MPI_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_IO_UNION, Mpi2MpiSGEIOUnion_t, MPI2_POINTER pMpi2MpiSGEIOUnion_t; - /**************************************************************************** * MPI SGE union for SGL's with Simple and Transaction elements ****************************************************************************/ @@ -913,7 +883,6 @@ typedef struct _MPI2_SGE_TRANS_SIMPLE_UNION } MPI2_SGE_TRANS_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_SGE_TRANS_SIMPLE_UNION, Mpi2SGETransSimpleUnion_t, MPI2_POINTER pMpi2SGETransSimpleUnion_t; - /**************************************************************************** * All MPI SGE types union ****************************************************************************/ @@ -929,7 +898,6 @@ typedef struct _MPI2_MPI_SGE_UNION } MPI2_MPI_SGE_UNION, MPI2_POINTER PTR_MPI2_MPI_SGE_UNION, Mpi2MpiSgeUnion_t, MPI2_POINTER pMpi2MpiSgeUnion_t; - /**************************************************************************** * MPI SGE field definition and masks ****************************************************************************/ @@ -1005,7 +973,6 @@ typedef struct _MPI2_MPI_SGE_UNION #define MPI2_GET_CHAIN_OFFSET(x) ((x & MPI2_SGE_CHAIN_OFFSET_MASK) >> MPI2_SGE_CHAIN_OFFSET_SHIFT) - /***************************************************************************** * * Fusion-MPT IEEE Scatter Gather Elements @@ -1040,7 +1007,6 @@ typedef union _MPI2_IEEE_SGE_SIMPLE_UNION } MPI2_IEEE_SGE_SIMPLE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_SIMPLE_UNION, Mpi2IeeeSgeSimpleUnion_t, MPI2_POINTER pMpi2IeeeSgeSimpleUnion_t; - /**************************************************************************** * IEEE Chain Element structures ****************************************************************************/ @@ -1056,7 +1022,6 @@ typedef union _MPI2_IEEE_SGE_CHAIN_UNION } MPI2_IEEE_SGE_CHAIN_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_CHAIN_UNION, Mpi2IeeeSgeChainUnion_t, MPI2_POINTER pMpi2IeeeSgeChainUnion_t; - /**************************************************************************** * All IEEE SGE types union ****************************************************************************/ @@ -1071,7 +1036,6 @@ typedef struct _MPI2_IEEE_SGE_UNION } MPI2_IEEE_SGE_UNION, MPI2_POINTER PTR_MPI2_IEEE_SGE_UNION, Mpi2IeeeSgeUnion_t, MPI2_POINTER pMpi2IeeeSgeUnion_t; - /**************************************************************************** * IEEE SGE field definitions and masks ****************************************************************************/ @@ -1117,9 +1081,6 @@ typedef struct _MPI2_IEEE_SGE_UNION #define MPI2_IEEE32_pSGE_SET_FLAGS(psg,f) (psg)->FlagsLength |= MPI2_IEEE32_SGE_SET_FLAGS(f) #define MPI2_IEEE32_pSGE_SET_LENGTH(psg,l) (psg)->FlagsLength |= MPI2_IEEE32_SGE_LENGTH(l) - - - /***************************************************************************** * * Fusion-MPT MPI/IEEE Scatter Gather Unions @@ -1133,7 +1094,6 @@ typedef union _MPI2_SIMPLE_SGE_UNION } MPI2_SIMPLE_SGE_UNION, MPI2_POINTER PTR_MPI2_SIMPLE_SGE_UNION, Mpi2SimpleSgeUntion_t, MPI2_POINTER pMpi2SimpleSgeUntion_t; - typedef union _MPI2_SGE_IO_UNION { MPI2_SGE_SIMPLE_UNION MpiSimple; @@ -1143,7 +1103,6 @@ typedef union _MPI2_SGE_IO_UNION } MPI2_SGE_IO_UNION, MPI2_POINTER PTR_MPI2_SGE_IO_UNION, Mpi2SGEIOUnion_t, MPI2_POINTER pMpi2SGEIOUnion_t; - /**************************************************************************** * * Values for SGLFlags field, used in many request messages with an SGL @@ -1162,6 +1121,4 @@ typedef union _MPI2_SGE_IO_UNION #define MPI2_SGLFLAGS_SGL_TYPE_IEEE32 (0x01) #define MPI2_SGLFLAGS_SGL_TYPE_IEEE64 (0x02) - #endif - Modified: head/sys/dev/mps/mpi/mpi2_cnfg.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_cnfg.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_cnfg.h Tue Sep 1 22:07:00 2020 (r365203) @@ -221,7 +221,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION } MPI2_CONFIG_EXT_PAGE_HEADER_UNION, MPI2_POINTER PTR_MPI2_CONFIG_EXT_PAGE_HEADER_UNION, Mpi2ConfigPageExtendedHeaderUnion, MPI2_POINTER pMpi2ConfigPageExtendedHeaderUnion; - /* PageType field values */ #define MPI2_CONFIG_PAGEATTR_READ_ONLY (0x00) #define MPI2_CONFIG_PAGEATTR_CHANGEABLE (0x10) @@ -239,7 +238,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_TYPENUM_MASK (0x0FFF) - /* ExtPageType field values */ #define MPI2_CONFIG_EXTPAGETYPE_SAS_IO_UNIT (0x10) #define MPI2_CONFIG_EXTPAGETYPE_SAS_EXPANDER (0x11) @@ -253,7 +251,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_CONFIG_EXTPAGETYPE_ETHERNET (0x19) #define MPI2_CONFIG_EXTPAGETYPE_EXT_MANUFACTURING (0x1A) - /***************************************************************************** * PageAddress defines *****************************************************************************/ @@ -265,7 +262,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_VOLUME_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Physical Disk PageAddress format */ #define MPI2_PHYSDISK_PGAD_FORM_MASK (0xF0000000) #define MPI2_PHYSDISK_PGAD_FORM_GET_NEXT_PHYSDISKNUM (0x00000000) @@ -275,7 +271,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_PHYSDISK_PGAD_PHYSDISKNUM_MASK (0x000000FF) #define MPI2_PHYSDISK_PGAD_DEVHANDLE_MASK (0x0000FFFF) - /* SAS Expander PageAddress format */ #define MPI2_SAS_EXPAND_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_EXPAND_PGAD_FORM_GET_NEXT_HNDL (0x00000000) @@ -286,7 +281,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_EXPAND_PGAD_PHYNUM_MASK (0x00FF0000) #define MPI2_SAS_EXPAND_PGAD_PHYNUM_SHIFT (16) - /* SAS Device PageAddress format */ #define MPI2_SAS_DEVICE_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -294,7 +288,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_DEVICE_PGAD_HANDLE_MASK (0x0000FFFF) - /* SAS PHY PageAddress format */ #define MPI2_SAS_PHY_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_PHY_PGAD_FORM_PHY_NUMBER (0x00000000) @@ -303,7 +296,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_PHY_PGAD_PHY_NUMBER_MASK (0x000000FF) #define MPI2_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK (0x0000FFFF) - /* SAS Port PageAddress format */ #define MPI2_SASPORT_PGAD_FORM_MASK (0xF0000000) #define MPI2_SASPORT_PGAD_FORM_GET_NEXT_PORT (0x00000000) @@ -311,7 +303,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SASPORT_PGAD_PORTNUMBER_MASK (0x00000FFF) - /* SAS Enclosure PageAddress format */ #define MPI2_SAS_ENCLOS_PGAD_FORM_MASK (0xF0000000) #define MPI2_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE (0x00000000) @@ -319,7 +310,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_SAS_ENCLOS_PGAD_HANDLE_MASK (0x0000FFFF) - /* RAID Configuration PageAddress format */ #define MPI2_RAID_PGAD_FORM_MASK (0xF0000000) #define MPI2_RAID_PGAD_FORM_GET_NEXT_CONFIGNUM (0x00000000) @@ -328,7 +318,6 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_RAID_PGAD_CONFIGNUM_MASK (0x000000FF) - /* Driver Persistent Mapping PageAddress format */ #define MPI2_DPM_PGAD_FORM_MASK (0xF0000000) #define MPI2_DPM_PGAD_FORM_ENTRY_RANGE (0x00000000) @@ -337,15 +326,12 @@ typedef union _MPI2_CONFIG_EXT_PAGE_HEADER_UNION #define MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT (16) #define MPI2_DPM_PGAD_START_ENTRY_MASK (0x0000FFFF) - /* Ethernet PageAddress format */ #define MPI2_ETHERNET_PGAD_FORM_MASK (0xF0000000) #define MPI2_ETHERNET_PGAD_FORM_IF_NUM (0x00000000) #define MPI2_ETHERNET_PGAD_IF_NUMBER_MASK (0x000000FF) - - /**************************************************************************** * Configuration messages ****************************************************************************/ @@ -383,7 +369,6 @@ typedef struct _MPI2_CONFIG_REQUEST /* use MPI2_SGLFLAGS_ defines from mpi2.h for the SGLFlags field */ - /* Config Reply Message */ typedef struct _MPI2_CONFIG_REPLY { @@ -404,8 +389,6 @@ typedef struct _MPI2_CONFIG_REPLY } MPI2_CONFIG_REPLY, MPI2_POINTER PTR_MPI2_CONFIG_REPLY, Mpi2ConfigReply_t, MPI2_POINTER pMpi2ConfigReply_t; - - /***************************************************************************** * * C o n f i g u r a t i o n P a g e s @@ -439,9 +422,6 @@ typedef struct _MPI2_CONFIG_REPLY #define MPI2_MFGPAGE_DEVID_SAS2308_2 (0x0087) #define MPI2_MFGPAGE_DEVID_SAS2308_3 (0x006E) - - - /* Manufacturing Page 0 */ typedef struct _MPI2_CONFIG_PAGE_MAN_0 @@ -458,7 +438,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_0 #define MPI2_MANUFACTURING0_PAGEVERSION (0x00) - /* Manufacturing Page 1 */ typedef struct _MPI2_CONFIG_PAGE_MAN_1 @@ -471,7 +450,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_1 #define MPI2_MANUFACTURING1_PAGEVERSION (0x00) - typedef struct _MPI2_CHIP_REVISION_ID { U16 DeviceID; /* 0x00 */ @@ -480,7 +458,6 @@ typedef struct _MPI2_CHIP_REVISION_ID } MPI2_CHIP_REVISION_ID, MPI2_POINTER PTR_MPI2_CHIP_REVISION_ID, Mpi2ChipRevisionId_t, MPI2_POINTER pMpi2ChipRevisionId_t; - /* Manufacturing Page 2 */ /* @@ -502,7 +479,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_2 #define MPI2_MANUFACTURING2_PAGEVERSION (0x00) - /* Manufacturing Page 3 */ /* @@ -524,7 +500,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_3 #define MPI2_MANUFACTURING3_PAGEVERSION (0x00) - /* Manufacturing Page 4 */ typedef struct _MPI2_MANPAGE4_PWR_SAVE_SETTINGS @@ -600,7 +575,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_4 #define MPI2_MANPAGE4_IM_RESYNC_CACHE_ENABLE (0x00000002) #define MPI2_MANPAGE4_IR_NO_MIX_SAS_SATA (0x00000001) - /* Manufacturing Page 5 */ /* @@ -633,7 +607,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_5 #define MPI2_MANUFACTURING5_PAGEVERSION (0x03) - /* Manufacturing Page 6 */ typedef struct _MPI2_CONFIG_PAGE_MAN_6 @@ -646,7 +619,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_6 #define MPI2_MANUFACTURING6_PAGEVERSION (0x00) - /* Manufacturing Page 7 */ typedef struct _MPI2_MANPAGE7_CONNECTOR_INFO @@ -717,7 +689,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_7 /* defines for the Flags field */ #define MPI2_MANPAGE7_FLAG_USE_SLOT_INFO (0x00000001) - /* * Generic structure to use for product-specific manufacturing pages * (currently Manufacturing Page 8 through Manufacturing Page 31). @@ -756,7 +727,6 @@ typedef struct _MPI2_CONFIG_PAGE_MAN_PS #define MPI2_MANUFACTURING30_PAGEVERSION (0x00) #define MPI2_MANUFACTURING31_PAGEVERSION (0x00) - /**************************************************************************** * IO Unit Config Pages ****************************************************************************/ @@ -774,7 +744,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_0 #define MPI2_IOUNITPAGE0_PAGEVERSION (0x02) - /* IO Unit Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 @@ -798,7 +767,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_1 #define MPI2_IOUNITPAGE1_DISABLE_TASK_SET_FULL_HANDLING (0x00000020) #define MPI2_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID (0x00000004) - /* IO Unit Page 3 */ /* @@ -827,7 +795,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_3 #define MPI2_IOUNITPAGE3_GPIO_SETTING_OFF (0x0000) #define MPI2_IOUNITPAGE3_GPIO_SETTING_ON (0x0001) - /* IO Unit Page 5 */ /* @@ -866,7 +833,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_5 #define MPI2_IOUNITPAGE5_DMA_CAP_HASHING (0x0002) #define MPI2_IOUNITPAGE5_DMA_CAP_ENCRYPTION (0x0001) - /* IO Unit Page 6 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 @@ -887,7 +853,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_6 /* defines for IO Unit Page 6 Flags field */ #define MPI2_IOUNITPAGE6_FLAGS_ENABLE_RAID_ACCELERATOR (0x0001) - /* IO Unit Page 7 */ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 @@ -951,8 +916,6 @@ typedef struct _MPI2_CONFIG_PAGE_IO_UNIT_7 #define MPI2_IOUNITPAGE7_BOARD_TEMP_FAHRENHEIT (0x01) #define MPI2_IOUNITPAGE7_BOARD_TEMP_CELSIUS (0x02) - - /**************************************************************************** * IOC Config Pages ****************************************************************************/ @@ -977,7 +940,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_0 #define MPI2_IOCPAGE0_PAGEVERSION (0x02) - /* IOC Page 1 */ typedef struct _MPI2_CONFIG_PAGE_IOC_1 @@ -1047,7 +1009,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_6 #define MPI2_IOCPAGE6_CAP_FLAGS_RAID0_SUPPORT (0x00000002) #define MPI2_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE (0x00000001) - /* IOC Page 7 */ #define MPI2_IOCPAGE7_EVENTMASK_WORDS (4) @@ -1065,7 +1026,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_7 #define MPI2_IOCPAGE7_PAGEVERSION (0x01) - /* IOC Page 8 */ typedef struct _MPI2_CONFIG_PAGE_IOC_8 @@ -1102,7 +1062,6 @@ typedef struct _MPI2_CONFIG_PAGE_IOC_8 #define MPI2_IOCPAGE8_IRFLAGS_LOW_VOLUME_MAPPING (0x00000000) #define MPI2_IOCPAGE8_IRFLAGS_HIGH_VOLUME_MAPPING (0x00000001) - /**************************************************************************** * BIOS Config Pages ****************************************************************************/ @@ -1155,7 +1114,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_1 #define MPI2_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN (0x00000002) #define MPI2_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN (0x00000001) - /* BIOS Page 2 */ typedef struct _MPI2_BOOT_DEVICE_ADAPTER_ORDER @@ -1242,7 +1200,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_2 #define MPI2_BIOSPAGE2_FORM_ENCLOSURE_SLOT (0x06) #define MPI2_BIOSPAGE2_FORM_DEVICE_NAME (0x07) - /* BIOS Page 3 */ typedef struct _MPI2_ADAPTER_INFO @@ -1278,7 +1235,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_3 #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DISPLAY (0x00000020) #define MPI2_BIOSPAGE3_FLAGS_ADAPTER_DEV_DISPLAY (0x00000040) - /* BIOS Page 4 */ /* @@ -1308,7 +1264,6 @@ typedef struct _MPI2_CONFIG_PAGE_BIOS_4 #define MPI2_BIOSPAGE4_PAGEVERSION (0x01) - /**************************************************************************** * RAID Volume Config Pages ****************************************************************************/ @@ -1439,7 +1394,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_0 #define MPI2_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05) #define MPI2_RAIDVOLPAGE0_PREVIOUSLY_DELETED (0x06) - /* RAID Volume Page 1 */ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 @@ -1457,7 +1411,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_VOL_1 #define MPI2_RAIDVOLPAGE1_PAGEVERSION (0x03) - /**************************************************************************** * RAID Physical Disk Config Pages ****************************************************************************/ @@ -1559,7 +1512,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_0 #define MPI2_PHYSDISK0_STATUS_FLAG_QUIESCED (0x00000002) #define MPI2_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC (0x00000001) - /* RAID Physical Disk Page 1 */ /* @@ -1601,7 +1553,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_RAIDPHYSDISKPAGE1_PAGEVERSION (0x02) - /**************************************************************************** * values for fields used by several types of SAS Config Pages ****************************************************************************/ @@ -1622,7 +1573,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_NEG_LINK_RATE_3_0 (0x09) #define MPI2_SAS_NEG_LINK_RATE_6_0 (0x0A) - /* values for AttachedPhyInfo fields */ #define MPI2_SAS_APHYINFO_INSIDE_ZPSDS_PERSISTENT (0x00000040) #define MPI2_SAS_APHYINFO_REQUESTED_INSIDE_ZPSDS (0x00000020) @@ -1639,7 +1589,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_APHYINFO_REASON_BREAK_TIMEOUT (0x00000007) #define MPI2_SAS_APHYINFO_REASON_PHY_TEST_STOPPED (0x00000008) - /* values for PhyInfo fields */ #define MPI2_SAS_PHYINFO_PHY_VACANT (0x80000000) @@ -1680,7 +1629,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PHYINFO_SUBTRACTIVE_ROUTING (0x00000010) #define MPI2_SAS_PHYINFO_TABLE_ROUTING (0x00000020) - /* values for SAS ProgrammedLinkRate fields */ #define MPI2_SAS_PRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_PRATE_MAX_RATE_NOT_PROGRAMMABLE (0x00) @@ -1693,7 +1641,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_PRATE_MIN_RATE_3_0 (0x09) #define MPI2_SAS_PRATE_MIN_RATE_6_0 (0x0A) - /* values for SAS HwLinkRate fields */ #define MPI2_SAS_HWRATE_MAX_RATE_MASK (0xF0) #define MPI2_SAS_HWRATE_MAX_RATE_1_5 (0x80) @@ -1704,8 +1651,6 @@ typedef struct _MPI2_CONFIG_PAGE_RD_PDISK_1 #define MPI2_SAS_HWRATE_MIN_RATE_3_0 (0x09) #define MPI2_SAS_HWRATE_MIN_RATE_6_0 (0x0A) - - /**************************************************************************** * SAS IO Unit Config Pages ****************************************************************************/ @@ -1782,7 +1727,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_0 #define MPI2_SASIOUNIT0_DS_UNADDRESSABLE_DEVICE (0x00000002) #define MPI2_SASIOUNIT0_DS_LOOP_DETECTED (0x00000001) - /* SAS IO Unit Page 1 */ typedef struct _MPI2_SAS_IO_UNIT1_PHY_DATA @@ -1877,7 +1821,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_1 /* see mpi2_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */ - /* SAS IO Unit Page 4 */ typedef struct _MPI2_SAS_IOUNIT4_SPINUP_GROUP @@ -1923,7 +1866,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_4 /* defines for PHY field */ #define MPI2_SASIOUNIT4_PHY_SPINUP_GROUP_MASK (0x03) - /* SAS IO Unit Page 5 */ typedef struct _MPI2_SAS_IO_UNIT5_PHY_PM_SETTINGS @@ -1993,7 +1935,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_5 #define MPI2_SASIOUNITPAGE5_PAGEVERSION (0x01) - /* SAS IO Unit Page 6 */ typedef struct _MPI2_SAS_IO_UNIT6_PORT_WIDTH_MOD_GROUP_STATUS @@ -2048,7 +1989,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_6 #define MPI2_SASIOUNITPAGE6_PAGEVERSION (0x00) - /* SAS IO Unit Page 7 */ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP_SETTINGS @@ -2068,7 +2008,6 @@ typedef struct _MPI2_SAS_IO_UNIT7_PORT_WIDTH_MOD_GROUP /* defines for Flags field */ #define MPI2_SASIOUNIT7_FLAGS_ENABLE_PORT_WIDTH_MODULATION (0x01) - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumGroups at runtime. @@ -2096,7 +2035,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_7 #define MPI2_SASIOUNITPAGE7_PAGEVERSION (0x00) - /* SAS IO Unit Page 8 */ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 @@ -2123,9 +2061,6 @@ typedef struct _MPI2_CONFIG_PAGE_SASIOUNIT_8 #define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_SLUMBER_MODE (0x000000002) #define MPI2_SASIOUNIT8_PM_IOUNIT_SATA_PARTIAL_MODE (0x000000001) - - - /**************************************************************************** * SAS Expander Config Pages ****************************************************************************/ @@ -2198,7 +2133,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_0 #define MPI2_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS (0x0002) #define MPI2_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG (0x0001) - /* SAS Expander Page 1 */ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 @@ -2248,7 +2182,6 @@ typedef struct _MPI2_CONFIG_PAGE_EXPANDER_1 #define MPI2_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE (0x02) #define MPI2_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES (0x01) - /**************************************************************************** * SAS Device Config Pages ****************************************************************************/ @@ -2320,7 +2253,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_0 #define MPI2_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH (0x0008) #define MPI2_SAS_DEVICE0_FLAGS_DEVICE_PRESENT (0x0001) - /* SAS Device Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 @@ -2337,7 +2269,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_DEV_1 #define MPI2_SASDEVICE1_PAGEVERSION (0x01) - /**************************************************************************** * SAS PHY Config Pages ****************************************************************************/ @@ -2379,7 +2310,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_0 /* use MPI2_SAS_PHYINFO_ for the PhyInfo field */ - /* SAS PHY Page 1 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 @@ -2395,7 +2325,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_1 #define MPI2_SASPHY1_PAGEVERSION (0x01) - /* SAS PHY Page 2 */ typedef struct _MPI2_SASPHY2_PHY_EVENT @@ -2409,7 +2338,6 @@ typedef struct _MPI2_SASPHY2_PHY_EVENT /* use MPI2_SASPHY3_EVENT_CODE_ for the PhyEventCode field */ - /* * Host code (drivers, BIOS, utilities, etc.) should leave this define set to * one and check the value returned for NumPhyEvents at runtime. @@ -2431,7 +2359,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_2 #define MPI2_SASPHY2_PAGEVERSION (0x00) - /* SAS PHY Page 3 */ typedef struct _MPI2_SASPHY3_PHY_EVENT_CONFIG @@ -2524,7 +2451,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_3 #define MPI2_SASPHY3_PAGEVERSION (0x00) - /* SAS PHY Page 4 */ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 @@ -2543,9 +2469,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PHY_4 #define MPI2_SASPHY4_FLAGS_FRAME_VALID (0x02) #define MPI2_SASPHY4_FLAGS_SATA_FRAME (0x01) - - - /**************************************************************************** * SAS Port Config Pages ****************************************************************************/ @@ -2573,7 +2496,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_PORT_0 /* see mpi2_sas.h for values for SAS Port Page 0 DeviceInfo values */ - /**************************************************************************** * SAS Enclosure Config Pages ****************************************************************************/ @@ -2608,7 +2530,6 @@ typedef struct _MPI2_CONFIG_PAGE_SAS_ENCLOSURE_0 #define MPI2_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE (0x0004) #define MPI2_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO (0x0005) - /**************************************************************************** * Log Config Page ****************************************************************************/ @@ -2658,7 +2579,6 @@ typedef struct _MPI2_CONFIG_PAGE_LOG_0 #define MPI2_LOG_0_PAGEVERSION (0x02) - /**************************************************************************** * RAID Config Page ****************************************************************************/ @@ -2691,7 +2611,6 @@ typedef struct _MPI2_RAIDCONFIG0_CONFIG_ELEMENT #define MPI2_RAIDCONFIG0_EFLAGS_HOT_SPARE_ELEMENT (0x0002) #define MPI2_RAIDCONFIG0_EFLAGS_OCE_ELEMENT (0x0003) - typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0 { MPI2_CONFIG_EXTENDED_PAGE_HEADER Header; /* 0x00 */ @@ -2715,7 +2634,6 @@ typedef struct _MPI2_CONFIG_PAGE_RAID_CONFIGURATION_0 /* values for RAID Configuration Page 0 Flags field */ #define MPI2_RAIDCONFIG0_FLAG_FOREIGN_CONFIG (0x00000001) - /**************************************************************************** * Driver Persistent Mapping Config Pages ****************************************************************************/ @@ -2748,7 +2666,6 @@ typedef struct _MPI2_CONFIG_PAGE_DRIVER_MAPPING_0 #define MPI2_DRVMAP0_MAPINFO_SLOT_SHIFT (4) #define MPI2_DRVMAP0_MAPINFO_MISSING_MASK (0x000F) - /**************************************************************************** * Ethernet Config Pages ****************************************************************************/ @@ -2815,7 +2732,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_0 #define MPI2_ETHPG0_MS_100MBIT (0x02) #define MPI2_ETHPG0_MS_1GBIT (0x03) - /* Ethernet Page 1 */ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1 @@ -2866,7 +2782,6 @@ typedef struct _MPI2_CONFIG_PAGE_ETHERNET_1 #define MPI2_ETHPG1_MS_DATA_RATE_100MBIT (0x02) #define MPI2_ETHPG1_MS_DATA_RATE_1GBIT (0x03) - /**************************************************************************** * Extended Manufacturing Config Pages ****************************************************************************/ @@ -2888,4 +2803,3 @@ typedef struct _MPI2_CONFIG_PAGE_EXT_MAN_PS /* PageVersion should be provided by product-specific code */ #endif - Modified: head/sys/dev/mps/mpi/mpi2_hbd.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_hbd.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_hbd.h Tue Sep 1 22:07:00 2020 (r365203) @@ -120,7 +120,6 @@ typedef struct _MPI2_HBD_ACTION_REQUEST #define MPI2_HBD_MAX_RATE_3_0 (0x09) #define MPI2_HBD_MAX_RATE_6_0 (0x0A) - /* Host Based Discovery Action Reply Message */ typedef struct _MPI2_HBD_ACTION_REPLY { @@ -140,7 +139,4 @@ typedef struct _MPI2_HBD_ACTION_REPLY } MPI2_HBD_ACTION_REPLY, MPI2_POINTER PTR_MPI2_HBD_ACTION_REPLY, Mpi2HbdActionReply_t, MPI2_POINTER pMpi2HbdActionReply_t; - #endif - - Modified: head/sys/dev/mps/mpi/mpi2_init.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_init.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_init.h Tue Sep 1 22:07:00 2020 (r365203) @@ -240,7 +240,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST #define MPI2_SCSIIO_CONTROL_TLR_ON (0x00000040) #define MPI2_SCSIIO_CONTROL_TLR_OFF (0x00000080) - /* SCSI IO Error Reply Message */ typedef struct _MPI2_SCSI_IO_REPLY { @@ -297,7 +296,6 @@ typedef struct _MPI2_SCSI_IO_REPLY #define MPI2_SCSI_TASKTAG_UNKNOWN (0xFFFF) - /**************************************************************************** * SCSI Task Management messages ****************************************************************************/ @@ -348,8 +346,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REQUEST #define MPI2_SCSITASKMGMT_MSGFLAGS_DO_NOT_SEND_TASK_IU (0x01) - - /* SCSI Task Management Reply Message */ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY { @@ -394,7 +390,6 @@ typedef struct _MPI2_SCSI_TASK_MANAGE_REPLY #define MPI2_SCSITASKMGMT_RI_MASK_ARI0 (0xFF000000) #define MPI2_SCSITASKMGMT_RI_SHIFT_ARI0 (24) - /**************************************************************************** * SCSI Enclosure Processor messages ****************************************************************************/ @@ -442,7 +437,6 @@ typedef struct _MPI2_SEP_REQUEST #define MPI2_SEP_REQ_SLOTSTATUS_DEV_FAULTY (0x00000002) #define MPI2_SEP_REQ_SLOTSTATUS_NO_ERROR (0x00000001) - /* SCSI Enclosure Processor Reply Message */ typedef struct _MPI2_SEP_REPLY { @@ -479,7 +473,4 @@ typedef struct _MPI2_SEP_REPLY #define MPI2_SEP_REPLY_SLOTSTATUS_DEV_FAULTY (0x00000002) #define MPI2_SEP_REPLY_SLOTSTATUS_NO_ERROR (0x00000001) - #endif - - Modified: head/sys/dev/mps/mpi/mpi2_ioc.h ============================================================================== --- head/sys/dev/mps/mpi/mpi2_ioc.h Tue Sep 1 22:06:41 2020 (r365202) +++ head/sys/dev/mps/mpi/mpi2_ioc.h Tue Sep 1 22:07:00 2020 (r365203) @@ -209,7 +209,6 @@ typedef struct _MPI2_IOC_INIT_REQUEST /* minimum depth for the Reply Descriptor Post Queue */ #define MPI2_RDPQ_DEPTH_MIN (16) - /* IOCInit Reply message */ typedef struct _MPI2_IOC_INIT_REPLY *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***