Skip to contentSkip to conversation

net: enetc: S32N79 pseudo-MAC (PPM) networking support

PATCH New Claudiu Manoil 2 participants 9 messages Nov 13 – Nov 14

Subsystems (6)
lore
Share & tools
lore

Claudiu Manoil

author maintainer
#0 lore raw

v4 cover net: enetc: S32N79 pseudo-MAC (PPM) networking support

This series adds networking support for the ENETCv4.4 pseudo-MAC (PPM) ports found on the NXP S32N79 SoC. On S32N79, the ENETCv4 ports are not wired to any external PHY/MII; instead they are internal "pseudo-MAC" links into the on-chip NETC switch. These links are proprietary, expose no standard IEEE interface, and run at a speed fixed at boot time by the Port PCR[PSPEED] register.

A key use case is a port that has no "ethernet" DT node at all: NETC is reached over PCI from a host that probes the ENETC, while the internal NETC switch it connects to is not owned by Linux. Such a port must have its fixed link synthesized at probe time.

The driver synthesizes the fixed link directly in C using an of_changeset:
of_changeset_create_node() adds a "fixed-link" subnode onto the PCI function's dynamic OF node (CONFIG_PCI_DYNAMIC_OF_NODES), with the "speed" property read from PCR[PSPEED] at probe time and "full-duplex" set. phylink then picks up the fixed-link node through dev_fwnode().

The series touches three subsystems:
- net/enetc: pseudo-MAC fixed-link support, probing of 4.4 devices and a fix for more than 6 ring interrupt vectors
- arm64 dts: NETC IEP18 ECAM node on S32N79 and its RDB board enable
- PCI: a quirk creating the OF node for the ENETC PMAC functions

Because this is primarily a networking feature and the pieces are interdependent at runtime, it would be most convenient to merge the whole series through the netdev tree.

Patch 1 has a runtime (not Kconfig) dependency on CONFIG_PCI_DYNAMIC_OF_NODES; absent that, the pseudo-MAC probe path fails gracefully with -ENODEV.

v4:
- Patch 1: made NXP_ENETC4 depend on OF, as OF_DYNAMIC is only available with OF; improved the commit message.
- Patch 2: new, allocates the int_vector array dynamically to prevent an out-of-bounds access on S32N79.
- Patch 3: clarified the commit message.
- Patches 4-6: no changes.
v3:
- Patch 1: fixed the CONFIG_OF_DYNAMIC dependency, refactored enetc4_add_ppm_fixed_link() as per Wei's feedback, and improved the commit message.
- Patch 3: added sysclk_freq info for the v4.4 ENETC devices.
- Patches 4-6: no changes.
v2:
- Switched the fixed-link patch from a DT overlay blob (of_overlay_fdt_apply() + a .dtso compiled to .dtbo) to of_changeset_create_node(), per review feedback. This drops the embedded overlay externs, the Makefile .dtbo wrapping, and the OF_OVERLAY Kconfig dependency. The operating speed is now baked directly into the changeset-created fixed-link node (read once from PCR[PSPEED] at probe time); the phylink get_fixed_state callback is no longer needed and was removed.
- Described why there are two ENETC PF IDs in the commit message, as per review.
- Replaced the 'msi-parent' stub property with 'msi-map', as per H/W spec.
- Reworded the PCI patch commit message to match the fixed-link approach (no functional change); added Bjorn's Acked-by.
v1: initial submission.

