Commit 7e760633 authored by Tom Rix's avatar Tom Rix Committed by Martin K. Petersen
Browse files

scsi: aic7xxx: Restore several defines for aic7xxx firmware build 

With CONFIG_AIC7XXX_BUILD_FIRMWARE, there is this representative error:

  aicasm: Stopped at file ./drivers/scsi/aic7xxx/aic7xxx.seq,
    line 271 - Undefined symbol MSG_SIMPLE_Q_TAG referenced

MSG_SIMPLE_Q_TAG used to be defined in drivers/scsi/aic7xxx/scsi_message.h
as:

  #define MSG_SIMPLE_Q_TAG	0x20 /* O/O */

The new definition in include/scsi/scsi.h is:

  #define SIMPLE_QUEUE_TAG    0x20

But aicasm can not handle the all the preprocessor directives in scsi.h, so
add MSG_SIMPLE_Q_TAB and other required defines back to scsi_message.h.

Link: https://lore.kernel.org/r/20210517132451.1832233-1-trix@redhat.com


Fixes: d8cd784f ("scsi: aic7xxx: aic79xx: Drop internal SCSI message definition"
Signed-off-by: default avatarTom Rix <trix@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5aaeca25

drivers/scsi/aic7xxx/scsi_message.h

+11 −0
Original line number Diff line number Diff line
@@ -3,6 +3,17 @@ 
 * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.2 2000/05/01 20:21:29 peter Exp $

 */



/* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */

#define MSG_SAVEDATAPOINTER	0x02 /* O/O */

#define MSG_RESTOREPOINTERS	0x03 /* O/O */

#define MSG_DISCONNECT		0x04 /* O/O */

#define MSG_MESSAGE_REJECT	0x07 /* M/M */

#define MSG_NOOP		0x08 /* M/M */



/* Messages (2 byte) */

#define MSG_SIMPLE_Q_TAG	0x20 /* O/O */

#define MSG_IGN_WIDE_RESIDUE	0x23 /* O/O */



/* Identify message */		     /* M/M */	

#define MSG_IDENTIFYFLAG	0x80 

#define MSG_IDENTIFY_DISCFLAG	0x40