From nobody Thu Dec 18 18:06:25 2025 Received: from wfout7-smtp.messagingengine.com (wfout7-smtp.messagingengine.com [64.147.123.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D8DD4F201 for ; Wed, 1 May 2024 07:33:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714548801; cv=none; b=FBG06B8DJPus9E4sJ6e0yI328UEItUSyihGJXaPdN0AD7urLCouq29jxkhUoMHNli4vbCZNzt6kmhvRygBX4YisfL/bNBOIwaZhrINor3/VkUBvEA6bKoUQV3mpNCHOsUsGIsPkaH3HYADmvG9PH91p22vK6qEwDAE29qoGg58g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714548801; c=relaxed/simple; bh=bipW+sFTPR0KNhCgWOsfzV4atAEryOnMGBM6QNDGdgk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D3g8wlnzCuOk9HS68yAnL8lUb6RD/VO+DT0tT9qKV36KTS6AVIOouENIBR7h95Gd7e1wYDDjwOYcQVdYyAZfdwpa6lWjKqzeOoRqOCQQFcbHzOPvo8bJCD7z6LXd4jCvxlpafmFX1W33spqG0k8BQDS8KPLX/I+iMyOG4KUKp5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp; spf=pass smtp.mailfrom=sakamocchi.jp; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b=jJjUpBCv; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=cPo1tp9u; arc=none smtp.client-ip=64.147.123.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sakamocchi.jp Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sakamocchi.jp header.i=@sakamocchi.jp header.b="jJjUpBCv"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="cPo1tp9u" Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailfout.west.internal (Postfix) with ESMTP id 84FB31C0010F; Wed, 1 May 2024 03:33:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 01 May 2024 03:33:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakamocchi.jp; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1714548798; x= 1714635198; bh=HgUZJoRk+wcwO/h9C2rYbGduJQggRI/00GIyShHGGpA=; b=j JjUpBCvGeTlsxIUw5HQKZbOWIrlFM2iP6G2ZepoUYd5Gt29KSM4/CJZFSYmIRzRz +u6eVG0dXM67eyp3BnKoGX+f8w1oo9JFjWqZS1QkawrgiHDCDouq68o2bEOfv2t9 mo+3HWO20Hasist7d1c4w8K1S3Q8ZgHIKTJRO/+XBx3NlKPVh0Ay0YKb4TAJhl28 3lkzeottPpmEJJpJiJwclzAzdIMGRdZ4Lu3epiMetomIY1fUlziieHHah1D+PVUS Psdn/UpY5/xLlUQWILauoEVLBHSXTokPw4h41rXVf8//XR3nxMXXHJRDjqQCVxdQ jIiyczxX/kBM/2TYKYpww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1714548798; x= 1714635198; bh=HgUZJoRk+wcwO/h9C2rYbGduJQggRI/00GIyShHGGpA=; b=c Po1tp9u76EPuscnqfGXwz5UmsjcEwPZhrpc67yjjicwV7mlTve3sYmyksanIdwn+ oeaKJGjEuYpWT020fQ14IBoIoy++syarHuuCU1XqemzTSWnvimgVIozZSkvPpdJw AP+B0V80+g74fWqraAPL5J7nfzwJHJEgpyLYiMBQtghPf3CcbFI3zPt6ScONqaxx +T5xjWKvDUiJ9prJX5EFKuv6PDUQqcVXIh9fUTMFHUHDC4lgOSPokiWjNp98u0b2 Afw7JfXF1R7gEjmNZtEr+RX0uOh8yNFKBsXpMAvqLl+jNuQt7JRtIaesC3OqwIlJ m5liOmWq8A7RIvnmWGI8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdduhedggeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvrghkrghshhhiucfurghkrghmohhtohcuoehoqdhtrghk rghshhhisehsrghkrghmohgttghhihdrjhhpqeenucggtffrrghtthgvrhhnpedvjefgje euvdfguddukeelveetgfdtvefhtdfffeeigfevueetffeivdffkedvtdenucevlhhushht vghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehoqdhtrghkrghshhhise hsrghkrghmohgttghhihdrjhhp X-ME-Proxy: Feedback-ID: ie8e14432:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 1 May 2024 03:33:16 -0400 (EDT) From: Takashi Sakamoto To: linux1394-devel@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, adamg@pobox.com Subject: [PATCH 4/5] Revert "firewire: core: option to log bus reset initiation" Date: Wed, 1 May 2024 16:32:37 +0900 Message-ID: <20240501073238.72769-5-o-takashi@sakamocchi.jp> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240501073238.72769-1-o-takashi@sakamocchi.jp> References: <20240501073238.72769-1-o-takashi@sakamocchi.jp> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 6732491243045f5a7e1995b4be5f3c964b579ebd. The former commit adds some alternative tracepoints events to replace the reverted kernel log messages. Signed-off-by: Takashi Sakamoto --- drivers/firewire/core-card.c | 10 ---------- drivers/firewire/core-transaction.c | 7 ------- drivers/firewire/core.h | 4 ---- 3 files changed, 21 deletions(-) diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c index 5d43acf45a7d..127d87e3a153 100644 --- a/drivers/firewire/core-card.c +++ b/drivers/firewire/core-card.c @@ -224,10 +224,6 @@ static int reset_bus(struct fw_card *card, bool short_= reset) =20 trace_bus_reset_initiate(card->generation, short_reset); =20 - if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS)) - fw_notice(card, "initiating %s bus reset\n", - short_reset ? "short" : "long"); - return card->driver->update_phy_reg(card, reg, 0, bit); } =20 @@ -235,10 +231,6 @@ void fw_schedule_bus_reset(struct fw_card *card, bool = delayed, bool short_reset) { trace_bus_reset_schedule(card->generation, short_reset); =20 - if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS)) - fw_notice(card, "scheduling %s bus reset\n", - short_reset ? "short" : "long"); - /* We don't try hard to sort out requests of long vs. short resets. */ card->br_short =3D short_reset; =20 @@ -259,8 +251,6 @@ static void br_work(struct work_struct *work) time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) { trace_bus_reset_postpone(card->generation, card->br_short); =20 - if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS)) - fw_notice(card, "delaying bus reset\n"); if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ)) fw_card_put(card); return; diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-tr= ansaction.c index d3eefbf23663..571fdff65c2b 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -1390,12 +1390,5 @@ static void __exit fw_core_cleanup(void) idr_destroy(&fw_device_idr); } =20 -int fw_core_param_debug; -module_param_named(debug, fw_core_param_debug, int, 0644); -MODULE_PARM_DESC(debug, "Verbose logging (default =3D 0" - ", bus resets =3D " __stringify(FW_CORE_PARAM_DEBUG_BUSRESETS) - ")"); - - module_init(fw_core_init); module_exit(fw_core_cleanup); diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h index 5097c7a270b4..7c36d2628e37 100644 --- a/drivers/firewire/core.h +++ b/drivers/firewire/core.h @@ -245,10 +245,6 @@ static inline bool tcode_is_link_internal(unsigned int= tcode) /* OHCI-1394's default upper bound for physical DMA: 4 GB */ #define FW_MAX_PHYSICAL_RANGE (1ULL << 32) =20 -#define FW_CORE_PARAM_DEBUG_BUSRESETS 1 - -extern int fw_core_param_debug; - void fw_core_handle_request(struct fw_card *card, struct fw_packet *reques= t); void fw_core_handle_response(struct fw_card *card, struct fw_packet *packe= t); int fw_get_response_length(struct fw_request *request); --=20 2.43.0