From nobody Thu Jan 19 03:52:22 2023 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 4Ny7xM1grMz2svWy; Thu, 19 Jan 2023 03:52:23 +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 4Ny7xM0Twtz3jHs; Thu, 19 Jan 2023 03:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100343; 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=mu/uxZaxW9+85hS7juDhnAqWCGdbpsQoK55URrzr0Sg=; b=B8e5RdZqrbeabDKufAdjNUbJJwYLnLM557OFbAO7sUqH1iaKx2wXfIm0Mj1di+CT9N6eID fhCxi+v/H5Lo8WJktMpslwhGRHublWTnssbL46qvkivi7y9ddjZe3CDfIncUri47mlbAX4 8mJNUYvvix6ltdvvVQ4oQhRVAbGSaH5uf9+mey/W+Gj9f0DLlFm+Kvpo3vmKkjmIZzwLRk OQnJK1iR5CmfK6tEsiIOP/v5cjqRCuXMSGhyFKPNI/AtxF2yQZRpcRUlaNGX+ujvQcquBP JWdLi8ifQI+Y0bUZZgGuN7NYME0U00JG0RwdOPuBQk5Zr1brf9h02Dl4ywZcgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674100343; 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=mu/uxZaxW9+85hS7juDhnAqWCGdbpsQoK55URrzr0Sg=; b=BflZTWwuvI/wNYIE/TCXF8IsaKJpj5AVfZXNigFPRC3t8+2JGngl3mS3GvsBFEYb5pfvTv wNcvKum1w8vYgACcDm8zVRXOBRcoNcEyJs7dCWwqFNRl3OhDj6lqSJYwvqk7KFZg8FgtEX diNbkX57xMmjJKJrO49LEhz9ZHjsZlqMeuhUysAV+hdfAA9HT7t8nqa1PH//4OpDsVYjs7 Dg8zdPT00A3hmNrimaJ47vC/0dKAB358LY/M5t4tJibvVTKAcKdEf5HkKZnSU3LwifvdUZ u0NQfvnd1vZLRNHICya5uQHjcQf6brYXdi6m53Ckhms2PSSCPQL2QKsf3usGjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674100343; a=rsa-sha256; cv=none; b=eKQimm+sYDGNGoW9nnelKy2O4FfGOMONBBN4/nbFSWgwINdiZpnpAKi4BzF4Urd9bKNwRj 5BSSAchpH8nJRgyt//QDPh8J63mdbSj51qbOaKN4/cACY9anpicNCuNKlKcrD3OnN6y55C DVvK2YPWdoQVgb8HPdpCKOrXzz/Ko6og49uPdCm084CneVl2izppWt5GaLaBPOCt/4hk3D Di0U+9e/bhTlUTWScjjYWDxRizXRllEo7GR5LrPQD5fKxcdMspuyduAK5TJHWbqDvzsgzA i+TQdvu3dkpqOfEDCHJ+iawBu78TVxaxos/LyaYO1PjA9yQJlJ67NP/Vw7g0DA== 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 4Ny7xL65Qrzcdv; Thu, 19 Jan 2023 03:52:22 +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 30J3qMH7025758; Thu, 19 Jan 2023 03:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30J3qMtj025757; Thu, 19 Jan 2023 03:52:22 GMT (envelope-from git) Date: Thu, 19 Jan 2023 03:52:22 GMT Message-Id: <202301190352.30J3qMtj025757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 74eacab8dc47 - stable/13 - if_bnxt: Add support for smaller backing_store_cfg message size 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74eacab8dc479a343e93c13aa9cff466706b26bc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=74eacab8dc479a343e93c13aa9cff466706b26bc commit 74eacab8dc479a343e93c13aa9cff466706b26bc Author: Sumit Saxena AuthorDate: 2022-11-04 22:33:21 +0000 Commit: Warner Losh CommitDate: 2023-01-19 01:00:06 +0000 if_bnxt: Add support for smaller backing_store_cfg message size Add compat logic to fallback to the older/smaller backing_store_cfg message size. Reviewed by: imp Differentil Revision: https://reviews.freebsd.org/D36447 (cherry picked from commit 2ed061f08d9e2fe35bb8ff925cc19768d2430e77) --- sys/dev/bnxt/bnxt_hwrm.c | 8 ++++++-- sys/dev/bnxt/bnxt_hwrm.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 9d74b1ebf65b..46dd8f34a6c5 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -394,7 +394,7 @@ int bnxt_hwrm_func_backing_store_cfg(struct bnxt_softc *softc, uint32_t enables) struct hwrm_func_backing_store_cfg_input req = {0}; struct bnxt_ctx_mem_info *ctx = softc->ctx_mem; struct bnxt_ctx_pg_info *ctx_pg; - uint32_t *num_entries; + uint32_t *num_entries, req_len = sizeof(req); uint64_t *pg_dir; uint8_t *pg_attr; int i, rc; @@ -481,7 +481,11 @@ int bnxt_hwrm_func_backing_store_cfg(struct bnxt_softc *softc, uint32_t enables) *num_entries = htole32(ctx_pg->entries); bnxt_hwrm_set_pg_attr(&ctx_pg->ring_mem, pg_attr, pg_dir); } - rc = hwrm_send_message(softc, &req, sizeof(req)); + + if (req_len > softc->hwrm_max_ext_req_len) + req_len = BNXT_BACKING_STORE_CFG_LEGACY_LEN; + + rc = hwrm_send_message(softc, &req, req_len); if (rc) rc = -EIO; return rc; diff --git a/sys/dev/bnxt/bnxt_hwrm.h b/sys/dev/bnxt/bnxt_hwrm.h index 8033ddb50136..dde82c0aaff8 100644 --- a/sys/dev/bnxt/bnxt_hwrm.h +++ b/sys/dev/bnxt/bnxt_hwrm.h @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #define BNXT_AUTO_PAUSE_AUTONEG_PAUSE \ (HWRM_PORT_PHY_QCFG_OUTPUT_AUTO_PAUSE_AUTONEG_PAUSE) #define BNXT_HWRM_SHORT_REQ_LEN sizeof(struct hwrm_short_input) +#define BNXT_BACKING_STORE_CFG_LEGACY_LEN 256 /* HWRM Function Prototypes */ int bnxt_alloc_hwrm_dma_mem(struct bnxt_softc *softc);