From nobody Fri Dec 24 09:02:01 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8CBE41909A93; Fri, 24 Dec 2021 09:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JL1K51pfrz4ll5; Fri, 24 Dec 2021 09:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E41A212FA; Fri, 24 Dec 2021 09:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BO9210I055548; Fri, 24 Dec 2021 09:02:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BO921Us055547; Fri, 24 Dec 2021 09:02:01 GMT (envelope-from git) Date: Fri, 24 Dec 2021 09:02:01 GMT Message-Id: <202112240902.1BO921Us055547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ram Kishore Vegesna Subject: git: a086650f6dc8 - stable/12 - ocs_fc: Populate subvendor and subdevice ids. Enable serialnumber reporting. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ram X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a086650f6dc864806e65d8020f6eae58a1da0ea5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640336521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/tBfc3h4MgvjK99AjfM9yDtmLjnuleFEsIxcXaVbWZU=; b=GkShzdGRzhvD9DyvKfGenn8YPJPSME0ka61oQXMePnFy+EL6tdraAO+d/iW9wkV+qj6EJz T7AOMCafXU364vlgyoixiBHCheQpT1R1esxHGDejwZQJ3c+rRR5KFYj2WCVkzTxN7NOJN9 Pbj57sycPcp4gPC463ysfec5oEiquXpz1pF1C8S3JFzW+b7MAGQy+eQRqdrGuAudJ1pyV7 NhU92WltR9zYU1GNM0mhP4Ae3IpegAA+rv1JMhKZjH0l8ojGux4XCQV7L+MGCNHQBtsOP1 397moNYKT1j4Ksh3D1v8WoIYUc0Gx8KeK/P691zQjlXSsT49el4MVEURjPoLmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640336521; a=rsa-sha256; cv=none; b=LXio2wWFsIiNfgYrnancDD44uOcSYnnuwusX5tenRgSy7VIsugJ52fm2vSKyrU8YGACF8T tljBudlhnSVDfv4xufT+e5w/s2xgUjQEwXI16RDbGEWHurba80FUxlHja6oYn8zagbB74a yeelNlCVlPOdhV0RhZ7RDZh1CKgJso2KA8hPSjx99tGQ6abgYUVbwIASFjyTpKKCBNs2cV n2uZJg/eiezGwca+sN5y1BK1+NXhpB6nf8Rjfb06v/15BfGvZ0sJf+DsqYi129aVSn/k6O uDyh57FmHkIxbn5agDxNNUH6IrP6itdVoxIHhYZomQ8jCbAdnnMPcViOuMuzkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=a086650f6dc864806e65d8020f6eae58a1da0ea5 commit a086650f6dc864806e65d8020f6eae58a1da0ea5 Author: Ram Kishore Vegesna AuthorDate: 2021-12-20 12:25:13 +0000 Commit: Ram Kishore Vegesna CommitDate: 2021-12-24 08:55:50 +0000 ocs_fc: Populate subvendor and subdevice ids. Enable serialnumber reporting. Reviewed by: mav MFC after: 3 days (cherry picked from commit cba757ef2a7ec2bb985fbcd67e8d616328b7209a) ocs_fs(4): Fix some common typos in source code comments - s/transfered/transferred/ - s/associted/associated/ MFC after: 3 days (cherry picked from commit 16b71d98d96a3a9a2ac666440aa80f12d478959d) --- sys/dev/ocs_fc/ocs_gendump.c | 2 +- sys/dev/ocs_fc/ocs_hw_queues.c | 2 +- sys/dev/ocs_fc/ocs_pci.c | 3 +++ sys/dev/ocs_fc/ocs_scsi.c | 4 ---- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_gendump.c b/sys/dev/ocs_fc/ocs_gendump.c index d24870f39668..83155d90c3a3 100644 --- a/sys/dev/ocs_fc/ocs_gendump.c +++ b/sys/dev/ocs_fc/ocs_gendump.c @@ -234,7 +234,7 @@ ocs_fdb_dump(ocs_t *ocs) * @par Description * This function creates a DMA buffer to hold a Lancer dump, * sets the dump location to point to that buffer, then calls - * ocs_gen_dump to cause a dump to be transfered to the buffer. + * ocs_gen_dump to cause a dump to be transferred to the buffer. * After the dump is complete it copies the dump to the provided * user space buffer. * diff --git a/sys/dev/ocs_fc/ocs_hw_queues.c b/sys/dev/ocs_fc/ocs_hw_queues.c index 2527d72865a7..437e1f296ad1 100644 --- a/sys/dev/ocs_fc/ocs_hw_queues.c +++ b/sys/dev/ocs_fc/ocs_hw_queues.c @@ -962,7 +962,7 @@ hw_queue_teardown(ocs_hw_t *hw) * If wq_steering is OCS_HW_WQ_STEERING_REQUEST, then a WQ from the EQ that * the IO request came in on is selected. * - * If wq_steering is OCS_HW_WQ_STEERING_CPU, then a WQ associted with the + * If wq_steering is OCS_HW_WQ_STEERING_CPU, then a WQ associated with the * CPU the request is made on is selected. * * @param hw pointer to HW object diff --git a/sys/dev/ocs_fc/ocs_pci.c b/sys/dev/ocs_fc/ocs_pci.c index b38ec041b397..a5e67c2614c3 100644 --- a/sys/dev/ocs_fc/ocs_pci.c +++ b/sys/dev/ocs_fc/ocs_pci.c @@ -532,6 +532,9 @@ ocs_pci_attach(device_t dev) ocs->pci_vendor = pci_get_vendor(dev); ocs->pci_device = pci_get_device(dev); + ocs->pci_subsystem_vendor = pci_get_subvendor(dev); + ocs->pci_subsystem_device = pci_get_subdevice(dev); + snprintf(ocs->businfo, sizeof(ocs->businfo), "%02X:%02X:%02X", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); diff --git a/sys/dev/ocs_fc/ocs_scsi.c b/sys/dev/ocs_fc/ocs_scsi.c index b11d2678267c..560ed023f955 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -44,9 +44,7 @@ #include "ocs.h" #include "ocs_els.h" #include "ocs_scsi.h" -#if defined(OCS_ENABLE_VPD_SUPPORT) #include "ocs_vpd.h" -#endif #include "ocs_utils.h" #include "ocs_device.h" @@ -2826,7 +2824,6 @@ void *ocs_scsi_get_property_ptr(ocs_t *ocs, ocs_scsi_property_e prop) case OCS_SCSI_BIOS_VERSION_STRING: rc = ocs_hw_get_ptr(&ocs->hw, OCS_HW_BIOS_VERSION_STRING); break; -#if defined(OCS_ENABLE_VPD_SUPPORT) case OCS_SCSI_SERIALNUMBER: { uint8_t *pvpd; @@ -2877,7 +2874,6 @@ void *ocs_scsi_get_property_ptr(ocs_t *ocs, ocs_scsi_property_e prop) } break; } -#endif default: break; }