From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from twmbx01.aspeedtech.com (mail.aspeedtech.com [211.20.114.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05D0849D590; Thu, 15 Oct 2026 06:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=211.20.114.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792046836; cv=none; b=iFLf0wNoDPGsK3xnN7bhfBnm+llokneEXzcGHEJP/++u/XP5IYgfwt0bPO0M4M0eO6lo7ElvMP/e+S26AByp93DBx2wK/KcZmBcPNr5XPM4pbo4Nf294H+63b+AtJds4fvq67CTkEHnXOXd2bmKAUbW+vSMYcuyTyBZ213ox/dg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792046836; c=relaxed/simple; bh=QOof8Ln5197tONi246cNMG5Jj+NA5lrKsaTcXlkqcQ8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=mmRHbIk4vj4++4EZuESkvjIueg8qwwF7Ne/XhJMYL9GzkrMWhewbilO6ODF9Az2CZmS/MzZPjJZs2jkiEw7wu2UeyuCKW80/WuvjiUp6ajOzIvtjcDvqaKl+XqSXwIDQDNdju3cZW69MSCzWbS5msQHtLOYSDk797jmichopkPY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com; spf=pass smtp.mailfrom=aspeedtech.com; arc=none smtp.client-ip=211.20.114.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=aspeedtech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aspeedtech.com Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Thu, 15 Oct 2026 14:46:59 +0800 Received: from [127.0.1.1] (192.168.10.13) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1748.10 via Frontend Transport; Thu, 15 Oct 2026 14:46:59 +0800 From: Jacky Chou Date: Thu, 15 Oct 2026 14:46:55 +0800 Subject: [PATCH net-next v3 3/6] net: ftgmac100: Enable AST2700 RMII support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20261015-support_ast2700-v3-3-8d7999171ac4@aspeedtech.com> References: <20261015-support_ast2700-v3-0-8d7999171ac4@aspeedtech.com> In-Reply-To: <20261015-support_ast2700-v3-0-8d7999171ac4@aspeedtech.com> To: Andrew Lunn , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Po-Yu Chuang , Eric Dumazet , "Heiner Kallweit" , Russell King , "Eric Dumazet" CC: , , , Jacky Chou X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1792046819; l=4258; i=jacky_chou@aspeedtech.com; s=20251031; h=from:subject:message-id; bh=QOof8Ln5197tONi246cNMG5Jj+NA5lrKsaTcXlkqcQ8=; b=zK6uT5CDsdmg1dKIf7YlttfeuYT7+5pCIfAqisvgl4kmLHPGt7ZjmXkgIM852aZN5hpNVq8W1 inNMR7NFhK+B/lmfuFmXUSNs/j2azVvDwwOK5dexyIzEztQ29Y3a0D/ X-Developer-Key: i=jacky_chou@aspeedtech.com; a=ed25519; pk=8XBx7KFM1drEsfCXTH9QC2lbMlGU4XwJTA6Jt9Mabdo= Set the RMII enable bit when an AST2700 port uses RMII so the MAC is programmed for the selected interface mode. Describe the requirement as a match-data quirk instead of checking the MAC generation in the data path, allowing later compatible controllers to opt into the behavior. phydev is always populated by the time this runs: ftgmac100_start_hw() is only reached once the device has been opened, and ftgmac100_probe_dt() always attaches a phy_device before register_netdev() can succeed -- via a discrete PHY ("phy-handle"), a "fixed-link" node, or NC-SI's internal fixed 100Mbit PHY (ftgmac100_probe_ncsi()). Any failure in that setup aborts probe before register_netdev(), so an opened AST2700 netdev always has phydev set. This mirrors the same assumption ftgmac100_reset_and_config_mac() already makes for every Aspeed SoC earlier in the open path. Signed-off-by: Jacky Chou --- drivers/net/ethernet/faraday/ftgmac100.c | 21 +++++++++++++++++++-- drivers/net/ethernet/faraday/ftgmac100.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 67b1fa464a42..9b7becb01726 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -41,8 +41,11 @@ enum ftgmac100_mac_id { FTGMAC100_AST2700 }; +#define FTGMAC100_QUIRK_RMII_ENABLE BIT(0) + struct ftgmac100_match_data { enum ftgmac100_mac_id mac_id; + u32 quirks; }; /* Arbitrary values, I am not sure the HW has limits */ @@ -79,6 +82,7 @@ struct ftgmac100 { void __iomem *base; enum ftgmac100_mac_id mac_id; + u32 quirks; /* Rx ring */ unsigned int rx_q_entries; @@ -355,6 +359,12 @@ static void ftgmac100_init_hw(struct ftgmac100 *priv) static void ftgmac100_start_hw(struct ftgmac100 *priv) { u32 maccr = ioread32(priv->base + FTGMAC100_OFFSET_MACCR); + /* + * Only reached once the device is open, so a phy_device is already + * attached: a discrete PHY via "phy-handle", a "fixed-link" node, or + * NC-SI's internal fixed 100M PHY. + */ + struct phy_device *phydev = priv->netdev->phydev; /* Keep the original GMAC and FAST bits */ maccr &= (FTGMAC100_MACCR_FAST_MODE | FTGMAC100_MACCR_GIGA_MODE); @@ -383,6 +393,11 @@ static void ftgmac100_start_hw(struct ftgmac100 *priv) if (priv->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) maccr |= FTGMAC100_MACCR_RM_VLAN; + if ((priv->quirks & FTGMAC100_QUIRK_RMII_ENABLE) && + phydev->interface == PHY_INTERFACE_MODE_RMII) { + maccr |= FTGMAC100_MACCR_RMII_ENABLE; + } + /* Hit the HW */ iowrite32(maccr, priv->base + FTGMAC100_OFFSET_MACCR); } @@ -1942,7 +1957,7 @@ static int ftgmac100_probe_dt(struct net_device *netdev, static int ftgmac100_probe(struct platform_device *pdev) { - const struct ftgmac100_match_data *match_data; + const struct ftgmac100_match_data *match_data = NULL; enum ftgmac100_mac_id mac_id; struct resource *res; int irq; @@ -1987,6 +2002,7 @@ static int ftgmac100_probe(struct platform_device *pdev) priv->netdev = netdev; priv->dev = &pdev->dev; priv->mac_id = mac_id; + priv->quirks = match_data ? match_data->quirks : 0; INIT_WORK(&priv->reset_task, ftgmac100_reset_task); /* map io memory */ @@ -2134,7 +2150,8 @@ static const struct ftgmac100_match_data ftgmac100_match_data_ast2600 = { }; static const struct ftgmac100_match_data ftgmac100_match_data_ast2700 = { - .mac_id = FTGMAC100_AST2700 + .mac_id = FTGMAC100_AST2700, + .quirks = FTGMAC100_QUIRK_RMII_ENABLE, }; static const struct ftgmac100_match_data ftgmac100_match_data_faraday = { diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h index 4968f6f0bdbc..8c35c895b146 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.h +++ b/drivers/net/ethernet/faraday/ftgmac100.h @@ -167,6 +167,7 @@ #define FTGMAC100_MACCR_RX_BROADPKT (1 << 17) #define FTGMAC100_MACCR_DISCARD_CRCERR (1 << 18) #define FTGMAC100_MACCR_FAST_MODE (1 << 19) +#define FTGMAC100_MACCR_RMII_ENABLE BIT(20) #define FTGMAC100_MACCR_SW_RST (1 << 31) /* -- 2.34.1