Page MenuHomeFreeBSD
Differential D43596

nda: Use the NVMEV macro instead of expanded versions
ClosedPublic
Actions

Authored by jhb on Jan 25 2024, 10:28 PM.
Tags
None
Referenced Files
F124668276: D43596.id133515.diff
Tue, Jul 29, 1:59 AM
F124601598: D43596.id133360.diff
Mon, Jul 28, 1:07 PM
F124594491: D43596.diff
Mon, Jul 28, 11:21 AM
Unknown Object (File)
Fri, Jul 25, 12:40 PM
Unknown Object (File)
Fri, Jul 25, 11:41 AM
Unknown Object (File)
Fri, Jul 25, 10:08 AM
Unknown Object (File)
Sat, Jul 12, 1:43 PM
Unknown Object (File)
Sun, Jul 6, 7:42 PM
View All 98 Files
Subscribers
dab

Details

Reviewers
imp
chuck
Group Reviewers
cam
Commits
rGe8edea1b4cc5: nda: Use the NVMEV macro instead of expanded versions
rG2cb78e71503e: nda: Use the NVMEV macro instead of expanded versions
Summary

Sponsored by: Chelsio Communications

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 55610
Build 52499: arc lint + arc unit

Revision Contents
Changeset List

PathSize
sys/
cam/
nvme/
13 lines

Diff 133360

View Options

sys/cam/nvme/nvme_da.c

Show First 20 Lines • Show All 905 Lines • ▼ Show 20 Linesndaregister(struct cam_periph *periph, void *arg)
disk->d_drv1 = periph; disk->d_drv1 = periph;
disk->d_unit = periph->unit_number; disk->d_unit = periph->unit_number;
maxio = cpi.maxio; /* Honor max I/O size of SIM */ maxio = cpi.maxio; /* Honor max I/O size of SIM */
if (maxio == 0) if (maxio == 0)
maxio = DFLTPHYS; /* traditional default */ maxio = DFLTPHYS; /* traditional default */
else if (maxio > maxphys) else if (maxio > maxphys)
maxio = maxphys; /* for safety */ maxio = maxphys; /* for safety */
disk->d_maxsize = maxio; disk->d_maxsize = maxio;
flbas_fmt = (nsd->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas);
NVME_NS_DATA_FLBAS_FORMAT_MASK; lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]);
lbads = (nsd->lbaf[flbas_fmt] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) &
NVME_NS_DATA_LBAF_LBADS_MASK;
disk->d_sectorsize = 1 << lbads; disk->d_sectorsize = 1 << lbads;
disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze);
disk->d_delmaxsize = disk->d_mediasize; disk->d_delmaxsize = disk->d_mediasize;
disk->d_flags = DISKFLAG_DIRECT_COMPLETION; disk->d_flags = DISKFLAG_DIRECT_COMPLETION;
if (nvme_ctrlr_has_dataset_mgmt(cd)) if (nvme_ctrlr_has_dataset_mgmt(cd))
disk->d_flags |= DISKFLAG_CANDELETE; disk->d_flags |= DISKFLAG_CANDELETE;
vwc_present = (cd->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc);
NVME_CTRLR_DATA_VWC_PRESENT_MASK;
if (vwc_present) if (vwc_present)
disk->d_flags |= DISKFLAG_CANFLUSHCACHE; disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { if ((cpi.hba_misc & PIM_UNMAPPED) != 0) {
disk->d_flags |= DISKFLAG_UNMAPPED_BIO; disk->d_flags |= DISKFLAG_UNMAPPED_BIO;
softc->unmappedio = 1; softc->unmappedio = 1;
} }
/* /*
* d_ident and d_descr are both far bigger than the length of either * d_ident and d_descr are both far bigger than the length of either
* the serial or model number strings. * the serial or model number strings.
*/ */
cam_strvis_flag(disk->d_descr, cd->mn, NVME_MODEL_NUMBER_LENGTH, cam_strvis_flag(disk->d_descr, cd->mn, NVME_MODEL_NUMBER_LENGTH,
sizeof(disk->d_descr), CAM_STRVIS_FLAG_NONASCII_SPC); sizeof(disk->d_descr), CAM_STRVIS_FLAG_NONASCII_SPC);
cam_strvis_flag(disk->d_ident, cd->sn, NVME_SERIAL_NUMBER_LENGTH, cam_strvis_flag(disk->d_ident, cd->sn, NVME_SERIAL_NUMBER_LENGTH,
sizeof(disk->d_ident), CAM_STRVIS_FLAG_NONASCII_SPC); sizeof(disk->d_ident), CAM_STRVIS_FLAG_NONASCII_SPC);
disk->d_hba_vendor = cpi.hba_vendor; disk->d_hba_vendor = cpi.hba_vendor;
disk->d_hba_device = cpi.hba_device; disk->d_hba_device = cpi.hba_device;
disk->d_hba_subvendor = cpi.hba_subvendor; disk->d_hba_subvendor = cpi.hba_subvendor;
disk->d_hba_subdevice = cpi.hba_subdevice; disk->d_hba_subdevice = cpi.hba_subdevice;
snprintf(disk->d_attachment, sizeof(disk->d_attachment), snprintf(disk->d_attachment, sizeof(disk->d_attachment),
"%s%d", cpi.dev_name, cpi.unit_number); "%s%d", cpi.dev_name, cpi.unit_number);
if (((nsd->nsfeat >> NVME_NS_DATA_NSFEAT_NPVALID_SHIFT) & if (NVMEV(NVME_NS_DATA_NSFEAT_NPVALID, nsd->nsfeat) != 0 &&
NVME_NS_DATA_NSFEAT_NPVALID_MASK) != 0 && nsd->npwg != 0) nsd->npwg != 0)
disk->d_stripesize = ((nsd->npwg + 1) * disk->d_sectorsize); disk->d_stripesize = ((nsd->npwg + 1) * disk->d_sectorsize);
else else
disk->d_stripesize = nsd->noiob * disk->d_sectorsize; disk->d_stripesize = nsd->noiob * disk->d_sectorsize;
disk->d_stripeoffset = 0; disk->d_stripeoffset = 0;
disk->d_devstat = devstat_new_entry(periph->periph_name, disk->d_devstat = devstat_new_entry(periph->periph_name,
periph->unit_number, disk->d_sectorsize, periph->unit_number, disk->d_sectorsize,
DEVSTAT_ALL_SUPPORTED, DEVSTAT_ALL_SUPPORTED,
DEVSTAT_TYPE_DIRECT | XPORT_DEVSTAT_TYPE(cpi.transport), DEVSTAT_TYPE_DIRECT | XPORT_DEVSTAT_TYPE(cpi.transport),
▲ Show 20 Lines • Show All 406 Lines • Show Last 20 Lines