From nobody Thu Oct 2 13:05:48 2025 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) (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 EAC21244681; Wed, 17 Sep 2025 06:34:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758090847; cv=none; b=Y0/sHS6k/3NAaaPWVOfmDM9T3/XFKeM/HKcsaGCowmc5sF3YC9SANdINU5yMr/W5p0G0VVB2wp6agabsN2uo8QrNPDUFddN6GqC0sBk4bEZo6S2syFHklCA3XtkSIGN/P9Dr9ErXeq8quYOjNr6rUamUEna4dr77T/oAIjjLJEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758090847; c=relaxed/simple; bh=LBCqY7zUR//93PTgwEx4kk207wNigO+Bez3AEF3pSfQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MXFaEIlENl4Dpw9iHGBmlXwH4tpET3z9m9hVD/nAuLIOj3W/sl/zGWOLmUNBrK4/PEVZZ4XslKYdoRhpeurJy4dpPQb9DyK5cadL4esijTXdh5owEyRhi8isSgG0KiAtvJeYiCHYO3QsS0kmNn2gFAfSgAeCY7bwK668hF5tQlk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=hLv3DHom; arc=none smtp.client-ip=115.124.30.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="hLv3DHom" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1758090835; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=QXJAUGDYWc0L7efEoBkhFUMBAgY1wDEDmp5dyuIIeqY=; b=hLv3DHom0fySdMnb7nx16X1/hnN1w32zsLl6BjCZBJYOnqBL6Y6RtL68yu8nyIVGy+BRfCOjyllnEK4+n4o1hhpcDvxuW8+KA19Zl/0iyIwx8y6zinpHTEm1pXMjHwczTR5A1TI4nz7aIOWoSM8Cl6iCmIwvH5gZKhyPvhrvRHQ= Received: from localhost.localdomain(mailfrom:xueshuai@linux.alibaba.com fp:SMTPD_---0WoBL8K6_1758090834 cluster:ay36) by smtp.aliyun-inc.com; Wed, 17 Sep 2025 14:33:54 +0800 From: Shuai Xue To: bhelgaas@google.com, mahesh@linux.ibm.com, mani@kernel.org, Jonathan.Cameron@huawei.com, sathyanarayanan.kuppuswamy@linux.intel.com Cc: oohall@gmail.com, xueshuai@linux.alibaba.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 1/3] PCI/DPC: Clarify naming for error port in DPC Handling Date: Wed, 17 Sep 2025 14:33:50 +0800 Message-Id: <20250917063352.19429-2-xueshuai@linux.alibaba.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250917063352.19429-1-xueshuai@linux.alibaba.com> References: <20250917063352.19429-1-xueshuai@linux.alibaba.com> 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" dpc_handler() is registered for error port which recevie DPC interrupt and acpi_dpc_port_get() locate the port that experienced the containment event. Rename edev and pdev to err_port for clear so that later patch will avoid misused err_port in pcie_do_recovery(). No functional changes intended. Signed-off-by: Shuai Xue Reviewed-by: Kuppuswamy Sathyanarayanan --- drivers/pci/pcie/dpc.c | 10 +++++----- drivers/pci/pcie/edr.c | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c index fc18349614d7..bff29726c6a5 100644 --- a/drivers/pci/pcie/dpc.c +++ b/drivers/pci/pcie/dpc.c @@ -361,21 +361,21 @@ static bool dpc_is_surprise_removal(struct pci_dev *p= dev) =20 static irqreturn_t dpc_handler(int irq, void *context) { - struct pci_dev *pdev =3D context; + struct pci_dev *err_port =3D context; =20 /* * According to PCIe r6.0 sec 6.7.6, errors are an expected side effect * of async removal and should be ignored by software. */ - if (dpc_is_surprise_removal(pdev)) { - dpc_handle_surprise_removal(pdev); + if (dpc_is_surprise_removal(err_port)) { + dpc_handle_surprise_removal(err_port); return IRQ_HANDLED; } =20 - dpc_process_error(pdev); + dpc_process_error(err_port); =20 /* We configure DPC so it only triggers on ERR_FATAL */ - pcie_do_recovery(pdev, pci_channel_io_frozen, dpc_reset_link); + pcie_do_recovery(err_port, pci_channel_io_frozen, dpc_reset_link); =20 return IRQ_HANDLED; } diff --git a/drivers/pci/pcie/edr.c b/drivers/pci/pcie/edr.c index e86298dbbcff..521fca2f40cb 100644 --- a/drivers/pci/pcie/edr.c +++ b/drivers/pci/pcie/edr.c @@ -150,7 +150,7 @@ static int acpi_send_edr_status(struct pci_dev *pdev, s= truct pci_dev *edev, =20 static void edr_handle_event(acpi_handle handle, u32 event, void *data) { - struct pci_dev *pdev =3D data, *edev; + struct pci_dev *pdev =3D data, *err_port; pci_ers_result_t estate =3D PCI_ERS_RESULT_DISCONNECT; u16 status; =20 @@ -169,36 +169,36 @@ static void edr_handle_event(acpi_handle handle, u32 = event, void *data) * may be that port or a parent of it (PCI Firmware r3.3, sec * 4.6.13). */ - edev =3D acpi_dpc_port_get(pdev); - if (!edev) { + err_port =3D acpi_dpc_port_get(pdev); + if (!err_port) { pci_err(pdev, "Firmware failed to locate DPC port\n"); return; } =20 - pci_dbg(pdev, "Reported EDR dev: %s\n", pci_name(edev)); + pci_dbg(pdev, "Reported EDR dev: %s\n", pci_name(err_port)); =20 /* If port does not support DPC, just send the OST */ - if (!edev->dpc_cap) { - pci_err(edev, FW_BUG "This device doesn't support DPC\n"); + if (!err_port->dpc_cap) { + pci_err(err_port, FW_BUG "This device doesn't support DPC\n"); goto send_ost; } =20 /* Check if there is a valid DPC trigger */ - pci_read_config_word(edev, edev->dpc_cap + PCI_EXP_DPC_STATUS, &status); + pci_read_config_word(err_port, err_port->dpc_cap + PCI_EXP_DPC_STATUS, &s= tatus); if (!(status & PCI_EXP_DPC_STATUS_TRIGGER)) { - pci_err(edev, "Invalid DPC trigger %#010x\n", status); + pci_err(err_port, "Invalid DPC trigger %#010x\n", status); goto send_ost; } =20 - dpc_process_error(edev); - pci_aer_raw_clear_status(edev); + dpc_process_error(err_port); + pci_aer_raw_clear_status(err_port); =20 /* * Irrespective of whether the DPC event is triggered by ERR_FATAL * or ERR_NONFATAL, since the link is already down, use the FATAL * error recovery path for both cases. */ - estate =3D pcie_do_recovery(edev, pci_channel_io_frozen, dpc_reset_link); + estate =3D pcie_do_recovery(err_port, pci_channel_io_frozen, dpc_reset_li= nk); =20 send_ost: =20 @@ -207,15 +207,15 @@ static void edr_handle_event(acpi_handle handle, u32 = event, void *data) * to firmware. If not successful, send _OST(0xF, BDF << 16 | 0x81). */ if (estate =3D=3D PCI_ERS_RESULT_RECOVERED) { - pci_dbg(edev, "DPC port successfully recovered\n"); - pcie_clear_device_status(edev); - acpi_send_edr_status(pdev, edev, EDR_OST_SUCCESS); + pci_dbg(err_port, "DPC port successfully recovered\n"); + pcie_clear_device_status(err_port); + acpi_send_edr_status(pdev, err_port, EDR_OST_SUCCESS); } else { - pci_dbg(edev, "DPC port recovery failed\n"); - acpi_send_edr_status(pdev, edev, EDR_OST_FAILED); + pci_dbg(err_port, "DPC port recovery failed\n"); + acpi_send_edr_status(pdev, err_port, EDR_OST_FAILED); } =20 - pci_dev_put(edev); + pci_dev_put(err_port); } =20 void pci_acpi_add_edr_notifier(struct pci_dev *pdev) --=20 2.39.3