From nobody Sat Jul 01 17:10:15 2023 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 4Qtdwl4DP0z4l3Mp; Sat, 1 Jul 2023 17:10:15 +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 4Qtdwl2YmMz3hfT; Sat, 1 Jul 2023 17:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231415; 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=qdQsYrNAeQj8104TYf12bTYM9hI1OxGbFrKa4a2DNCA=; b=WX7LCRejKqhWxc87bHIeeGZFL2PyOr4sBmXFMlq7z/gRcWTbHUpVhdg4tNXdGLAz8nBUFx IGqgua+qZMPvLcPGqncHqL+ifMVarxtVxH0yFNhnrhJwArt3mfa5pyL5EcAVI8X2Fyqp3G HePTfX7n6kHVfrk/1/xSxLUit2oIkW8ToqI9KYYRRv+FEpaBxx1tYWuI19qmDHrRfiIiCy Uen6EZT46rbgbI39MpKqNORajIsD854n1VgkXnYLnrxprWNmA9nBgKUlr6+UIZNnyqMHTl FmJB4WLux5VbAAIlPiLLbxH5eK3OBhWQBWUtxv6APShYQh3OPsVC1pwcpY182Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688231415; 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=qdQsYrNAeQj8104TYf12bTYM9hI1OxGbFrKa4a2DNCA=; b=AfYUYop0XudOLxqRr8qPxIRkBEdL4q7RybNapbg1oTPgQrpzPSm9zL3T7rt1MbsHMxJa7V Uz7YtpjlhSZ9XUs6f/97BSo4pkpkCS4PFbwx6jLimMQD5AYHl1BsXzrLixEzQGkrkFxBC3 fNX1JLeNVeQUZvxyRio64NruWQkz/EA8nopE/l0o0xv9mXJEojysf6xPMQJtP/rZ1STCjc mf/M4nlB0h9zs2IeQQ53ustEtSAgJa0peLfDVlKB1Bux2DQnaRXKvDlRbAoAFR0hgYOaFd QFfnwWZsUQbLAYl9ohFu1keWT1rbJBUA4Uyz5L6qEMosVaEZFgUDEE3l3OzCQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688231415; a=rsa-sha256; cv=none; b=ufOAppnQvfo0uAfMnnn2iCbwx6rZ1GMLWJOMwhjUvq+uPBpCXxLjGmetccuYUezaMf6rc6 FYsAzWIOF2KlVuWgYWsWv8Se3cqEF+iApLgcjepAjD+hKOjvzafQn3qxvx5IOxNi1U3bvi fTwdX5+zmpQvAVgU/3+glBLflGwmCpLVsJT6eaZv5+oBKJPHmtdAIjMivqdDRGmqYFwL5m GsyJl/5q+gxFTzt/qEWJ3EDHYucJ+bzqaIUF+WpvZA/tlwtNTRguiclmpvvTucMBEmDDCX rILquxPWi4OHhSClz6sP05YUnbqHI5RYw2TlVa4IRxl7qECBo+GpK5+skoRPXw== 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 4Qtdwl1d54zZ3t; Sat, 1 Jul 2023 17:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361HAFnn045592; Sat, 1 Jul 2023 17:10:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HAFtp045585; Sat, 1 Jul 2023 17:10:15 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:10:15 GMT Message-Id: <202307011710.361HAFtp045585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c1be7151d543 - main - qlnxe: Fix too many args in call to internal_ram_wr() 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1be7151d5433718821a2b61245eaf99157daa9a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1be7151d5433718821a2b61245eaf99157daa9a commit c1be7151d5433718821a2b61245eaf99157daa9a Author: Mark O'Donovan AuthorDate: 2023-07-01 17:06:50 +0000 Commit: Warner Losh CommitDate: 2023-07-01 17:06:56 +0000 qlnxe: Fix too many args in call to internal_ram_wr() internal_ram_wr() only takes 3 args when ECORE_CONFIG_DIRECT_HWFN is defined Signed-off-by: Mark O'Donovan Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/779 --- sys/dev/qlnx/qlnxe/qlnx_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 0b5dba75300b..3c788f5c0fb7 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -6602,8 +6602,13 @@ qlnx_update_rx_prod(struct ecore_hwfn *p_hwfn, struct qlnx_rx_queue *rxq) */ wmb(); - internal_ram_wr(p_hwfn, rxq->hw_rxq_prod_addr, +#ifdef ECORE_CONFIG_DIRECT_HWFN + internal_ram_wr(p_hwfn, rxq->hw_rxq_prod_addr, sizeof(rx_prods), &rx_prods.data32); +#else + internal_ram_wr(rxq->hw_rxq_prod_addr, + sizeof(rx_prods), &rx_prods.data32); +#endif /* mmiowb is needed to synchronize doorbell writes from more than one * processor. It guarantees that the write arrives to the device before