| Message ID | 20241210-imx95_lut-v8-2-2e730b2e5fde@nxp.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: add enabe(disable)_device() hook for bridge | expand |
On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > This involves checking msi-map and iommu-map device tree properties to > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > LUT-related registers are configured. In the absence of an msi-map, the > built-in MSI controller is utilized as a fallback. This is wrong information. What you want to say is that if an msi-map isn't detected this means that the platform relies on DWC built-in controller for MSIs (that does not need streamIDs handling). That's quite different from what you are writing here. > > Register a PCI bus callback function to handle enable_device() and > disable_device() operations, setting up the LUT whenever a new PCI device > is enabled. > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > Signed-off-by: Frank Li <Frank.Li@nxp.com> > --- > Change from v7 to v8 > - update comment message according to Lorenzo Pieralisi's suggestion. > - rework err target table > - improve err==0 && target ==NULL description, use 1:1 map RID to > stream ID. > - invalidate case -> unexisted case, never happen > - sid_i will not do mask, add comments said only MSI glue layer add > controller id. > - rework iommu map and msi map return value check logic according to > Lorenzo Pieralisi's suggestion > > Change from v5 to v7 > - change comment rid to RID > - some mini change according to mani's feedback > > Change from v4 to v5 > - rework commt message > - add comment for mutex > - s/reqid/rid/ > - keep only one loop when enable lut > - add warning when try to add duplicate rid > - Replace hardcode 0xffff with IMX95_PE0_LUT_MASK > - Fix some error message > > Change from v3 to v4 > - Check target value at of_map_id(). > - of_node_put() for target. > - add case for msi-map exist, but rid entry is not exist. > > Change from v2 to v3 > - Use the "target" argument of of_map_id() > - Check if rid already in lut table when enable device > > change from v1 to v2 > - set callback to pci_host_bridge instead pci->ops. > --- > drivers/pci/controller/dwc/pci-imx6.c | 186 +++++++++++++++++++++++++++++++++- > 1 file changed, 185 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index c8d5c90aa4d45..d325f4fb279c8 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -55,6 +55,22 @@ > #define IMX95_PE0_GEN_CTRL_3 0x1058 > #define IMX95_PCIE_LTSSM_EN BIT(0) > > +#define IMX95_PE0_LUT_ACSCTRL 0x1008 > +#define IMX95_PEO_LUT_RWA BIT(16) > +#define IMX95_PE0_LUT_ENLOC GENMASK(4, 0) > + > +#define IMX95_PE0_LUT_DATA1 0x100c > +#define IMX95_PE0_LUT_VLD BIT(31) > +#define IMX95_PE0_LUT_DAC_ID GENMASK(10, 8) > +#define IMX95_PE0_LUT_STREAM_ID GENMASK(5, 0) > + > +#define IMX95_PE0_LUT_DATA2 0x1010 > +#define IMX95_PE0_LUT_REQID GENMASK(31, 16) > +#define IMX95_PE0_LUT_MASK GENMASK(15, 0) > + > +#define IMX95_SID_MASK GENMASK(5, 0) > +#define IMX95_MAX_LUT 32 > + > #define to_imx_pcie(x) dev_get_drvdata((x)->dev) > > enum imx_pcie_variants { > @@ -87,6 +103,7 @@ enum imx_pcie_variants { > * workaround suspend resume on some devices which are affected by this errata. > */ > #define IMX_PCIE_FLAG_BROKEN_SUSPEND BIT(9) > +#define IMX_PCIE_FLAG_HAS_LUT BIT(10) > > #define imx_check_flag(pci, val) (pci->drvdata->flags & val) > > @@ -139,6 +156,9 @@ struct imx_pcie { > struct device *pd_pcie_phy; > struct phy *phy; > const struct imx_pcie_drvdata *drvdata; > + > + /* Ensure that only one device's LUT is configured at any given time */ > + struct mutex lock; > }; > > /* Parameters for the waiting for PCIe PHY PLL to lock on i.MX7 */ > @@ -930,6 +950,162 @@ static void imx_pcie_stop_link(struct dw_pcie *pci) > imx_pcie_ltssm_disable(dev); > } > > +static int imx_pcie_add_lut(struct imx_pcie *imx_pcie, u16 rid, u8 sid) > +{ > + struct dw_pcie *pci = imx_pcie->pci; > + struct device *dev = pci->dev; > + u32 data1, data2; > + int free = -1; > + int i; > + > + if (sid >= 64) { > + dev_err(dev, "Invalid SID for index %d\n", sid); > + return -EINVAL; > + } > + > + guard(mutex)(&imx_pcie->lock); > + > + /* > + * Iterate through all LUT entries to check for duplicate RID and > + * identify the first available entry. Configure this available entry > + * immediately after verification to avoid rescanning it. > + */ > + for (i = 0; i < IMX95_MAX_LUT; i++) { > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, IMX95_PEO_LUT_RWA | i); > + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, &data1); > + > + if (!(data1 & IMX95_PE0_LUT_VLD)) { > + if (free < 0) > + free = i; > + continue; > + } > + > + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, &data2); > + > + /* Do not add duplicate RID */ > + if (rid == FIELD_GET(IMX95_PE0_LUT_REQID, data2)) { > + dev_warn(dev, "Existing LUT entry available for RID (%d)", rid); > + return 0; > + } > + } > + > + if (free < 0) { > + dev_err(dev, "LUT entry is not available\n"); > + return -ENOSPC; > + } > + > + data1 = FIELD_PREP(IMX95_PE0_LUT_DAC_ID, 0); > + data1 |= FIELD_PREP(IMX95_PE0_LUT_STREAM_ID, sid); > + data1 |= IMX95_PE0_LUT_VLD; > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, data1); > + > + data2 = IMX95_PE0_LUT_MASK; /* Match all bits of RID */ > + data2 |= FIELD_PREP(IMX95_PE0_LUT_REQID, rid); > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, data2); > + > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, free); > + > + return 0; > +} > + > +static void imx_pcie_remove_lut(struct imx_pcie *imx_pcie, u16 rid) > +{ > + u32 data2; > + int i; > + > + guard(mutex)(&imx_pcie->lock); > + > + for (i = 0; i < IMX95_MAX_LUT; i++) { > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, IMX95_PEO_LUT_RWA | i); > + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, &data2); > + if (FIELD_GET(IMX95_PE0_LUT_REQID, data2) == rid) { > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, 0); > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, 0); > + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, i); > + > + break; > + } > + } > +} > + > +static int imx_pcie_enable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > +{ > + struct imx_pcie *imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > + u32 sid_i, sid_m, rid = pci_dev_id(pdev); > + struct device_node *target; > + struct device *dev; > + int err_i, err_m; > + u32 sid; > + > + dev = imx_pcie->pci->dev; > + > + target = NULL; > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > + if (target) { > + of_node_put(target); > + } else { > + /* > + * "target == NULL && err_i == 0" means use 1:1 map RID to Is it what it means ? Or does it mean that the iommu-map property was found and RID is out of range ? Could you point me at a sample dts for this host bridge please ? > + * stream ID. Hardware can't support this because stream ID > + * only 5bits It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. > + */ > + err_i = -EINVAL; > + } > + > + target = NULL; > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > + > + /* > + * err_m target > + * 0 NULL Use 1:1 map RID to stream ID, Again, is that what it really means ? > + * Current hardware can't support it, > + * So return -EINVAL. > + * != 0 NULL msi-map not exist, use built-in MSI. does not exist. > + * 0 != NULL Get correct streamID from RID. > + * != 0 != NULL Unexisted case, never happen. "Invalid combination" > + */ > + if (!err_m && !target) > + return -EINVAL; > + else if (target) > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > + > + /* > + * msi-map iommu-map > + * N N DWC MSI Ctrl > + * Y Y ITS + SMMU, require the same sid > + * Y N ITS > + * N Y DWC MSI Ctrl + SMMU > + */ > + if (err_i && err_m) > + return 0; > + > + if (!err_i && !err_m) { > + /* > + * MSI glue layer auto add 2 bits controller ID ahead of stream What's "MSI glue layer" ? > + * ID, so mask this 2bits to get stream ID. > + * But IOMMU glue layer doesn't do that. and "IOMMU glue layer" ? > + */ > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > + return -EINVAL; > + } > + } > + > + sid = sid_i; err_i could be != 0 here, I understand that the end result is fine given how the code is written but it is misleading. if (!err_i) else if (!err_m) > + if (!err_m) > + sid = sid_m & IMX95_SID_MASK; > + > + return imx_pcie_add_lut(imx_pcie, rid, sid); > +} > + > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > +{ > + struct imx_pcie *imx_pcie; > + > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > +} > + > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > { > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > } > } > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > + pp->bridge->enable_device = imx_pcie_enable_device; > + pp->bridge->disable_device = imx_pcie_disable_device; > + } > + > imx_pcie_assert_core_reset(imx_pcie); > > if (imx_pcie->drvdata->init_phy) > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > imx_pcie->pci = pci; > imx_pcie->drvdata = of_device_get_match_data(dev); > > + mutex_init(&imx_pcie->lock); > + > /* Find the PHY if one is defined, only imx7d uses it */ > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > if (np) { > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > }, > [IMX95] = { > .variant = IMX95, > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > + IMX_PCIE_FLAG_HAS_LUT, > .clk_names = imx8mq_clks, > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > -- > 2.34.1 >
On Thu, Dec 12, 2024 at 05:46:09PM +0100, Lorenzo Pieralisi wrote: > On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > > This involves checking msi-map and iommu-map device tree properties to > > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > > LUT-related registers are configured. In the absence of an msi-map, the > > built-in MSI controller is utilized as a fallback. > > This is wrong information. What you want to say is that if an msi-map > isn't detected this means that the platform relies on DWC built-in > controller for MSIs (that does not need streamIDs handling). > > That's quite different from what you are writing here. How about ? "If an msi-map isn't detected, platform relies on DWC built-in controller for MSIs that does not need streamdIDs" > > > > > Register a PCI bus callback function to handle enable_device() and > > disable_device() operations, setting up the LUT whenever a new PCI device > > is enabled. > > > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > > Signed-off-by: Frank Li <Frank.Li@nxp.com> [...] > > + int err_i, err_m; > > + u32 sid; > > + > > + dev = imx_pcie->pci->dev; > > + > > + target = NULL; > > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > > + if (target) { > > + of_node_put(target); > > + } else { > > + /* > > + * "target == NULL && err_i == 0" means use 1:1 map RID to > > Is it what it means ? Or does it mean that the iommu-map property was found > and RID is out of range ? yes, if this happen, sid_i will be equal to RID. > > Could you point me at a sample dts for this host bridge please ? https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/arch/arm64/boot/dts/freescale/imx95.dtsi /* 0x10~0x17 stream id for pci0 */ iommu-map = <0x000 &smmu 0x10 0x1>, <0x100 &smmu 0x11 0x7>; /* msi part */ msi-map = <0x000 &its 0x10 0x1>, <0x100 &its 0x11 0x7>; > > > + * stream ID. Hardware can't support this because stream ID > > + * only 5bits > > It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. Sorry for typo. it is 6bits. > > > + */ > > + err_i = -EINVAL; > > + } > > + > > + target = NULL; > > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > > + > > + /* > > + * err_m target > > + * 0 NULL Use 1:1 map RID to stream ID, > > Again, is that what it really means ? > > > + * Current hardware can't support it, > > + * So return -EINVAL. > > + * != 0 NULL msi-map not exist, use built-in MSI. > > does not exist. > > > + * 0 != NULL Get correct streamID from RID. > > + * != 0 != NULL Unexisted case, never happen. > > "Invalid combination" > > > + */ > > + if (!err_m && !target) > > + return -EINVAL; > > + else if (target) > > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > > + > > + /* > > + * msi-map iommu-map > > + * N N DWC MSI Ctrl > > + * Y Y ITS + SMMU, require the same sid > > + * Y N ITS > > + * N Y DWC MSI Ctrl + SMMU > > + */ > > + if (err_i && err_m) > > + return 0; > > + > > + if (!err_i && !err_m) { > > + /* > > + * MSI glue layer auto add 2 bits controller ID ahead of stream > > What's "MSI glue layer" ? It is common term for IC desgin, which connect IP's signal to platform with some simple logic. Inside chip, when connect LUT output 6bit streamIDs to MSI controller, there are 2bits hardcode controller ID information append to 6 bits streamID. Glue Layer <==========> ┌─────┐ ┌──────────┐ │ LUT │ 6bit stream ID │ │ │ ┼─────────────────►│ MSI │ └─────┘ 2bit ctrl ID │ │ ┌───────────►│ │ │ │ │ 00 PCIe0 │ │ │ 01 ENETC │ │ │ 10 PCIe1 │ │ │ │ └──────────┘ > > > + * ID, so mask this 2bits to get stream ID. > > + * But IOMMU glue layer doesn't do that. > > and "IOMMU glue layer" ? See above. Frank > > > + */ > > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > > + return -EINVAL; > > + } > > + } > > + > > + sid = sid_i; > > err_i could be != 0 here, I understand that the end result is > fine given how the code is written but it is misleading. > > if (!err_i) > else if (!err_m) Okay > > > + if (!err_m) > > + sid = sid_m & IMX95_SID_MASK; > > + > > + return imx_pcie_add_lut(imx_pcie, rid, sid); > > +} > > + > > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > > +{ > > + struct imx_pcie *imx_pcie; > > + > > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > > +} > > + > > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > { > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > } > > } > > > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > > + pp->bridge->enable_device = imx_pcie_enable_device; > > + pp->bridge->disable_device = imx_pcie_disable_device; > > + } > > + > > imx_pcie_assert_core_reset(imx_pcie); > > > > if (imx_pcie->drvdata->init_phy) > > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > > imx_pcie->pci = pci; > > imx_pcie->drvdata = of_device_get_match_data(dev); > > > > + mutex_init(&imx_pcie->lock); > > + > > /* Find the PHY if one is defined, only imx7d uses it */ > > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > > if (np) { > > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > > }, > > [IMX95] = { > > .variant = IMX95, > > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > > + IMX_PCIE_FLAG_HAS_LUT, > > .clk_names = imx8mq_clks, > > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > > > -- > > 2.34.1 > >
On Thu, Dec 12, 2024 at 12:29:16PM -0500, Frank Li wrote: > On Thu, Dec 12, 2024 at 05:46:09PM +0100, Lorenzo Pieralisi wrote: > > On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > > > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > > > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > > > This involves checking msi-map and iommu-map device tree properties to > > > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > > > LUT-related registers are configured. In the absence of an msi-map, the > > > built-in MSI controller is utilized as a fallback. > > > > This is wrong information. What you want to say is that if an msi-map > > isn't detected this means that the platform relies on DWC built-in > > controller for MSIs (that does not need streamIDs handling). > > > > That's quite different from what you are writing here. > > How about ? > > "If an msi-map isn't detected, platform relies on DWC built-in controller > for MSIs that does not need streamdIDs" Right. Question: what happens if DT shows that there are SMMU and/or ITS bindings/mappings but the SMMU driver and ITS driver are either not enabled or have not probed ? I assume the LUT programming makes no difference (it is useless yes but should be harmless too) in this case but wanted to check with you. Thanks, Lorenzo > > > > > > > > > Register a PCI bus callback function to handle enable_device() and > > > disable_device() operations, setting up the LUT whenever a new PCI device > > > is enabled. > > > > > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > > > Signed-off-by: Frank Li <Frank.Li@nxp.com> > > [...] > > > > + int err_i, err_m; > > > + u32 sid; > > > + > > > + dev = imx_pcie->pci->dev; > > > + > > > + target = NULL; > > > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > > > + if (target) { > > > + of_node_put(target); > > > + } else { > > > + /* > > > + * "target == NULL && err_i == 0" means use 1:1 map RID to > > > > Is it what it means ? Or does it mean that the iommu-map property was found > > and RID is out of range ? > > yes, if this happen, sid_i will be equal to RID. > > > > > Could you point me at a sample dts for this host bridge please ? > > https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/arch/arm64/boot/dts/freescale/imx95.dtsi > > /* 0x10~0x17 stream id for pci0 */ > iommu-map = <0x000 &smmu 0x10 0x1>, > <0x100 &smmu 0x11 0x7>; > > /* msi part */ > msi-map = <0x000 &its 0x10 0x1>, > <0x100 &its 0x11 0x7>; > > > > > > + * stream ID. Hardware can't support this because stream ID > > > + * only 5bits > > > > It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. > > Sorry for typo. it is 6bits. > > > > > > + */ > > > + err_i = -EINVAL; > > > + } > > > + > > > + target = NULL; > > > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > > > + > > > + /* > > > + * err_m target > > > + * 0 NULL Use 1:1 map RID to stream ID, > > > > Again, is that what it really means ? > > > > > + * Current hardware can't support it, > > > + * So return -EINVAL. > > > + * != 0 NULL msi-map not exist, use built-in MSI. > > > > does not exist. > > > > > + * 0 != NULL Get correct streamID from RID. > > > + * != 0 != NULL Unexisted case, never happen. > > > > "Invalid combination" > > > > > + */ > > > + if (!err_m && !target) > > > + return -EINVAL; > > > + else if (target) > > > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > > > + > > > + /* > > > + * msi-map iommu-map > > > + * N N DWC MSI Ctrl > > > + * Y Y ITS + SMMU, require the same sid > > > + * Y N ITS > > > + * N Y DWC MSI Ctrl + SMMU > > > + */ > > > + if (err_i && err_m) > > > + return 0; > > > + > > > + if (!err_i && !err_m) { > > > + /* > > > + * MSI glue layer auto add 2 bits controller ID ahead of stream > > > > What's "MSI glue layer" ? > > It is common term for IC desgin, which connect IP's signal to platform with > some simple logic. Inside chip, when connect LUT output 6bit streamIDs > to MSI controller, there are 2bits hardcode controller ID information > append to 6 bits streamID. > > Glue Layer > <==========> > ┌─────┐ ┌──────────┐ > │ LUT │ 6bit stream ID │ │ > │ ┼─────────────────►│ MSI │ > └─────┘ 2bit ctrl ID │ │ > ┌───────────►│ │ > │ │ │ > 00 PCIe0 │ │ │ > 01 ENETC │ │ │ > 10 PCIe1 │ │ │ > │ └──────────┘ > > > > > > + * ID, so mask this 2bits to get stream ID. > > > + * But IOMMU glue layer doesn't do that. > > > > and "IOMMU glue layer" ? > > See above. > > Frank > > > > > > + */ > > > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > > > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > > > + return -EINVAL; > > > + } > > > + } > > > + > > > + sid = sid_i; > > > > err_i could be != 0 here, I understand that the end result is > > fine given how the code is written but it is misleading. > > > > if (!err_i) > > else if (!err_m) > > Okay > > > > > > + if (!err_m) > > > + sid = sid_m & IMX95_SID_MASK; > > > + > > > + return imx_pcie_add_lut(imx_pcie, rid, sid); > > > +} > > > + > > > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > > > +{ > > > + struct imx_pcie *imx_pcie; > > > + > > > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > > > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > > > +} > > > + > > > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > { > > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > } > > > } > > > > > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > > > + pp->bridge->enable_device = imx_pcie_enable_device; > > > + pp->bridge->disable_device = imx_pcie_disable_device; > > > + } > > > + > > > imx_pcie_assert_core_reset(imx_pcie); > > > > > > if (imx_pcie->drvdata->init_phy) > > > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > > > imx_pcie->pci = pci; > > > imx_pcie->drvdata = of_device_get_match_data(dev); > > > > > > + mutex_init(&imx_pcie->lock); > > > + > > > /* Find the PHY if one is defined, only imx7d uses it */ > > > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > > > if (np) { > > > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > > > }, > > > [IMX95] = { > > > .variant = IMX95, > > > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > > > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > > > + IMX_PCIE_FLAG_HAS_LUT, > > > .clk_names = imx8mq_clks, > > > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > > > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > > > > > -- > > > 2.34.1 > > >
On Fri, Dec 13, 2024 at 10:32:28AM +0100, Lorenzo Pieralisi wrote: > On Thu, Dec 12, 2024 at 12:29:16PM -0500, Frank Li wrote: > > On Thu, Dec 12, 2024 at 05:46:09PM +0100, Lorenzo Pieralisi wrote: > > > On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > > > > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > > > > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > > > > This involves checking msi-map and iommu-map device tree properties to > > > > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > > > > LUT-related registers are configured. In the absence of an msi-map, the > > > > built-in MSI controller is utilized as a fallback. > > > > > > This is wrong information. What you want to say is that if an msi-map > > > isn't detected this means that the platform relies on DWC built-in > > > controller for MSIs (that does not need streamIDs handling). > > > > > > That's quite different from what you are writing here. > > > > How about ? > > > > "If an msi-map isn't detected, platform relies on DWC built-in controller > > for MSIs that does not need streamdIDs" > > Right. Question: what happens if DT shows that there are SMMU and/or > ITS bindings/mappings but the SMMU driver and ITS driver are either not > enabled or have not probed ? It is little bit complex. iommu: Case 1: iommu{ status = "disabled" }; PCI driver normal probed. if RID is in range of iommu-map, not any functional impact and harmless. If RID is out of range of iommu-map, "false alarm" will return. enable PCI EP device failure, but actually it can work without IOMMU. Case 2: iommu { status = "Okay" } but iommu driver have not probed yet. PCI Host bridge driver should defer till iommu probed. Worst case is "false alarm". But this happen is very rare if DTS is correct. MSI: case 1: msi-controller { status = "disabled"; } Whole all dwc drivers will be broken. case 2: msi-controller { status = "Okay" } if msi driver have not probed yet, PCI Host bridge driver will defer. Frank > > I assume the LUT programming makes no difference (it is useless yes but > should be harmless too) in this case but wanted to check with you. > > Thanks, > Lorenzo > > > > > > > > > > > > > > Register a PCI bus callback function to handle enable_device() and > > > > disable_device() operations, setting up the LUT whenever a new PCI device > > > > is enabled. > > > > > > > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > > > > Signed-off-by: Frank Li <Frank.Li@nxp.com> > > > > [...] > > > > > > + int err_i, err_m; > > > > + u32 sid; > > > > + > > > > + dev = imx_pcie->pci->dev; > > > > + > > > > + target = NULL; > > > > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > > > > + if (target) { > > > > + of_node_put(target); > > > > + } else { > > > > + /* > > > > + * "target == NULL && err_i == 0" means use 1:1 map RID to > > > > > > Is it what it means ? Or does it mean that the iommu-map property was found > > > and RID is out of range ? > > > > yes, if this happen, sid_i will be equal to RID. > > > > > > > > Could you point me at a sample dts for this host bridge please ? > > > > https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/arch/arm64/boot/dts/freescale/imx95.dtsi > > > > /* 0x10~0x17 stream id for pci0 */ > > iommu-map = <0x000 &smmu 0x10 0x1>, > > <0x100 &smmu 0x11 0x7>; > > > > /* msi part */ > > msi-map = <0x000 &its 0x10 0x1>, > > <0x100 &its 0x11 0x7>; > > > > > > > > > + * stream ID. Hardware can't support this because stream ID > > > > + * only 5bits > > > > > > It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. > > > > Sorry for typo. it is 6bits. > > > > > > > > > + */ > > > > + err_i = -EINVAL; > > > > + } > > > > + > > > > + target = NULL; > > > > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > > > > + > > > > + /* > > > > + * err_m target > > > > + * 0 NULL Use 1:1 map RID to stream ID, > > > > > > Again, is that what it really means ? > > > > > > > + * Current hardware can't support it, > > > > + * So return -EINVAL. > > > > + * != 0 NULL msi-map not exist, use built-in MSI. > > > > > > does not exist. > > > > > > > + * 0 != NULL Get correct streamID from RID. > > > > + * != 0 != NULL Unexisted case, never happen. > > > > > > "Invalid combination" > > > > > > > + */ > > > > + if (!err_m && !target) > > > > + return -EINVAL; > > > > + else if (target) > > > > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > > > > + > > > > + /* > > > > + * msi-map iommu-map > > > > + * N N DWC MSI Ctrl > > > > + * Y Y ITS + SMMU, require the same sid > > > > + * Y N ITS > > > > + * N Y DWC MSI Ctrl + SMMU > > > > + */ > > > > + if (err_i && err_m) > > > > + return 0; > > > > + > > > > + if (!err_i && !err_m) { > > > > + /* > > > > + * MSI glue layer auto add 2 bits controller ID ahead of stream > > > > > > What's "MSI glue layer" ? > > > > It is common term for IC desgin, which connect IP's signal to platform with > > some simple logic. Inside chip, when connect LUT output 6bit streamIDs > > to MSI controller, there are 2bits hardcode controller ID information > > append to 6 bits streamID. > > > > Glue Layer > > <==========> > > ┌─────┐ ┌──────────┐ > > │ LUT │ 6bit stream ID │ │ > > │ ┼─────────────────►│ MSI │ > > └─────┘ 2bit ctrl ID │ │ > > ┌───────────►│ │ > > │ │ │ > > 00 PCIe0 │ │ │ > > 01 ENETC │ │ │ > > 10 PCIe1 │ │ │ > > │ └──────────┘ > > > > > > > > > + * ID, so mask this 2bits to get stream ID. > > > > + * But IOMMU glue layer doesn't do that. > > > > > > and "IOMMU glue layer" ? > > > > See above. > > > > Frank > > > > > > > > > + */ > > > > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > > > > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > > > > + return -EINVAL; > > > > + } > > > > + } > > > > + > > > > + sid = sid_i; > > > > > > err_i could be != 0 here, I understand that the end result is > > > fine given how the code is written but it is misleading. > > > > > > if (!err_i) > > > else if (!err_m) > > > > Okay > > > > > > > > > + if (!err_m) > > > > + sid = sid_m & IMX95_SID_MASK; > > > > + > > > > + return imx_pcie_add_lut(imx_pcie, rid, sid); > > > > +} > > > > + > > > > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > > > > +{ > > > > + struct imx_pcie *imx_pcie; > > > > + > > > > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > > > > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > > > > +} > > > > + > > > > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > { > > > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > > > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > } > > > > } > > > > > > > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > > > > + pp->bridge->enable_device = imx_pcie_enable_device; > > > > + pp->bridge->disable_device = imx_pcie_disable_device; > > > > + } > > > > + > > > > imx_pcie_assert_core_reset(imx_pcie); > > > > > > > > if (imx_pcie->drvdata->init_phy) > > > > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > > > > imx_pcie->pci = pci; > > > > imx_pcie->drvdata = of_device_get_match_data(dev); > > > > > > > > + mutex_init(&imx_pcie->lock); > > > > + > > > > /* Find the PHY if one is defined, only imx7d uses it */ > > > > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > > > > if (np) { > > > > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > > > > }, > > > > [IMX95] = { > > > > .variant = IMX95, > > > > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > > > > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > > > > + IMX_PCIE_FLAG_HAS_LUT, > > > > .clk_names = imx8mq_clks, > > > > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > > > > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > > > > > > > -- > > > > 2.34.1 > > > >
On Fri, Dec 13, 2024 at 12:20:40PM -0500, Frank Li wrote: > On Fri, Dec 13, 2024 at 10:32:28AM +0100, Lorenzo Pieralisi wrote: > > On Thu, Dec 12, 2024 at 12:29:16PM -0500, Frank Li wrote: > > > On Thu, Dec 12, 2024 at 05:46:09PM +0100, Lorenzo Pieralisi wrote: > > > > On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > > > > > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > > > > > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > > > > > This involves checking msi-map and iommu-map device tree properties to > > > > > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > > > > > LUT-related registers are configured. In the absence of an msi-map, the > > > > > built-in MSI controller is utilized as a fallback. > > > > > > > > This is wrong information. What you want to say is that if an msi-map > > > > isn't detected this means that the platform relies on DWC built-in > > > > controller for MSIs (that does not need streamIDs handling). > > > > > > > > That's quite different from what you are writing here. > > > > > > How about ? > > > > > > "If an msi-map isn't detected, platform relies on DWC built-in controller > > > for MSIs that does not need streamdIDs" > > > > Right. Question: what happens if DT shows that there are SMMU and/or > > ITS bindings/mappings but the SMMU driver and ITS driver are either not > > enabled or have not probed ? > > It is little bit complex. > iommu: > Case 1: > iommu{ > status = "disabled" > }; > > PCI driver normal probed. if RID is in range of iommu-map, not > any functional impact and harmless. > If RID is out of range of iommu-map, "false alarm" will return. > enable PCI EP device failure, but actually it can work without IOMMU. What does "false alarm" mean in practice ? PCI device enable fails but actually it should not ? That does not look like a false alarm to me. > > Case 2: > iommu { > status = "Okay" > } > but iommu driver have not probed yet. PCI Host bridge driver > should defer till iommu probed. > > Worst case is "false alarm". But this happen is very rare if DTS is > correct. Explain what this means. > MSI: > case 1: > msi-controller { > status = "disabled"; > } > Whole all dwc drivers will be broken. What MSI controller. Please make an effort to be precise and explain. Thanks, Lorenzo > case 2: > msi-controller { > status = "Okay" > } > if msi driver have not probed yet, PCI Host bridge driver will > defer. > > Frank > > > > > I assume the LUT programming makes no difference (it is useless yes but > > should be harmless too) in this case but wanted to check with you. > > > > Thanks, > > Lorenzo > > > > > > > > > > > > > > > > > > > Register a PCI bus callback function to handle enable_device() and > > > > > disable_device() operations, setting up the LUT whenever a new PCI device > > > > > is enabled. > > > > > > > > > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > > > > > Signed-off-by: Frank Li <Frank.Li@nxp.com> > > > > > > [...] > > > > > > > > + int err_i, err_m; > > > > > + u32 sid; > > > > > + > > > > > + dev = imx_pcie->pci->dev; > > > > > + > > > > > + target = NULL; > > > > > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > > > > > + if (target) { > > > > > + of_node_put(target); > > > > > + } else { > > > > > + /* > > > > > + * "target == NULL && err_i == 0" means use 1:1 map RID to > > > > > > > > Is it what it means ? Or does it mean that the iommu-map property was found > > > > and RID is out of range ? > > > > > > yes, if this happen, sid_i will be equal to RID. > > > > > > > > > > > Could you point me at a sample dts for this host bridge please ? > > > > > > https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/arch/arm64/boot/dts/freescale/imx95.dtsi > > > > > > /* 0x10~0x17 stream id for pci0 */ > > > iommu-map = <0x000 &smmu 0x10 0x1>, > > > <0x100 &smmu 0x11 0x7>; > > > > > > /* msi part */ > > > msi-map = <0x000 &its 0x10 0x1>, > > > <0x100 &its 0x11 0x7>; > > > > > > > > > > > > + * stream ID. Hardware can't support this because stream ID > > > > > + * only 5bits > > > > > > > > It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. > > > > > > Sorry for typo. it is 6bits. > > > > > > > > > > > > + */ > > > > > + err_i = -EINVAL; > > > > > + } > > > > > + > > > > > + target = NULL; > > > > > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > > > > > + > > > > > + /* > > > > > + * err_m target > > > > > + * 0 NULL Use 1:1 map RID to stream ID, > > > > > > > > Again, is that what it really means ? > > > > > > > > > + * Current hardware can't support it, > > > > > + * So return -EINVAL. > > > > > + * != 0 NULL msi-map not exist, use built-in MSI. > > > > > > > > does not exist. > > > > > > > > > + * 0 != NULL Get correct streamID from RID. > > > > > + * != 0 != NULL Unexisted case, never happen. > > > > > > > > "Invalid combination" > > > > > > > > > + */ > > > > > + if (!err_m && !target) > > > > > + return -EINVAL; > > > > > + else if (target) > > > > > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > > > > > + > > > > > + /* > > > > > + * msi-map iommu-map > > > > > + * N N DWC MSI Ctrl > > > > > + * Y Y ITS + SMMU, require the same sid > > > > > + * Y N ITS > > > > > + * N Y DWC MSI Ctrl + SMMU > > > > > + */ > > > > > + if (err_i && err_m) > > > > > + return 0; > > > > > + > > > > > + if (!err_i && !err_m) { > > > > > + /* > > > > > + * MSI glue layer auto add 2 bits controller ID ahead of stream > > > > > > > > What's "MSI glue layer" ? > > > > > > It is common term for IC desgin, which connect IP's signal to platform with > > > some simple logic. Inside chip, when connect LUT output 6bit streamIDs > > > to MSI controller, there are 2bits hardcode controller ID information > > > append to 6 bits streamID. > > > > > > Glue Layer > > > <==========> > > > ┌─────┐ ┌──────────┐ > > > │ LUT │ 6bit stream ID │ │ > > > │ ┼─────────────────►│ MSI │ > > > └─────┘ 2bit ctrl ID │ │ > > > ┌───────────►│ │ > > > │ │ │ > > > 00 PCIe0 │ │ │ > > > 01 ENETC │ │ │ > > > 10 PCIe1 │ │ │ > > > │ └──────────┘ > > > > > > > > > > > > + * ID, so mask this 2bits to get stream ID. > > > > > + * But IOMMU glue layer doesn't do that. > > > > > > > > and "IOMMU glue layer" ? > > > > > > See above. > > > > > > Frank > > > > > > > > > > > > + */ > > > > > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > > > > > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > > > > > + return -EINVAL; > > > > > + } > > > > > + } > > > > > + > > > > > + sid = sid_i; > > > > > > > > err_i could be != 0 here, I understand that the end result is > > > > fine given how the code is written but it is misleading. > > > > > > > > if (!err_i) > > > > else if (!err_m) > > > > > > Okay > > > > > > > > > > > > + if (!err_m) > > > > > + sid = sid_m & IMX95_SID_MASK; > > > > > + > > > > > + return imx_pcie_add_lut(imx_pcie, rid, sid); > > > > > +} > > > > > + > > > > > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > > > > > +{ > > > > > + struct imx_pcie *imx_pcie; > > > > > + > > > > > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > > > > > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > > > > > +} > > > > > + > > > > > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > > { > > > > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > > > > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > > } > > > > > } > > > > > > > > > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > > > > > + pp->bridge->enable_device = imx_pcie_enable_device; > > > > > + pp->bridge->disable_device = imx_pcie_disable_device; > > > > > + } > > > > > + > > > > > imx_pcie_assert_core_reset(imx_pcie); > > > > > > > > > > if (imx_pcie->drvdata->init_phy) > > > > > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > > > > > imx_pcie->pci = pci; > > > > > imx_pcie->drvdata = of_device_get_match_data(dev); > > > > > > > > > > + mutex_init(&imx_pcie->lock); > > > > > + > > > > > /* Find the PHY if one is defined, only imx7d uses it */ > > > > > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > > > > > if (np) { > > > > > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > > > > > }, > > > > > [IMX95] = { > > > > > .variant = IMX95, > > > > > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > > > > > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > > > > > + IMX_PCIE_FLAG_HAS_LUT, > > > > > .clk_names = imx8mq_clks, > > > > > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > > > > > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > > > > > > > > > -- > > > > > 2.34.1 > > > > >
On Tue, Dec 17, 2024 at 10:25:59AM +0100, Lorenzo Pieralisi wrote: > On Fri, Dec 13, 2024 at 12:20:40PM -0500, Frank Li wrote: > > On Fri, Dec 13, 2024 at 10:32:28AM +0100, Lorenzo Pieralisi wrote: > > > On Thu, Dec 12, 2024 at 12:29:16PM -0500, Frank Li wrote: > > > > On Thu, Dec 12, 2024 at 05:46:09PM +0100, Lorenzo Pieralisi wrote: > > > > > On Tue, Dec 10, 2024 at 05:48:59PM -0500, Frank Li wrote: > > > > > > For the i.MX95, configuration of a LUT is necessary to convert Bus Device > > > > > > Function (BDF) to stream IDs, which are utilized by both IOMMU and ITS. > > > > > > This involves checking msi-map and iommu-map device tree properties to > > > > > > ensure consistent mapping of PCI BDF to the same stream IDs. Subsequently, > > > > > > LUT-related registers are configured. In the absence of an msi-map, the > > > > > > built-in MSI controller is utilized as a fallback. > > > > > > > > > > This is wrong information. What you want to say is that if an msi-map > > > > > isn't detected this means that the platform relies on DWC built-in > > > > > controller for MSIs (that does not need streamIDs handling). > > > > > > > > > > That's quite different from what you are writing here. > > > > > > > > How about ? > > > > > > > > "If an msi-map isn't detected, platform relies on DWC built-in controller > > > > for MSIs that does not need streamdIDs" > > > > > > Right. Question: what happens if DT shows that there are SMMU and/or > > > ITS bindings/mappings but the SMMU driver and ITS driver are either not > > > enabled or have not probed ? > > > > It is little bit complex. > > iommu: > > Case 1: > > iommu{ > > status = "disabled" > > }; > > > > PCI driver normal probed. if RID is in range of iommu-map, not > > any functional impact and harmless. > > If RID is out of range of iommu-map, "false alarm" will return. > > enable PCI EP device failure, but actually it can work without IOMMU. > > What does "false alarm" mean in practice ? PCI device enable fails > but actually it should not ? Yes, you are right. It should work without iommu. but return failure for this case. > That does not look like a false alarm to me. My means: return failure but it should work without iommu. Ideally of_map_id() should return failure when iommu is disabled. It needs more work for that. I think we can improve it later. > > > > > Case 2: > > iommu { > > status = "Okay" > > } > > but iommu driver have not probed yet. PCI Host bridge driver > > should defer till iommu probed. > > > > Worst case is "false alarm". But this happen is very rare if DTS is > > correct. > > Explain what this means. It return failure, but it should return success if "iommu disabled" and "RID is out of iommu-map range". > > > MSI: > > case 1: > > msi-controller { > > status = "disabled"; > > } > > Whole all dwc drivers will be broken. > > What MSI controller. Please make an effort to be precise and explain. For example: ARM its, I use general term here because some other platform such as RISC V have not use ARM ITS. pcie { ... msi-map= <...> ... } DWC common driver will check property "msi-map". if it exist, built-in MSI controller will skip init by history reason. That is also the another reason why Rob don't want us to check these standard property. Without MSI, system will failure back to INTx mode, same to no-msi=yes. But some EP devices require MSI support. Frank > > Thanks, > Lorenzo > > > case 2: > > msi-controller { > > status = "Okay" > > } > > if msi driver have not probed yet, PCI Host bridge driver will > > defer. > > > > Frank > > > > > > > > I assume the LUT programming makes no difference (it is useless yes but > > > should be harmless too) in this case but wanted to check with you`. > > > > > > Thanks, > > > Lorenzo > > > > > > > > > > > > > > > > > > > > > > > > Register a PCI bus callback function to handle enable_device() and > > > > > > disable_device() operations, setting up the LUT whenever a new PCI device > > > > > > is enabled. > > > > > > > > > > > > Acked-by: Richard Zhu <hongxing.zhu@nxp.com> > > > > > > Signed-off-by: Frank Li <Frank.Li@nxp.com> > > > > > > > > [...] > > > > > > > > > > + int err_i, err_m; > > > > > > + u32 sid; > > > > > > + > > > > > > + dev = imx_pcie->pci->dev; > > > > > > + > > > > > > + target = NULL; > > > > > > + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); > > > > > > + if (target) { > > > > > > + of_node_put(target); > > > > > > + } else { > > > > > > + /* > > > > > > + * "target == NULL && err_i == 0" means use 1:1 map RID to > > > > > > > > > > Is it what it means ? Or does it mean that the iommu-map property was found > > > > > and RID is out of range ? > > > > > > > > yes, if this happen, sid_i will be equal to RID. > > > > > > > > > > > > > > Could you point me at a sample dts for this host bridge please ? > > > > > > > > https://github.com/nxp-imx/linux-imx/blob/lf-6.6.y/arch/arm64/boot/dts/freescale/imx95.dtsi > > > > > > > > /* 0x10~0x17 stream id for pci0 */ > > > > iommu-map = <0x000 &smmu 0x10 0x1>, > > > > <0x100 &smmu 0x11 0x7>; > > > > > > > > /* msi part */ > > > > msi-map = <0x000 &its 0x10 0x1>, > > > > <0x100 &its 0x11 0x7>; > > > > > > > > > > > > > > > + * stream ID. Hardware can't support this because stream ID > > > > > > + * only 5bits > > > > > > > > > > It is 5 or 6 bits ? From GENMASK(5, 0) above it should be 6. > > > > > > > > Sorry for typo. it is 6bits. > > > > > > > > > > > > > > > + */ > > > > > > + err_i = -EINVAL; > > > > > > + } > > > > > > + > > > > > > + target = NULL; > > > > > > + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); > > > > > > + > > > > > > + /* > > > > > > + * err_m target > > > > > > + * 0 NULL Use 1:1 map RID to stream ID, > > > > > > > > > > Again, is that what it really means ? > > > > > > > > > > > + * Current hardware can't support it, > > > > > > + * So return -EINVAL. > > > > > > + * != 0 NULL msi-map not exist, use built-in MSI. > > > > > > > > > > does not exist. > > > > > > > > > > > + * 0 != NULL Get correct streamID from RID. > > > > > > + * != 0 != NULL Unexisted case, never happen. > > > > > > > > > > "Invalid combination" > > > > > > > > > > > + */ > > > > > > + if (!err_m && !target) > > > > > > + return -EINVAL; > > > > > > + else if (target) > > > > > > + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ > > > > > > + > > > > > > + /* > > > > > > + * msi-map iommu-map > > > > > > + * N N DWC MSI Ctrl > > > > > > + * Y Y ITS + SMMU, require the same sid > > > > > > + * Y N ITS > > > > > > + * N Y DWC MSI Ctrl + SMMU > > > > > > + */ > > > > > > + if (err_i && err_m) > > > > > > + return 0; > > > > > > + > > > > > > + if (!err_i && !err_m) { > > > > > > + /* > > > > > > + * MSI glue layer auto add 2 bits controller ID ahead of stream > > > > > > > > > > What's "MSI glue layer" ? > > > > > > > > It is common term for IC desgin, which connect IP's signal to platform with > > > > some simple logic. Inside chip, when connect LUT output 6bit streamIDs > > > > to MSI controller, there are 2bits hardcode controller ID information > > > > append to 6 bits streamID. > > > > > > > > Glue Layer > > > > <==========> > > > > ┌─────┐ ┌──────────┐ > > > > │ LUT │ 6bit stream ID │ │ > > > > │ ┼─────────────────►│ MSI │ > > > > └─────┘ 2bit ctrl ID │ │ > > > > ┌───────────►│ │ > > > > │ │ │ > > > > 00 PCIe0 │ │ │ > > > > 01 ENETC │ │ │ > > > > 10 PCIe1 │ │ │ > > > > │ └──────────┘ > > > > > > > > > > > > > > > + * ID, so mask this 2bits to get stream ID. > > > > > > + * But IOMMU glue layer doesn't do that. > > > > > > > > > > and "IOMMU glue layer" ? > > > > > > > > See above. > > > > > > > > Frank > > > > > > > > > > > > > > > + */ > > > > > > + if (sid_i != (sid_m & IMX95_SID_MASK)) { > > > > > > + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); > > > > > > + return -EINVAL; > > > > > > + } > > > > > > + } > > > > > > + > > > > > > + sid = sid_i; > > > > > > > > > > err_i could be != 0 here, I understand that the end result is > > > > > fine given how the code is written but it is misleading. > > > > > > > > > > if (!err_i) > > > > > else if (!err_m) > > > > > > > > Okay > > > > > > > > > > > > > > > + if (!err_m) > > > > > > + sid = sid_m & IMX95_SID_MASK; > > > > > > + > > > > > > + return imx_pcie_add_lut(imx_pcie, rid, sid); > > > > > > +} > > > > > > + > > > > > > +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) > > > > > > +{ > > > > > > + struct imx_pcie *imx_pcie; > > > > > > + > > > > > > + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); > > > > > > + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); > > > > > > +} > > > > > > + > > > > > > static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > > > { > > > > > > struct dw_pcie *pci = to_dw_pcie_from_pp(pp); > > > > > > @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) > > > > > > } > > > > > > } > > > > > > > > > > > > + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { > > > > > > + pp->bridge->enable_device = imx_pcie_enable_device; > > > > > > + pp->bridge->disable_device = imx_pcie_disable_device; > > > > > > + } > > > > > > + > > > > > > imx_pcie_assert_core_reset(imx_pcie); > > > > > > > > > > > > if (imx_pcie->drvdata->init_phy) > > > > > > @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) > > > > > > imx_pcie->pci = pci; > > > > > > imx_pcie->drvdata = of_device_get_match_data(dev); > > > > > > > > > > > > + mutex_init(&imx_pcie->lock); > > > > > > + > > > > > > /* Find the PHY if one is defined, only imx7d uses it */ > > > > > > np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); > > > > > > if (np) { > > > > > > @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { > > > > > > }, > > > > > > [IMX95] = { > > > > > > .variant = IMX95, > > > > > > - .flags = IMX_PCIE_FLAG_HAS_SERDES, > > > > > > + .flags = IMX_PCIE_FLAG_HAS_SERDES | > > > > > > + IMX_PCIE_FLAG_HAS_LUT, > > > > > > .clk_names = imx8mq_clks, > > > > > > .clks_cnt = ARRAY_SIZE(imx8mq_clks), > > > > > > .ltssm_off = IMX95_PE0_GEN_CTRL_3, > > > > > > > > > > > > -- > > > > > > 2.34.1 > > > > > >
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index c8d5c90aa4d45..d325f4fb279c8 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -55,6 +55,22 @@ #define IMX95_PE0_GEN_CTRL_3 0x1058 #define IMX95_PCIE_LTSSM_EN BIT(0) +#define IMX95_PE0_LUT_ACSCTRL 0x1008 +#define IMX95_PEO_LUT_RWA BIT(16) +#define IMX95_PE0_LUT_ENLOC GENMASK(4, 0) + +#define IMX95_PE0_LUT_DATA1 0x100c +#define IMX95_PE0_LUT_VLD BIT(31) +#define IMX95_PE0_LUT_DAC_ID GENMASK(10, 8) +#define IMX95_PE0_LUT_STREAM_ID GENMASK(5, 0) + +#define IMX95_PE0_LUT_DATA2 0x1010 +#define IMX95_PE0_LUT_REQID GENMASK(31, 16) +#define IMX95_PE0_LUT_MASK GENMASK(15, 0) + +#define IMX95_SID_MASK GENMASK(5, 0) +#define IMX95_MAX_LUT 32 + #define to_imx_pcie(x) dev_get_drvdata((x)->dev) enum imx_pcie_variants { @@ -87,6 +103,7 @@ enum imx_pcie_variants { * workaround suspend resume on some devices which are affected by this errata. */ #define IMX_PCIE_FLAG_BROKEN_SUSPEND BIT(9) +#define IMX_PCIE_FLAG_HAS_LUT BIT(10) #define imx_check_flag(pci, val) (pci->drvdata->flags & val) @@ -139,6 +156,9 @@ struct imx_pcie { struct device *pd_pcie_phy; struct phy *phy; const struct imx_pcie_drvdata *drvdata; + + /* Ensure that only one device's LUT is configured at any given time */ + struct mutex lock; }; /* Parameters for the waiting for PCIe PHY PLL to lock on i.MX7 */ @@ -930,6 +950,162 @@ static void imx_pcie_stop_link(struct dw_pcie *pci) imx_pcie_ltssm_disable(dev); } +static int imx_pcie_add_lut(struct imx_pcie *imx_pcie, u16 rid, u8 sid) +{ + struct dw_pcie *pci = imx_pcie->pci; + struct device *dev = pci->dev; + u32 data1, data2; + int free = -1; + int i; + + if (sid >= 64) { + dev_err(dev, "Invalid SID for index %d\n", sid); + return -EINVAL; + } + + guard(mutex)(&imx_pcie->lock); + + /* + * Iterate through all LUT entries to check for duplicate RID and + * identify the first available entry. Configure this available entry + * immediately after verification to avoid rescanning it. + */ + for (i = 0; i < IMX95_MAX_LUT; i++) { + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, IMX95_PEO_LUT_RWA | i); + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, &data1); + + if (!(data1 & IMX95_PE0_LUT_VLD)) { + if (free < 0) + free = i; + continue; + } + + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, &data2); + + /* Do not add duplicate RID */ + if (rid == FIELD_GET(IMX95_PE0_LUT_REQID, data2)) { + dev_warn(dev, "Existing LUT entry available for RID (%d)", rid); + return 0; + } + } + + if (free < 0) { + dev_err(dev, "LUT entry is not available\n"); + return -ENOSPC; + } + + data1 = FIELD_PREP(IMX95_PE0_LUT_DAC_ID, 0); + data1 |= FIELD_PREP(IMX95_PE0_LUT_STREAM_ID, sid); + data1 |= IMX95_PE0_LUT_VLD; + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, data1); + + data2 = IMX95_PE0_LUT_MASK; /* Match all bits of RID */ + data2 |= FIELD_PREP(IMX95_PE0_LUT_REQID, rid); + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, data2); + + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, free); + + return 0; +} + +static void imx_pcie_remove_lut(struct imx_pcie *imx_pcie, u16 rid) +{ + u32 data2; + int i; + + guard(mutex)(&imx_pcie->lock); + + for (i = 0; i < IMX95_MAX_LUT; i++) { + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, IMX95_PEO_LUT_RWA | i); + regmap_read(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, &data2); + if (FIELD_GET(IMX95_PE0_LUT_REQID, data2) == rid) { + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA1, 0); + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_DATA2, 0); + regmap_write(imx_pcie->iomuxc_gpr, IMX95_PE0_LUT_ACSCTRL, i); + + break; + } + } +} + +static int imx_pcie_enable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) +{ + struct imx_pcie *imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); + u32 sid_i, sid_m, rid = pci_dev_id(pdev); + struct device_node *target; + struct device *dev; + int err_i, err_m; + u32 sid; + + dev = imx_pcie->pci->dev; + + target = NULL; + err_i = of_map_id(dev->of_node, rid, "iommu-map", "iommu-map-mask", &target, &sid_i); + if (target) { + of_node_put(target); + } else { + /* + * "target == NULL && err_i == 0" means use 1:1 map RID to + * stream ID. Hardware can't support this because stream ID + * only 5bits + */ + err_i = -EINVAL; + } + + target = NULL; + err_m = of_map_id(dev->of_node, rid, "msi-map", "msi-map-mask", &target, &sid_m); + + /* + * err_m target + * 0 NULL Use 1:1 map RID to stream ID, + * Current hardware can't support it, + * So return -EINVAL. + * != 0 NULL msi-map not exist, use built-in MSI. + * 0 != NULL Get correct streamID from RID. + * != 0 != NULL Unexisted case, never happen. + */ + if (!err_m && !target) + return -EINVAL; + else if (target) + of_node_put(target); /* Find stream ID map entry for RID in msi-map */ + + /* + * msi-map iommu-map + * N N DWC MSI Ctrl + * Y Y ITS + SMMU, require the same sid + * Y N ITS + * N Y DWC MSI Ctrl + SMMU + */ + if (err_i && err_m) + return 0; + + if (!err_i && !err_m) { + /* + * MSI glue layer auto add 2 bits controller ID ahead of stream + * ID, so mask this 2bits to get stream ID. + * But IOMMU glue layer doesn't do that. + */ + if (sid_i != (sid_m & IMX95_SID_MASK)) { + dev_err(dev, "iommu-map and msi-map entries mismatch!\n"); + return -EINVAL; + } + } + + sid = sid_i; + if (!err_m) + sid = sid_m & IMX95_SID_MASK; + + return imx_pcie_add_lut(imx_pcie, rid, sid); +} + +static void imx_pcie_disable_device(struct pci_host_bridge *bridge, struct pci_dev *pdev) +{ + struct imx_pcie *imx_pcie; + + imx_pcie = to_imx_pcie(to_dw_pcie_from_pp(bridge->sysdata)); + imx_pcie_remove_lut(imx_pcie, pci_dev_id(pdev)); +} + static int imx_pcie_host_init(struct dw_pcie_rp *pp) { struct dw_pcie *pci = to_dw_pcie_from_pp(pp); @@ -946,6 +1122,11 @@ static int imx_pcie_host_init(struct dw_pcie_rp *pp) } } + if (pp->bridge && imx_check_flag(imx_pcie, IMX_PCIE_FLAG_HAS_LUT)) { + pp->bridge->enable_device = imx_pcie_enable_device; + pp->bridge->disable_device = imx_pcie_disable_device; + } + imx_pcie_assert_core_reset(imx_pcie); if (imx_pcie->drvdata->init_phy) @@ -1330,6 +1511,8 @@ static int imx_pcie_probe(struct platform_device *pdev) imx_pcie->pci = pci; imx_pcie->drvdata = of_device_get_match_data(dev); + mutex_init(&imx_pcie->lock); + /* Find the PHY if one is defined, only imx7d uses it */ np = of_parse_phandle(node, "fsl,imx7d-pcie-phy", 0); if (np) { @@ -1627,7 +1810,8 @@ static const struct imx_pcie_drvdata drvdata[] = { }, [IMX95] = { .variant = IMX95, - .flags = IMX_PCIE_FLAG_HAS_SERDES, + .flags = IMX_PCIE_FLAG_HAS_SERDES | + IMX_PCIE_FLAG_HAS_LUT, .clk_names = imx8mq_clks, .clks_cnt = ARRAY_SIZE(imx8mq_clks), .ltssm_off = IMX95_PE0_GEN_CTRL_3,