Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2752284pxj; Mon, 31 May 2021 09:51:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUuREGOqQxFPKvhB2aTXNs1Tduqy10Llw3DyPdHDnD3/oz7cMf6GRZ9u4VfbWXAzIOelky X-Received: by 2002:a17:906:2d51:: with SMTP id e17mr1872596eji.500.1622479882191; Mon, 31 May 2021 09:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622479882; cv=none; d=google.com; s=arc-20160816; b=dBjUNpfGCUk06/97NhD+kGzVD6/VidS8mwYQvL1mmcC4CHF9FIlPquaSCqNrHe4PC/ Vgm2QwEAcW0bJjdUwBbG2SfeQ+PM1clDKD8UvL/LY48qRADF0PX+J1iqBaufH1/2skoE 98vuLrS70laxg8MkMAVwoCVo5hGPRqVb8EsWMHFzKBLNUD5gp4dLKyBHvcd+/CTFMh00 cRn8jbq0iUpsS9OZkYGYy7igwCslDS2OLY+QnKVhFI7RFhL8NV6hHN5YmkAEnv3JLlYf gR/c8kwEUrHY0GsOmb7Cts4YnUbkVYtM4am3M0ysGyaVLFxe9wdQRpeo+nCtaWmmWFsV PQUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YtQdDTpjkCYjc55+/TD+I5tGy78hn58lklWP9rFVG2w=; b=Dcs8LEi0JEtTVPVIHi+64tJiA3+pD9GJoF5amNxOhpgkPC8LAh4xJ59VxB1DOgzaTl MX5jZt8/FInK9weGsbxuKp0zBKqauF5+RhAktFl3XbXXNnUyxBJ0cVrG/tq1wHtCovtb 5OQ7IDKB2ohjku8qWN5Fp9Qwhkn7JXtbbJ3sI//fPYEOWTiNgJI9iQyJK+Ma5NF77Ps5 31u0BqU5oi1sK663rFADh9vgc4uRjyTwU5ZdISdDuSm8rkst8DrmruYsVT1cHIb3cPWk 6zz2khcsXs2+yirsKQR8H6aXnzTUfxsfw7JISOfrB1zeIoWYlecWCLTp4ELlNe1BgT1w dMdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uP4V42Tz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si13887250edc.364.2021.05.31.09.50.58; Mon, 31 May 2021 09:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uP4V42Tz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233399AbhEaQvp (ORCPT + 99 others); Mon, 31 May 2021 12:51:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:51350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234116AbhEaO5p (ORCPT ); Mon, 31 May 2021 10:57:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E3ED961CC7; Mon, 31 May 2021 14:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622469647; bh=C2WS6xhbObfd+1D9ZcNUvJNVM3eLmKUdDTfjOjdcOco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uP4V42TztLAMKv7T4sd5LyDhVurf+sRzx8nyXye+adxj6lF9SuqZy/9B8G5+oOrlx 8rxWXfU5t8kw64ZqZSYeVL22V5P0MGJ9JUbforpOin7zkFlTNbFdFNSR97UxPJK1sh bGVC43WaSoqDahBsepuAiXTwQS/4pn060mp/WixY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Rix , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.12 276/296] scsi: aic7xxx: Restore several defines for aic7xxx firmware build Date: Mon, 31 May 2021 15:15:31 +0200 Message-Id: <20210531130713.013680144@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130703.762129381@linuxfoundation.org> References: <20210531130703.762129381@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Rix [ Upstream commit 7e7606330b167a0ff483fb02caed9267bfab69ee ] 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: d8cd784ff7b3 ("scsi: aic7xxx: aic79xx: Drop internal SCSI message definition" Signed-off-by: Tom Rix Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/aic7xxx/scsi_message.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/scsi/aic7xxx/scsi_message.h b/drivers/scsi/aic7xxx/scsi_message.h index a7515c3039ed..53343a6d8ae1 100644 --- a/drivers/scsi/aic7xxx/scsi_message.h +++ b/drivers/scsi/aic7xxx/scsi_message.h @@ -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 -- 2.30.2