From nobody Mon Aug 21 01:36:46 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 4RTZp63dhdz4r1KM; Mon, 21 Aug 2023 01:36:46 +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 4RTZp6329Hz4kly; Mon, 21 Aug 2023 01:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581806; 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=1gSQCPcoN2gRNDctbsLBLAo7DtxftH54z7ySRcxbqeA=; b=b6JsdD0DVIiY5AEFwhcX/05DwmN9jn00TffQ5XfHqwKYIrqhy62lYH5rwnEpeKTK3wz/pu Sjjof/zyPf1H99Dcxan9u66sjyICLZxpQWRdslGvQXXCME3Z+2kgkPUI6iVR+RhtuAtzOU Yq/zUA3l2AZXyFfeGxtsqmRxEbvSKTXYuQKLGE4UsWZzJI3n5rAo1dUL/AiL4xYX+CbFcn oLF9Tg7L47XBuwRJD4qtJstkauynCVp/hlvZil3WthyzvCf8kFAlA7kUJhhRRqGgAXfwQh 8IjDWg76Pl41larpRNg+k9IdIURmURJX+ZlCr2ANoQf50ujGk9cawF0kct2pAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692581806; 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=1gSQCPcoN2gRNDctbsLBLAo7DtxftH54z7ySRcxbqeA=; b=UqzbtKE8xNNl+JF534dV1w0DqrGvTe3CJPNxROL76uEy2dGdPonlj+ZdaE55c8H/5Mm9J6 3gx+gXyMpXpXWu+9j0fYoIHerm/bw0TEuBzvvoNUXlBRPTdVxetnqp3Wu74cKqIH8zeqxX X1lLKHoB8+WGGY2/BiJnKeh4flDWwFMyvqqkJnl8Vd5uhnEKgXYwe6n4L9Vfi522Yig2iD oaWV9Gju35QFg1shYTEJuiO1KFK8kWPsgQNQjsR+7VoyDLfhxT/oi/TaLr9yPSsMaEUy/E BcCQLOQemW8Hlgdrh6fAAF9wPRsTLDZFhQ1QaJihNTN/ee9nUmGgHMsUghytng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692581806; a=rsa-sha256; cv=none; b=bJYeIo7zxjEZqzC2GK8u8jXmTYxGNiaDrT7oP0MLqw84M69jsL/U655O13MForIZ/Kpkoh TOF87Jq5QSgPDMxhkOoOHY6uSPQrLLBdl+/pEPf+uZ/crOGLKr7uPTFH1E4ogwtUzxvX0P FMTZ6+VRzV48ftzwkrooIvTXXfppbyCzJJpG/YXxoBDZ4h156k9JQ4u1VRmzDIxuC1129Y S/RqcSBu/iHFHw/hNkBRtj2CiHFFW6Df3/N0R87/4spEIQNd9/dxBKPT/aWoBVQ7u8HEHm Q4Bdt8VD/MBwoSvWvD9yyfZLTKllPV/GGplt/9qffH07vy+J3ko2CWw6Vl+VjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTZp625xZz11xm; Mon, 21 Aug 2023 01:36:46 +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 37L1akSB038178; Mon, 21 Aug 2023 01:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37L1akH5038175; Mon, 21 Aug 2023 01:36:46 GMT (envelope-from git) Date: Mon, 21 Aug 2023 01:36:46 GMT Message-Id: <202308210136.37L1akH5038175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 734e82fe33aa - main - ath10k: specifically mark a debug workaround for an early firmware crash 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 734e82fe33aa764367791a7d603b383996c6b40b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=734e82fe33aa764367791a7d603b383996c6b40b commit 734e82fe33aa764367791a7d603b383996c6b40b Author: Bjoern A. Zeeb AuthorDate: 2023-05-17 20:21:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-21 01:30:50 +0000 ath10k: specifically mark a debug workaround for an early firmware crash During the last import a (debug) workaround to avoid an early firmware crash was imported. In order to remember and to separate it from upstream sources put it under #ifdef MFC after: 20 days --- sys/contrib/dev/athk/ath10k/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index 6a9b0367b2bd..b9fa4792d816 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -1450,14 +1450,23 @@ int ath10k_pci_hif_tx_sg(struct ath10k *ar, u8 pipe_id, /* `i` is equal to `n_items -1` after for() */ ath10k_dbg(ar, ATH10K_DBG_PCI, +#if defined(__linux__) + "pci tx item %d paddr %pad len %d n_items %d\n", + i, &items[i].paddr, items[i].len, n_items); +#elif defined(__FreeBSD__) "pci tx item %d paddr %pad len %d n_items %d pipe_id %u\n", i, &items[i].paddr, items[i].len, n_items, pipe_id); + /* + * XXX-BZ specific debug; the DELAY makes things work for one chipset. + * There's likely a race somewhere (here or LinuxKPI). + */ if (n_items == 1 && items[i].len == 140) { ath10k_dbg_dump(ar, ATH10K_DBG_PCI, NULL, "pci tx data: ", items[i].vaddr, items[i].len); dump_stack(); DELAY(500); } +#endif ath10k_dbg_dump(ar, ATH10K_DBG_PCI_DUMP, NULL, "pci tx data: ", items[i].vaddr, items[i].len);