Claudiu Manoil (6):
net: enetc: Add pseudo-MAC support for ENETCv4 Ports via a fixed-link
node
net: enetc: Allocate int_vector array dynamically
net: enetc: Enable probing of version 4.4 devices
arm64: dts: s32n79: add NETC IEP18 ECAM node for ENETC PPM ports
arm64: dts: s32n79-rdb: enable NETC IEP18
PCI: Create OF node for NXP ENETC pseudo-MAC functions

 arch/arm64/boot/dts/freescale/s32n79-rdb.dts  |   4 +
 arch/arm64/boot/dts/freescale/s32n79.dtsi     |  24 ++++
 drivers/net/ethernet/freescale/enetc/Kconfig  |   2 +
 drivers/net/ethernet/freescale/enetc/enetc.c  |  34 ++++++
 drivers/net/ethernet/freescale/enetc/enetc.h  |   3 +-
 .../net/ethernet/freescale/enetc/enetc4_pf.c  | 109 +++++++++++++++++-
 .../net/ethernet/freescale/enetc/enetc_hw.h   |   4 +-
 .../net/ethernet/freescale/enetc/enetc_pf.h   |   2 +
 .../freescale/enetc/enetc_pf_common.c         |  41 ++++++-
 .../freescale/enetc/enetc_pf_common.h         |   1 +
 drivers/pci/quirks.c                          |   2 +
 11 files changed, 214 insertions(+), 12 deletions(-)
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH v4 1/6 net: enetc: Add pseudo-MAC support for ENETCv4 Ports via a fixed-link node

ENETCv4 has special internal links when connected to the on-chip NETC switch via internal switch ports, called pseudo-MAC links. These pseudo-MACs are proprietary, they don't implement any standard IEEE interface (like MII), and can be modeled as fixed links with the link speed determined at boot time by the Port PCR[PSPEED] register configuration.

We also need to be able to probe the ENETCv4 Ports featuring pseudo-MACs as pure PCI devices, i.e. without any "ethernet" DT node representation. The typical use case for this consists in a board with NETC connected via PCI to another host which probes the ENETC. Note that in this scenario, the pseudo-MAC ENETCs are connected internally to a NETC switch that is not owned by Linux.

Since such a port has no "ethernet" DT node, its fixed link has to be synthesized at probe time. Build the fixed-link subnode directly in C with an of_changeset: of_changeset_create_node() adds a "fixed-link" node onto the port's own OF node, and of_changeset_add_prop_*() populate its "speed" and "full-duplex" properties. The changeset is applied with of_changeset_apply(), so the fixed-link node is spliced onto the ENETC netdev's fwnode exactly as if it had come from static DT, and phylink picks it up through dev_fwnode().

The operating speed written into the node is read from PCR[PSPEED] at probe time and mapped to a phylink-supported value, so the fixed link reflects the actual boot-time configuration, as long as it's a phylink supported value. Otherwise, PCR[PSPEED] will be updated to the closest rounded down supported value.

The pseudo-MAC path is selected when the port has no OF node, or when it only has the empty PCI-synthesized node (OF_DYNAMIC), which carries no fixed-link description. Ports described by static DT take the regular of_get_phy_mode() path instead.

Building the fixed-link node requires the of_changeset API, which is only available with CONFIG_OF_DYNAMIC, so select it. As OF_DYNAMIC itself depends on OF, make NXP_ENETC4 depend on OF as well, rather than force OF_DYNAMIC on without the core OF code being built.

The changeset is reverted and destroyed on teardown and on the probe error unwind. The node-less pseudo-MAC path has a runtime dependency on CONFIG_PCI_DYNAMIC_OF_NODES: that is what makes the PCI core synthesize the per-function OF node (of_pci_make_dev_node()) that the fixed-link node is attached onto. This is intentionally not a hard Kconfig dependency, since the ENETC4 driver also serves regular ports described by static DT; when PCI_DYNAMIC_OF_NODES is absent the PCI function has no of_node and the pseudo-MAC probe path fails gracefully with a clear -ENODEV error.

---
v4:
- Made NXP_ENETC4 depend on OF, since OF_DYNAMIC (selected for the of_changeset API) is only available with OF; added to the commit message. Reported by the kernel test robot on v2 and in review.

v3:
- Fixed the CONFIG_OF_DYNAMIC dependency.
- Refactored enetc4_add_ppm_fixed_link(), as per Wei's feedback.
- Improved the commit message.

