From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 867742D191F; Thu, 22 May 2025 23:23:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747956230; cv=none; b=LYFCdLb7/x6mfhqlLa3WFBcaq51xLonIave9Y6GKViU3UIF/2gumJPsRw/PkMHerQOZ4XzjHy2fBG9HZlX5wHTcvGHXsXhd/CQXAunO1v2rhjwivQ8TNVv1TXHGdK9hD2L/UMv46IhZOb0o2jnYh5q46KeAZl0vAz4l64o9/ksA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747956230; c=relaxed/simple; bh=LcIUWhj5nNnSPZAL+zgkVI9JEnmmZCD3KzStQFp7sr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NfJYUUJyqhe2hewt+fnIQe46Synx6p1q6U0nUBQhhW/e1avSh3/ZvGeXvUyq4dTiusX3R0PQgGxenGP9jtP7B0Mwo+OIZpsF0BNO6a0HilJke4gXGWAdOTAs3ntKmVDHNjynhiPLDoXi0q4jg3XKCxEN/KCVA11STxEBt2pyhWg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K/HVPUDe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="K/HVPUDe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B35D9C4CEF3; Thu, 22 May 2025 23:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747956229; bh=LcIUWhj5nNnSPZAL+zgkVI9JEnmmZCD3KzStQFp7sr0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K/HVPUDe7VbeiPhmHszDIct1InFeR0HSHX3Mkvyockt4/bAnfiPMojUOiqEGyAlbz HHBkoy4f+KcU+Xk1UHRECQH443b9MYF78R0xzsuNIRES+iI8ciL8pA0qvIC6APqgIU bjZOzO3ViaHTMM4Z1vMaXVl3Xtt7+d+JPUwQ4/zTeZ5EqBpWOmtWLA6MTLwtXofn+p QsYWS9kqaV3XtvR9XGsIU5W5TnMybqVftBasWTWqu/l+BqLDqLH5+S0TI0CzK9DmNp weOFJvD0Xp1EY8OA7bZg0znqQYQqkzYZOkYE5dZSttSf1xwQN6RJeyyykor+K6YucJ wcfwJ4z32AAfQ== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Jon Pan-Doh , Karolina Stolarek , Weinan Liu , Martin Petersen , Ben Fuller , Drew Walton , Anil Agrawal , Tony Luck , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sathyanarayanan Kuppuswamy , Lukas Wunner , Jonathan Cameron , Sargun Dhillon , "Paul E . McKenney" , Mahesh J Salgaonkar , Oliver O'Halloran , Kai-Heng Feng , Keith Busch , Robert Richter , Terry Bowman , Shiju Jose , Dave Jiang , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Bjorn Helgaas Subject: [PATCH v8 03/20] PCI/AER: Factor COR/UNCOR error handling out from aer_isr_one_error() Date: Thu, 22 May 2025 18:21:09 -0500 Message-ID: <20250522232339.1525671-4-helgaas@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522232339.1525671-1-helgaas@kernel.org> References: <20250522232339.1525671-1-helgaas@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Bjorn Helgaas aer_isr_one_error() duplicates the Error Source ID logging and AER error processing for Correctable Errors and Uncorrectable Errors. Factor out the duplicated code to aer_isr_one_error_type(). aer_isr_one_error() doesn't need the struct aer_rpc pointer, so pass it the Root Port or RCEC pci_dev pointer instead. Signed-off-by: Bjorn Helgaas Reviewed-by: Ilpo Järvinen Reviewed-by: Jonathan Cameron Reviewed-by: Kuppuswamy Sathyanarayanan Link: https://patch.msgid.link/20250520215047.1350603-4-helgaas@kernel.org --- drivers/pci/pcie/aer.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index a1cf8c7ef628..568229288ca3 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1273,17 +1273,32 @@ static inline void aer_process_err_devices(struct aer_err_info *e_info) } /** - * aer_isr_one_error - consume an error detected by Root Port - * @rpc: pointer to the Root Port which holds an error + * aer_isr_one_error_type - consume a Correctable or Uncorrectable Error + * detected by Root Port or RCEC + * @root: pointer to Root Port or RCEC that signaled AER interrupt + * @info: pointer to AER error info + */ +static void aer_isr_one_error_type(struct pci_dev *root, + struct aer_err_info *info) +{ + aer_print_port_info(root, info); + + if (find_source_device(root, info)) + aer_process_err_devices(info); +} + +/** + * aer_isr_one_error - consume error(s) signaled by an AER interrupt from + * Root Port or RCEC + * @root: pointer to Root Port or RCEC that signaled AER interrupt * @e_src: pointer to an error source */ -static void aer_isr_one_error(struct aer_rpc *rpc, +static void aer_isr_one_error(struct pci_dev *root, struct aer_err_source *e_src) { - struct pci_dev *pdev = rpc->rpd; struct aer_err_info e_info; - pci_rootport_aer_stats_incr(pdev, e_src); + pci_rootport_aer_stats_incr(root, e_src); /* * There is a possibility that both correctable error and @@ -1297,10 +1312,8 @@ static void aer_isr_one_error(struct aer_rpc *rpc, e_info.multi_error_valid = 1; else e_info.multi_error_valid = 0; - aer_print_port_info(pdev, &e_info); - if (find_source_device(pdev, &e_info)) - aer_process_err_devices(&e_info); + aer_isr_one_error_type(root, &e_info); } if (e_src->status & PCI_ERR_ROOT_UNCOR_RCV) { @@ -1316,10 +1329,7 @@ static void aer_isr_one_error(struct aer_rpc *rpc, else e_info.multi_error_valid = 0; - aer_print_port_info(pdev, &e_info); - - if (find_source_device(pdev, &e_info)) - aer_process_err_devices(&e_info); + aer_isr_one_error_type(root, &e_info); } } @@ -1340,7 +1350,7 @@ static irqreturn_t aer_isr(int irq, void *context) return IRQ_NONE; while (kfifo_get(&rpc->aer_fifo, &e_src)) - aer_isr_one_error(rpc, &e_src); + aer_isr_one_error(rpc->rpd, &e_src); return IRQ_HANDLED; } -- 2.43.0