From nobody Tue Dec 21 07:22:41 2021 X-Original-To: dev-commits-src-main@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 5F53A18FB2D4; Tue, 21 Dec 2021 07:22:42 +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 4JJ7Ft0sLlz3R6T; Tue, 21 Dec 2021 07:22:42 +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 F19E125832; Tue, 21 Dec 2021 07:22:41 +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 1BL7MfCw032600; Tue, 21 Dec 2021 07:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BL7MfhI032599; Tue, 21 Dec 2021 07:22:41 GMT (envelope-from git) Date: Tue, 21 Dec 2021 07:22:41 GMT Message-Id: <202112210722.1BL7MfhI032599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ram Kishore Vegesna Subject: git: cba757ef2a7e - main - ocs_fc: Populate subvendor and subdevice ids. Enable serialnumber reporting. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cba757ef2a7ec2bb985fbcd67e8d616328b7209a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640071362; 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=NdWhtu84/MVFr7Qgp/ft/O/TxnmuEjUzJw6dQ29Nee0=; b=CFFYk60GGjDTHEYFO/uqylRxeIKd3dNJRKP3pnnP26dgDHYQdNxMMLIWdgG87+ol4XdkP0 y7emHyH0UIMSBMH+XPxCaOYXOJ5Pbs3mWdknKe1Qr4pmlmpEtvjYQPXnc99i2K+U4f0eZT 81dGbIKjFljR7+qdQiJ3sC1SgDqocC3HfLQnW2gojLhU+MYUk3Hbtmh+mMy3YURn9dcorL B8c6ExKSxtOzLb4cGQhM+jffsFPcLdtc7EKuVP3Y8NRQJxuXAoP/ell/fZ7AyW/FOIe7FE qeR1PBzG4SLn48JxXB5u0kr88R0RdOeakEk9cytD094W69q1BLQgcEt+mwZ1vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640071362; a=rsa-sha256; cv=none; b=sNy1uyM4mnZp4SUcSGxfsb2ShAgD8gyYSVhdknSgiAsghYoCw5bP3Qx/WqNwrK9Uuy+vXs R9HPtJDgW9FJTp5cbakZRKl0KbzJs7jdd9eJnzfPLSqOkeEl+5tj993Fgj0wVehbUeFmEB VwYn93x5gezyB24GCAKhjrGf2vSF8D15Djk/IiucbB77o63flEc5FPMUrcvwtrDvCGmdF4 UL+1KDrIUcUiRxnmQhV0bePSa4D9GauUuJHp7e7yEl+adyAgjcoxw2+ttFB6e4X8Olqh3K hDubkNjtt5xwV98g2QM72KinrWU2nB5RCBa3VelRvfJE06dXHQT7hJL2YgPJYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ram: URL: https://cgit.FreeBSD.org/src/commit/?id=cba757ef2a7ec2bb985fbcd67e8d616328b7209a commit cba757ef2a7ec2bb985fbcd67e8d616328b7209a Author: Ram Kishore Vegesna AuthorDate: 2021-12-20 12:25:13 +0000 Commit: Ram Kishore Vegesna CommitDate: 2021-12-21 07:11:51 +0000 ocs_fc: Populate subvendor and subdevice ids. Enable serialnumber reporting. Reviewed by: mav MFC after: 3 days --- sys/dev/ocs_fc/ocs_pci.c | 3 +++ sys/dev/ocs_fc/ocs_scsi.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/ocs_fc/ocs_pci.c b/sys/dev/ocs_fc/ocs_pci.c index 8714c242a212..f50172fdada6 100644 --- a/sys/dev/ocs_fc/ocs_pci.c +++ b/sys/dev/ocs_fc/ocs_pci.c @@ -529,6 +529,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 b1d98c7c0e3d..8938c0e2819f 100644 --- a/sys/dev/ocs_fc/ocs_scsi.c +++ b/sys/dev/ocs_fc/ocs_scsi.c @@ -43,9 +43,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" @@ -2808,7 +2806,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; @@ -2859,7 +2856,6 @@ void *ocs_scsi_get_property_ptr(ocs_t *ocs, ocs_scsi_property_e prop) } break; } -#endif default: break; }