Skip to contentSkip to conversation

scsi: fix additional sense code definition

PATCH Superseded Damien Le Moal 2 participants 2 messages Sep 18 SCSI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: fix additional sense code definition

The ASC() macro used to define an additional sense code with no additional sense code qualifier conflicts with the ASC macro definition of the file arch/sparc/include/asm/ns87303.h, leading to compilation errors. Avoid this conflict by renaming the macro as SCSI_ASC() and the ASC_DEF() macro to SCSI_ASC_DEF() to be consistant.

Fixes 72c54bd0cbb2 ("scsi: core: Define all additional sense codes and their qualifiers")
---
 include/scsi/scsi_sense.h | 232 +++++++++++++++++++-------------------
 1 file changed, 116 insertions(+), 116 deletions(-)
include/scsi/scsi_sense.h +116 -116
index a210a93c1e4e..f213c5277696 100644
@@ -30,10 +30,10 @@ enum scsi_sense_key {
 	COMPLETED		= 0x0f,
 };
 
-#define ASC_DEF(name)	ASC_##name
-#define ASC(name, code)					\
-	ASC_DEF(name)	= (code),			\
-	name		= ((code) << 8) | 0x00
+#define SCSI_ASC_DEF(name)	ASC_##name
+#define SCSI_ASC(name, code)				\
+	SCSI_ASC_DEF(name)	= (code),		\
+	name			= ((code) << 8) | 0x00
 
 /*
  * SCSI additional sense codes and sense codes qualifiers.
@@ -49,7 +49,7 @@ enum scsi_sense_key {
  * are prefixed with "SSC_" (e.g. WARNING and WRITE_ERROR).
  */
 enum scsi_sense_code {
-	ASC(NO_ADDITIONAL_SENSE_INFORMATION,			0x00),
+	SCSI_ASC(NO_ADDITIONAL_SENSE_INFORMATION,		0x00),
 	FILEMARK_DETECTED					= 0x0001,
 	END_OF_PARTITION_MEDIUM_DETECTED			= 0x0002,
 	SETMARK_DETECTED					= 0x0003,
@@ -77,15 +77,15 @@ enum scsi_sense_code {
 	DEFERRED_MICROCODE_IS_PENDING				= 0x0022,
 	OVERLAPPING_ATOMIC_COMMAND_IN_PROGRESS			= 0x0023,
 
-	ASC(NO_INDEX_SECTOR_SIGNAL,				0x01),
+	SCSI_ASC(NO_INDEX_SECTOR_SIGNAL,			0x01),
 
-	ASC(NO_SEEK_COMPLETE,					0x02),
+	SCSI_ASC(NO_SEEK_COMPLETE,				0x02),
 
-	ASC(PERIPHERAL_DEVICE_WRITE_FAULT,			0x03),
+	SCSI_ASC(PERIPHERAL_DEVICE_WRITE_FAULT,			0x03),
 	NO_WRITE_CURRENT					= 0x0301,
 	EXCESSIVE_WRITE_ERRORS					= 0x0302,
 
-	ASC(LU_NOT_READY,					0x04),
+	SCSI_ASC(LU_NOT_READY,					0x04),
 	LU_IS_IN_PROCESS_OF_BECOMING_READY			= 0x0401,
 	LU_NOT_READY_INITIALIZING_COMMAND_REQUIRED		= 0x0402,
 	LU_NOT_READY_MANUAL_INTERVENTION_REQUIRED		= 0x0403,
@@ -123,28 +123,28 @@ enum scsi_sense_code {
 	DEPOPULATION_IN_PROGRESS				= 0x0424,
 	DEPOPULATION_RESTORATION_IN_PROGRESS			= 0x0425,
 
-	ASC(LU_DOES_NOT_RESPOND_TO_SELECTION,			0x05),
+	SCSI_ASC(LU_DOES_NOT_RESPOND_TO_SELECTION,		0x05),
 
-	ASC(NO_REFERENCE_POSITION_FOUND,			0x06),
+	SCSI_ASC(NO_REFERENCE_POSITION_FOUND,			0x06),
 
-	ASC(MULTIPLE_PERIPHERAL_DEVICES_SELECTED,		0x07),
+	SCSI_ASC(MULTIPLE_PERIPHERAL_DEVICES_SELECTED,		0x07),
 
-	ASC(LU_COMMUNICATION_FAILURE,				0x08),
+	SCSI_ASC(LU_COMMUNICATION_FAILURE,			0x08),
 	LU_COMMUNICATION_TIMEOUT				= 0x0801,
 	LU_COMMUNICATION_PARITY_ERROR				= 0x0802,
 	LU_COMMUNICATION_CRC_ERROR				= 0x0803,
 	UNREACHABLE_COPY_TARGET					= 0x0804,
 
-	ASC(TRACK_FOLLOWING_ERROR,				0x09),
+	SCSI_ASC(TRACK_FOLLOWING_ERROR,				0x09),
 	TRACKING_SERVO_FAILURE					= 0x0901,
 	FOCUS_SERVO_FAILURE					= 0x0902,
 	SPINDLE_SERVO_FAILURE					= 0x0903,
 	HEAD_SELECT_FAULT					= 0x0904,
 	VIBRATION_INDUCED_TRACKING_ERROR			= 0x0905,
 
-	ASC(ERROR_LOG_OVERFLOW,					0x0A),
+	SCSI_ASC(ERROR_LOG_OVERFLOW,				0x0A),
 
-	ASC(SSC_WARNING,					0x0B),
+	SCSI_ASC(SSC_WARNING,					0x0B),
 	WARNING_SPECIFIED_TEMPERATURE_EXCEEDED			= 0x0B01,
 	WARNING_ENCLOSURE_DEGRADED				= 0x0B02,
 	WARNING_BACKGROUND_SELFTEST_FAILED			= 0x0B03,
@@ -167,7 +167,7 @@ enum scsi_sense_code {
 	WARNING_PHYSICAL_ELEMENT_STATUS_CHANGE			= 0x0B14,
 
 	/* Defined as "WRITE ERROR" in T10. */
-	ASC(SSC_WRITE_ERROR,					0x0C),
+	SCSI_ASC(SSC_WRITE_ERROR,				0x0C),
 	WRITE_ERROR_RECOVERED_WITH_AUTO_REALLOCATION		= 0x0C01,
 	WRITE_ERROR_AUTO_REALLOCATION_FAILED			= 0x0C02,
 	WRITE_ERROR_RECOMMEND_REASSIGNMENT			= 0x0C03,
@@ -187,26 +187,26 @@ enum scsi_sense_code {
 	WRITE_ERROR_RECOVERY_SCAN_NEEDED			= 0x0C11,
 	WRITE_ERROR_INSUFFICIENT_ZONE_RESOURCES			= 0x0C12,
 
-	ASC(ERROR_DETECTED_BY_THIRD_PARTY_TEMPORARY_INITIATOR,	0x0D),
+	SCSI_ASC(ERROR_DETECTED_BY_THIRD_PARTY_TEMPORARY_INITIATOR, 0x0D),
 	THIRD_PARTY_DEVICE_FAILURE				= 0x0D01,
 	COPY_TARGET_DEVICE_NOT_REACHABLE			= 0x0D02,
 	INCORRECT_COPY_TARGET_DEVICE_TYPE			= 0x0D03,
 	COPY_TARGET_DEVICE_DATA_UNDERRUN			= 0x0D04,
 	COPY_TARGET_DEVICE_DATA_OVERRUN				= 0x0D05,
 
-	ASC(INVALID_INFORMATION_UNIT,				0x0E),
+	SCSI_ASC(INVALID_INFORMATION_UNIT,			0x0E),
 	INFORMATION_UNIT_TOO_SHORT				= 0x0E01,
 	INFORMATION_UNIT_TOO_LONG				= 0x0E02,
 	INVALID_FIELD_IN_COMMAND_INFORMATION_UNIT		= 0x0E03,
 
-	ASC(ID_CRC_OR_ECC_ERROR,				0x10),
+	SCSI_ASC(ID_CRC_OR_ECC_ERROR,				0x10),
 	LOGICAL_BLOCK_GUARD_CHECK_FAILED			= 0x1001,
 	LOGICAL_BLOCK_APPLICATION_TAG_CHECK_FAILED		= 0x1002,
 	LOGICAL_BLOCK_REFERENCE_TAG_CHECK_FAILED		= 0x1003,
 	LOGICAL_BLOCK_PROTECTION_ERROR_ON_RECOVER_BUFFERED_DATA	= 0x1004,
 	LOGICAL_BLOCK_PROTECTION_METHOD_ERROR			= 0x1005,
 
-	ASC(UNRECOVERED_READ_ERROR,				0x11),
+	SCSI_ASC(UNRECOVERED_READ_ERROR,			0x11),
 	READ_RETRIES_EXHAUSTED					= 0x1101,
 	ERROR_TOO_LONG_TO_CORRECT				= 0x1102,
 	MULTIPLE_READ_ERRORS					= 0x1103,
@@ -229,11 +229,11 @@ enum scsi_sense_code {
 	READ_ERROR_LBA_MARKED_BAD_BY_APPLICATION_CLIENT		= 0x1114,
 	WRITE_AFTER_SANITIZE_REQUIRED				= 0x1115,
 
-	ASC(ADDRESS_MARK_NOT_FOUND_FOR_ID_FIELD,		0x12),
+	SCSI_ASC(ADDRESS_MARK_NOT_FOUND_FOR_ID_FIELD,		0x12),
 
-	ASC(ADDRESS_MARK_NOT_FOUND_FOR_DATA_FIELD,		0x13),
+	SCSI_ASC(ADDRESS_MARK_NOT_FOUND_FOR_DATA_FIELD,		0x13),
 
-	ASC(RECORDED_ENTITY_NOT_FOUND,				0x14),
+	SCSI_ASC(RECORDED_ENTITY_NOT_FOUND,			0x14),
 	RECORD_NOT_FOUND					= 0x1401,
 	FILEMARK_OR_SETMARK_NOT_FOUND				= 0x1402,
 	END_OF_DATA_NOT_FOUND					= 0x1403,
@@ -242,17 +242,17 @@ enum scsi_sense_code {
 	RECORD_NOT_FOUND_DATA_AUTO_REALLOCATED			= 0x1406,
 	LOCATE_OPERATION_FAILURE				= 0x1407,
 
-	ASC(RANDOM_POSITIONING_ERROR,				0x15),
+	SCSI_ASC(RANDOM_POSITIONING_ERROR,			0x15),
 	MECHANICAL_POSITIONING_ERROR				= 0x1501,
 	POSITIONING_ERROR_DETECTED_BY_READ_OF_MEDIUM		= 0x1502,
 
-	ASC(DATA_SYNCHRONIZATION_MARK_ERROR,			0x16),
+	SCSI_ASC(DATA_SYNCHRONIZATION_MARK_ERROR,		0x16),
 	DATA_SYNC_ERROR_DATA_REWRITTEN				= 0x1601,
 	DATA_SYNC_ERROR_RECOMMEND_REWRITE			= 0x1602,
 	DATA_SYNC_ERROR_DATA_AUTO_REALLOCATED			= 0x1603,
 	DATA_SYNC_ERROR_RECOMMEND_REASSIGNMENT			= 0x1604,
 
-	ASC(RECOVERED_DATA_WITH_NO_ERROR_CORRECTION_APPLIED,	0x17),
+	SCSI_ASC(RECOVERED_DATA_WITH_NO_ERROR_CORRECTION_APPLIED, 0x17),
 	RECOVERED_DATA_WITH_RETRIES				= 0x1701,
 	RECOVERED_DATA_WITH_POSITIVE_HEAD_OFFSET		= 0x1702,
 	RECOVERED_DATA_WITH_NEGATIVE_HEAD_OFFSET		= 0x1703,
@@ -263,7 +263,7 @@ enum scsi_sense_code {
 	RECOVERED_DATA_WITHOUT_ECC_RECOMMEND_REWRITE		= 0x1708,
 	RECOVERED_DATA_WITHOUT_ECC_DATA_REWRITTEN		= 0x1709,
 
-	ASC(RECOVERED_DATA_WITH_ERROR_CORRECTION_APPLIED,	0x18),
+	SCSI_ASC(RECOVERED_DATA_WITH_ERROR_CORRECTION_APPLIED,	0x18),
 	RECOVERED_DATA_WITH_ERROR_CORRECTION_RETRIES_APPLIED	= 0x1801,
 	RECOVERED_DATA_DATA_AUTO_REALLOCATED			= 0x1802,
 	RECOVERED_DATA_WITH_CIRC				= 0x1803,
@@ -273,27 +273,27 @@ enum scsi_sense_code {
 	RECOVERED_DATA_WITH_ECC_DATA_REWRITTEN			= 0x1807,
 	RECOVERED_DATA_WITH_LINKING				= 0x1808,
 
-	ASC(DEFECT_LIST_ERROR,					0x19),
+	SCSI_ASC(DEFECT_LIST_ERROR,				0x19),
 	DEFECT_LIST_NOT_AVAILABLE				= 0x1901,
 	DEFECT_LIST_ERROR_IN_PRIMARY_LIST			= 0x1902,
 	DEFECT_LIST_ERROR_IN_GROWN_LIST				= 0x1903,
 
-	ASC(PARAMETER_LIST_LENGTH_ERROR,			0x1A),
+	SCSI_ASC(PARAMETER_LIST_LENGTH_ERROR,			0x1A),
 
-	ASC(SYNCHRONOUS_DATA_TRANSFER_ERROR,			0x1B),
+	SCSI_ASC(SYNCHRONOUS_DATA_TRANSFER_ERROR,		0x1B),
 
-	ASC(DEFECT_LIST_NOT_FOUND,				0x1C),
+	SCSI_ASC(DEFECT_LIST_NOT_FOUND,				0x1C),
 	PRIMARY_DEFECT_LIST_NOT_FOUND				= 0x1C01,
 	GROWN_DEFECT_LIST_NOT_FOUND				= 0x1C02,
 
-	ASC(MISCOMPARE_DURING_VERIFY_OPERATION,			0x1D),
+	SCSI_ASC(MISCOMPARE_DURING_VERIFY_OPERATION,		0x1D),
 	MISCOMPARE_VERIFY_OF_UNMAPPED_LBA			= 0x1D01,
 
-	ASC(RECOVERED_ID_WITH_ECC_CORRECTION,			0x1E),
+	SCSI_ASC(RECOVERED_ID_WITH_ECC_CORRECTION,		0x1E),
 
-	ASC(PARTIAL_DEFECT_LIST_TRANSFER,			0x1F),
+	SCSI_ASC(PARTIAL_DEFECT_LIST_TRANSFER,			0x1F),
 
-	ASC(INVALID_COMMAND_OP_CODE,				0x20),
+	SCSI_ASC(INVALID_COMMAND_OP_CODE,			0x20),
 	ACCESS_DENIED_INITIATOR_PENDING_ENROLLED		= 0x2001,
 	ACCESS_DENIED_NO_ACCESS_RIGHTS				= 0x2002,
 	ACCESS_DENIED_INVALID_MGMT_ID_KEY			= 0x2003,
@@ -309,7 +309,7 @@ enum scsi_sense_code {
 	NOT_A_SUBSIDIARY_LOGICAL_UNIT				= 0x200E,
 	NOT_A_CONGLOMERATE_LOGICAL_UNIT				= 0x200F,
 
-	ASC(LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE,			0x21),
+	SCSI_ASC(LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE,		0x21),
 	INVALID_ELEMENT_ADDRESS					= 0x2101,
 	INVALID_ADDRESS_FOR_WRITE				= 0x2102,
 	INVALID_WRITE_CROSSING_LAYER_JUMP			= 0x2103,
@@ -320,9 +320,9 @@ enum scsi_sense_code {
 	MISALIGNED_WRITE_COMMAND				= 0x2108,
 	ATTEMPT_TO_ACCESS_GAP_ZONE				= 0x2109,
 
-	ASC(ILLEGAL_FUNCTION,					0x22),
+	SCSI_ASC(ILLEGAL_FUNCTION,				0x22),
 
-	ASC(INVALID_TOKEN_OP,					0x23),
+	SCSI_ASC(INVALID_TOKEN_OP,				0x23),
 	INVALID_TOKEN_OP_UNSUPPORTED_TOKEN_TYPE			= 0x2301,
 	INVALID_TOKEN_OP_REMOTE_TOKEN_USAGE_NOT_SUPPORTED	= 0x2302,
 	INVALID_TOKEN_OP_REMOTE_ROD_TOKEN_CREATION_NOT_SUPPORTED = 0x2303,
@@ -334,7 +334,7 @@ enum scsi_sense_code {
 	INVALID_TOKEN_OP_TOKEN_DELETED				= 0x2309,
 	INVALID_TOKEN_OP_INVALID_TOKEN_LENGTH			= 0x230A,
 
-	ASC(INVALID_FIELD_IN_CDB,				0x24),
+	SCSI_ASC(INVALID_FIELD_IN_CDB,				0x24),
 	CDB_DECRYPTION_ERROR					= 0x2401,
 	SECURITY_AUDIT_VALUE_FROZEN				= 0x2404,
 	SECURITY_WORKING_KEY_FROZEN				= 0x2405,
@@ -343,9 +343,9 @@ enum scsi_sense_code {
 	INVALID_XCDB						= 0x2408,
 	INVALID_FAST_FORMAT					= 0x2409,
 
-	ASC(LU_NOT_SUPPORTED,					0x25),
+	SCSI_ASC(LU_NOT_SUPPORTED,				0x25),
 
-	ASC(INVALID_FIELD_IN_PARAMETER_LIST,			0x26),
+	SCSI_ASC(INVALID_FIELD_IN_PARAMETER_LIST,		0x26),
 	PARAMETER_NOT_SUPPORTED					= 0x2601,
 	PARAMETER_VALUE_INVALID					= 0x2602,
 	THRESHOLD_PARAMETERS_NOT_SUPPORTED			= 0x2603,
@@ -369,7 +369,7 @@ enum scsi_sense_code {
 	COPY_SOURCE_OR_COPY_DESTINATION_NOT_AUTHORIZED		= 0x2615,
 	FAST_COPY_NOT_POSSIBLE					= 0x2616,
 
-	ASC(WRITE_PROTECTED,					0x27),
+	SCSI_ASC(WRITE_PROTECTED,				0x27),
 	HW_WRITE_PROTECTED					= 0x2701,
 	LU_SOFTWARE_WRITE_PROTECTED				= 0x2702,
 	ASSOCIATED_WRITE_PROTECT				= 0x2703,
@@ -379,12 +379,12 @@ enum scsi_sense_code {
 	SPACE_ALLOCATION_FAILED_WRITE_PROTECT			= 0x2707,
 	ZONE_IS_READ_ONLY					= 0x2708,
 
-	ASC(NOT_READY_TO_READY_CHANGE_MEDIUM_MAY_HAVE_CHANGED,	0x28),
+	SCSI_ASC(NOT_READY_TO_READY_CHANGE_MEDIUM_MAY_HAVE_CHANGED, 0x28),
 	IMPORT_OR_EXPORT_ELEMENT_ACCESSED			= 0x2801,
 	FORMAT_LAYER_MAY_HAVE_CHANGED				= 0x2802,
 	IMPORT_EXPORT_ELEMENT_ACCESSED_MEDIUM_CHANGED		= 0x2803,
 
-	ASC(POWER_ON_RESET_OR_BUS_DEVICE_RESET_OCCURRED,	0x29),
+	SCSI_ASC(POWER_ON_RESET_OR_BUS_DEVICE_RESET_OCCURRED,	0x29),
 	POWER_ON_OCCURRED					= 0x2901,
 	SCSI_BUS_RESET_OCCURRED					= 0x2902,
 	BUS_DEVICE_RESET_FUNCTION_OCCURRED			= 0x2903,
@@ -393,7 +393,7 @@ enum scsi_sense_code {
 	TRANSCEIVER_MODE_CHANGED_TO_LVD				= 0x2906,
 	I_T_NEXUS_LOSS_OCCURRED					= 0x2907,
 
-	ASC(PARAMETERS_CHANGED,					0x2A),
+	SCSI_ASC(PARAMETERS_CHANGED,				0x2A),
 	MODE_PARAMETERS_CHANGED					= 0x2A01,
 	LOG_PARAMETERS_CHANGED					= 0x2A02,
 	RESERVATIONS_PREEMPTED					= 0x2A03,
@@ -415,9 +415,9 @@ enum scsi_sense_code {
 	MEDIUM_REMOVAL_PREVENTION_PREEMPTED			= 0x2A15,
 	ZONE_RESET_WRITE_POINTER_RECOMMENDED			= 0x2A16,
 
-	ASC(COPY_CANNOT_EXECUTE_SINCE_HOST_CANNOT_DISCONNECT,	0x2B),
+	SCSI_ASC(COPY_CANNOT_EXECUTE_SINCE_HOST_CANNOT_DISCONNECT, 0x2B),
 
-	ASC(COMMAND_SEQUENCE_ERROR,				0x2C),
+	SCSI_ASC(COMMAND_SEQUENCE_ERROR,			0x2C),
 	TOO_MANY_WINDOWS_SPECIFIED				= 0x2C01,
 	INVALID_COMBINATION_OF_WINDOWS_SPECIFIED		= 0x2C02,
 	CURRENT_PROGRAM_AREA_IS_NOT_EMPTY			= 0x2C03,
@@ -438,19 +438,19 @@ enum scsi_sense_code {
 	ZONE_IS_INACTIVE					= 0x2C12,
 	WELL_KNOWN_LU_ACCESS_REQUIRED				= 0x2C13,
 
-	ASC(OVERWRITE_ERROR_ON_UPDATE_IN_PLACE,			0x2D),
+	SCSI_ASC(OVERWRITE_ERROR_ON_UPDATE_IN_PLACE,		0x2D),
 
-	ASC(INSUFFICIENT_TIME_FOR_OPERATION,			0x2E),
+	SCSI_ASC(INSUFFICIENT_TIME_FOR_OPERATION,		0x2E),
 	COMMAND_TIMEOUT_BEFORE_PROCESSING			= 0x2E01,
 	COMMAND_TIMEOUT_DURING_PROCESSING			= 0x2E02,
 	COMMAND_TIMEOUT_DURING_PROCESSING_DUE_TO_ERROR_RECOVERY	= 0x2E03,
 
-	ASC(COMMANDS_CLEARED_BY_ANOTHER_INITIATOR,		0x2F),
+	SCSI_ASC(COMMANDS_CLEARED_BY_ANOTHER_INITIATOR,		0x2F),
 	COMMANDS_CLEARED_BY_POWER_LOSS_NOTIFICATION		= 0x2F01,
 	COMMANDS_CLEARED_BY_DEVICE_SERVER			= 0x2F02,
 	SOME_COMMANDS_CLEARED_BY_QUEUING_LAYER_EVENT		= 0x2F03,
 
-	ASC(INCOMPATIBLE_MEDIUM_INSTALLED,			0x30),
+	SCSI_ASC(INCOMPATIBLE_MEDIUM_INSTALLED,			0x30),
 	CANNOT_READ_MEDIUM_UNKNOWN_FORMAT			= 0x3001,
 	CANNOT_READ_MEDIUM_INCOMPATIBLE_FORMAT			= 0x3002,
 	CLEANING_CARTRIDGE_INSTALLED				= 0x3003,
@@ -468,32 +468,32 @@ enum scsi_sense_code {
 	INCOMPATIBLE_VOLUME_QUALIFIER				= 0x3012,
 	CLEANING_VOLUME_EXPIRED					= 0x3013,
 
-	ASC(MEDIUM_FORMAT_CORRUPTED,				0x31),
+	SCSI_ASC(MEDIUM_FORMAT_CORRUPTED,			0x31),
 	FORMAT_COMMAND_FAILED					= 0x3101,
 	ZONED_FORMATTING_FAILED_DUE_TO_SPARE_LINKING		= 0x3102,
 	SANITIZE_COMMAND_FAILED					= 0x3103,
 	DEPOPULATION_FAILED					= 0x3104,
 	DEPOPULATION_RESTORATION_FAILED				= 0x3105,
 
-	ASC(NO_DEFECT_SPARE_LOCATION_AVAILABLE,			0x32),
+	SCSI_ASC(NO_DEFECT_SPARE_LOCATION_AVAILABLE,		0x32),
 	DEFECT_LIST_UPDATE_FAILURE				= 0x3201,
 
-	ASC(TAPE_LENGTH_ERROR,					0x33),
+	SCSI_ASC(TAPE_LENGTH_ERROR,				0x33),
 
-	ASC(ENCLOSURE_FAILURE,					0x34),
+	SCSI_ASC(ENCLOSURE_FAILURE,				0x34),
 
-	ASC(ENCLOSURE_SERVICES_FAILURE,				0x35),
+	SCSI_ASC(ENCLOSURE_SERVICES_FAILURE,			0x35),
 	UNSUPPORTED_ENCLOSURE_FUNCTION				= 0x3501,
 	ENCLOSURE_SERVICES_UNAVAILABLE				= 0x3502,
 	ENCLOSURE_SERVICES_TRANSFER_FAILURE			= 0x3503,
 	ENCLOSURE_SERVICES_TRANSFER_REFUSED			= 0x3504,
 	ENCLOSURE_SERVICES_CHECKSUM_ERROR			= 0x3505,
 
-	ASC(RIBBON_INK_OR_TONER_FAILURE,			0x36),
+	SCSI_ASC(RIBBON_INK_OR_TONER_FAILURE,			0x36),
 
-	ASC(ROUNDED_PARAMETER,					0x37),
+	SCSI_ASC(ROUNDED_PARAMETER,				0x37),
 
-	ASC(EVENT_STATUS_NOTIFICATION,				0x38),
+	SCSI_ASC(EVENT_STATUS_NOTIFICATION,			0x38),
 	ESN_POWER_MANAGEMENT_CLASS_EVENT			= 0x3802,
 	ESN_MEDIA_CLASS_EVENT					= 0x3804,
 	ESN_DEVICE_BUSY_CLASS_EVENT				= 0x3806,
@@ -501,15 +501,15 @@ enum scsi_sense_code {
 	DEPOPULATION_INTERRUPTED				= 0x3808,
 	DEPOPULATION_RESTORATION_INTERRUPTED			= 0x3809,
 
-	ASC(SAVING_PARAMETERS_NOT_SUPPORTED,			0x39),
+	SCSI_ASC(SAVING_PARAMETERS_NOT_SUPPORTED,		0x39),
 
-	ASC(MEDIUM_NOT_PRESENT,					0x3A),
+	SCSI_ASC(MEDIUM_NOT_PRESENT,				0x3A),
 	MEDIUM_NOT_PRESENT_TRAY_CLOSED				= 0x3A01,
 	MEDIUM_NOT_PRESENT_TRAY_OPEN				= 0x3A02,
 	MEDIUM_NOT_PRESENT_LOADABLE				= 0x3A03,
 	MEDIUM_NOT_PRESENT_MEDIUM_AUXILIARY_MEMORY_ACCESSIBLE	= 0x3A04,
 
-	ASC(SEQUENTIAL_POSITIONING_ERROR,			0x3B),
+	SCSI_ASC(SEQUENTIAL_POSITIONING_ERROR,			0x3B),
 	TAPE_POSITION_ERROR_AT_BEGINNING_OF_MEDIUM		= 0x3B01,
 	TAPE_POSITION_ERROR_AT_END_OF_MEDIUM			= 0x3B02,
 	TAPE_OR_ELECTRONIC_VERTICAL_FORMS_UNIT_NOT_READY	= 0x3B03,
@@ -539,15 +539,15 @@ enum scsi_sense_code {
 	TOO_MANY_LOGICAL_OBJECTS_ON_PARTITION_TO_SUPPORT_OP	= 0x3B1C,
 	ELEMENT_STATIC_INFORMATION_CHANGED			= 0x3B20,
 
-	ASC(INVALID_BITS_IN_IDENTIFY_MESSAGE,			0x3D),
+	SCSI_ASC(INVALID_BITS_IN_IDENTIFY_MESSAGE,		0x3D),
 
-	ASC(LU_HAS_NOT_SELF_CONFIGURED_YET,			0x3E),
+	SCSI_ASC(LU_HAS_NOT_SELF_CONFIGURED_YET,		0x3E),
 	LU_FAILURE						= 0x3E01,
 	TIMEOUT_ON_LOGICAL_UNIT					= 0x3E02,
 	LU_FAILED_SELF_TEST					= 0x3E03,
 	LU_UNABLE_TO_UPDATE_SELFTEST_LOG			= 0x3E04,
 
-	ASC(TARGET_OPERATING_CONDITIONS_HAVE_CHANGED,		0x3F),
+	SCSI_ASC(TARGET_OPERATING_CONDITIONS_HAVE_CHANGED,	0x3F),
 	MICROCODE_HAS_BEEN_CHANGED				= 0x3F01,
 	CHANGED_OPERATING_DEFINITION				= 0x3F02,
 	INQUIRY_DATA_HAS_CHANGED				= 0x3F03,
@@ -575,24 +575,24 @@ enum scsi_sense_code {
 	BIND_REDIRECTED						= 0x3F19,
 	SUBSIDIARY_BINDING_CHANGED				= 0x3F1A,
 
-	ASC(RAM_FAILURE,					0x40),
+	SCSI_ASC(RAM_FAILURE,					0x40),
 	/* DIAGNOSTIC_FAILURE_ON_COMPONENT_NN			= 0x40NN */
 
-	ASC(DATA_PATH_FAILURE,					0x41),
+	SCSI_ASC(DATA_PATH_FAILURE,				0x41),
 
-	ASC(POWER_ON_OR_SELFTEST_FAILURE,			0x42),
+	SCSI_ASC(POWER_ON_OR_SELFTEST_FAILURE,			0x42),
 
-	ASC(MESSAGE_ERROR,					0x43),
+	SCSI_ASC(MESSAGE_ERROR,					0x43),
 
-	ASC(INTERNAL_TARGET_FAILURE,				0x44),
+	SCSI_ASC(INTERNAL_TARGET_FAILURE,			0x44),
 	PERSISTENT_RESERVATION_INFORMATION_LOST			= 0x4401,
 	ATA_DEVICE_FAILED_SET_FEATURES				= 0x4471,
 
-	ASC(SELECT_OR_RESELECT_FAILURE,				0x45),
+	SCSI_ASC(SELECT_OR_RESELECT_FAILURE,			0x45),
 
-	ASC(UNSUCCESSFUL_SOFT_RESET,				0x46),
+	SCSI_ASC(UNSUCCESSFUL_SOFT_RESET,			0x46),
 
-	ASC(SCSI_PARITY_ERROR,					0x47),
+	SCSI_ASC(SCSI_PARITY_ERROR,				0x47),
 	DATA_PHASE_CRC_ERROR_DETECTED				= 0x4701,
 	SCSI_PARITY_ERROR_DETECTED_DURING_ST_DATA_PHASE		= 0x4702,
 	INFORMATION_UNIT_iuCRC_ERROR_DETECTED			= 0x4703,
@@ -601,13 +601,13 @@ enum scsi_sense_code {
 	PHY_TEST_FUNCTION_IN_PROGRESS				= 0x4706,
 	SOME_COMMANDS_CLEARED_BY_ISCSI_PROTOCOL_EVENT		= 0x477F,
 
-	ASC(INITIATOR_DETECTED_ERROR_MESSAGE_RECEIVED,		0x48),
+	SCSI_ASC(INITIATOR_DETECTED_ERROR_MESSAGE_RECEIVED,	0x48),
 
-	ASC(INVALID_MESSAGE_ERROR,				0x49),
+	SCSI_ASC(INVALID_MESSAGE_ERROR,				0x49),
 
-	ASC(COMMAND_PHASE_ERROR,				0x4A),
+	SCSI_ASC(COMMAND_PHASE_ERROR,				0x4A),
 
-	ASC(DATA_PHASE_ERROR,					0x4B),
+	SCSI_ASC(DATA_PHASE_ERROR,				0x4B),
 	INVALID_TARGET_PORT_TRANSFER_TAG_RECEIVED		= 0x4B01,
 	TOO_MUCH_WRITE_DATA					= 0x4B02,
 	ACK_NAK_TIMEOUT						= 0x4B03,
@@ -630,22 +630,22 @@ enum scsi_sense_code {
 	PCIE_ACS_VIOLATION					= 0x4B14,
 	PCIE_TLP_PREFIX_BLOCKED					= 0x4B15,
 
-	ASC(LU_FAILED_SELF_CONFIGURATION,			0x4C),
+	SCSI_ASC(LU_FAILED_SELF_CONFIGURATION,			0x4C),
 
-	ASC(TAGGED_OVERLAPPED_COMMANDS,				0x4D),
+	SCSI_ASC(TAGGED_OVERLAPPED_COMMANDS,			0x4D),
 
-	ASC(OVERLAPPED_COMMANDS_ATTEMPTED,			0x4E),
+	SCSI_ASC(OVERLAPPED_COMMANDS_ATTEMPTED,			0x4E),
 
-	ASC(WRITE_APPEND_ERROR,					0x50),
+	SCSI_ASC(WRITE_APPEND_ERROR,				0x50),
 	WRITE_APPEND_POSITION_ERROR				= 0x5001,
 	POSITION_ERROR_RELATED_TO_TIMING			= 0x5002,
 
-	ASC(ERASE_FAILURE,					0x51),
+	SCSI_ASC(ERASE_FAILURE,					0x51),
 	ERASE_FAILURE_INCOMPLETE_ERASE_OP_DETECTED		= 0x5101,
 
-	ASC(CARTRIDGE_FAULT,					0x52),
+	SCSI_ASC(CARTRIDGE_FAULT,				0x52),
 
-	ASC(MEDIA_LOAD_OR_EJECT_FAILED,				0x53),
+	SCSI_ASC(MEDIA_LOAD_OR_EJECT_FAILED,			0x53),
 	UNLOAD_TAPE_FAILURE					= 0x5301,
 	MEDIUM_REMOVAL_PREVENTED				= 0x5302,
 	MEDIUM_REMOVAL_PREVENTED_BY_DATA_TRANSFER_ELEMENT	= 0x5303,
@@ -660,9 +660,9 @@ enum scsi_sense_code {
 	DATA_TRANSFER_DEVICE_ERR_EJECT_FAILED			= 0x530C,
 	DATA_TRANSFER_DEVICE_ERR_LIBRARY_COMMUNICATION_FAILED	= 0x530D,
 
-	ASC(SCSI_TO_HOST_SYSTEM_INTERFACE_FAILURE,		0x54),
+	SCSI_ASC(SCSI_TO_HOST_SYSTEM_INTERFACE_FAILURE,		0x54),
 
-	ASC(SYSTEM_RESOURCE_FAILURE,				0x55),
+	SCSI_ASC(SYSTEM_RESOURCE_FAILURE,			0x55),
 	SYSTEM_BUFFER_FULL					= 0x5501,
 	INSUFFICIENT_RESERVATION_RESOURCES			= 0x5502,
 	INSUFFICIENT_RESOURCES					= 0x5503,
@@ -681,27 +681,27 @@ enum scsi_sense_code {
 	MAXIMUM_NUMBER_OF_STREAMS_OPEN				= 0x5510,
 	INSUFFICIENT_RESOURCES_TO_BIND				= 0x5511,
 
-	ASC(UNABLE_TO_RECOVER_TABLE_OF_CONTENTS,		0x57),
+	SCSI_ASC(UNABLE_TO_RECOVER_TABLE_OF_CONTENTS,		0x57),
 
-	ASC(GENERATION_DOES_NOT_EXIST,				0x58),
+	SCSI_ASC(GENERATION_DOES_NOT_EXIST,			0x58),
 
-	ASC(UPDATED_BLOCK_READ,					0x59),
+	SCSI_ASC(UPDATED_BLOCK_READ,				0x59),
 
-	ASC(OPERATOR_REQUEST_OR_STATE_CHANGE_INPUT,		0x5A),
+	SCSI_ASC(OPERATOR_REQUEST_OR_STATE_CHANGE_INPUT,	0x5A),
 	OPERATOR_MEDIUM_REMOVAL_REQUEST				= 0x5A01,
 	OPERATOR_SELECTED_WRITE_PROTECT				= 0x5A02,
 	OPERATOR_SELECTED_WRITE_PERMIT				= 0x5A03,
 
-	ASC(LOG_EXCEPTION,					0x5B),
+	SCSI_ASC(LOG_EXCEPTION,					0x5B),
 	THRESHOLD_CONDITION_MET					= 0x5B01,
 	LOG_COUNTER_AT_MAXIMUM					= 0x5B02,
 	LOG_LIST_CODES_EXHAUSTED				= 0x5B03,
 
-	ASC(RPL_STATUS_CHANGE,					0x5C),
+	SCSI_ASC(RPL_STATUS_CHANGE,				0x5C),
 	SPINDLES_SYNCHRONIZED					= 0x5C01,
 	SPINDLES_NOT_SYNCHRONIZED				= 0x5C02,
 
-	ASC(FAILURE_PREDICTION_THRESHOLD_EXCEEDED,		0x5D),
+	SCSI_ASC(FAILURE_PREDICTION_THRESHOLD_EXCEEDED,		0x5D),
 	MEDIA_FAILURE_PREDICTION_THRESHOLD_EXCEEDED		= 0x5D01,
 	LU_FAILURE_PREDICTION_THRESHOLD_EXCEEDED		= 0x5D02,
 	SPARE_AREA_EXHAUSTION_PREDICTION_THRESHOLD_EXCEEDED	= 0x5D03,
@@ -787,7 +787,7 @@ enum scsi_sense_code {
 	MEDIA_IMPENDING_FAILURE_ENDURANCE_LIMIT_MET		= 0x5D73,
 	FAILURE_PREDICTION_THRESHOLD_EXCEEDED_FALSE		= 0x5DFF,
 
-	ASC(LOW_POWER_CONDITION_ON,				0x5E),
+	SCSI_ASC(LOW_POWER_CONDITION_ON,			0x5E),
 	IDLE_CONDITION_ACTIVATED_BY_TIMER			= 0x5E01,
 	STANDBY_CONDITION_ACTIVATED_BY_TIMER			= 0x5E02,
 	IDLE_CONDITION_ACTIVATED_BY_COMMAND			= 0x5E03,
@@ -804,28 +804,28 @@ enum scsi_sense_code {
 	POWER_STATE_CHANGE_TO_SLEEP				= 0x5E45,
 	POWER_STATE_CHANGE_TO_DEVICE_CONTROL			= 0x5E47,
 
-	ASC(LAMP_FAILURE,					0x60),
+	SCSI_ASC(LAMP_FAILURE,					0x60),
 
-	ASC(VIDEO_ACQUISITION_ERROR,				0x61),
+	SCSI_ASC(VIDEO_ACQUISITION_ERROR,			0x61),
 	UNABLE_TO_ACQUIRE_VIDEO					= 0x6101,
 	OUT_OF_FOCUS						= 0x6102,
 
-	ASC(SCAN_HEAD_POSITIONING_ERROR,			0x62),
+	SCSI_ASC(SCAN_HEAD_POSITIONING_ERROR,			0x62),
 
-	ASC(END_OF_USER_AREA_ENCOUNTERED_ON_THIS_TRACK,		0x63),
+	SCSI_ASC(END_OF_USER_AREA_ENCOUNTERED_ON_THIS_TRACK,	0x63),
 	PACKET_DOES_NOT_FIT_IN_AVAILABLE_SPACE			= 0x6301,
 
-	ASC(ILLEGAL_MODE_FOR_THIS_TRACK,			0x64),
+	SCSI_ASC(ILLEGAL_MODE_FOR_THIS_TRACK,			0x64),
 	INVALID_PACKET_SIZE					= 0x6401,
 
-	ASC(VOLTAGE_FAULT,					0x65),
+	SCSI_ASC(VOLTAGE_FAULT,					0x65),
 
-	ASC(AUTOMATIC_DOCUMENT_FEEDER_COVER_UP,			0x66),
+	SCSI_ASC(AUTOMATIC_DOCUMENT_FEEDER_COVER_UP,		0x66),
 	AUTOMATIC_DOCUMENT_FEEDER_LIFT_UP			= 0x6601,
 	DOCUMENT_JAM_IN_AUTOMATIC_DOCUMENT_FEEDER		= 0x6602,
 	DOCUMENT_MISS_FEED_AUTOMATIC_IN_DOCUMENT_FEEDER		= 0x6603,
 
-	ASC(CONFIG_FAILURE,					0x67),
+	SCSI_ASC(CONFIG_FAILURE,				0x67),
 	CONFIG_OF_INCAPABLE_LOGICAL_UNITS_FAILED		= 0x6701,
 	ADD_LU_FAILED						= 0x6702,
 	MODIFICATION_OF_LU_FAILED				= 0x6703,
@@ -841,26 +841,26 @@ enum scsi_sense_code {
 	EXPLICIT_BIND_NOT_ALLOWED				= 0x670D,
 	FEATURE_NOT_ENABLED					= 0x670E,
 
-	ASC(LU_NOT_CONFIGURED,					0x68),
+	SCSI_ASC(LU_NOT_CONFIGURED,				0x68),
 	SUBSIDIARY_LU_NOT_CONFIGURED				= 0x6801,
 
-	ASC(DATA_LOSS_ON_LOGICAL_UNIT,				0x69),
+	SCSI_ASC(DATA_LOSS_ON_LOGICAL_UNIT,			0x69),
 	MULTIPLE_LU_FAILURES					= 0x6901,
 	PARITY_DATA_MISMATCH					= 0x6902,
 
-	ASC(INFORMATIONAL_REFER_TO_LOG,				0x6A),
+	SCSI_ASC(INFORMATIONAL_REFER_TO_LOG,			0x6A),
 
-	ASC(STATE_CHANGE_HAS_OCCURRED,				0x6B),
+	SCSI_ASC(STATE_CHANGE_HAS_OCCURRED,			0x6B),
 	REDUNDANCY_LEVEL_GOT_BETTER				= 0x6B01,
 	REDUNDANCY_LEVEL_GOT_WORSE				= 0x6B02,
 
-	ASC(REBUILD_FAILURE_OCCURRED,				0x6C),
+	SCSI_ASC(REBUILD_FAILURE_OCCURRED,			0x6C),
 
-	ASC(RECALCULATE_FAILURE_OCCURRED,			0x6D),
+	SCSI_ASC(RECALCULATE_FAILURE_OCCURRED,			0x6D),
 
-	ASC(COMMAND_TO_LU_FAILED,				0x6E),
+	SCSI_ASC(COMMAND_TO_LU_FAILED,				0x6E),
 
-	ASC(COPY_PROTECTION_KEY_EXCHANGE_FAILURE_AUTHENTICATION_FAILURE, 0x6F),
+	SCSI_ASC(COPY_PROTECTION_KEY_EXCHANGE_FAILURE_AUTHENTICATION_FAILURE, 0x6F),
 	COPY_PROTECTION_KEY_EXCHANGE_FAILURE_KEY_NOT_PRESENT	= 0x6F01,
 	COPY_PROTECTION_KEY_EXCHANGE_FAILURE_KEY_NOT_ESTABLISHED = 0x6F02,
 	READ_OF_SCRAMBLED_SECTOR_WITHOUT_AUTHENTICATION		= 0x6F03,
@@ -872,11 +872,11 @@ enum scsi_sense_code {
 	INVALID_DRIVE_HOST_PAIRING_SERVER			= 0x6F09,
 	DRIVE_HOST_PAIRING_SUSPENDED				= 0x6F0A,
 
-	ASC(DECOMPRESSION_EXCEPTION_SHORT_ALGORITHM_ID,		0x70),
+	SCSI_ASC(DECOMPRESSION_EXCEPTION_SHORT_ALGORITHM_ID,	0x70),
 
-	ASC(DECOMPRESSION_EXCEPTION_LONG_ALGORITHM_ID,		0x71),
+	SCSI_ASC(DECOMPRESSION_EXCEPTION_LONG_ALGORITHM_ID,	0x71),
 
-	ASC(SESSION_FIXATION_ERROR,				0x72),
+	SCSI_ASC(SESSION_FIXATION_ERROR,			0x72),
 	SESSION_FIXATION_ERROR_WRITING_LEAD_IN			= 0x7201,
 	SESSION_FIXATION_ERROR_WRITING_LEAD_OUT			= 0x7202,
 	SESSION_FIXATION_ERROR_INCOMPLETE_TRACK_IN_SESSION	= 0x7203,
@@ -885,7 +885,7 @@ enum scsi_sense_code {
 	RMZ_EXTENSION_IS_NOT_ALLOWED				= 0x7206,
 	NO_MORE_TEST_ZONE_EXTENSIONS_ARE_ALLOWED		= 0x7207,
 
-	ASC(CD_CONTROL_ERROR,					0x73),
+	SCSI_ASC(CD_CONTROL_ERROR,				0x73),
 	POWER_CALIBRATION_AREA_ALMOST_FULL			= 0x7301,
 	POWER_CALIBRATION_AREA_IS_FULL				= 0x7302,
 	POWER_CALIBRATION_AREA_ERROR				= 0x7303,
@@ -896,7 +896,7 @@ enum scsi_sense_code {
 	CURRENT_POWER_CALIBRATION_AREA_IS_FULL			= 0x7311,
 	RDZ_IS_FULL						= 0x7317,
 
-	ASC(SECURITY_ERROR,					0x74),
+	SCSI_ASC(SECURITY_ERROR,				0x74),
 	UNABLE_TO_DECRYPT_DATA					= 0x7401,
 	UNENCRYPTED_DATA_ENCOUNTERED_WHILE_DECRYPTING		= 0x7402,
 	INCORRECT_DATA_ENCRYPTION_KEY				= 0x7403,
Signature · 1 line
2.55.0
#1 lore raw
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] scsi: incomplete macro rename leaves #undef ASC, breaking sparc builds --

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] scsi: incomplete macro rename leaves #undef ASC, breaking sparc builds --

commit c2cd70c047b8b139d3b1ed0fd15c700a718e24ce
Author: Damien Le Moal <[email protected]>

scsi: fix additional sense code definition

This patch renames the ASC() and ASC_DEF() macros to SCSI_ASC() and SCSI_ASC_DEF() to resolve a naming conflict with sparc architecture headers.

Quoted 6 lines
include/scsi/scsi_sense.h +0 -0
index a210a93c1e4e8..f213c52776968 100644
@@ -30,10 +30,10 @@ enum scsi_sense_key {
 	COMPLETED		= 0x0f,

include/scsi/scsi_sense.h enum scsi_sense_key { · line 36

Quoted 10 lines
include/scsi/scsi_sense.h +4 -4
 };
 
-#define ASC_DEF(name)	ASC_##name
-#define ASC(name, code)					\
-	ASC_DEF(name)	= (code),			\
-	name		= ((code) << 8) | 0x00
+#define SCSI_ASC_DEF(name)	ASC_##name
+#define SCSI_ASC(name, code)				\
+	SCSI_ASC_DEF(name)	= (code),		\
+	name			= ((code) << 8) | 0x00

[Severity: Low]
Were the corresponding #undef directives at the end of this file missed during the rename?

Further down in include/scsi/scsi_sense.h, these remain:

#undef ASC_DEF
#undef ASC

This leaves the newly renamed SCSI_ASC and SCSI_ASC_DEF macros leaking into the global namespace, and unintentionally undefines the external ASC macro. This seems like it will result in an undeclared identifier compilation error on sparc builds that include both headers in the same translation unit.

[ ... ]

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1