v2:
- Switched from a DT overlay blob (of_overlay_fdt_apply() + a .dtso compiled to .dtbo) to of_changeset_create_node(), per review feedback. Drops the embedded overlay externs, the Makefile .dtbo wrapping, and the OF_OVERLAY Kconfig dependency.
- Baked the operating speed directly into the changeset-created fixed-link node (read once from PCR[PSPEED] at probe time); the phylink get_fixed_state callback is no longer needed and was removed.

 drivers/net/ethernet/freescale/enetc/Kconfig  |   2 +
 .../net/ethernet/freescale/enetc/enetc4_pf.c  | 109 +++++++++++++++++-
 .../net/ethernet/freescale/enetc/enetc_pf.h   |   2 +
 .../freescale/enetc/enetc_pf_common.c         |  41 ++++++-
 .../freescale/enetc/enetc_pf_common.h         |   1 +
 5 files changed, 146 insertions(+), 9 deletions(-)
drivers/net/ethernet/freescale/enetc/Kconfig +2 -0
index f425f82a6213..465c913683c8 100644
@@ -49,12 +49,14 @@ config NXP_ENETC4
 	tristate "ENETC4 PF driver"
 	depends on PTP_1588_CLOCK_OPTIONAL
 	depends on PCI_MSI
+	depends on OF
 	select FSL_ENETC_CORE
 	select FSL_ENETC_MDIO
 	select NXP_ENETC_PF_COMMON
 	select NXP_NTMP
 	select PHYLINK
 	select DIMLIB
+	select OF_DYNAMIC
 	help
 	  This driver supports NXP ENETC devices with major revision 4. ENETC is
 	  as the NIC functionality in NETC, it supports virtualization/isolation
drivers/net/ethernet/freescale/enetc/enetc4_pf.c +103 -6

152 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_pf.h +2 -0
index 1f92d16d8ca8..ab11e40cfdbb 100644
@@ -67,6 +67,8 @@ struct enetc_pf {
 	bool sriov_enabled;
 	bool link_up;
 	u16 link_status_ms_mask;
+
+	struct of_changeset *ppm_ocs; /* pseudo-MAC fixed-link changeset */
 };
 
 #define phylink_to_enetc_pf(config) \
drivers/net/ethernet/freescale/enetc/enetc_pf_common.c +38 -3

53 lines not on this page · raw message

drivers/net/ethernet/freescale/enetc/enetc_pf_common.h +1 -0
index c9eed879d5a3..aede1aad6362 100644
@@ -13,6 +13,7 @@ void enetc_mdiobus_destroy(struct enetc_pf *pf);
 int enetc_phylink_create(struct enetc_ndev_priv *priv, struct device_node *node,
 			 const struct phylink_mac_ops *ops);
 void enetc_phylink_destroy(struct enetc_ndev_priv *priv);
+int enetc_phylink_match_pseudo_mac_speed(int speed);
 void enetc_set_default_rss_key(struct enetc_pf *pf);
 int enetc_vlan_rx_add_vid(struct net_device *ndev, __be16 prot, u16 vid);
 int enetc_vlan_rx_del_vid(struct net_device *ndev, __be16 prot, u16 vid);
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH net-next v4 1/6] net: enetc: Add pseudo-MAC support for ENETCv4 Ports via a fixed-link node

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider: - [Medium] net: enetc: enetc_phylink_match_pseudo_mac_speed() returns

Thank you for your contribution! Sashiko AI review found 1 potential issue to consider:
- [Medium] net: enetc: enetc_phylink_match_pseudo_mac_speed() returns

Quoted 1 line

10G fixed-link

--

commit 15e36db0338302292004a6cbf3727d8f9d63565f
Author: Claudiu Manoil <[email protected]>

net: enetc: Add pseudo-MAC support for ENETCv4 Ports via a fixed-link node

This commit adds pseudo-MAC support for ENETCv4 ports lacking static DT nodes by synthesizing a fixed-link DT subnode at probe time with the speed derived from PCR[PSPEED].

Quoted 34 lines
drivers/net/ethernet/freescale/enetc/enetc_pf_common.c +26 -0
index 8facc8bf8693a..b032b586f07b4 100644
@@ -436,6 +436,43 @@ void enetc_mdiobus_destroy(struct enetc_pf *pf)
 }
 EXPORT_SYMBOL_GPL(enetc_mdiobus_destroy);
 
+static struct {
+	unsigned long mac_cap;
+	int speed; /* descending order sorted  */
+} enetc_phylink_pseudo_mac_caps[] = {
+	{ MAC_25000FD,  SPEED_25000 },
+	{ MAC_20000FD,  SPEED_20000 },
+	{ MAC_10000FD,  SPEED_10000 },
+	{ MAC_5000FD,   SPEED_5000  },
+	{ MAC_2500FD,   SPEED_2500  },
+	{ MAC_1000FD,   SPEED_1000  },
+	{ MAC_100FD,    SPEED_100   },
+	{ MAC_10FD,     SPEED_10    },
+};
+
+static unsigned long enetc_phylink_get_pseudo_mac_caps(void)
+{
+	unsigned long mac_caps = 0;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(enetc_phylink_pseudo_mac_caps); i++)
+		mac_caps |= enetc_phylink_pseudo_mac_caps[i].mac_cap;
+
+	return mac_caps;
+}
+
+int enetc_phylink_match_pseudo_mac_speed(int speed)

drivers/net/ethernet/freescale/enetc/enetc_pf_common.c void enetc_mdiobus_destroy(struct enetc_pf *pf) · line 474

Quoted 10 lines
drivers/net/ethernet/freescale/enetc/enetc_pf_common.c +10 -0
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(enetc_phylink_pseudo_mac_caps); i++)
+		if (enetc_phylink_pseudo_mac_caps[i].speed <= speed)
+			return enetc_phylink_pseudo_mac_caps[i].speed;
+
+	return SPEED_UNKNOWN;
+}
+EXPORT_SYMBOL_GPL(enetc_phylink_match_pseudo_mac_speed);

[Severity: Medium]
Can phylink_parse_fixedlink() handle SPEED_20000 or SPEED_25000 when enetc4_add_ppm_fixed_link() writes the result of enetc_phylink_match_pseudo_mac_speed() into the fixed-link DT node?

When PCR[PSPEED] is configured for 20 Gbps or 25 Gbps at boot, enetc_phylink_match_pseudo_mac_speed() returns 20000 or 25000, but phylink_fill_fixedlink_supported() only populates linkmodes up to 10000baseT_Full:

drivers/net/phy/phylink.c:phylink_fill_fixedlink_supported() {
    ...
	linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, supported);
	linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, supported);
	linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, supported);
}

As a result, phy_caps_lookup() in phylink_parse_fixedlink() returns NULL, triggering a phylink warning ("fixed link full duplex 20000Mbps not recognised") and leaving pl->supported, pl->link_config.advertising, and pl->link_config.lp_advertising with no speed linkmode bits set.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
author maintainer
#3 lore raw

PATCH v4 2/6 net: enetc: Allocate int_vector array dynamically

In reply to Claudiu Manoil

The number of Rx/Tx ring interrupt vectors, priv->bdr_int_num, is set in enetc_init_si_rings_params() to the lesser of the number of online CPUs and the number of Rx rings of the station interface. The int_vector[] array in struct enetc_ndev_priv, however, has a fixed size of ENETC_MAX_BDR_INT (6), a limit that dates back to the maximum CPU count of the SoCs integrating ENETC at the time.

That assumption does not hold for S32N79, which has 8 CPUs and gives the ENETC PF up to 8 Rx rings. There, bdr_int_num can reach 8, and enetc_alloc_msix() writes priv->int_vector[i] past the end of the array, corrupting the adjacent fields of the netdev private area. No SoC currently supported upstream exceeds 6 vectors, so this is not reachable today; it must be fixed before S32N79 devices can be enabled by a following patch.

Allocate int_vector[] with devm_kcalloc() in enetc_alloc_msix(), once bdr_int_num is known. The memory is released together with the PCI device, so no explicit free is needed on the error or teardown paths. This is common code, so the PF and VF drivers benefit alike. Drop the ENETC_MAX_BDR_INT define, which only existed to size this array.

---
v4:
- New patch. Prevents an out-of-bounds access to priv->int_vector[] when bdr_int_num exceeds 6, as is the case on S32N79, as requested in review.

 drivers/net/ethernet/freescale/enetc/enetc.c | 8 ++++++++
 drivers/net/ethernet/freescale/enetc/enetc.h | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/freescale/enetc/enetc.c +8 -0
index c6571b5cc842..855b2d3b8718 100644
@@ -3641,6 +3641,13 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv)
 	if (n != nvec)
 		return -EPERM;
 
+	priv->int_vector = devm_kcalloc(&pdev->dev, priv->bdr_int_num,
+					sizeof(*priv->int_vector), GFP_KERNEL);
+	if (!priv->int_vector) {
+		err = -ENOMEM;
+		goto fail_int_vector;
+	}
+
 	/* # of tx rings per int vector */
 	v_tx_rings = priv->num_tx_rings / priv->bdr_int_num;
 	v_remainder = priv->num_tx_rings % priv->bdr_int_num;
@@ -3676,6 +3683,7 @@ int enetc_alloc_msix(struct enetc_ndev_priv *priv)
 	while (i--)
 		enetc_int_vector_destroy(priv, i);
 
+fail_int_vector:
 	pci_free_irq_vectors(pdev);
 
 	return err;
drivers/net/ethernet/freescale/enetc/enetc.h +1 -2
index d9e91832a9c1..689ad82b2949 100644
@@ -407,7 +407,6 @@ struct enetc_cls_rule {
 	int used;
 };
 
-#define ENETC_MAX_BDR_INT	6 /* fixed to max # of available cpus */
 struct psfp_cap {
 	u32 max_streamid;
 	u32 max_psfp_filter;
@@ -456,7 +455,7 @@ struct enetc_ndev_priv {
 	struct enetc_si *si;
 
 	int bdr_int_num; /* number of Rx/Tx ring interrupts */
-	struct enetc_int_vector *int_vector[ENETC_MAX_BDR_INT];
+	struct enetc_int_vector **int_vector;
 	u16 num_rx_rings, num_tx_rings;
 	u16 rx_bd_count, tx_bd_count;
 
Signature · 1 line
2.34.1
author maintainer
#4 lore raw

PATCH v4 3/6 net: enetc: Enable probing of version 4.4 devices

In reply to Claudiu Manoil

This commit adds driver data and platform info entries for ENETC v4.4 PF and VF devices on S32N79 SoCs with a 500 MHz system clock frequency.

The ENETC v4.4 devices are present on S32N79 SoCs and feature only Pseudo-MAC ENETC ports, whose PFs use either the 0xe101 or the 0xe110 PCI device ID, and the VFs answer to the usual device ID of 0xef00.

While the ENETC PF instances are usually designated by the 0xe101 ID, in newer IP versions the 0xe110 ID was introduced to indicate the power-on reset default NETC switch management interface. These IDs do not indicate any functional difference between the designated ENETC instances, and can be interchanged and re-assigned at boot time (i.e. from firmware).

---
v4:
- Added a leading sentence to the commit message, stating that the patch adds driver data and platform info entries for ENETC v4.4 devices with a 500 MHz system clock frequency.

v3:
- Added sysclk_freq info for the v4.4 ENETC devices.

v2:
- Described why there are two ENETC PF IDs in the commit message, as per review.

 drivers/net/ethernet/freescale/enetc/enetc.c  | 26 +++++++++++++++++++
 .../net/ethernet/freescale/enetc/enetc_hw.h   |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc.c +26 -0
index 855b2d3b8718..e3aa117d323d 100644
@@ -3840,6 +3840,20 @@ static const struct enetc_drvdata enetc4_vf_data = {
 	.eth_ops = &enetc_vf_ethtool_ops,
 };
 
+static const struct enetc_drvdata enetc4_s32n79_ppm_data = {
+	.sysclk_freq = ENETC_CLK_500M,
+	.tx_csum = true,
+	.max_frags = ENETC4_MAX_SKB_FRAGS,
+	.eth_ops = &enetc4_ppm_ethtool_ops,
+};
+
+static const struct enetc_drvdata enetc4_s32n79_vf_data = {
+	.sysclk_freq = ENETC_CLK_500M,
+	.tx_csum = true,
+	.max_frags = ENETC4_MAX_SKB_FRAGS,
+	.eth_ops = &enetc_vf_ethtool_ops,
+};
+
 static const struct enetc_platform_info enetc_info[] = {
 	{ .revision = ENETC_REV_1_0,
 	  .dev_id = ENETC_DEV_ID_PF,
@@ -3870,6 +3884,18 @@ static const struct enetc_platform_info enetc_info[] = {
 	  .dev_id = NXP_ENETC_VF_DEV_ID,
 	  .data = &enetc4_vf_data,
 	},
+	{ .revision = ENETC_REV_4_4,
+	  .dev_id = NXP_ENETC_PPM_DEV_ID,
+	  .data = &enetc4_s32n79_ppm_data,
+	},
+	{ .revision = ENETC_REV_4_4,
+	  .dev_id = NXP_ENETC_PF_DEV_ID,
+	  .data = &enetc4_s32n79_ppm_data,
+	},
+	{ .revision = ENETC_REV_4_4,
+	  .dev_id = NXP_ENETC_VF_DEV_ID,
+	  .data = &enetc4_s32n79_vf_data,
+	},
 };
 
 int enetc_get_driver_data(struct enetc_si *si)
drivers/net/ethernet/freescale/enetc/enetc_hw.h +3 -1
index 2c9d9042eb0b..8e6a9d366d40 100644
@@ -414,6 +414,7 @@ enum enetc_bdr_type {TX, RX};
 #define ENETC_REV_1_0		0x0100
 #define ENETC_REV_4_1		0X0401
 #define ENETC_REV_4_3		0x0403
+#define ENETC_REV_4_4		0x0404
 
 #define ENETC_G_EIPBRR1		0x0bfc
 #define ENETC_G_EPFBLPR(n)	(0xd00 + 4 * (n))
@@ -1048,8 +1049,9 @@ struct enetc_cbd {
 	u8 status_flags;
 };
 
-#define ENETC_CLK_400M		400000000ULL
 #define ENETC_CLK_333M		333000000ULL
+#define ENETC_CLK_400M		400000000ULL
+#define ENETC_CLK_500M		500000000ULL
 
 static inline u32 enetc_cycles_to_usecs(u32 cycles, u64 clk_freq)
 {
Signature · 1 line
2.34.1
author maintainer
#5 lore raw

PATCH v4 4/6 arm64: dts: s32n79: add NETC IEP18 ECAM node for ENETC PPM ports

In reply to Claudiu Manoil

Add the netc_iep18 PCIe ECAM host node describing the NETC integrated endpoint bus allocated to the first Linux cohort on S32N79. The bus is enumerated via the generic pci-host-ecam-generic driver and hosts the ENETC v4 Pseudo-MAC (PPM) PF and its VFs, which connect internally to the on-chip NETC switch (not owned by Linux).

The node is kept disabled at the SoC level; boards that wire up NETC enable it. MSIs are routed through the GIC-v3 ITS (msi-map) and DMA is translated by the SMMUv3 (iommu-map).

---
v4: none
v3: none

v2:
- Replaced the 'msi-parent' stub property with 'msi-map', as per H/W spec.

 arch/arm64/boot/dts/freescale/s32n79.dtsi | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)
arch/arm64/boot/dts/freescale/s32n79.dtsi +24 -0
index 94ab58783fdc..65cf65e82832 100644
@@ -122,6 +122,30 @@ irqsteer_coss: interrupt-controller@4ed00000 {
 		};
 	};
 
+	nwss-bus {
+		compatible = "simple-bus";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges = <0x0 0x48800000 0x0 0x48800000 0x0 0x4b0000>,
+			 <0x2 0x40000000 0x2 0x40000000 0x0 0x20000000>;
+
+		netc_iep18: pcie@241200000 {
+			compatible = "pci-host-ecam-generic";
+			reg = <0x2 0x41200000 0x0 0x100000>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+			device_type = "pci";
+			bus-range = <0x0 0x0>;
+			iommu-map = <0x0 &smmu 0xc0000 0x100>;
+			msi-map = <0x0 &its 0xc0000 0x100>;
+			dma-coherent;
+			status = "disabled";
+
+			/* All NETC PCIe functions */
+			ranges = <0x82000000 0x0 0x48800000 0x0 0x48800000 0x0 0x4b0000>;
+		};
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
Signature · 1 line
2.34.1
author maintainer
#6 lore raw

PATCH v4 5/6 arm64: dts: s32n79-rdb: enable NETC IEP18

In reply to Claudiu Manoil

Enable the NETC v4 ECAM bus #18 on the S32N79-RDB board so that the ENETC v4 Pseudo-MAC port (PPM) PF and VF instances are probed.

---
v4: none
v3: none
v2: none

 arch/arm64/boot/dts/freescale/s32n79-rdb.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/freescale/s32n79-rdb.dts +4 -0
index 1feccd61258e..897ba24ac03a 100644
@@ -68,3 +68,7 @@ &usdhc0 {
 	no-sdio;
 	status = "okay";
 };
+
+&netc_iep18 {
+	status = "okay";
+};
Signature · 1 line
2.34.1
author maintainer
#7 lore raw

PATCH v4 6/6 PCI: Create OF node for NXP ENETC pseudo-MAC functions

In reply to Claudiu Manoil

NXP ENETCv4 pseudo-MAC (PPM) ports can be probed as pure PCI endpoints, without any "ethernet" node in the static device tree. The ENETC4 driver describes their fixed link by attaching a fixed-link node to the PCI function's own OF node, which requires that node to exist.

Request the PCI core to synthesize a per-function OF node for these devices by registering of_pci_make_dev_node() as a final fixup, following the existing precedent for the Xilinx, Red Hat and EFAR devices. The helper is a no-op when the function already has a static OF node, so this has no effect on platforms that describe ENETC via static DT. It only takes effect when CONFIG_PCI_DYNAMIC_OF_NODES is enabled.

Both ENETC4 PCI device IDs are covered (0xe101 and 0xe110), since either can be instantiated as a pseudo-MAC port on S32N79.

---
v4: none
v3: none
v2: none (reworded the overlay reference to match patch 1's fixed-link
approach; no functional change)

 drivers/pci/quirks.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/pci/quirks.c +2 -0
index 7f1f47ea2ee4..71f272d8a296 100644
@@ -6563,6 +6563,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_XILINX, 0x5021, of_pci_make_dev_node);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_REDHAT, 0x0005, of_pci_make_dev_node);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_EFAR, 0x9660, of_pci_make_dev_node);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_TOSHIBA, 0x0220, of_pci_make_dev_node);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_PHILIPS, 0xe101, of_pci_make_dev_node);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_PHILIPS, 0xe110, of_pci_make_dev_node);
 
 /*
  * Devices known to require a longer delay before first config space access
Signature · 1 line
2.34.1
#8 lore raw

Re: [PATCH net-next v4 6/6] PCI: Create OF node for NXP ENETC pseudo-MAC functions

Sashiko has reviewed this patch and found no issues.
Quoted 12 lines

NXP ENETCv4 pseudo-MAC (PPM) ports can be probed as pure PCI endpoints, without any "ethernet" node in the static device tree. The ENETC4 driver describes their fixed link by attaching a fixed-link node to the PCI function's own OF node, which requires that node to exist.

Request the PCI core to synthesize a per-function OF node for these devices by registering of_pci_make_dev_node() as a final fixup, following the existing precedent for the Xilinx, Red Hat and EFAR devices. The helper is a no-op when the function already has a static OF node, so this has no effect on platforms that describe ENETC via static DT. It only takes effect when CONFIG_PCI_DYNAMIC_OF_NODES is enabled.

Quoted 4 lines

Both ENETC4 PCI device IDs are covered (0xe101 and 0xe110), since either can be instantiated as a pseudo-MAC port on S32N79.

Sashiko has reviewed this patch and found no issues.

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6