From: Niklas Cassel <Niklas.Cassel@wdc.com>
To: Frank Li <Frank.Li@nxp.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
Vidya Sagar <vidyas@nvidia.com>
Cc: "helgaas@kernel.org" <helgaas@kernel.org>,
"kishon@ti.com" <kishon@ti.com>,
"lorenzo.pieralisi@arm.com" <lorenzo.pieralisi@arm.com>,
"kw@linux.com" <kw@linux.com>,
"jingoohan1@gmail.com" <jingoohan1@gmail.com>,
"gustavo.pimentel@synopsys.com" <gustavo.pimentel@synopsys.com>,
"lznuaa@gmail.com" <lznuaa@gmail.com>,
"hongxing.zhu@nxp.com" <hongxing.zhu@nxp.com>,
"jdmason@kudzu.us" <jdmason@kudzu.us>,
"dave.jiang@intel.com" <dave.jiang@intel.com>,
"allenbh@gmail.com" <allenbh@gmail.com>,
"linux-ntb@googlegroups.com" <linux-ntb@googlegroups.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>
Subject: Re: [PATCH v2 1/4] PCI: designware-ep: Allow pci_epc_set_bar() update inbound map address
Date: Thu, 14 Dec 2023 14:31:04 +0000 [thread overview]
Message-ID: <ZXsRp+Lzg3x/nhk3@x1-carbon> (raw)
In-Reply-To: <20220222162355.32369-2-Frank.Li@nxp.com>
Hello Frank,
On Tue, Feb 22, 2022 at 10:23:52AM -0600, Frank Li wrote:
> ntb_mw_set_trans() will set memory map window after endpoint function
> driver bind. The inbound map address need be updated dynamically when
> using NTB by PCIe Root Port and PCIe Endpoint connection.
>
> Checking if iatu already assigned to the BAR, if yes, using assigned iatu
> number to update inbound address map and skip set BAR's register.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
>
> Change from V1:
> - improve commit message
>
> drivers/pci/controller/dwc/pcie-designware-ep.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
> index 998b698f40858..cad5d9ea7cc6c 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-ep.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-ep.c
> @@ -161,7 +161,11 @@ static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no,
> u32 free_win;
> struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
>
> - free_win = find_first_zero_bit(ep->ib_window_map, pci->num_ib_windows);
find_first_zero_bit() can return 0, representing bit 0,
which is a perfectly valid return value.
> + if (!ep->bar_to_atu[bar])
so this check is not correct.
For platforms that has a core_init_notifier, e.g. qcom and tegra,
what will happen is that, on first boot:
BAR0: iATU0
BAR1: iATU1
BAR2: iATU2
BAR3: iATU3
BAR4: iATU4
BAR5: iATU5
Rebooting the RC, will cause a perst assertion + deassertion,
after which:
BAR0: iATU6
BAR1: iATU1
BAR2: iATU2
BAR3: iATU3
BAR4: iATU4
BAR5: iATU5
This is obviously a bug, because you cannot use:
if (!ep->bar_to_atu[bar])
when 0 is a valid return value.
My proposed fix is:
@@ -172,16 +176,26 @@ static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type,
{
int ret;
u32 free_win;
+ u32 saved_atu;
struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
- if (!ep->bar_to_atu[bar])
+ saved_atu = ep->bar_to_atu[bar];
+ if (!saved_atu) {
free_win = find_first_zero_bit(ep->ib_window_map, pci->num_ib_windows);
- else
- free_win = ep->bar_to_atu[bar];
-
- if (free_win >= pci->num_ib_windows) {
- dev_err(pci->dev, "No free inbound window\n");
- return -EINVAL;
+ //pr_err("%s BAR: %d, found no ATU, using first free, index: %d\n", __func__, bar, free_win);
+ if (free_win >= pci->num_ib_windows) {
+ dev_err(pci->dev, "No free inbound window\n");
+ return -EINVAL;
+ }
+
+ /*
+ * In order for bar_to_atu[bar] == 0 to equal no iATU, offset
+ * the saved value with 1.
+ */
+ saved_atu = free_win + 1;
+ } else {
+ free_win = saved_atu - 1;
+ //pr_err("%s BAR: %d, already has ATU, index: %d\n", __func__, bar, free_win);
}
ret = dw_pcie_prog_ep_inbound_atu(pci, func_no, free_win, type,
@@ -191,7 +205,7 @@ static int dw_pcie_ep_inbound_atu(struct dw_pcie_ep *ep, u8 func_no, int type,
return ret;
}
- ep->bar_to_atu[bar] = free_win;
+ ep->bar_to_atu[bar] = saved_atu;
set_bit(free_win, ep->ib_window_map);
return 0;
> static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
> @@ -244,6 +249,9 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
> if (ret)
> return ret;
>
> + if (ep->epf_bar[bar])
> + return 0;
> +
However, here you ignore writing the settings if (ep->epf_bar[bar]),
again, this will not work for a platform with a core_init_notifier,
as they perform a full core reset using reset_control_assert(),
when perst is asserted + deasserted, so AFAICT, these settings will
get cleared for those platforms, so they will need to be re-written.
> dw_pcie_dbi_ro_wr_en(pci);
>
> dw_pcie_writel_dbi2(pci, reg, lower_32_bits(size - 1));
Kind regards,
Niklas
next prev parent reply other threads:[~2023-12-14 14:31 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 16:23 [PATCH V2 0/4] NTB function for PCIe RC to EP connection Frank Li
2022-02-22 16:23 ` [PATCH v2 1/4] PCI: designware-ep: Allow pci_epc_set_bar() update inbound map address Frank Li
2023-12-14 14:31 ` Niklas Cassel [this message]
2023-12-14 15:19 ` Frank Li
2023-12-14 20:23 ` Niklas Cassel
2023-12-14 20:52 ` Frank Li
2023-12-14 21:28 ` Frank Li
2023-12-16 10:11 ` Niklas Cassel
2023-12-19 17:59 ` Manivannan Sadhasivam
2023-12-20 5:14 ` Damien Le Moal
2023-12-20 6:03 ` Manivannan Sadhasivam
2023-12-20 7:06 ` Damien Le Moal
2023-12-14 21:39 ` Niklas Cassel
2022-02-22 16:23 ` [PATCH v2 2/4] NTB: epf: Allow more flexibility in the memory BAR map method Frank Li
2022-03-10 22:08 ` Zhi Li
2022-02-22 16:23 ` [PATCH v2 3/4] PCI: endpoint: Support NTB transfer between RC and EP Frank Li
2022-03-10 22:09 ` Zhi Li
2022-12-14 0:08 ` Bjorn Helgaas
[not found] ` <CAHrpEqSGySHDET3YPu3czzoMBmCRJsgGgU4s3GWWbtruFLVHaA@mail.gmail.com>
2022-12-14 0:28 ` Bjorn Helgaas
2022-12-14 0:47 ` [EXT] " Frank Li
2022-02-22 16:23 ` [PATCH v2 4/4] Documentation: PCI: Add specification for the PCI vNTB function device Frank Li
2022-03-10 22:01 ` [PATCH V2 0/4] NTB function for PCIe RC to EP connection Zhi Li
2022-03-10 22:07 ` Zhi Li
2022-04-04 20:12 ` Zhi Li
2022-04-05 10:34 ` Kishon Vijay Abraham I
2022-04-05 15:35 ` Zhi Li
2022-04-20 20:22 ` Zhi Li
2022-04-22 15:15 ` Kishon Vijay Abraham I
2022-04-22 15:36 ` Zhi Li
2022-08-12 14:02 ` Jon Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZXsRp+Lzg3x/nhk3@x1-carbon \
--to=niklas.cassel@wdc.com \
--cc=Frank.Li@nxp.com \
--cc=allenbh@gmail.com \
--cc=dave.jiang@intel.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=helgaas@kernel.org \
--cc=hongxing.zhu@nxp.com \
--cc=jdmason@kudzu.us \
--cc=jingoohan1@gmail.com \
--cc=kishon@ti.com \
--cc=kw@linux.com \
--cc=linux-ntb@googlegroups.com \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=lznuaa@gmail.com \
--cc=manivannan.sadhasivam@linaro.org \
--cc=vidyas@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).