From patchwork Mon Mar 17 20:43:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 26409 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 65E5020143 for ; Mon, 17 Mar 2014 20:44:40 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wn1sf24155647obc.9 for ; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:thread-index:dlp-filter:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding:content-language; bh=26yJHChmh0j+g7rGUZ7b7k3UymML5IxIr7d4NPMGKW0=; b=S6dXSVb4mvjtJBynUNTPj0Xad7h7tSMfgvaZngWvmOB4brvKpIE1WUJUO5YIaRsDsG 2XTWZTzZ62hWnb65j+B15q28HPrrxFQdU7u3tEzcE/TAK2IZ7szae580xdjTvI+wHdcu av8hMbUB+n+MbXqWAVAtedSACxFpXVqpQOGXooGaKaC0YgkcR5+SpZ4CNxgWG/D30zF+ PiXaVfR3XNfhGWIY9zy5EMZ1wdGtb6ror1Qg82HKcsP/JooYLKxdISopfNsRXdGYJCec NbL2CLkw4BhMbk6ADibctYkXtD5qSlHcUYBqmscmYTb4Er41xg+HaGAXKmlwN2ncupP6 d4Fw== X-Gm-Message-State: ALoCoQmiuO1/bJbewz9KNY8dLgDVgy0wEgAw4NRmY4bmGhuIuxsZjxLLzg/o2Li7czpVCgS1e2c3 X-Received: by 10.50.178.200 with SMTP id da8mr6205778igc.6.1395089079903; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.138 with SMTP id 10ls49388qgj.92.gmail; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-Received: by 10.221.37.1 with SMTP id tc1mr76172vcb.32.1395089079772; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id dl6si3056126veb.73.2014.03.17.13.44.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Mar 2014 13:44:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id cz12so6057477veb.2 for ; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr3264610vco.25.1395089079633; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp155312vck; Mon, 17 Mar 2014 13:44:39 -0700 (PDT) X-Received: by 10.68.244.8 with SMTP id xc8mr5654923pbc.164.1395089078548; Mon, 17 Mar 2014 13:44:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mp8si15675084pbc.202.2014.03.17.13.44.38; Mon, 17 Mar 2014 13:44:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbaCQUo0 (ORCPT + 4 others); Mon, 17 Mar 2014 16:44:26 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:25688 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbaCQUn7 (ORCPT ); Mon, 17 Mar 2014 16:43:59 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2L00EYVLL63F30@mailout4.samsung.com>; Tue, 18 Mar 2014 05:43:54 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 4C.96.14803.A8E57235; Tue, 18 Mar 2014 05:43:54 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-5f-53275e8a13d3 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 62.38.29263.A8E57235; Tue, 18 Mar 2014 05:43:54 +0900 (KST) Received: from VISITOR1LAB ([105.128.19.10]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2L00EJWLKRKR00@mmp2.samsung.com>; Tue, 18 Mar 2014 05:43:54 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: davem@davemloft.net, ks.giri@samsung.com, ilho215.lee@samsung.com Subject: [PATCH V3 6/8] net: sxgbe: add WOL(Wakeup-On-Lan)support for Samsung sxgbe Date: Mon, 17 Mar 2014 13:43:45 -0700 Message-id: <00c301cf4221$99d6aa10$cd83fe30$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac9CH+8DqzKS2+a8SBu/sXHhGWVWcQ== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsVy+t8zY92uOPVgg+n3+CzmnG9hsTj6byGj xfyjO5gsZpzfx2RxbIGYA6vHlpU3mTz6tqxi9Pi8SS6AOYrLJiU1J7MstUjfLoEr4+bR1ewF 89MrDiy7ytTAeCmsi5GDQ0LAROLade8uRk4gU0ziwr31bF2MXBxCAssYJfr7J7BAJEwkfrz9 zwqRmM4o8f/dY3YI5w+jxMVpT9lAqtgE1CSaZ14Gs0UEbCWWHPnMDrKBWcBVoueGBkhYWCBU 4tD5v6wgNouAqsTJS8cZQWxeAUuJG6fusEDYghI/Jt8Ds5kFtCTW7zzOBGHLS2xe85YZ4iAF iR1nXzOCjBcR0JM4vTADokRcYtKDh2CnSQhsYpd4N6uFCWKXgMS3yYdYIB6Wldh0AGqMpMTB FTdYJjCKzUKyeRaSzbOQbJ6FZMUCRpZVjKKpBckFxUnpRaZ6xYm5xaV56XrJ+bmbGCERNnEH 4/0D1ocYk4HWT2SWEk3OB0ZoXkm8obGZkYWpiamxkbmlGWnCSuK86Y+SgoQE0hNLUrNTUwtS i+KLSnNSiw8xMnFwSjUw6ra5h29Qab075b3zsp65TUfXZqxtrOXpkJ245NrdE/yP699Unb3+ vVov/83tTqHsts9az9rcg0P23T93t/H90zcZrBZKM0w/r3a7dz3dNfSbLp/COjl2O81Pv55f tFc65TG7P3EBQ32/4uvcxQITPhdkfXuwMOPwzT7DifIbWfbqHJiXKnLgnhJLcUaioRZzUXEi AL2wnHDGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsVy+t9jQd2uOPVggwnvOCzmnG9hsTj6byGj xfyjO5gsZpzfx2RxbIGYA6vHlpU3mTz6tqxi9Pi8SS6AOaqB0SYjNTEltUghNS85PyUzL91W yTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMHaKWSQlliTilQKCCxuFhJ3w7ThNAQN10L mMYIXd+QILgeIwM0kLCOMePm0dXsBfPTKw4su8rUwHgprIuRk0NCwETix9v/rBC2mMSFe+vZ uhi5OIQEpjNK/H/3mB3C+cMocXHaUzaQKjYBNYnmmZfBbBEBW4klRz4DFXFwMAu4SvTc0AAJ CwuEShw6/xdsKIuAqsTJS8cZQWxeAUuJG6fusEDYghI/Jt8Ds5kFtCTW7zzOBGHLS2xe85YZ 4iAFiR1nXzOCjBcR0JM4vTADokRcYtKDh+wTGAVmIZk0C8mkWUgmzULSsoCRZRWjaGpBckFx UnquoV5xYm5xaV66XnJ+7iZGcAQ/k9rBuLLB4hCjAAejEg/vCzb1YCHWxLLiytxDjBIczEoi vBImQCHelMTKqtSi/Pii0pzU4kOMyUCPTmSWEk3OByaXvJJ4Q2MTMyNLIzMLIxNzc9KElcR5 D7RaBwoJpCeWpGanphakFsFsYeLglGpg3GhUsHSGzqmqPztFXP59ej9nUskPw5tm+4oO3FVW sJbqfCoc+cTZpDTKbeG9P5wiu2Z33xY8qHlgl4HQihgm1Rdy602mfMmJO3X6VuefEzFngrYs KlG+dGOjY5xwTG+bfsD2RFdGjyPn85qPp7S8vS8u/nkZg9GHpYE5u3gEbauvKEV89FM9qsRS nJFoqMVcVJwIAM/4TjYkAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: netdev@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: bh74.an@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: en-us From: Girish K S This patch adds support for wake up on magic frame arrival. Also remote wake up on all other packets (unicast, multicast broadcast) is supported. Signed-off-by: Girish K S Neatening-by: Joe Perches Signed-off-by: Byungho An --- drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 15 +++++ drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 29 ++++++++ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 47 +++++++++++++ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 71 ++++++++++++++++++++ drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c | 43 +++++++++++- drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h | 4 ++ .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 ++ drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h | 3 + 8 files changed, 215 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h index c915789..0f4d088 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h @@ -121,9 +121,18 @@ struct sxgbe_mtl_ops; #define RX_ENTRY_LPI_MODE 0x40 #define RX_EXIT_LPI_MODE 0x80 +/* PMT mode bits */ +#define PMT_PWRDWN BIT(0) +#define PMT_MGPKT_EN BIT(1) +#define PMT_RWKPKT_EN BIT(2) +#define PMT_GUCAST_EN BIT(9) + /* EEE-LPI Interrupt status flag */ #define LPI_INT_STATUS BIT(5) +/* PMT Interrupt status */ +#define PMT_INT_STATUS BIT(4) + /* EEE-LPI Default timer values */ #define LPI_LINK_STATUS_TIMER 0x3E8 #define LPI_MAC_WAIT_TIMER 0x00 @@ -225,6 +234,7 @@ struct sxgbe_extra_stats { unsigned long rx_desc_access_err; unsigned long rx_buffer_access_err; unsigned long rx_data_transfer_err; + unsigned long pmt_irq_event_n; /* EEE-LPI stats */ unsigned long tx_lpi_entry_n; @@ -488,6 +498,11 @@ struct sxgbe_priv_data { int eee_enabled; int eee_active; int tx_lpi_timer; + + /* PM-WOL specific members */ + int wolopts; + int wolenabled; + int wol_irq; }; /* Function prototypes */ diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c index 5885fd6..334d196 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c @@ -78,12 +78,41 @@ static int sxgbe_core_host_irq_status(void __iomem *ioaddr, if (unlikely(irq_status & LPI_INT_STATUS)) status |= sxgbe_get_lpi_status(ioaddr, irq_status); + if (unlikely(irq_status & PMT_INT_STATUS)) { + /* clear the PMT bits 5 and 6 by reading the PMT status reg */ + readl(ioaddr + SXGBE_CORE_PMT_CTL_STATUS_REG); + x->pmt_irq_event_n++; + } + return status; } /* Set power management mode (e.g. magic frame) */ static void sxgbe_core_pmt(void __iomem *ioaddr, unsigned long mode) { + unsigned int pmt = 0; + + if (mode & WAKE_MAGIC) { + pr_debug("WOL Magic frame\n"); + pmt |= PMT_MGPKT_EN; + } + if (mode & WAKE_UCAST) { + pr_debug("WOL on global unicast\n"); + pmt |= PMT_GUCAST_EN; + } + if (mode & (WAKE_MCAST | WAKE_BCAST)) { + pr_debug("WOL on any other packet\n"); + pmt |= PMT_RWKPKT_EN; + } + + writel(pmt, ioaddr + SXGBE_CORE_PMT_CTL_STATUS_REG); + + /* Enable power down bit if any of the requested mode is enabled */ + if (pmt) { + writel(SXGBE_RX_ENABLE, ioaddr + SXGBE_CORE_RX_CONFIG_REG); + pmt |= PMT_PWRDWN; + writel(pmt, ioaddr + SXGBE_CORE_PMT_CTL_STATUS_REG); + } } /* Set/Get Unicast MAC addresses */ diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c index 9083300..89b1450 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -37,6 +38,7 @@ static const struct sxgbe_stats sxgbe_gstrings_stats[] = { SXGBE_STAT(rx_lpi_entry_n), SXGBE_STAT(rx_lpi_exit_n), SXGBE_STAT(eee_wakeup_error_n), + SXGBE_STAT(pmt_irq_event_n), }; #define SXGBE_STATS_LEN ARRAY_SIZE(sxgbe_gstrings_stats) @@ -80,9 +82,54 @@ static int sxgbe_ethtool_set_eee(struct net_device *dev, return phy_ethtool_set_eee(priv->phydev, edata); } +static void sxgbe_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) +{ + struct sxgbe_priv_data *priv = netdev_priv(dev); + + wol->wolopts = 0; + if (!device_can_wakeup(priv->device)) { + dev_err(priv->device, "cannot wakeup device\n"); + return; + } + + if (priv->hw_cap.pmt_magic_frame) + wol->supported |= WAKE_MAGIC; + + if (priv->hw_cap.pmt_remote_wake_up) + wol->supported |= (WAKE_UCAST | WAKE_MCAST | WAKE_BCAST); + + wol->wolopts = priv->wolopts; +} + +static int sxgbe_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) +{ + struct sxgbe_priv_data *priv = netdev_priv(dev); + + if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE)) + return -EOPNOTSUPP; + + if (!device_can_wakeup(priv->device)) + return -EOPNOTSUPP; + + if (wol->wolopts) { + netdev_info(dev, "wakeup enable\n"); + device_set_wakeup_enable(priv->device, true); + enable_irq_wake(priv->wol_irq); + } else { + device_set_wakeup_enable(priv->device, false); + disable_irq_wake(priv->wol_irq); + } + + priv->wolopts = wol->wolopts; + + return 0; +} + static const struct ethtool_ops sxgbe_ethtool_ops = { .get_eee = sxgbe_ethtool_get_eee, .set_eee = sxgbe_ethtool_set_eee, + .get_wol = sxgbe_get_wol, + .set_wol = sxgbe_set_wol, }; void sxgbe_set_ethtool_ops(struct net_device *netdev) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 6780dd4..c81611a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c @@ -1111,6 +1111,18 @@ static int sxgbe_open(struct net_device *dev) goto init_error; } + /* Request the Wake IRQ in case of another line is used for WoL */ + if (priv->wol_irq != dev->irq) { + ret = devm_request_irq(priv->device, priv->wol_irq, + sxgbe_common_interrupt, IRQF_SHARED, + dev->name, dev); + if (unlikely(ret < 0)) { + netdev_err(dev, "%s: ERROR: allocating the WoL IRQ %d (%d)\n", + __func__, priv->wol_irq, ret); + goto init_error; + } + } + /* If the LPI irq is different from the mac irq * register a dedicated handler */ @@ -2067,6 +2079,27 @@ static int sxgbe_hw_init(struct sxgbe_priv_data * const priv) return 0; } +static void sxgbe_set_pmt_capabilities(struct sxgbe_priv_data *priv) +{ + u32 ctrl; + + priv->wolopts = 0; + + ctrl = readl(priv->ioaddr + SXGBE_CORE_PMT_CTL_STATUS_REG); + /* Enable maagic packet reception */ + if (priv->hw_cap.pmt_magic_frame) { + priv->wolopts |= WAKE_MAGIC; + ctrl |= PMT_MGPKT_EN; + } + if (priv->hw_cap.pmt_remote_wake_up) { + priv->wolopts |= WAKE_UCAST | WAKE_MCAST | WAKE_BCAST; + ctrl |= (PMT_RWKPKT_EN | PMT_GUCAST_EN); + } + writel(ctrl, priv->ioaddr + SXGBE_CORE_PMT_CTL_STATUS_REG); + + device_init_wakeup(priv->device, true); +} + /** * sxgbe_dvr_probe * @device: device pointer @@ -2190,6 +2223,7 @@ struct sxgbe_priv_data *sxgbe_dvr_probe(struct device *device, goto error_mdio_register; } + sxgbe_set_pmt_capabilities(priv); sxgbe_check_ether_addr(priv); return priv; @@ -2240,11 +2274,48 @@ int sxgbe_dvr_remove(struct net_device *ndev) #ifdef CONFIG_PM int sxgbe_suspend(struct net_device *ndev) { + struct sxgbe_priv_data *priv = netdev_priv(ndev); + struct netdev_hw_addr *ha; + int queue_num = 0, reg = 0; + + /* Disable TX and wait till all frames flushed out */ + priv->hw->mac->enable_tx(priv->ioaddr, false); + sxgbe_tx_all_clean(priv); + SXGBE_FOR_EACH_QUEUE(SXGBE_TX_QUEUES, queue_num) + priv->hw->mtl->mtl_flush_txqueue(priv->ioaddr, queue_num); + + /* Disable RX and wait till all frames read into memory */ + priv->hw->mac->enable_rx(priv->ioaddr, false); + SXGBE_FOR_EACH_QUEUE(SXGBE_RX_QUEUES, queue_num) + priv->hw->mtl->mtl_readout_rxqueue(priv->ioaddr, queue_num); + + /* Enable Power down mode by programming the PMT regs */ + if (device_may_wakeup(priv->device)) { + priv->hw->mac->pmt(priv->ioaddr, priv->wolopts); + } else { + netdev_for_each_uc_addr(ha, ndev) + priv->hw->mac->set_umac_addr(priv->ioaddr, ha->addr, + reg++); + /* Disable clock in case of PWM is off */ + clk_disable_unprepare(priv->sxgbe_clk); + } + return 0; } int sxgbe_resume(struct net_device *ndev) { + struct sxgbe_priv_data *priv = netdev_priv(ndev); + + if (device_may_wakeup(priv->device)) + priv->hw->mac->pmt(priv->ioaddr, 0); + else + /* enable the clk prevously disabled */ + clk_prepare_enable(priv->sxgbe_clk); + + priv->hw->mac->enable_rx(priv->ioaddr, true); + priv->hw->mac->enable_tx(priv->ioaddr, true); + return 0; } diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c index 3a1a3bb..8f687a8 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c @@ -164,6 +164,45 @@ static void sxgbe_mtl_fup_disable(void __iomem *ioaddr, int queue_num) writel(reg_val, ioaddr + SXGBE_MTL_RXQ_OPMODE_REG(queue_num)); } +static int sxgbe_mtl_flush_txqueue(void __iomem *ioaddr, int queue_num) +{ + unsigned long timeout; + u32 reg_val; + + timeout = jiffies + msecs_to_jiffies(5); + + reg_val = readl(ioaddr + SXGBE_MTL_TXQ_OPMODE_REG(queue_num)); + while ((reg_val & + (SXGBE_MTL_TXQ_EMPTY_STAT | SXGBE_MTL_TXQ_WRITE_STAT))) { + if (time_after(jiffies, timeout)) { + pr_err("cannot flush tx queue - timeout\n"); + return -ETIMEDOUT; + } + reg_val = readl(ioaddr + SXGBE_MTL_TXQ_OPMODE_REG(queue_num)); + } + + return 0; +} + +static int sxgbe_mtl_readout_rxqueue(void __iomem *ioaddr, int queue_num) +{ + unsigned long timeout; + u32 reg_val; + + timeout = jiffies + msecs_to_jiffies(5); + + reg_val = readl(ioaddr + SXGBE_MTL_TXQ_OPMODE_REG(queue_num)); + while ((reg_val & + (SXGBE_MTL_TXQ_EMPTY_STAT | SXGBE_MTL_TXQ_WRITE_STAT))) { + if (time_after(jiffies, timeout)) { + pr_err("cannot flush tx queue - timeout\n"); + return -ETIMEDOUT; + } + reg_val = readl(ioaddr + SXGBE_MTL_TXQ_OPMODE_REG(queue_num)); + } + + return 0; +} static void sxgbe_set_tx_mtl_mode(void __iomem *ioaddr, int queue_num, int tx_mode) @@ -232,7 +271,9 @@ static const struct sxgbe_mtl_ops mtl_ops = { .mtl_fep_enable = sxgbe_mtl_fep_enable, .mtl_fep_disable = sxgbe_mtl_fep_disable, .mtl_fup_enable = sxgbe_mtl_fup_enable, - .mtl_fup_disable = sxgbe_mtl_fup_disable + .mtl_fup_disable = sxgbe_mtl_fup_disable, + .mtl_flush_txqueue = sxgbe_mtl_flush_txqueue, + .mtl_readout_rxqueue = sxgbe_mtl_readout_rxqueue }; const struct sxgbe_mtl_ops *sxgbe_get_mtl_ops(void) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h index 7e4810c..b2f3f10 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h @@ -97,6 +97,10 @@ struct sxgbe_mtl_ops { void (*mtl_fup_enable)(void __iomem *ioaddr, int queue_num); void (*mtl_fup_disable)(void __iomem *ioaddr, int queue_num); + + int (*mtl_flush_txqueue)(void __iomem *ioaddr, int queue_num); + + int (*mtl_readout_rxqueue)(void __iomem *ioaddr, int queue_num); }; const struct sxgbe_mtl_ops *sxgbe_get_mtl_ops(void); diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index b58e8e8..341fad0 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -165,6 +165,10 @@ static int sxgbe_platform_probe(struct platform_device *pdev) if (priv->lpi_irq == -ENXIO) priv->lpi_irq = priv->dev->irq; + priv->wol_irq = irq_of_parse_and_map(dev->of_node, loop++); + if (priv->wol_irq == -ENXIO) + priv->wol_irq = priv->dev->irq; + platform_set_drvdata(pdev, priv->dev); pr_debug("platform driver registration completed\n"); diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h index 85a7b31..bd85923 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h @@ -257,6 +257,9 @@ #define SXGBE_MTL_SFMODE BIT(1) #define SXGBE_MTL_FIFO_LSHIFT 16 #define SXGBE_MTL_ENABLE_QUEUE 0x00000008 +#define SXGBE_MTL_TXQ_EMPTY_STAT BIT(4) +#define SXGBE_MTL_TXQ_WRITE_STAT BIT(3) + #define SXGBE_MTL_TXQ_UNDERFLOW_REG(qnum) \ (SXGBE_MTL_TC_TXBASE_REG + (qnum * 0x80) + 0x04) #define SXGBE_MTL_TXQ_DEBUG_REG(qnum) \