From nobody Fri Dec 19 16:04:42 2025 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C26931F03EF for ; Sat, 24 May 2025 18:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748112800; cv=none; b=RfOhja4ieFEHNYabKb5VhPJRzSocxjBRHR/jbQRnn1ZymMt6I8MqZ3g5yylOZZJ0hhiK/j3wI9y+rO78IGq83ALkDUnScs5c5ZN/CI0AI9caMTeuoqV0V9WKe67FohzoTnKi4iCNENwhVDmrr57AzkHRuwxNv34e/q8waFrQ3/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748112800; c=relaxed/simple; bh=kPBTZmljEuhDGk2ErBFVwmGtLoHH2MQuuDrbHZOdfIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LT3NSHOOMVaYvd75BVk53/XLA2wcK54q+hqHdA/6bQMZB++0VLJxG8jpHByKbgZ4+UrydxEemp8kENt/oWHjM4z/IcRvQbERL/E6WRCC32+22ksG6+Pgz1cEX+EX6uRx7fP3xgIL+wh6OQ8U3xxSPWiY1pqa2HbZKz0XWp9uf0U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=HAIp/99g; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HAIp/99g" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-742b0840d98so653276b3a.1 for ; Sat, 24 May 2025 11:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748112798; x=1748717598; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lFpWtTUVCy45y8KpE1YWlnoXsJZ2GgrsFpHF1cJftMU=; b=HAIp/99g93tCpbJR2dJO0wtLChCE6pfYOY5wZyUdbFFQe6ZUcnrXeFc5M7cdVznDNB tUueMV8I0fBIQaTDlWIPkmUQEmb/srRfPVgiWra1b2jbSx1Z8wPfQNbYNCV5v+le2+RL 4bHLuiNdnYqSFXpNVW9Etk744lrV1rFFtazJYaz4cTER0bMPvTfzGBFLXUEOIqAtMLmi YMcXh/EPNbluR6ExVdi2ZPM5kCaKeYLpUTPvYwo99CAWcrbvuV+NbIpIjMtI9js463FI OxTms1fmG12RWl2m3M/Jp2GoDLjqT2nkpWEZOlZFhcT/TMKbZ8mYTxs0f/CnEAUN3hsb 3iUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748112798; x=1748717598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lFpWtTUVCy45y8KpE1YWlnoXsJZ2GgrsFpHF1cJftMU=; b=FHx8Bv8sCqpMrICJ0IHq7iWI2+Xw7VWy0j9YRdskTr8tBGCo1VLhJ6ZRhMPg+Mat1G XXGGN45vQY3xBJ2ZoM9+/eVfi0HMqhxrmDmHSxv2G9bcItm3Y9p9clvnr6+Mm0cxHiNK +mPfgzouSEOVmfYHwQGC8EOlMWbeS+PImprj/3L0Pu+jqUbHqKsX+MzxkTpUia4qaldb d+rcfNWiNdDfs1gR8KvVhEaSnDBYf70V2xR/8WP+8aqZTUHO+BiPuBnSQDUlekM9TTJC Z4FvA/NprCiZKFUabH8OYRkJ94JSNtWLGqIo05j52Eh0t096xUdDR/S3J3pXd7gBb8cv DikQ== X-Forwarded-Encrypted: i=1; AJvYcCU6b2curzhIRR+niyZiQEkKrHx5U57sWk/YYD4E9SWIk3HnVxSRysOi9RSvcm7zZLK+N29AjMjhvfNWqVs=@vger.kernel.org X-Gm-Message-State: AOJu0Yzz77lyzyesRW+SdNqWLRReZ6JiB08WSbyysJJh3Z7eSZ+wnvEp yKgwE1Eb0rZEQYvdcEvW9cX2WmrRRz2ehLmRNv6K+N9TmnECPXoNkUp4PoMctMM6nA== X-Gm-Gg: ASbGncsgv9pSS9VA0cWOOry4SRp6MD4r1nLDqAqu+fkekD2TwDzxPZwhOStCqGNv2Q9 EOR1BHcTjogO98H1uWijk/g1zpQKGM/QV30H2Laf6PqIemQPkrMkBOFrr99zwdTk+b4M6rDSPVF Ls9JXPqoKoaaFeJqUR7kpFiRyarl3inE3ymOUuWNCxp3zvq1YTCDqVOqhnbnDNXx95vDJOvdbCR qkX7RApGI63QTRS4gJkyGiqy1E2p/UlXqpBDsoiT5c1ZJ9LIBMG0/CQlTFlNN/O+X01BxVCOFgi CyDtcGTEQ1m28jf1LQhjaZbX6ZmVm1FDoom+Z0T0qcQX9W75nlHYjx6YckOQ7SMR X-Google-Smtp-Source: AGHT+IFTaPyM14w9Q4zemsGbNZMO1mPe5g7dLj3PlVCsB7p2Kh20T9kEekBWHuXLHjAU931mjogyhA== X-Received: by 2002:a05:6a21:9208:b0:1f5:7ba7:69d8 with SMTP id adf61e73a8af0-2188c259141mr6240048637.15.1748112798039; Sat, 24 May 2025 11:53:18 -0700 (PDT) Received: from thinkpad.. ([120.56.192.43]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0a906bsm14532931a12.71.2025.05.24.11.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 11:53:17 -0700 (PDT) From: Manivannan Sadhasivam To: bhelgaas@google.com, lpieralisi@kernel.org, kw@linux.com Cc: linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, cassel@kernel.org, wilfred.mallawa@wdc.com, Manivannan Sadhasivam , Lukas Wunner Subject: [PATCH 1/2] PCI: Save and restore root port config space in pcibios_reset_secondary_bus() Date: Sun, 25 May 2025 00:23:03 +0530 Message-ID: <20250524185304.26698-2-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250524185304.26698-1-manivannan.sadhasivam@linaro.org> References: <20250524185304.26698-1-manivannan.sadhasivam@linaro.org> 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" host_bridge::reset_slot() is supposed to reset the PCI root port/slot. Once that happens, the config space content would be lost. This was reported by Niklas on the dw-rockchip based platform where the MPS setting of the root port was lost after the host_bridge::reset_slot() callback. Hence, save the config space before calling the host_bridge::reset_slot() callback and restore it afterwards. While at it, make sure that the callback is only called for root ports by checking if the bridge is behind the root bus. Fixes: d5c1e1c25b37 ("PCI/ERR: Add support for resetting the slots in a pla= tform specific way") Reported-by: Niklas Cassel Closes: https://lore.kernel.org/linux-pci/aC9OrPAfpzB_A4K2@ryzen Suggested-by: Lukas Wunner Signed-off-by: Manivannan Sadhasivam Reviewed-by: Niklas Cassel Reviewed-by: Wilfred Mallawa Tested-by: Wilfred Mallawa --- drivers/pci/pci.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4d396bbab4a8..6d6e9ce2bbcc 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4985,10 +4985,19 @@ void __weak pcibios_reset_secondary_bus(struct pci_= dev *dev) struct pci_host_bridge *host =3D pci_find_host_bridge(dev->bus); int ret; =20 - if (host->reset_slot) { + if (pci_is_root_bus(dev->bus) && host->reset_slot) { + /* + * Save the config space of the root port before doing the + * reset, since the state could be lost. The device state + * should've been saved by the caller. + */ + pci_save_state(dev); ret =3D host->reset_slot(host, dev); if (ret) pci_err(dev, "failed to reset slot: %d\n", ret); + else + /* Now restore it on success */ + pci_restore_state(dev); =20 return; } --=20 2.43.0 From nobody Fri Dec 19 16:04:42 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF5B21F1515 for ; Sat, 24 May 2025 18:53:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748112804; cv=none; b=omqn/RyPfrhOsXARfvlzKTV9Eo+eN3TAMgHpqJA9ly2J39WfWFWPNHYiuozA3aLa7YLMIaO8GxhzGA1ACF8cvi+1GYl/ykc6mRnwr960BrBC0TLGCKi5+VXFbaEzp80CAoiOpp4nWjhm9GYi37nyYEjUKnDAtRQzMp8JoSMsZKU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748112804; c=relaxed/simple; bh=zCMczU4v06ghUQ9pw1P+u0746zqUXj2cY86m3N4kgoM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aPgrDx0AjIvWGDGpmIsqqpxuMqGL53Nq/ma8LPRyn9w1HiYa44C/0gCCUeER0BuVzMLgaD7kpBn5+yTbt2F8AL+rnpIMSUjPtwvukaCsGAbxOOTYE2zPFhNycO4ShL9aWSO+/LRk7EcRvPG7/bNVAHcrtpmoV4wSqWy9r4iCxTs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=WLyDJWaw; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WLyDJWaw" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-742c2ed0fe1so903976b3a.1 for ; Sat, 24 May 2025 11:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748112802; x=1748717602; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PDL6QRovWt7sBQP7alBAWgPBh+2vhpbIyHwbqahrS2s=; b=WLyDJWawRD1FNVUO53IcDqiIk+1S8tTG07NErfEEomLbdnKYT+NDprIEJk4GbdabR7 t0zLzHXhgHuDQep/TSjSf8jngJySlhSK+9JXOpTI+RBJ+yUQACwke93CsyQIvc4kHkkh qVYvdRTkJNwXKy0P826BxgCk7Yx8Y0vsh1IrhkPyczACJlItM9aYmZVUtoikSj+s2lJ9 acOWchrLvxZ8aWAm0gkB/9UV+Y9tXtWxN3852prXeypOhl+YV0yFiIz57d3mopz5R1/j xO3CFaIiLnKrQn3YUpltvTaW/bRHwSLO2j0IAoUt+6yVJYrY3rp0NXfDJmSLz8deqRp2 tm5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748112802; x=1748717602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PDL6QRovWt7sBQP7alBAWgPBh+2vhpbIyHwbqahrS2s=; b=Qmvd4EZNsVJEvBo/5i69Jzs4PLMqtgEp2DMg0ftfMiSvOk1p6NdO82+Poj9yQFcla1 BfP6aA7TsNQvUb2j88vFY66GpX3mIzbOK+pzQV6FQmZnOMoM6GkSZ0Yu4A9zxysH/Unr 9fvt+f8mwe5iMk+i088OeZ6QnpUh7/H6lBOt1lBtnjc/8wJVxUmFkpQgks11VIFDUW1J Sbgw4IH5tb4EsYHaJCJs1Evjh2Qd7rjkUrACiwPVU1RGKpw+vE08ejSC0qvtXb4GMpnl tKYhGwKq7XoBnF9ubeqtm11MVTqLa7XbtM9BOp0xqy8tL82Sn/2WeC9uWzr6gSRKxoe+ Wlxg== X-Forwarded-Encrypted: i=1; AJvYcCWGp/4z6dfYkO1Naf7Sfoua2KN8ojtsqZzu652OvfvF2SEJxt3+xXtrWzkVeE1TQoPBQl7BteAJ+MNmWb8=@vger.kernel.org X-Gm-Message-State: AOJu0YwDcy3O84PJP0LQlx/YL7iWTFAUqeO7Z6h21o0IqrqGy+BTT08b UGysJvGO7sxRYphXau2OFDR4jchQLNqUtWzFr1+p3WDOzkshvjuuXiEX+RWFrBUeOQ== X-Gm-Gg: ASbGncv2WmG0cXYTFAt4dKFTbxnEQUDn8JSOOQQcUJlfYwqtLzfv3oqrbGDhbAGofqz PgElewrjgrIVYnBHK+/0KBp7aM6jM4IaXWH0OM08kDTwaiflEs+TD1vLiBeG4bmX6XSzeez/Sft EekyN8OsU3r+yLI7fMUV3v1NAWyCNoQrETt4DxVgP/mlDmS+5j+K71fS28RyijDM8CHfTx/HI2B DjzNuNCnxwRPAAdzHd6gwrptHO2vLucd2wOEvEj/s6VlhaOFz5NIsQZhzf2vHWZiiBlQjW2Os7W b8vsLTs8YFxNod1VcjYdSwPoHmYaOCxs/hFvn8YcVCDjt90id4c7DdkuzgDeTj9w X-Google-Smtp-Source: AGHT+IH+7qg3wNDv5nyRf+S4VLDCGgKjl9E0QRjKmpL5PiZmmYwJKZ+o/DGKeM99GhkflOY9BkiCbg== X-Received: by 2002:a05:6a20:a11c:b0:215:e60b:3bd3 with SMTP id adf61e73a8af0-2188c353194mr6571996637.29.1748112802033; Sat, 24 May 2025 11:53:22 -0700 (PDT) Received: from thinkpad.. ([120.56.192.43]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eb0a906bsm14532931a12.71.2025.05.24.11.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 May 2025 11:53:21 -0700 (PDT) From: Manivannan Sadhasivam To: bhelgaas@google.com, lpieralisi@kernel.org, kw@linux.com Cc: linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, cassel@kernel.org, wilfred.mallawa@wdc.com, Manivannan Sadhasivam , Lukas Wunner Subject: [PATCH 2/2] PCI: Rename host_bridge::reset_slot() to host_bridge::reset_root_port() Date: Sun, 25 May 2025 00:23:04 +0530 Message-ID: <20250524185304.26698-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250524185304.26698-1-manivannan.sadhasivam@linaro.org> References: <20250524185304.26698-1-manivannan.sadhasivam@linaro.org> 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" The callback is supposed to reset the root port, hence it should be named as 'reset_root_port'. This also warrants renaming the rest of the instances of 'reset slot' as 'reset root port' in the drivers. Suggested-by: Lukas Wunner Signed-off-by: Manivannan Sadhasivam Reviewed-by: Niklas Cassel Reviewed-by: Wilfred Mallawa Tested-by: Wilfred Mallawa --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 8 ++++---- drivers/pci/controller/dwc/pcie-qcom.c | 8 ++++---- drivers/pci/controller/pci-host-common.c | 20 +++++++++---------- drivers/pci/pci.c | 6 +++--- include/linux/pci.h | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/co= ntroller/dwc/pcie-dw-rockchip.c index 193e97adf228..0cc7186758ce 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -85,7 +85,7 @@ struct rockchip_pcie_of_data { const struct pci_epc_features *epc_features; }; =20 -static int rockchip_pcie_rc_reset_slot(struct pci_host_bridge *bridge, +static int rockchip_pcie_rc_reset_root_port(struct pci_host_bridge *bridge, struct pci_dev *pdev); =20 static int rockchip_pcie_readl_apb(struct rockchip_pcie *rockchip, u32 reg) @@ -261,7 +261,7 @@ static int rockchip_pcie_host_init(struct dw_pcie_rp *p= p) rockchip); =20 rockchip_pcie_enable_l0s(pci); - pp->bridge->reset_slot =3D rockchip_pcie_rc_reset_slot; + pp->bridge->reset_root_port =3D rockchip_pcie_rc_reset_slot; =20 return 0; } @@ -700,7 +700,7 @@ static int rockchip_pcie_probe(struct platform_device *= pdev) return ret; } =20 -static int rockchip_pcie_rc_reset_slot(struct pci_host_bridge *bridge, +static int rockchip_pcie_rc_reset_root_port(struct pci_host_bridge *bridge, struct pci_dev *pdev) { struct pci_bus *bus =3D bridge->bus; @@ -759,7 +759,7 @@ static int rockchip_pcie_rc_reset_slot(struct pci_host_= bridge *bridge, =20 /* Ignore errors, the link may come up later. */ dw_pcie_wait_for_link(pci); - dev_dbg(dev, "slot reset completed\n"); + dev_dbg(dev, "Root port reset completed\n"); return ret; =20 deinit_clk: diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controlle= r/dwc/pcie-qcom.c index 0c59030a2d55..840263c1efe0 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -291,7 +291,7 @@ struct qcom_pcie { }; =20 #define to_qcom_pcie(x) dev_get_drvdata((x)->dev) -static int qcom_pcie_reset_slot(struct pci_host_bridge *bridge, +static int qcom_pcie_reset_root_port(struct pci_host_bridge *bridge, struct pci_dev *pdev); =20 static void qcom_ep_reset_assert(struct qcom_pcie *pcie) @@ -1277,7 +1277,7 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp) goto err_assert_reset; } =20 - pp->bridge->reset_slot =3D qcom_pcie_reset_slot; + pp->bridge->reset_root_port =3D qcom_pcie_reset_root_port; =20 return 0; =20 @@ -1533,7 +1533,7 @@ static void qcom_pcie_icc_opp_update(struct qcom_pcie= *pcie) } } =20 -static int qcom_pcie_reset_slot(struct pci_host_bridge *bridge, +static int qcom_pcie_reset_root_port(struct pci_host_bridge *bridge, struct pci_dev *pdev) { struct pci_bus *bus =3D bridge->bus; @@ -1589,7 +1589,7 @@ static int qcom_pcie_reset_slot(struct pci_host_bridg= e *bridge, =20 qcom_pcie_start_link(pci); =20 - dev_dbg(dev, "Slot reset completed\n"); + dev_dbg(dev, "Root port reset completed\n"); =20 return 0; =20 diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/control= ler/pci-host-common.c index afa7b140a04a..24e357e85adb 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c @@ -99,22 +99,22 @@ void pci_host_common_remove(struct platform_device *pde= v) EXPORT_SYMBOL_GPL(pci_host_common_remove); =20 #if IS_ENABLED(CONFIG_PCIEAER) -static pci_ers_result_t pci_host_reset_slot(struct pci_dev *dev) +static pci_ers_result_t pci_host_reset_root_port(struct pci_dev *dev) { int ret; =20 ret =3D pci_bus_error_reset(dev); if (ret) { - pci_err(dev, "Failed to reset slot: %d\n", ret); + pci_err(dev, "Failed to reset root port: %d\n", ret); return PCI_ERS_RESULT_DISCONNECT; } =20 - pci_info(dev, "Slot has been reset\n"); + pci_info(dev, "Root port has been reset\n"); =20 return PCI_ERS_RESULT_RECOVERED; } =20 -static void pci_host_recover_slots(struct pci_host_bridge *host) +static void pci_host_reset_root_ports(struct pci_host_bridge *host) { struct pci_bus *bus =3D host->bus; struct pci_dev *dev; @@ -124,11 +124,11 @@ static void pci_host_recover_slots(struct pci_host_br= idge *host) continue; =20 pcie_do_recovery(dev, pci_channel_io_frozen, - pci_host_reset_slot); + pci_host_reset_root_port); } } #else -static void pci_host_recover_slots(struct pci_host_bridge *host) +static void pci_host_reset_root_ports(struct pci_host_bridge *host) { struct pci_bus *bus =3D host->bus; struct pci_dev *dev; @@ -140,17 +140,17 @@ static void pci_host_recover_slots(struct pci_host_br= idge *host) =20 ret =3D pci_bus_error_reset(dev); if (ret) - pci_err(dev, "Failed to reset slot: %d\n", ret); + pci_err(dev, "Failed to reset root port: %d\n", ret); else - pci_info(dev, "Slot has been reset\n"); + pci_info(dev, "Root port has been reset\n"); } } #endif =20 void pci_host_handle_link_down(struct pci_host_bridge *bridge) { - dev_info(&bridge->dev, "Recovering slots due to Link Down\n"); - pci_host_recover_slots(bridge); + dev_info(&bridge->dev, "Recovering root ports due to Link Down\n"); + pci_host_reset_root_ports(bridge); } EXPORT_SYMBOL_GPL(pci_host_handle_link_down); =20 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6d6e9ce2bbcc..154d33e1af84 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4985,16 +4985,16 @@ void __weak pcibios_reset_secondary_bus(struct pci_= dev *dev) struct pci_host_bridge *host =3D pci_find_host_bridge(dev->bus); int ret; =20 - if (pci_is_root_bus(dev->bus) && host->reset_slot) { + if (pci_is_root_bus(dev->bus) && host->reset_root_port) { /* * Save the config space of the root port before doing the * reset, since the state could be lost. The device state * should've been saved by the caller. */ pci_save_state(dev); - ret =3D host->reset_slot(host, dev); + ret =3D host->reset_root_port(host, dev); if (ret) - pci_err(dev, "failed to reset slot: %d\n", ret); + pci_err(dev, "failed to reset root port: %d\n", ret); else /* Now restore it on success */ pci_restore_state(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 8d7d2a49b76c..ab4f4a668f6d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -599,7 +599,7 @@ struct pci_host_bridge { void (*release_fn)(struct pci_host_bridge *); int (*enable_device)(struct pci_host_bridge *bridge, struct pci_dev *dev); void (*disable_device)(struct pci_host_bridge *bridge, struct pci_dev *de= v); - int (*reset_slot)(struct pci_host_bridge *bridge, struct pci_dev *dev); + int (*reset_root_port)(struct pci_host_bridge *bridge, struct pci_dev *de= v); void *release_data; unsigned int ignore_reset_delay:1; /* For entire hierarchy */ unsigned int no_ext_tags:1; /* No Extended Tags */ --=20 2.43.0