Skip to contentSkip to conversation

scsi: aic7xxx: restore several defines for aix7xxx firmware build

PATCH Applied [email protected] 2 participants 2 messages May 17, 2021 – May 22, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: aic7xxx: restore several defines for aix7xxx firmware build

From: Tom Rix <[email protected]>

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 similar back to scsi_message.h

Fixes d8cd784ff7b3 ("scsi: aic7xxx: aic79xx: Drop internal SCSI message definition"
---
 drivers/scsi/aic7xxx/scsi_message.h | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/scsi/aic7xxx/scsi_message.h +11 -0
index a7515c3039edb..53343a6d8ae19 100644
@@ -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 
Signature · 1 line
2.26.3
#1 lore raw
Quoted 11 lines · On Mon, 17 May 2021 06:24:51 -0700, [email protected] wrote:

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 */

[...]

Applied to 5.13/scsi-fixes, thanks!

[1/1] scsi: aic7xxx: restore several defines for aix7xxx firmware build

      https://git.kernel.org/mkp/scsi/c/7e7606330b16
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering