github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

scsi: ibmvfc: send NVMe target discovery MAD

Browse Source 
Extend target discovery to send protocol-specific discover-target MADs
for NVMe/FC.

Use the protocol-aware discovery helper to build an NVMe discover-target
request, submit it when NVMe/FC support is active, and process the
returned target count using the NVMe channel group's discovery buffer.

This allows the driver to discover NVMe/FC targets in parallel with the
existing SCSI discovery flow while keeping protocol-specific target data
separate.

Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Link: https://patch.msgid.link/20260723000149.969416-16-tyreld@linux.ibm.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Tyrel Datwyler 2026-07-22 17:01:31 -07:00 committed by Martin K. Petersen
parent fe150862d5
commit 5e9dd03726
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/scsi/ibmvscsi/ibmvfc-core.c
View File

@ -173,6 +173,11 @@ static const struct {
{ IBMVFC_FC_SCSI_ERROR, IBMVFC_COMMAND_FAILED, DID_ERROR, 0, 1, "PRLI to device failed." },
};
static const char *proto_type[] = {
"SCSI",
"NVMe",
};
static void ibmvfc_npiv_login(struct ibmvfc_host *);
static void ibmvfc_tgt_send_prli(struct ibmvfc_target *);
static void ibmvfc_tgt_send_plogi(struct ibmvfc_target *);
@ -5011,19 +5016,30 @@ static void ibmvfc_discover_targets_done(struct ibmvfc_event *evt)
{
struct ibmvfc_host *vhost = evt->vhost;
struct ibmvfc_discover_targets *rsp = &evt->xfer_iu->discover_targets;
struct ibmvfc_channels *channels;
u32 mad_status = be16_to_cpu(rsp->common.status);
u32 opcode = be32_to_cpu(rsp->common.opcode);
int level = IBMVFC_DEFAULT_LOG_LEVEL;
if (opcode == IBMVFC_DISC_TARGETS)
channels = &vhost->scsi_scrqs;
else
channels = &vhost->nvme_scrqs;
switch (mad_status) {
case IBMVFC_MAD_SUCCESS:
ibmvfc_dbg(vhost, "Discover Targets succeeded\n");
vhost->scsi_scrqs.num_targets = min_t(u32, be32_to_cpu(rsp->num_written),
max_targets);
ibmvfc_dbg(vhost, "Discover %s Targets succeeded\n",
proto_type[channels->protocol]);
channels->num_targets = min_t(u32, be32_to_cpu(rsp->num_written),
max_targets);
ibmvfc_dbg(vhost, "%d %s targets found\n", channels->num_targets,
proto_type[channels->protocol]);
ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_ALLOC_TGTS);
break;
case IBMVFC_MAD_FAILED:
level += ibmvfc_retry_host_init(vhost);
ibmvfc_log(vhost, level, "Discover Targets failed: %s (%x:%x)\n",
ibmvfc_log(vhost, level, "Discover %s Targets failed: %s (%x:%x)\n",
proto_type[channels->protocol],
ibmvfc_get_cmd_error(be16_to_cpu(rsp->status), be16_to_cpu(rsp->error)),
be16_to_cpu(rsp->status), be16_to_cpu(rsp->error));
break;
@ -5076,7 +5092,7 @@ static void ibmvfc_discover_targets(struct ibmvfc_host *vhost)
int level = IBMVFC_DEFAULT_LOG_LEVEL;
if (!evt) {
ibmvfc_log(vhost, level, "Discover Targets failed: no available events\n");
ibmvfc_log(vhost, level, "Discover SCSI Targets failed: no available events\n");
ibmvfc_hard_reset_host(vhost);
return;
}
@ -5084,9 +5100,29 @@ static void ibmvfc_discover_targets(struct ibmvfc_host *vhost)
ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT_WAIT);
if (!ibmvfc_send_event(evt, vhost, default_timeout))
ibmvfc_dbg(vhost, "Sent discover targets\n");
ibmvfc_dbg(vhost, "Sent discover SCSI targets\n");
else
ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD);
goto link_down;
if (!ibmvfc_nvme_active(vhost))
return;
evt = ibmvfc_get_disc_event(&vhost->nvme_scrqs);
if (!evt) {
ibmvfc_log(vhost, level, "Discover NVMe Targets failed: no available events\n");
ibmvfc_hard_reset_host(vhost);
return;
}
if (!ibmvfc_send_event(evt, vhost, default_timeout))
ibmvfc_dbg(vhost, "Sent discover NVMe targets\n");
else
goto link_down;
return;
link_down:
ibmvfc_link_down(vhost, IBMVFC_LINK_DEAD);
}
static void ibmvfc_fabric_login_nvme_done(struct ibmvfc_event *evt)