From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Hannes Reinecke <hare@suse.de>, kernel test robot <lkp@intel.com>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 06/18] aic7xxx: make BUILD_SCSIID() a function
Date: Mon, 2 Oct 2023 17:43:16 +0200 [thread overview]
Message-ID: <20231002154328.43718-7-hare@suse.de> (raw)
In-Reply-To: <20231002154328.43718-1-hare@suse.de>
Convert BUILD_SCSIID() into a function and add a scsi_device argument.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
drivers/scsi/aic7xxx/aic7xxx_osm.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index d3b1082654d5..15e53b33b955 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -798,11 +798,18 @@ struct scsi_host_template aic7xxx_driver_template = {
/**************************** Tasklet Handler *********************************/
-/******************************** Macros **************************************/
-#define BUILD_SCSIID(ahc, cmd) \
- ((((cmd)->device->id << TID_SHIFT) & TID) \
- | (((cmd)->device->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \
- | (((cmd)->device->channel == 0) ? 0 : TWIN_CHNLB))
+
+static inline unsigned int ahc_build_scsiid(struct ahc_softc *ahc,
+ struct scsi_device *sdev)
+{
+ unsigned int scsiid = (sdev->id << TID_SHIFT) & TID;
+
+ if (sdev->channel == 0)
+ scsiid |= ahc->our_id;
+ else
+ scsiid |= ahc->our_id_b | TWIN_CHNLB;
+ return scsiid;
+}
/******************************** Bus DMA *************************************/
int
@@ -1457,7 +1464,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev,
* Fill out basics of the HSCB.
*/
hscb->control = 0;
- hscb->scsiid = BUILD_SCSIID(ahc, cmd);
+ hscb->scsiid = ahc_build_scsiid(ahc, cmd->device);
hscb->lun = cmd->device->lun;
mask = SCB_GET_TARGET_MASK(ahc, scb);
tinfo = ahc_fetch_transinfo(ahc, SCB_GET_CHANNEL(ahc, scb),
--
2.35.3
next prev parent reply other threads:[~2023-10-02 15:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 15:43 [PATCHv5 00/18] scsi: EH rework prep patches, part 1 Hannes Reinecke
2023-10-02 15:43 ` [PATCH 01/18] mptfc: simplify mptfc_block_error_handler() Hannes Reinecke
2023-10-02 15:43 ` [PATCH 02/18] mptfusion: correct definitions for mptscsih_dev_reset() Hannes Reinecke
2023-10-02 15:43 ` [PATCH 03/18] mptfc: open-code mptfc_block_error_handler() for bus reset Hannes Reinecke
2023-10-02 15:43 ` [PATCH 04/18] qedf: use fc rport as argument for qedf_initiate_tmf() Hannes Reinecke
2023-10-02 15:43 ` [PATCH 05/18] bnx2fc: Do not rely on a scsi command for lun or target reset Hannes Reinecke
2023-10-02 15:43 ` Hannes Reinecke [this message]
2023-10-12 8:26 ` [PATCH 06/18] aic7xxx: make BUILD_SCSIID() a function Christoph Hellwig
2023-10-13 17:59 ` Martin K. Petersen
2023-10-02 15:43 ` [PATCH 07/18] aic7xxx: do not reference scsi command when resetting device Hannes Reinecke
2023-10-02 15:43 ` [PATCH 08/18] aic79xx: make BUILD_SCSIID() a function Hannes Reinecke
2023-10-12 8:26 ` Christoph Hellwig
2023-10-13 17:59 ` Martin K. Petersen
2023-10-02 15:43 ` [PATCH 09/18] aic79xx: do not reference scsi command when resetting device Hannes Reinecke
2023-10-02 15:43 ` [PATCH 10/18] ibmvfc: open-code reset loop for target reset Hannes Reinecke
2023-10-02 15:43 ` [PATCH 11/18] megaraid: pass in NULL scb for host reset Hannes Reinecke
2023-10-02 15:43 ` [PATCH 12/18] ips: Do not try to abort command from " Hannes Reinecke
2023-10-02 15:43 ` [PATCH 13/18] sym53c8xx_2: split off bus reset " Hannes Reinecke
2023-10-02 15:43 ` [PATCH 14/18] sym53c8xx_2: rework reset handling Hannes Reinecke
2023-10-02 15:43 ` [PATCH 15/18] qla1280: separate out host reset function from qla1280_error_action() Hannes Reinecke
2023-10-02 15:43 ` [PATCH 16/18] pmcraid: Select device in pmcraid_eh_bus_reset_handler() Hannes Reinecke
2023-10-02 15:43 ` [PATCH 17/18] pmcraid: select device in pmcraid_eh_target_reset_handler() Hannes Reinecke
2023-10-05 12:26 ` John Garry
2023-10-09 7:52 ` Hannes Reinecke
2023-10-02 15:43 ` [PATCH 18/18] mpi3mr: split off bus_reset function from host_reset Hannes Reinecke
2023-10-13 18:26 ` [PATCHv5 00/18] scsi: EH rework prep patches, part 1 Martin K. Petersen
2023-10-17 1:11 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002154328.43718-7-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-scsi@vger.kernel.org \
--cc=lkp@intel.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox