From nobody Fri Nov 4 04:16:16 2022 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 4N3S405jNWz4gvsS; Fri, 4 Nov 2022 04:16:16 +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 4N3S40577yz4CYJ; Fri, 4 Nov 2022 04:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667535376; 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=JJgZOm7wiHx0OkUVLbDegGrt6zY7dxlCCxg1AGHeOmY=; b=AnJ0zkxV0mZt9H0AHfSFTmfZ4V/txKBCjEcdenAIjFpFr3wZTJAoSObknNX+yC9l9dDNbf z02M2BGkwsqkBZvKUUoa37Vejr5qBKbnS1d4RrhAebSkyo/QvMUTMz4zeyKe9vqp4bmL3U s6Hj1LiGTPwX49INDwNw9Ac4GAg5AbdfMPCtCq25UL1vWzwkTM61f2MqeMnnBSHynS6lqu AEgSQcW8y0y1BwtoOGAxBH0U4Kjfeeh2+HHkum9ZOFwvAH5iocBx/dVUikMxQczQYwbD/E AOqS7ulB7HoTP5xOhEFwS+IVSFe4yDudpJlQE8yMxgwuY7jpAoDXFe+9epT58Q== 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 4N3S4049TRz12vm; Fri, 4 Nov 2022 04:16:16 +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 2A44GGo1047557; Fri, 4 Nov 2022 04:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A44GGhE047556; Fri, 4 Nov 2022 04:16:16 GMT (envelope-from git) Date: Fri, 4 Nov 2022 04:16:16 GMT Message-Id: <202211040416.2A44GGhE047556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: d0b5e4a30ac9 - main - mana(4): Make the code cross-platform 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: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0b5e4a30ac985051c14b0f5e3cb3e6cdd271929 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667535376; 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=JJgZOm7wiHx0OkUVLbDegGrt6zY7dxlCCxg1AGHeOmY=; b=mBPWT5SFSQmriRdqBTco1pz8WZ68p7IJ8Si6tgNZJ+3xLaVtrbGabokSEI4onJ3rjFVsVb OMIHpY/4lJ3/e8oEkrkyETGgcmwwrqS3OK/JOqihOPnaeDNIee/FDFu7aP9KUThQIOpvbt I8bEkbOY/DeVzVwp3HhqkFdcZFXUY4bX1ZDkUyQ0MgimfnKINRen58ECx8Hzx7YTN3l15/ XQL0UkE5S33OzUJ0pDGp86mOWCIfj77jNJCggRJpMNEMHKL6MvnBgBvWDPb8PB0Or/RUcG voYQw8ZWOyli2MbVZ9mjKTgL27AcaGuZhwALViymhHE5GDZm/AbnytJRoHuz9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667535376; a=rsa-sha256; cv=none; b=omZ3ywo7EpRG9t9q7G57THKmPOuuPd1kohq+6HC7rf1ohRP/TiHFq3pd1nnz3ut/v1pweZ Ayjb1yem4heLvwzevEQOz7VVgtPf993xz/huFxOsgC73utHHBCpDto7Z4IyLhN7QIYy6Ej MYN8AqURQi57NSVJ0uF3aUbXo8E9ZJ78VjD+k8Hrhbfz4FisJ60Ar7/PJhzaYuUX2FMy1h fUfawW6R0D1mj8WZt4mRhKp+4keY+q2AyuYtJs9YIRhjEsjZRGV3FyutJs2IfFWUAtZ9yc ya7N8uIf97lnzNduREmV9YN1lgQaDMNTAHr3YrR7D2TCeVAw/cal3X/V+lMmLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b5e4a30ac985051c14b0f5e3cb3e6cdd271929 commit d0b5e4a30ac985051c14b0f5e3cb3e6cdd271929 Author: Li-Wen Hsu AuthorDate: 2022-11-04 03:45:35 +0000 Commit: Li-Wen Hsu CommitDate: 2022-11-04 03:45:35 +0000 mana(4): Make the code cross-platform Discussed with: whu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36388 --- sys/dev/mana/mana_en.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 5e5e3939753f..5a95eff66ab6 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1054,10 +1054,8 @@ mana_cfg_vport(struct mana_port_context *apc, uint32_t protection_dom_id, apc->tx_shortform_allowed = resp.short_form_allowed; apc->tx_vp_offset = resp.tx_vport_offset; -#if defined(__amd64__) - if_printf(apc->ndev, "Configured vPort %lu PD %u DB %u\n", + if_printf(apc->ndev, "Configured vPort %ju PD %u DB %u\n", apc->port_handle, protection_dom_id, doorbell_pg_id); -#endif out: if (err) @@ -1127,10 +1125,8 @@ mana_cfg_vport_steering(struct mana_port_context *apc, err = EPROTO; } -#if defined(__amd64__) - if_printf(ndev, "Configured steering vPort %lu entries %u\n", + if_printf(ndev, "Configured steering vPort %ju entries %u\n", apc->port_handle, num_entries); -#endif out: free(req, M_DEVBUF); @@ -1694,13 +1690,8 @@ mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq, if (pktlen == 0) { /* data packets should never have packetlength of zero */ -#if defined(__amd64__) - if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%lx\n", + if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%jx\n", rxq->gdma_id, cq->gdma_id, rxq->rxobj); -#else - if_printf(ndev, "RX pkt len=0, rq=%u, cq=%u, rxobj=0x%llx\n", - rxq->gdma_id, cq->gdma_id, rxq->rxobj); -#endif return; }