From nobody Mon Jan 10 13:34:00 2022 X-Original-To: dev-commits-src-all@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 2D9AB1935492; Mon, 10 Jan 2022 13:34: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 4JXZY46LGWz4tDD; Mon, 10 Jan 2022 13:34:00 +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 BB022261B2; Mon, 10 Jan 2022 13:34:00 +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 20ADY0A7099951; Mon, 10 Jan 2022 13:34:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ADY0A8099950; Mon, 10 Jan 2022 13:34:00 GMT (envelope-from git) Date: Mon, 10 Jan 2022 13:34:00 GMT Message-Id: <202201101334.20ADY0A8099950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: ed65c80a3475 - main - Mana: report OS info to PF driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed65c80a3475a70f056bb950fba2821f4142ea84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641821640; 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=vTQEbSGvMB5Bw4tv18CqzcjNxzMbwghmI0cf5l6cNDA=; b=eiDc3Al2U5A+4JenzJLUh43MT3/co7qRAMtTJgsA50rIDnWYAslJrXEpSdSLdlPx6CQ47u Im3SPawmVtS51gOV8S1IXTB4Jicj7gWQt/8Z+/arbdEoWpz9yf/exzccJHw+ugHcRFgtrH w6gHGGSD2+O85kEeWJWhA+MXJSyW2sqr0Mym54I2Z5Pa97GvKfubZMUJRQNcClH7SLYSjD +53ucgwW0bxykaqhn8my+OHHultR6F9ijO35q/C8ZcI3zUl4Ise0aHtN1C/kciga+aMKKb ZrFJlYCxItPfaJt9xSxMmh73nndAHmDe/b8lQNTCduZchN1xJ9khKbrh1nFMIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641821640; a=rsa-sha256; cv=none; b=aW/T1vV72WbaeUFqmoUVn+EMIgnDFpnq5rMDAnL914Hilp5DJHQluB1TbYH3O4raxvsauj FKtmncn9mbMQAWPC1gO+PA2Ay+oc3ZfJdX5Zae1RqVIJ3DsmBEEiN6Obvat/niaUkkuCrp yobcEyNzZLgztTtUxz+BEfEJBp0xsXgV4uekbh3ngMNybgC3io7/z2SC/AyyHK+JG14rbu 4/32zt0grbQH220ycN32M1fwayx1gdA20tieClFxz9ALRZu0ftqUntjO6L2JfkB8VmgPAo GCZdtHY9ismNK77sglDQBydto+QfwBZ6lyrA/nwZ43dhCzHLogcfp1Brh6MdQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=ed65c80a3475a70f056bb950fba2821f4142ea84 commit ed65c80a3475a70f056bb950fba2821f4142ea84 Author: Wei Hu AuthorDate: 2022-01-07 13:12:31 +0000 Commit: Wei Hu CommitDate: 2022-01-10 13:32:30 +0000 Mana: report OS info to PF driver The PF driver might use the OS info for statistical purposes. MFC after: 2 weeks Sponsored by: Microsoft --- sys/dev/mana/gdma_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index 211e47368cc5..49af54f4be5d 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -1060,6 +1060,9 @@ mana_gd_destroy_queue(struct gdma_context *gc, struct gdma_queue *queue) free(queue, M_DEVBUF); } +#define OS_MAJOR_DIV 100000 +#define OS_BUILD_MOD 1000 + int mana_gd_verify_vf_version(device_t dev) { @@ -1074,6 +1077,14 @@ mana_gd_verify_vf_version(device_t dev) req.protocol_ver_min = GDMA_PROTOCOL_FIRST; req.protocol_ver_max = GDMA_PROTOCOL_LAST; + req.drv_ver = 0; /* Unused */ + req.os_type = 0x30; /* Other */ + req.os_ver_major = osreldate / OS_MAJOR_DIV; + req.os_ver_minor = (osreldate % OS_MAJOR_DIV) / OS_BUILD_MOD; + req.os_ver_build = osreldate % OS_BUILD_MOD; + strncpy(req.os_ver_str1, ostype, sizeof(req.os_ver_str1) - 1); + strncpy(req.os_ver_str2, osrelease, sizeof(req.os_ver_str2) - 1); + err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp); if (err || resp.hdr.status) { device_printf(gc->dev,