From patchwork Thu Apr 25 01:03:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642761 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 544054C7E for ; Thu, 25 Apr 2024 01:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007126; cv=none; b=tt5onru8VWAVMpXaqiFAhrioYRCLYb4eBlI8LMZP7FSWDw4olZMfmeKk27LdEsw5RJMQBj9EQVoBFDGi4Q1mlzIV47hQQmh62EwE+7nzjCpJUucVXuzQj8VP99bZYoG6KstUss5Y2slUdiWRhaIMkUf7qPDammXPBo1Ipwlp4qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007126; c=relaxed/simple; bh=1+YfES0rUJMtmebgsBt2gjJDpG4zb9+auOkUqPK65aY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ucljOIa9e5rDC2yCUcafz0+sHEKlpWg0Y2RtMDf4C1yQ0k9AYvMDClAvyeZYRGHQtpv/xBhH33AeQcGuw0ndAxAymNkCw1IZ7vGx6DK33OY/n8czhejm3zvN7lIlvvTBX7ZpENuIK2rn0atKdnQd7ShbsoVCO5WakmqjuENK3Go= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=c+Z4RfiH; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c+Z4RfiH" Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6ea0a6856d7so47292a34.1 for ; Wed, 24 Apr 2024 18:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007124; x=1714611924; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6ktERlXiL+O7F2ZilFf6Zkq2fIRwEdeAOSRMxI3TGZ8=; b=c+Z4RfiHP1rWF0AqrXV/udcvwymLGnnP3wwvlrrUYlQznp2pjzwct13PBmMuyaU7k0 MIa5m5cm1eNdXuHUoIm7aXlf/ohk3zz4do4xUoWVOZXrVCwEDeXtlG7NZdlJSWUN60u8 ZO4m11C9aK93mBM3b3DZmQK3TI4Rj4a14lsZGTT09SzFOE9ZWcNXgmc5mqZTe6itYOEW JkP3w9IOBeRtJlAEIYs4lycVN9KjJHQ2ZUKkFBHDsYYPr518k/T1QO7U2DsWPjoDcUDF /L3Y9HmNb2STi9mjpeJJ/RrCdmbpy614PnIN4SmeCGxtC45P7iWcb4qclc/+WwQzXKFY P7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007124; x=1714611924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ktERlXiL+O7F2ZilFf6Zkq2fIRwEdeAOSRMxI3TGZ8=; b=Q43C5HFTwg79aTdjduT5nAY+VUiSsYfwTE5noF1qOx5opllhISRpBOO2QWcgDcWfN2 rivP5S9Dw/tGxpwWqwWas5nj8NQRNxLKEfweNR6+96plpD7pMJV1r+S+rCN9ioP754Au CNC7uiyX/k6s8Vg+WdDbKZ0hlM526sE4BF4nygHHjR5VuvmpEEHgkpI4FoQUB/fZKxct BGTw0oh1jlLXwB32Guu74MkDPQYBSqsQLr1oY1XPEK47D6lnrUsyTosJI4h9fRqKDI9A 5cFzns33gnFafSvpHiBeB1IN4Ddz3g+ZRkGIGriXJvemsoWyzfVQp8YCAtYXfid4flJ0 BGkQ== X-Gm-Message-State: AOJu0YzUXvoZypEIwPM5fwARGLTNQAsih4KQcnkpAamNOu4nohofYnkv 9x8S7ivSrUQ3z0CMZt4uey5yqJzoewdqRtjlYD/RdhCpgzH3HMZ2fNYZOQ== X-Google-Smtp-Source: AGHT+IFbrTCyNaeqlDDPZPwJf22S/gBnpgXedkZTkdHxRu9ARzKwic6kUzM9tvFTPuamSPcgsGRjFA== X-Received: by 2002:a05:6808:22a7:b0:3c8:4227:4fb0 with SMTP id bo39-20020a05680822a700b003c842274fb0mr3535128oib.2.1714007124099; Wed, 24 Apr 2024 18:05:24 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:23 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 1/6] net: tn40xx: add pci driver for Tehuti Networks TN40xx chips Date: Thu, 25 Apr 2024 10:03:49 +0900 Message-Id: <20240425010354.32605-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This just adds the scaffolding for an ethernet driver for Tehuti Networks TN40xx chips. Signed-off-by: FUJITA Tomonori --- MAINTAINERS | 8 +++- drivers/net/ethernet/tehuti/Kconfig | 12 ++++++ drivers/net/ethernet/tehuti/Makefile | 3 ++ drivers/net/ethernet/tehuti/tn40.c | 57 ++++++++++++++++++++++++++++ drivers/net/ethernet/tehuti/tn40.h | 15 ++++++++ 5 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 drivers/net/ethernet/tehuti/tn40.c create mode 100644 drivers/net/ethernet/tehuti/tn40.h diff --git a/MAINTAINERS b/MAINTAINERS index c0bfad334623..c3045c31f207 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21823,7 +21823,13 @@ TEHUTI ETHERNET DRIVER M: Andy Gospodarek L: netdev@vger.kernel.org S: Supported -F: drivers/net/ethernet/tehuti/* +F: drivers/net/ethernet/tehuti/tehuti.* + +TEHUTI TN40XX ETHERNET DRIVER +M: FUJITA Tomonori +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/tehuti/tn40* TELECOM CLOCK DRIVER FOR MCPL0010 M: Mark Gross diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig index 8735633765a1..849e3b4a71c1 100644 --- a/drivers/net/ethernet/tehuti/Kconfig +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -23,4 +23,16 @@ config TEHUTI help Tehuti Networks 10G Ethernet NIC +config TEHUTI_TN40 + tristate "Tehuti Networks TN40xx 10G Ethernet adapters" + depends on PCI + help + This driver supports 10G Ethernet adapters using Tehuti Networks + TN40xx chips. Currently, adapters with Applied Micro Circuits + Corporation QT2025 are supported; Tehuti Networks TN9310, + DLink DXE-810S, ASUS XG-C100F, and Edimax EN-9320. + + To compile this driver as a module, choose M here: the module + will be called tn40xx. + endif # NET_VENDOR_TEHUTI diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile index 13a0ddd62088..1c468d99e476 100644 --- a/drivers/net/ethernet/tehuti/Makefile +++ b/drivers/net/ethernet/tehuti/Makefile @@ -4,3 +4,6 @@ # obj-$(CONFIG_TEHUTI) += tehuti.o + +tn40xx-y := tn40.o +obj-$(CONFIG_TEHUTI_TN40) += tn40xx.o diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c new file mode 100644 index 000000000000..c26f391059e1 --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) Tehuti Networks Ltd. */ + +#include "tn40.h" + +static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +{ + int ret; + + ret = pci_enable_device(pdev); + if (ret) + return ret; + + if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) { + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) { + dev_err(&pdev->dev, "failed to set DMA mask.\n"); + goto err_disable_device; + } + } + return 0; +err_disable_device: + pci_disable_device(pdev); + return ret; +} + +static void tn40_remove(struct pci_dev *pdev) +{ + pci_disable_device(pdev); +} + +static const struct pci_device_id tn40_id_table[] = { + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_TEHUTI, 0x3015) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_DLINK, 0x4d00) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_ASUSTEK, 0x8709) }, + { PCI_DEVICE_SUB(PCI_VENDOR_ID_TEHUTI, 0x4022, + PCI_VENDOR_ID_EDIMAX, 0x8103) }, + { } +}; + +static struct pci_driver tn40_driver = { + .name = TN40_DRV_NAME, + .id_table = tn40_id_table, + .probe = tn40_probe, + .remove = tn40_remove, +}; + +module_pci_driver(tn40_driver); + +MODULE_DEVICE_TABLE(pci, tn40_id_table); +MODULE_AUTHOR("Tehuti networks"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Tehuti Network TN40xx Driver"); +MODULE_VERSION(TN40_DRV_VERSION); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h new file mode 100644 index 000000000000..83db71ba3b02 --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) Tehuti Networks Ltd. */ + +#ifndef _TN40_H_ +#define _TN40_H_ + +#include +#include + +#define TN40_DRV_NAME "tn40xx" +#define TN40_DRV_VERSION "0.3.6.17.2" + +#define PCI_VENDOR_ID_EDIMAX 0x1432 + +#endif /* _TN40XX_H */ From patchwork Thu Apr 25 01:03:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642762 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0547C6AC0 for ; Thu, 25 Apr 2024 01:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007128; cv=none; b=Bxl3ruu6FCHivwRkgwjAhcHL1xbl/fXrve3XURPGH7ZkNxmHl/y46NQaWS/3i3eDnh740eYWSuQgw+7T4obzCN4J6aEcaU6BvgGTXME8RanFzUn2buXYsDwsBL+4fBwVmr8i1X7P/pxRQcNuiohkzTGPP4LLVDSEzOABjSNVPSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007128; c=relaxed/simple; bh=G/fzz1BPRVSXAdKqTUuTb/nysIglAJebyFjHLk8rYeQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RCelpw5nEFARPToYY7ATWVXpbGXVwAfpLVokvTI6l8jJGfBVW7B/RQoyAJIeVK1yBPrFRW/B1ivHX72USXigycGmSLDnRzF2hzFWaYN+izcwOztgVao7ozBi+BhP6weEOi/P6ujXMc8bzxkDnTGjOzrmYWfiODuL7mUkEU/iupw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Hrt83ter; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hrt83ter" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2ac074ba920so105536a91.1 for ; Wed, 24 Apr 2024 18:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007126; x=1714611926; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+sMwOzSS8AXIut/UYF5L1XcJ9VhguG9KaY7zRMb1V7Y=; b=Hrt83ter41QOKouUUVqwCE85PpKfHQ/6oyJZp2L5V/0R+Y9pvD/gkjRKjZ6YNkt6HN 340IPrDnVFEcahHTdBSwyo/mqvmYw+Py+efKeZt2t3sVTgjLlHpYELAauj2U6sA6EhQo KlTchJTsFn+TuQ4C+Ini5OOh9WT4p6Q1EG5sm1eRSw8sTmooHwszAdpKe16mTjP7XjTF Cosdzws3XMlya/iG0B7Cc2KQbtRC2CHdmpXCZeoFuggg/mcV5QHwXPNUB5vqKTuKSdgv PZbP41Cpbv8wgFl+nuB2wzLTRAQhQUY3BauF3KBgl9+qrz6J050NlRaY21sbLKaU5k9X 9FCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007126; x=1714611926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+sMwOzSS8AXIut/UYF5L1XcJ9VhguG9KaY7zRMb1V7Y=; b=ouMuq2N3ntmG+IxC5pipmu0euThbjk36741sL7NT1rUnian387d5W+x0K/bcTUf1Sz CVjHWg7zjZ0MtEpY7EU6nyPWVwwZt0E/MWIrABI04E3C2FRfe6snNaqcvUTSFzgVSAoP shDT5xnWlo+A6kOesOIAdJQE52kqRVPWY7OETETHUT06UVwHXdVhnmmoA9sJhd8Wym63 RN+lrecv/TM4DK8mJt+BLiiS5Ct0nYQbgptySQEFOEyLAMeCx5rUKLGy49oP/0nnRd3/ /8tn+NkG/HiTm00pU35FbdrhKgrt6IjwQnujkRMIksDU5pQhUWYgUaAZudxk5EC6z5D0 KS2g== X-Gm-Message-State: AOJu0Yy1qOsufxCt1WD1FZXPZojCNs6ZjNw3Jh0jhnRfYWzpzwJa7K50 P1t2y5J/AABoBZi3Y1SsERGnVZ5IC0aUaOCMrTAEUcQe5jcA13OqIscHeQ== X-Google-Smtp-Source: AGHT+IHZbt/apRpibz8xpKePON256zparKlpPuRUQRR+3vtuyX42icB0TJrOz9LYz/mxhULg7QIrCg== X-Received: by 2002:a62:be11:0:b0:6ea:6f18:887a with SMTP id l17-20020a62be11000000b006ea6f18887amr4653409pff.1.1714007125868; Wed, 24 Apr 2024 18:05:25 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:25 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 2/6] net: tn40xx: add register defines Date: Thu, 25 Apr 2024 10:03:50 +0900 Message-Id: <20240425010354.32605-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This adds several defines to handle registers in Tehuti Networks TN40xx chips for later patches. Signed-off-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/tn40.h | 2 + drivers/net/ethernet/tehuti/tn40_regs.h | 266 ++++++++++++++++++++++++ 2 files changed, 268 insertions(+) create mode 100644 drivers/net/ethernet/tehuti/tn40_regs.h diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 83db71ba3b02..b4978f92574a 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -7,6 +7,8 @@ #include #include +#include "tn40_regs.h" + #define TN40_DRV_NAME "tn40xx" #define TN40_DRV_VERSION "0.3.6.17.2" diff --git a/drivers/net/ethernet/tehuti/tn40_regs.h b/drivers/net/ethernet/tehuti/tn40_regs.h new file mode 100644 index 000000000000..013f25272927 --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40_regs.h @@ -0,0 +1,266 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (c) Tehuti Networks Ltd. */ + +#ifndef _TN40_REGS_H_ +#define _TN40_REGS_H_ + +/* Register region size */ +#define TN40_REGS_SIZE 0x10000 + +/* Registers from 0x0000-0x00fc were remapped to 0x4000-0x40fc */ +#define REG_TXD_CFG1_0 0x4000 +#define REG_TXD_CFG1_1 0x4004 +#define REG_TXD_CFG1_2 0x4008 +#define REG_TXD_CFG1_3 0x400C + +#define REG_RXF_CFG1_0 0x4010 +#define REG_RXF_CFG1_1 0x4014 +#define REG_RXF_CFG1_2 0x4018 +#define REG_RXF_CFG1_3 0x401C + +#define REG_RXD_CFG1_0 0x4020 +#define REG_RXD_CFG1_1 0x4024 +#define REG_RXD_CFG1_2 0x4028 +#define REG_RXD_CFG1_3 0x402C + +#define REG_TXF_CFG1_0 0x4030 +#define REG_TXF_CFG1_1 0x4034 +#define REG_TXF_CFG1_2 0x4038 +#define REG_TXF_CFG1_3 0x403C + +#define REG_TXD_CFG0_0 0x4040 +#define REG_TXD_CFG0_1 0x4044 +#define REG_TXD_CFG0_2 0x4048 +#define REG_TXD_CFG0_3 0x404C + +#define REG_RXF_CFG0_0 0x4050 +#define REG_RXF_CFG0_1 0x4054 +#define REG_RXF_CFG0_2 0x4058 +#define REG_RXF_CFG0_3 0x405C + +#define REG_RXD_CFG0_0 0x4060 +#define REG_RXD_CFG0_1 0x4064 +#define REG_RXD_CFG0_2 0x4068 +#define REG_RXD_CFG0_3 0x406C + +#define REG_TXF_CFG0_0 0x4070 +#define REG_TXF_CFG0_1 0x4074 +#define REG_TXF_CFG0_2 0x4078 +#define REG_TXF_CFG0_3 0x407C + +#define REG_TXD_WPTR_0 0x4080 +#define REG_TXD_WPTR_1 0x4084 +#define REG_TXD_WPTR_2 0x4088 +#define REG_TXD_WPTR_3 0x408C + +#define REG_RXF_WPTR_0 0x4090 +#define REG_RXF_WPTR_1 0x4094 +#define REG_RXF_WPTR_2 0x4098 +#define REG_RXF_WPTR_3 0x409C + +#define REG_RXD_WPTR_0 0x40A0 +#define REG_RXD_WPTR_1 0x40A4 +#define REG_RXD_WPTR_2 0x40A8 +#define REG_RXD_WPTR_3 0x40AC + +#define REG_TXF_WPTR_0 0x40B0 +#define REG_TXF_WPTR_1 0x40B4 +#define REG_TXF_WPTR_2 0x40B8 +#define REG_TXF_WPTR_3 0x40BC + +#define REG_TXD_RPTR_0 0x40C0 +#define REG_TXD_RPTR_1 0x40C4 +#define REG_TXD_RPTR_2 0x40C8 +#define REG_TXD_RPTR_3 0x40CC + +#define REG_RXF_RPTR_0 0x40D0 +#define REG_RXF_RPTR_1 0x40D4 +#define REG_RXF_RPTR_2 0x40D8 +#define REG_RXF_RPTR_3 0x40DC + +#define REG_RXD_RPTR_0 0x40E0 +#define REG_RXD_RPTR_1 0x40E4 +#define REG_RXD_RPTR_2 0x40E8 +#define REG_RXD_RPTR_3 0x40EC + +#define REG_TXF_RPTR_0 0x40F0 +#define REG_TXF_RPTR_1 0x40F4 +#define REG_TXF_RPTR_2 0x40F8 +#define REG_TXF_RPTR_3 0x40FC + +/* Hardware versioning */ +#define FW_VER 0x5010 +#define SROM_VER 0x5020 +#define FPGA_VER 0x5030 +#define FPGA_SEED 0x5040 + +/* Registers from 0x0100-0x0150 were remapped to 0x5100-0x5150 */ +#define REG_ISR REG_ISR0 +#define REG_ISR0 0x5100 + +#define REG_IMR REG_IMR0 +#define REG_IMR0 0x5110 + +#define REG_RDINTCM0 0x5120 +#define REG_RDINTCM2 0x5128 + +#define REG_TDINTCM0 0x5130 + +#define REG_ISR_MSK0 0x5140 + +#define REG_INIT_SEMAPHORE 0x5170 +#define REG_INIT_STATUS 0x5180 + +#define REG_MAC_LNK_STAT 0x0200 +#define MAC_LINK_STAT 0x0004 /* Link state */ + +#define REG_BLNK_LED 0x0210 + +#define REG_GMAC_RXF_A 0x1240 + +#define REG_UNC_MAC0_A 0x1250 +#define REG_UNC_MAC1_A 0x1260 +#define REG_UNC_MAC2_A 0x1270 + +#define REG_VLAN_0 0x1800 + +#define REG_MAX_FRAME_A 0x12C0 + +#define REG_RX_MAC_MCST0 0x1A80 +#define REG_RX_MAC_MCST1 0x1A84 +#define MAC_MCST_NUM 15 +#define REG_RX_MCST_HASH0 0x1A00 +#define MAC_MCST_HASH_NUM 8 + +#define REG_VPC 0x2300 +#define REG_VIC 0x2320 +#define REG_VGLB 0x2340 + +#define REG_CLKPLL 0x5000 + +/* MDIO interface */ + +#define REG_MDIO_CMD_STAT 0x6030 +#define REG_MDIO_CMD 0x6034 +#define REG_MDIO_DATA 0x6038 +#define REG_MDIO_ADDR 0x603C +#define GET_MDIO_BUSY(x) FIELD_GET(GENMASK(0, 0), (x)) +#define GET_MDIO_RD_ERR(x) FIELD_GET(GENMASK(1, 1), (x)) + +/* for 10G only*/ +#define REG_RSS_CNG 0x000000b0 + +#define RSS_ENABLED 0x00000001 +#define RSS_HFT_TOEPLITZ 0x00000002 +#define RSS_HASH_IPV4 0x00000100 +#define RSS_HASH_TCP_IPV4 0x00000200 +#define RSS_HASH_IPV6 0x00000400 +#define RSS_HASH_IPV6_EX 0x00000800 +#define RSS_HASH_TCP_IPV6 0x00001000 +#define RSS_HASH_TCP_IPV6_EX 0x00002000 + +#define REG_RSS_HASH_BASE 0x0400 +#define RSS_HASH_LEN 40 +#define REG_RSS_INDT_BASE 0x0600 +#define RSS_INDT_LEN 256 + +#define REG_REVISION 0x6000 +#define REG_SCRATCH 0x6004 +#define REG_CTRLST 0x6008 +#define REG_MAC_ADDR_0 0x600C +#define REG_MAC_ADDR_1 0x6010 +#define REG_FRM_LENGTH 0x6014 +#define REG_PAUSE_QUANT 0x6054 +#define REG_RX_FIFO_SECTION 0x601C +#define REG_TX_FIFO_SECTION 0x6020 +#define REG_RX_FULLNESS 0x6024 +#define REG_TX_FULLNESS 0x6028 +#define REG_HASHTABLE 0x602C + +#define REG_RST_PORT 0x7000 +#define REG_DIS_PORT 0x7010 +#define REG_RST_QU 0x7020 +#define REG_DIS_QU 0x7030 + +#define REG_CTRLST_TX_ENA 0x0001 +#define REG_CTRLST_RX_ENA 0x0002 +#define REG_CTRLST_PRM_ENA 0x0010 +#define REG_CTRLST_PAD_ENA 0x0020 + +#define REG_CTRLST_BASE (REG_CTRLST_PAD_ENA | REG_CTRLST_PRM_ENA) + +#define REG_RX_FLT 0x1400 + +/* TXD TXF RXF RXD CONFIG 0x0000 --- 0x007c */ +#define TX_RX_CFG1_BASE 0xffffffff /*0-31 */ +#define TX_RX_CFG0_BASE 0xfffff000 /*31:12 */ +#define TX_RX_CFG0_RSVD 0x00000ffc /*11:2 */ +#define TX_RX_CFG0_SIZE 0x00000003 /*1:0 */ + +/* TXD TXF RXF RXD WRITE 0x0080 --- 0x00BC */ +#define TXF_WPTR_WR_PTR 0x00007ff8 /*14:3 */ + +/* TXD TXF RXF RXD READ 0x00CO --- 0x00FC */ +#define TXF_RPTR_RD_PTR 0x00007ff8 /*14:3 */ + +/* The last 4 bits are dropped size is rounded to 16 */ +#define TXF_WPTR_MASK 0x7ff0 + +/* regISR 0x0100 */ +/* regIMR 0x0110 */ +#define IMR_INPROG 0x80000000 /*31 */ +#define IR_LNKCHG1 0x10000000 /*28 */ +#define IR_LNKCHG0 0x08000000 /*27 */ +#define IR_GPIO 0x04000000 /*26 */ +#define IR_RFRSH 0x02000000 /*25 */ +#define IR_RSVD 0x01000000 /*24 */ +#define IR_SWI 0x00800000 /*23 */ +#define IR_RX_FREE_3 0x00400000 /*22 */ +#define IR_RX_FREE_2 0x00200000 /*21 */ +#define IR_RX_FREE_1 0x00100000 /*20 */ +#define IR_RX_FREE_0 0x00080000 /*19 */ +#define IR_TX_FREE_3 0x00040000 /*18 */ +#define IR_TX_FREE_2 0x00020000 /*17 */ +#define IR_TX_FREE_1 0x00010000 /*16 */ +#define IR_TX_FREE_0 0x00008000 /*15 */ +#define IR_RX_DESC_3 0x00004000 /*14 */ +#define IR_RX_DESC_2 0x00002000 /*13 */ +#define IR_RX_DESC_1 0x00001000 /*12 */ +#define IR_RX_DESC_0 0x00000800 /*11 */ +#define IR_PSE 0x00000400 /*10 */ +#define IR_TMR3 0x00000200 /* 9 */ +#define IR_TMR2 0x00000100 /* 8 */ +#define IR_TMR1 0x00000080 /* 7 */ +#define IR_TMR0 0x00000040 /* 6 */ +#define IR_VNT 0x00000020 /* 5 */ +#define IR_RxFL 0x00000010 /* 4 */ +#define IR_SDPERR 0x00000008 /* 3 */ +#define IR_TR 0x00000004 /* 2 */ +#define IR_PCIE_LINK 0x00000002 /* 1 */ +#define IR_PCIE_TOUT 0x00000001 /* 0 */ + +#define IR_EXTRA \ + (IR_RX_FREE_0 | IR_LNKCHG0 | IR_LNKCHG1 | IR_PSE | IR_TMR0 | \ + IR_PCIE_LINK | IR_PCIE_TOUT) + +#define GMAC_RX_FILTER_OSEN 0x1000 /* shared OS enable */ +#define GMAC_RX_FILTER_TXFC 0x0400 /* Tx flow control */ +#define GMAC_RX_FILTER_RSV0 0x0200 /* reserved */ +#define GMAC_RX_FILTER_FDA 0x0100 /* filter out direct address */ +#define GMAC_RX_FILTER_AOF 0x0080 /* accept over run */ +#define GMAC_RX_FILTER_ACF 0x0040 /* accept control frames */ +#define GMAC_RX_FILTER_ARUNT 0x0020 /* accept under run */ +#define GMAC_RX_FILTER_ACRC 0x0010 /* accept crc error */ +#define GMAC_RX_FILTER_AM 0x0008 /* accept multicast */ +#define GMAC_RX_FILTER_AB 0x0004 /* accept broadcast */ +#define GMAC_RX_FILTER_PRM 0x0001 /* [0:1] promiscuous mode */ + +#define MAX_FRAME_AB_VAL 0x3fff /* 13:0 */ + +#define CLKPLL_PLLLKD 0x0200 /* 9 */ +#define CLKPLL_RSTEND 0x0100 /* 8 */ +#define CLKPLL_SFTRST 0x0001 /* 0 */ + +#define CLKPLL_LKD (CLKPLL_PLLLKD | CLKPLL_RSTEND) + +#endif From patchwork Thu Apr 25 01:03:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642763 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56CAC10A22 for ; Thu, 25 Apr 2024 01:05:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007132; cv=none; b=qZ7qGWNnVc/d8lG+ZknWJ7cBRvKdQiZeuHTE5MbJmXEL2fCHu+fFQF89Y/WuR0MoLlXnRtdPBy+TJNxcYAKPrKnw4ENOkQzhDHmHt9+0SnPxkVCQ30224ks9gdGLmKULDEYAhJxt1rp7u6EwpYtWHimpkIglSldoN0D1hVgeL4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007132; c=relaxed/simple; bh=TJIq/6EzDbJIyw86wUj3wGe/6vvwNwQ1FLYNaf3Cy/4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=syCNGyPA4dxZUlCwzf/h03QUWqePZ72MMvYLaaSSIFmnecJ88dkw2QXD5F2afasZe1EQQn2/0wVqPNK6x1U2xFZcJ3KRJbv1bUEnThXRX3WJCa2A0Bz+laUCpCXehNLrXM0LdFRgJwYYEusQXFA7ak3OxUMyeAfKzS1rVYri5Jo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dmD7enNB; arc=none smtp.client-ip=209.85.160.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dmD7enNB" Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-2389e1dd2a6so969fac.3 for ; Wed, 24 Apr 2024 18:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007128; x=1714611928; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J+imsZF26fkTzdNUt2uaWAAuTVdyLbuFdot6hWruCHk=; b=dmD7enNBBtKTJXMXKyCfuUy9ItEbbd7T/NnW5rRzCYC4wxbtUDN8owSDJ9lvDk9BEp u1ApQMcoYvXu5D8RQYJ69NT75VtxoiOuQx0j5J5Ec0GZePJ/4vqhiPdIGDX4WpG6fdIm cH/4HX50dCzTeQlV+Vcwsx5a/9R91TYOSDzTx5OsrwLZFIy0hRzr3ERytBqYlBBM0mny 8CAo8Tjq5HLeAFptCzmKqN6QVMNGw8acPTxNIh/uex2o5KrmbrXDllMz6RnWKo6xZtA2 hlrQyhDsK2b9r4trZBfc6wFHhe3NxGw3M4NWGZrhpvjIAoMozTp0ZdUCmvukpzaa00RK uENQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007128; x=1714611928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J+imsZF26fkTzdNUt2uaWAAuTVdyLbuFdot6hWruCHk=; b=jGOHRyLFdvBE2pqYE+CGEcMkOxGeTf/I4l/rqIGgfuhptSeVxuuje7PgXhZKMP/LLm Epb+bAIJD8JL/+wtOWKnQxM+oH7TGKe2+iKml/mCJ7A3M3hcgblIYrC584aTzyEHrhnY d8uJfD3lb200Q5hMvrsVfhK+7HcZYEZbAaUgeHLbhvg57sMBmaOXhjG6wE1nZebYp0eM LRublN7t8eLoPffVyUW3X7ZFkQSuRlzVDhLE0XmsEg3rETrSZUDrNDcW8i9SPrbpR/Bl p5WewMBCUNTPusZnXJmxVtooFbCuyTLMQc3AESNCnh0a/SYSOa15HFqYYVJXZhdGLEO/ hCnQ== X-Gm-Message-State: AOJu0YxC1zhibL+TJ0eCNduDLwjNC779Qa2zLr7vFVWEGt8uBHHbOoKw OKYAn2DvMbq3TYLHx8J2/sY0lr3PdPZm19jnQfKYnQF9H9pm2s1tkLIHsg== X-Google-Smtp-Source: AGHT+IECHfl+yTPesL3sV/8ZXBZEb+6WkglYW6HZXeok8Q0OAUJEHFH55AQVR5UXwtK4AcOR4QwKpg== X-Received: by 2002:a05:6870:218f:b0:23b:3428:725a with SMTP id l15-20020a056870218f00b0023b3428725amr2358603oae.1.1714007127745; Wed, 24 Apr 2024 18:05:27 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:27 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 3/6] net: tn40xx: add basic Tx handling Date: Thu, 25 Apr 2024 10:03:51 +0900 Message-Id: <20240425010354.32605-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This patch adds device specific structures to initialize the hardware with basic Tx handling. The original driver loads the embedded firmware in the header file. This driver is implemented to use the firmware APIs. The Tx logic uses three major data structures; two ring buffers with NIC and one database. One ring buffer is used to send information about packets to be sent for NIC. The other is used to get information from NIC about packet that are sent. The database is used to keep the information about DMA mapping. After a packet is sent, the db is used to free the resource used for the packet. Signed-off-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/Kconfig | 1 + drivers/net/ethernet/tehuti/tn40.c | 1244 +++++++++++++++++++++++++++ drivers/net/ethernet/tehuti/tn40.h | 179 ++++ 3 files changed, 1424 insertions(+) diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig index 849e3b4a71c1..4198fd59e42e 100644 --- a/drivers/net/ethernet/tehuti/Kconfig +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -26,6 +26,7 @@ config TEHUTI config TEHUTI_TN40 tristate "Tehuti Networks TN40xx 10G Ethernet adapters" depends on PCI + select FW_LOADER help This driver supports 10G Ethernet adapters using Tehuti Networks TN40xx chips. Currently, adapters with Applied Micro Circuits diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index c26f391059e1..014ef9b3fcbd 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -3,10 +3,1167 @@ #include "tn40.h" +#define SHORT_PACKET_SIZE 60 +#define FIRMWARE_NAME "tn40xx-14.fw" + +static void tn40_enable_interrupts(struct tn40_priv *priv) +{ + write_reg(priv, REG_IMR, priv->isr_mask); +} + +static void tn40_disable_interrupts(struct tn40_priv *priv) +{ + write_reg(priv, REG_IMR, 0); +} + +static int tn40_fifo_alloc(struct tn40_priv *priv, struct fifo *f, + int fsz_type, + u16 reg_cfg0, u16 reg_cfg1, + u16 reg_rptr, u16 reg_wptr) +{ + u16 memsz = FIFO_SIZE * (1 << fsz_type); + + memset(f, 0, sizeof(struct fifo)); + /* 1K extra space is allocated at the end of the fifo to simplify + * processing of descriptors that wraps around fifo's end. + */ + f->va = dma_alloc_coherent(&priv->pdev->dev, + memsz + FIFO_EXTRA_SPACE, &f->da, + GFP_KERNEL); + if (!f->va) + return -ENOMEM; + + f->reg_cfg0 = reg_cfg0; + f->reg_cfg1 = reg_cfg1; + f->reg_rptr = reg_rptr; + f->reg_wptr = reg_wptr; + f->rptr = 0; + f->wptr = 0; + f->memsz = memsz; + f->size_mask = memsz - 1; + write_reg(priv, reg_cfg0, + lower_32_bits((f->da & TX_RX_CFG0_BASE) | fsz_type)); + write_reg(priv, reg_cfg1, upper_32_bits(f->da)); + return 0; +} + +static void tn40_fifo_free(struct tn40_priv *priv, struct fifo *f) +{ + dma_free_coherent(&priv->pdev->dev, + f->memsz + FIFO_EXTRA_SPACE, f->va, f->da); +} + +/* TX HW/SW interaction overview + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * There are 2 types of TX communication channels between driver and NIC. + * 1) TX Free Fifo - TXF - Holds ack descriptors for sent packets. + * 2) TX Data Fifo - TXD - Holds descriptors of full buffers. + * + * Currently the NIC supports TSO, checksumming and gather DMA + * UFO and IP fragmentation is on the way. + * + * RX SW Data Structures + * ~~~~~~~~~~~~~~~~~~~~~ + * TXDB is used to keep track of all skbs owned by SW and their DMA addresses. + * For TX case, ownership lasts from getting the packet via hard_xmit and + * until the HW acknowledges sending the packet by TXF descriptors. + * TXDB is implemented as a cyclic buffer. + * + * FIFO objects keep info about the fifo's size and location, relevant HW + * registers, usage and skb db. Each RXD and RXF fifo has their own fifo + * structure. Implemented as simple struct. + * + * TX SW Execution Flow + * ~~~~~~~~~~~~~~~~~~~~ + * OS calls the driver's hard_xmit method with a packet to send. The driver + * creates DMA mappings, builds TXD descriptors and kicks the HW by updating + * TXD WPTR. + * + * When a packet is sent, The HW write a TXF descriptor and the SW + * frees the original skb. To prevent TXD fifo overflow without + * reading HW registers every time, the SW deploys "tx level" + * technique. Upon startup, the tx level is initialized to TXD fifo + * length. For every sent packet, the SW gets its TXD descriptor size + * (from a pre-calculated array) and subtracts it from tx level. The + * size is also stored in txdb. When a TXF ack arrives, the SW fetched + * the size of the original TXD descriptor from the txdb and adds it + * to the tx level. When the Tx level drops below some predefined + * threshold, the driver stops the TX queue. When the TX level rises + * above that level, the tx queue is enabled again. + * + * This technique avoids excessive reading of RPTR and WPTR registers. + * As our benchmarks shows, it adds 1.5 Gbit/sec to NIS's throughput. + */ +static inline void __tx_db_ptr_next(struct txdb *db, struct tx_map **pptr) +{ + ++*pptr; + if (unlikely(*pptr == db->end)) + *pptr = db->start; +} + +static inline void tx_db_inc_rptr(struct txdb *db) +{ + __tx_db_ptr_next(db, &db->rptr); +} + +static inline void tx_db_inc_wptr(struct txdb *db) +{ + __tx_db_ptr_next(db, &db->wptr); +} + +static int tx_db_init(struct txdb *d, int sz_type) +{ + int memsz = FIFO_SIZE * (1 << (sz_type + 1)); + + d->start = vzalloc(memsz); + if (!d->start) + return -ENOMEM; + /* In order to differentiate between an empty db state and a full db + * state at least one element should always be empty in order to + * avoid rptr == wptr, which means that the db is empty. + */ + d->size = memsz / sizeof(struct tx_map) - 1; + d->end = d->start + d->size + 1; /* just after last element */ + + /* All dbs are created empty */ + d->rptr = d->start; + d->wptr = d->start; + return 0; +} + +static void tx_db_close(struct txdb *d) +{ + if (d->start) { + vfree(d->start); + d->start = NULL; + } +} + +/* Sizes of tx desc (including padding if needed) as function of the SKB's + * frag number + */ +static struct { + u16 bytes; + u16 qwords; /* qword = 64 bit */ +} txd_sizes[MAX_PBL]; + +inline void pbl_set(struct pbl *pbl, dma_addr_t dma, int len) +{ + pbl->len = cpu_to_le32(len); + pbl->pa_lo = cpu_to_le32(lower_32_bits(dma)); + pbl->pa_hi = cpu_to_le32(upper_32_bits(dma)); +} + +static inline void txdb_set(struct txdb *db, dma_addr_t dma, int len) +{ + db->wptr->len = len; + db->wptr->addr.dma = dma; +} + +struct mapping_info { + dma_addr_t dma; + size_t size; +}; + +/** + * tx_map_skb - create and store DMA mappings for skb's data blocks + * @priv: NIC private structure + * @skb: socket buffer to map + * @txdd: pointer to tx descriptor to be updated + * @pkt_len: pointer to unsigned long value + * + * This function creates DMA mappings for skb's data blocks and writes them to + * PBL of a new tx descriptor. It also stores them in the tx db, so they could + * be unmapped after the data has been sent. It is the responsibility of the + * caller to make sure that there is enough space in the txdb. The last + * element holds a pointer to skb itself and is marked with a zero length. + * + * Return: 0 on success and negative value on error. + */ +static inline int tx_map_skb(struct tn40_priv *priv, struct sk_buff *skb, + struct txd_desc *txdd, unsigned int *pkt_len) +{ + int nr_frags = skb_shinfo(skb)->nr_frags; + struct mapping_info info[MAX_PBL]; + struct pbl *pbl = &txdd->pbl[0]; + struct txdb *db = &priv->txdb; + unsigned int size; + int i, len, ret; + dma_addr_t dma; + + netdev_dbg(priv->ndev, "TX skb %p skbLen %d dataLen %d frags %d\n", skb, + skb->len, skb->data_len, nr_frags); + if (nr_frags > MAX_PBL - 1) { + ret = skb_linearize(skb); + if (ret) + return ret; + nr_frags = skb_shinfo(skb)->nr_frags; + } + /* initial skb */ + len = skb->len - skb->data_len; + dma = dma_map_single(&priv->pdev->dev, skb->data, len, + DMA_TO_DEVICE); + ret = dma_mapping_error(&priv->pdev->dev, dma); + if (ret) + return ret; + + txdb_set(db, dma, len); + pbl_set(pbl++, db->wptr->addr.dma, db->wptr->len); + *pkt_len = db->wptr->len; + + for (i = 0; i < nr_frags; i++) { + skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; + + size = skb_frag_size(frag); + dma = skb_frag_dma_map(&priv->pdev->dev, frag, 0, + size, DMA_TO_DEVICE); + + ret = dma_mapping_error(&priv->pdev->dev, dma); + if (ret) + goto mapping_error; + info[i].dma = dma; + info[i].size = size; + } + + for (i = 0; i < nr_frags; i++) { + tx_db_inc_wptr(db); + txdb_set(db, info[i].dma, info[i].size); + pbl_set(pbl++, db->wptr->addr.dma, db->wptr->len); + *pkt_len += db->wptr->len; + } + + /* SHORT_PKT_FIX */ + if (skb->len < SHORT_PACKET_SIZE) + ++nr_frags; + + /* Add skb clean up info. */ + tx_db_inc_wptr(db); + db->wptr->len = -txd_sizes[nr_frags].bytes; + db->wptr->addr.skb = skb; + tx_db_inc_wptr(db); + + return 0; + mapping_error: + dma_unmap_page(&priv->pdev->dev, db->wptr->addr.dma, db->wptr->len, + DMA_TO_DEVICE); + for (; i > 0; i--) + dma_unmap_page(&priv->pdev->dev, info[i - 1].dma, + info[i - 1].size, DMA_TO_DEVICE); + return -ENOMEM; +} + +static void init_txd_sizes(void) +{ + int i, lwords; + + if (txd_sizes[0].bytes) + return; + + /* 7 - is number of lwords in txd with one phys buffer + * 3 - is number of lwords used for every additional phys buffer + */ + for (i = 0; i < MAX_PBL; i++) { + lwords = 7 + (i * 3); + if (lwords & 1) + lwords++; /* pad it with 1 lword */ + txd_sizes[i].qwords = lwords >> 1; + txd_sizes[i].bytes = lwords << 2; + } +} + +static int create_tx_ring(struct tn40_priv *priv) +{ + int ret; + + ret = tn40_fifo_alloc(priv, &priv->txd_fifo0.m, priv->txd_size, + REG_TXD_CFG0_0, REG_TXD_CFG1_0, + REG_TXD_RPTR_0, REG_TXD_WPTR_0); + if (ret) + return ret; + + ret = tn40_fifo_alloc(priv, &priv->txf_fifo0.m, priv->txf_size, + REG_TXF_CFG0_0, REG_TXF_CFG1_0, + REG_TXF_RPTR_0, REG_TXF_WPTR_0); + if (ret) + goto err_free_txd; + + /* The TX db has to keep mappings for all packets sent (on + * TxD) and not yet reclaimed (on TxF). + */ + ret = tx_db_init(&priv->txdb, max(priv->txd_size, priv->txf_size)); + if (ret) + goto err_free_txf; + + /* SHORT_PKT_FIX */ + priv->b0_len = 64; + priv->b0_va = dma_alloc_coherent(&priv->pdev->dev, priv->b0_len, + &priv->b0_dma, GFP_KERNEL); + if (!priv->b0_va) + goto err_free_db; + + priv->tx_level = TN40_MAX_TX_LEVEL; + priv->tx_update_mark = priv->tx_level - 1024; + return 0; +err_free_db: + tx_db_close(&priv->txdb); +err_free_txf: + tn40_fifo_free(priv, &priv->txf_fifo0.m); +err_free_txd: + tn40_fifo_free(priv, &priv->txd_fifo0.m); + return -ENOMEM; +} + +/** + * tn40_tx_space - Calculate the available space in the TX fifo. + * @priv: NIC private structure + * + * Return: available space in TX fifo in bytes + */ +static inline int tn40_tx_space(struct tn40_priv *priv) +{ + struct txd_fifo *f = &priv->txd_fifo0; + int fsize; + + f->m.rptr = read_reg(priv, f->m.reg_rptr) & TXF_WPTR_WR_PTR; + fsize = f->m.rptr - f->m.wptr; + if (fsize <= 0) + fsize = f->m.memsz + fsize; + return fsize; +} + +#define TXD_FULL_CHECKSUM 7 + +static int tn40_start_xmit(struct sk_buff *skb, struct net_device *ndev) +{ + struct tn40_priv *priv = netdev_priv(ndev); + struct txd_fifo *f = &priv->txd_fifo0; + int txd_checksum = TXD_FULL_CHECKSUM; + int nr_frags, len, err; + struct txd_desc *txdd; + unsigned int pkt_len; + int txd_vlan_id = 0; + int txd_lgsnd = 0; + int txd_vtag = 0; + int txd_mss = 0; + + /* Build tx descriptor */ + txdd = (struct txd_desc *)(f->m.va + f->m.wptr); + err = tx_map_skb(priv, skb, txdd, &pkt_len); + if (err) { + dev_kfree_skb(skb); + return NETDEV_TX_OK; + } + nr_frags = skb_shinfo(skb)->nr_frags; + if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) + txd_checksum = 0; + + if (skb_shinfo(skb)->gso_size) { + txd_mss = skb_shinfo(skb)->gso_size; + txd_lgsnd = 1; + netdev_dbg(priv->ndev, "skb %p pkt len %d gso size = %d\n", skb, + pkt_len, txd_mss); + } + if (skb_vlan_tag_present(skb)) { + /* Don't cut VLAN ID to 12 bits */ + txd_vlan_id = skb_vlan_tag_get(skb); + txd_vtag = 1; + } + txdd->va_hi = 0; + txdd->va_lo = 0; + txdd->length = cpu_to_le16(pkt_len); + txdd->mss = cpu_to_le16(txd_mss); + txdd->txd_val1 = + cpu_to_le32(TXD_W1_VAL + (txd_sizes[nr_frags].qwords, txd_checksum, + txd_vtag, txd_lgsnd, txd_vlan_id)); + netdev_dbg(priv->ndev, "=== w1 qwords[%d] %d =====\n", nr_frags, + txd_sizes[nr_frags].qwords); + netdev_dbg(priv->ndev, "=== TxD desc =====================\n"); + netdev_dbg(priv->ndev, "=== w1: 0x%x ================\n", + txdd->txd_val1); + netdev_dbg(priv->ndev, "=== w2: mss 0x%x len 0x%x\n", txdd->mss, + txdd->length); + /* SHORT_PKT_FIX */ + if (pkt_len < SHORT_PACKET_SIZE) { + struct pbl *pbl = &txdd->pbl[++nr_frags]; + + txdd->length = cpu_to_le16(SHORT_PACKET_SIZE); + txdd->txd_val1 = + cpu_to_le32(TXD_W1_VAL + (txd_sizes[nr_frags].qwords, + txd_checksum, txd_vtag, txd_lgsnd, + txd_vlan_id)); + pbl->len = cpu_to_le32(SHORT_PACKET_SIZE - pkt_len); + pbl->pa_lo = cpu_to_le32(lower_32_bits(priv->b0_dma)); + pbl->pa_hi = cpu_to_le32(upper_32_bits(priv->b0_dma)); + netdev_dbg(priv->ndev, "=== SHORT_PKT_FIX ==============\n"); + netdev_dbg(priv->ndev, "=== nr_frags : %d ==============\n", + nr_frags); + } + + /* Increment TXD write pointer. In case of fifo wrapping copy + * reminder of the descriptor to the beginning. + */ + f->m.wptr += txd_sizes[nr_frags].bytes; + len = f->m.wptr - f->m.memsz; + if (unlikely(len >= 0)) { + f->m.wptr = len; + if (len > 0) + memcpy(f->m.va, f->m.va + f->m.memsz, len); + } + /* Force memory writes to complete before letting the HW know + * there are new descriptors to fetch. + */ + wmb(); + + priv->tx_level -= txd_sizes[nr_frags].bytes; + if (priv->tx_level > priv->tx_update_mark) { + write_reg(priv, f->m.reg_wptr, + f->m.wptr & TXF_WPTR_WR_PTR); + } else { + if (priv->tx_noupd++ > TN40_NO_UPD_PACKETS) { + priv->tx_noupd = 0; + write_reg(priv, f->m.reg_wptr, + f->m.wptr & TXF_WPTR_WR_PTR); + } + } + + netif_trans_update(ndev); + priv->net_stats.tx_packets++; + priv->net_stats.tx_bytes += pkt_len; + if (priv->tx_level < TN40_MIN_TX_LEVEL) { + netdev_dbg(priv->ndev, "TX Q STOP level %d\n", priv->tx_level); + netif_stop_queue(ndev); + } + + return NETDEV_TX_OK; +} + +static void tn40_tx_free_skbs(struct tn40_priv *priv) +{ + struct txdb *db = &priv->txdb; + + while (db->rptr != db->wptr) { + if (likely(db->rptr->len)) + dma_unmap_page(&priv->pdev->dev, db->rptr->addr.dma, + db->rptr->len, DMA_TO_DEVICE); + else + dev_kfree_skb(db->rptr->addr.skb); + tx_db_inc_rptr(db); + } +} + +static void destroy_tx_ring(struct tn40_priv *priv) +{ + tn40_tx_free_skbs(priv); + tn40_fifo_free(priv, &priv->txd_fifo0.m); + tn40_fifo_free(priv, &priv->txf_fifo0.m); + tx_db_close(&priv->txdb); + /* SHORT_PKT_FIX */ + if (priv->b0_len) { + dma_free_coherent(&priv->pdev->dev, priv->b0_len, priv->b0_va, + priv->b0_dma); + priv->b0_len = 0; + } +} + +/** + * tx_push_desc - Push a descriptor to TxD fifo. + * + * @priv: NIC private structure + * @data: desc's data + * @size: desc's size + * + * This function pushes desc to TxD fifo and overlaps it if needed. + * + * This function does not check for available space, nor does it check + * that the data size is smaller than the fifo size. Checking for + * space is the responsibility of the caller. + */ +static void tx_push_desc(struct tn40_priv *priv, void *data, int size) +{ + struct txd_fifo *f = &priv->txd_fifo0; + int i = f->m.memsz - f->m.wptr; + + if (size == 0) + return; + + if (i > size) { + memcpy(f->m.va + f->m.wptr, data, size); + f->m.wptr += size; + } else { + memcpy(f->m.va + f->m.wptr, data, i); + f->m.wptr = size - i; + memcpy(f->m.va, data + i, f->m.wptr); + } + write_reg(priv, f->m.reg_wptr, f->m.wptr & TXF_WPTR_WR_PTR); +} + +/** + * tx_push_desc_safe - push descriptor to TxD fifo in a safe way. + * + * @priv: NIC private structure + * @data: descriptor data + * @size: descriptor size + * + * This function does check for available space and, if necessary, + * waits for the NIC to read existing data before writing new data. + */ +static void tx_push_desc_safe(struct tn40_priv *priv, void *data, int size) +{ + int timer = 0; + + while (size > 0) { + /* We subtract 8 because when the fifo is full rptr == + * wptr, which also means that fifo is empty, we can + * understand the difference, but could the HW do the + * same ??? + */ + int avail = tn40_tx_space(priv) - 8; + + if (avail <= 0) { + if (timer++ > 300) /* Prevent endless loop */ + break; + + udelay(50); /* Give the HW a chance to clean the fifo */ + continue; + } + avail = min(avail, size); + netdev_dbg(priv->ndev, + "about to push %d bytes starting %p size %d\n", + avail, data, size); + tx_push_desc(priv, data, avail); + size -= avail; + data += avail; + } +} + +static int tn40_set_link_speed(struct tn40_priv *priv, u32 speed) +{ + u32 val; + int i; + + netdev_dbg(priv->ndev, "speed %d\n", speed); + switch (speed) { + case SPEED_10000: + case SPEED_5000: + case SPEED_2500: + netdev_dbg(priv->ndev, "link_speed %d\n", speed); + + write_reg(priv, 0x1010, 0x217); /*ETHSD.REFCLK_CONF */ + write_reg(priv, 0x104c, 0x4c); /*ETHSD.L0_RX_PCNT */ + write_reg(priv, 0x1050, 0x4c); /*ETHSD.L1_RX_PCNT */ + write_reg(priv, 0x1054, 0x4c); /*ETHSD.L2_RX_PCNT */ + write_reg(priv, 0x1058, 0x4c); /*ETHSD.L3_RX_PCNT */ + write_reg(priv, 0x102c, 0x434); /*ETHSD.L0_TX_PCNT */ + write_reg(priv, 0x1030, 0x434); /*ETHSD.L1_TX_PCNT */ + write_reg(priv, 0x1034, 0x434); /*ETHSD.L2_TX_PCNT */ + write_reg(priv, 0x1038, 0x434); /*ETHSD.L3_TX_PCNT */ + write_reg(priv, 0x6300, 0x0400); /*MAC.PCS_CTRL */ + + write_reg(priv, 0x1018, 0x00); /*Mike2 */ + udelay(5); + write_reg(priv, 0x1018, 0x04); /*Mike2 */ + udelay(5); + write_reg(priv, 0x1018, 0x06); /*Mike2 */ + udelay(5); + /*MikeFix1 */ + /*L0: 0x103c , L1: 0x1040 , L2: 0x1044 , L3: 0x1048 =0x81644 */ + write_reg(priv, 0x103c, 0x81644); /*ETHSD.L0_TX_DCNT */ + write_reg(priv, 0x1040, 0x81644); /*ETHSD.L1_TX_DCNT */ + write_reg(priv, 0x1044, 0x81644); /*ETHSD.L2_TX_DCNT */ + write_reg(priv, 0x1048, 0x81644); /*ETHSD.L3_TX_DCNT */ + write_reg(priv, 0x1014, 0x043); /*ETHSD.INIT_STAT */ + for (i = 1000; i; i--) { + udelay(50); + val = read_reg(priv, 0x1014); /*ETHSD.INIT_STAT */ + if (val & (1 << 9)) { + /*ETHSD.INIT_STAT */ + write_reg(priv, 0x1014, 0x3); + /*ETHSD.INIT_STAT */ + val = read_reg(priv, 0x1014); + + break; + } + } + if (!i) + netdev_err(priv->ndev, "MAC init timeout!\n"); + + write_reg(priv, 0x6350, 0x0); /*MAC.PCS_IF_MODE */ + write_reg(priv, REG_CTRLST, 0xC13); /*0x93//0x13 */ + write_reg(priv, 0x111c, 0x7ff); /*MAC.MAC_RST_CNT */ + for (i = 40; i--;) + udelay(50); + + write_reg(priv, 0x111c, 0x0); /*MAC.MAC_RST_CNT */ + break; + + case SPEED_1000: + case SPEED_100: + write_reg(priv, 0x1010, 0x613); /*ETHSD.REFCLK_CONF */ + write_reg(priv, 0x104c, 0x4d); /*ETHSD.L0_RX_PCNT */ + write_reg(priv, 0x1050, 0x0); /*ETHSD.L1_RX_PCNT */ + write_reg(priv, 0x1054, 0x0); /*ETHSD.L2_RX_PCNT */ + write_reg(priv, 0x1058, 0x0); /*ETHSD.L3_RX_PCNT */ + write_reg(priv, 0x102c, 0x35); /*ETHSD.L0_TX_PCNT */ + write_reg(priv, 0x1030, 0x0); /*ETHSD.L1_TX_PCNT */ + write_reg(priv, 0x1034, 0x0); /*ETHSD.L2_TX_PCNT */ + write_reg(priv, 0x1038, 0x0); /*ETHSD.L3_TX_PCNT */ + write_reg(priv, 0x6300, 0x01140); /*MAC.PCS_CTRL */ + + write_reg(priv, 0x1014, 0x043); /*ETHSD.INIT_STAT */ + for (i = 1000; i; i--) { + udelay(50); + val = read_reg(priv, 0x1014); /*ETHSD.INIT_STAT */ + if (val & (1 << 9)) { + /*ETHSD.INIT_STAT */ + write_reg(priv, 0x1014, 0x3); + /*ETHSD.INIT_STAT */ + val = read_reg(priv, 0x1014); + + break; + } + } + if (!i) + netdev_err(priv->ndev, "MAC init timeout!\n"); + + write_reg(priv, 0x6350, 0x2b); /*MAC.PCS_IF_MODE 1g */ + write_reg(priv, 0x6310, 0x9801); /*MAC.PCS_DEV_AB */ + + write_reg(priv, 0x6314, 0x1); /*MAC.PCS_PART_AB */ + write_reg(priv, 0x6348, 0xc8); /*MAC.PCS_LINK_LO */ + write_reg(priv, 0x634c, 0xc8); /*MAC.PCS_LINK_HI */ + udelay(50); + write_reg(priv, REG_CTRLST, 0xC13); /*0x93//0x13 */ + write_reg(priv, 0x111c, 0x7ff); /*MAC.MAC_RST_CNT */ + for (i = 40; i--;) + udelay(50); + + write_reg(priv, 0x111c, 0x0); /*MAC.MAC_RST_CNT */ + write_reg(priv, 0x6300, 0x1140); /*MAC.PCS_CTRL */ + break; + + case 0: /* Link down */ + write_reg(priv, 0x104c, 0x0); /*ETHSD.L0_RX_PCNT */ + write_reg(priv, 0x1050, 0x0); /*ETHSD.L1_RX_PCNT */ + write_reg(priv, 0x1054, 0x0); /*ETHSD.L2_RX_PCNT */ + write_reg(priv, 0x1058, 0x0); /*ETHSD.L3_RX_PCNT */ + write_reg(priv, 0x102c, 0x0); /*ETHSD.L0_TX_PCNT */ + write_reg(priv, 0x1030, 0x0); /*ETHSD.L1_TX_PCNT */ + write_reg(priv, 0x1034, 0x0); /*ETHSD.L2_TX_PCNT */ + write_reg(priv, 0x1038, 0x0); /*ETHSD.L3_TX_PCNT */ + + write_reg(priv, REG_CTRLST, 0x800); + write_reg(priv, 0x111c, 0x7ff); /*MAC.MAC_RST_CNT */ + for (i = 40; i--;) + udelay(50); + write_reg(priv, 0x111c, 0x0); /*MAC.MAC_RST_CNT */ + break; + + default: + netdev_err(priv->ndev, + "Link speed was not identified yet (%d)\n", speed); + speed = 0; + break; + } + return speed; +} + +#define LINK_LOOP_MAX 10 + +static void tn40_link_changed(struct tn40_priv *priv) +{ + u32 link = read_reg(priv, REG_MAC_LNK_STAT) & MAC_LINK_STAT; + + if (!link) { + if (netif_carrier_ok(priv->ndev) && priv->link) + netif_stop_queue(priv->ndev); + + priv->link = 0; + if (priv->link_loop_cnt++ > LINK_LOOP_MAX) { + /* MAC reset */ + tn40_set_link_speed(priv, 0); + priv->link_loop_cnt = 0; + } + write_reg(priv, 0x5150, 1000000); + return; + } + if (!netif_carrier_ok(priv->ndev) && !link) + netif_wake_queue(priv->ndev); + + priv->link = link; +} + +static inline void tn40_isr_extra(struct tn40_priv *priv, u32 isr) +{ + if (isr & (IR_LNKCHG0 | IR_LNKCHG1 | IR_TMR0)) { + netdev_dbg(priv->ndev, "isr = 0x%x\n", isr); + tn40_link_changed(priv); + } +} + +static irqreturn_t tn40_isr_napi(int irq, void *dev) +{ + struct tn40_priv *priv = netdev_priv((struct net_device *)dev); + u32 isr; + + isr = read_reg(priv, REG_ISR_MSK0); + + if (unlikely(!isr)) { + tn40_enable_interrupts(priv); + return IRQ_NONE; /* Not our interrupt */ + } + + if (isr & IR_EXTRA) + tn40_isr_extra(priv, isr); + + if (isr & (IR_RX_DESC_0 | IR_TX_FREE_0 | IR_TMR1)) { + /* We get here if an interrupt has slept into the + * small time window between these lines in + * tn40_poll: tn40_enable_interrupts(priv); return 0; + * + * Currently interrupts are disabled (since we read + * the ISR register) and we have failed to register + * the next poll. So we read the regs to trigger the + * chip and allow further interrupts. + */ + read_reg(priv, REG_TXF_WPTR_0); + read_reg(priv, REG_RXD_WPTR_0); + } + + tn40_enable_interrupts(priv); + return IRQ_HANDLED; +} + +static int tn40_fw_load(struct tn40_priv *priv) +{ + const struct firmware *fw = NULL; + int master, i, ret; + + ret = request_firmware(&fw, FIRMWARE_NAME, &priv->pdev->dev); + if (ret) + return ret; + + master = read_reg(priv, REG_INIT_SEMAPHORE); + if (!read_reg(priv, REG_INIT_STATUS) && master) { + netdev_dbg(priv->ndev, "Loading FW...\n"); + tx_push_desc_safe(priv, (void *)fw->data, fw->size); + mdelay(100); + } + for (i = 0; i < 200; i++) { + if (read_reg(priv, REG_INIT_STATUS)) + break; + mdelay(2); + } + if (master) + write_reg(priv, REG_INIT_SEMAPHORE, 1); + + if (i == 200) { + netdev_err(priv->ndev, "firmware loading failed\n"); + netdev_dbg(priv->ndev, "VPC: 0x%x VIC: 0x%x STATUS: 0x%xd\n", + read_reg(priv, REG_VPC), read_reg(priv, REG_VIC), + read_reg(priv, REG_INIT_STATUS)); + ret = -EIO; + } else { + netdev_dbg(priv->ndev, "firmware loading success\n"); + } + release_firmware(fw); + return ret; +} + +static void tn40_restore_mac(struct net_device *ndev, struct tn40_priv *priv) +{ + u32 val; + + netdev_dbg(priv->ndev, "mac0 =%x mac1 =%x mac2 =%x\n", + read_reg(priv, REG_UNC_MAC0_A), + read_reg(priv, REG_UNC_MAC1_A), + read_reg(priv, REG_UNC_MAC2_A)); + + val = (ndev->dev_addr[0] << 8) | (ndev->dev_addr[1]); + write_reg(priv, REG_UNC_MAC2_A, val); + val = (ndev->dev_addr[2] << 8) | (ndev->dev_addr[3]); + write_reg(priv, REG_UNC_MAC1_A, val); + val = (ndev->dev_addr[4] << 8) | (ndev->dev_addr[5]); + write_reg(priv, REG_UNC_MAC0_A, val); + + /* More then IP MAC address */ + write_reg(priv, REG_MAC_ADDR_0, + (ndev->dev_addr[3] << 24) | (ndev->dev_addr[2] << 16) | + (ndev->dev_addr[1] + << 8) | (ndev->dev_addr[0])); + write_reg(priv, REG_MAC_ADDR_1, + (ndev->dev_addr[5] << 8) | (ndev->dev_addr[4])); + + netdev_dbg(priv->ndev, "mac0 =%x mac1 =%x mac2 =%x\n", + read_reg(priv, REG_UNC_MAC0_A), + read_reg(priv, REG_UNC_MAC1_A), + read_reg(priv, REG_UNC_MAC2_A)); +} + +static void tn40_hw_start(struct tn40_priv *priv) +{ + write_reg(priv, REG_FRM_LENGTH, 0X3FE0); + write_reg(priv, REG_GMAC_RXF_A, 0X10fd); + /*MikeFix1 */ + /*L0: 0x103c , L1: 0x1040 , L2: 0x1044 , L3: 0x1048 =0x81644 */ + write_reg(priv, 0x103c, 0x81644); /*ETHSD.L0_TX_DCNT */ + write_reg(priv, 0x1040, 0x81644); /*ETHSD.L1_TX_DCNT */ + write_reg(priv, 0x1044, 0x81644); /*ETHSD.L2_TX_DCNT */ + write_reg(priv, 0x1048, 0x81644); /*ETHSD.L3_TX_DCNT */ + write_reg(priv, REG_RX_FIFO_SECTION, 0x10); + write_reg(priv, REG_TX_FIFO_SECTION, 0xE00010); + write_reg(priv, REG_RX_FULLNESS, 0); + write_reg(priv, REG_TX_FULLNESS, 0); + + write_reg(priv, REG_VGLB, 0); + write_reg(priv, REG_RDINTCM0, priv->rdintcm); + write_reg(priv, REG_RDINTCM2, 0); + + write_reg(priv, REG_TDINTCM0, priv->tdintcm); /* old val = 0x300064 */ + + /* Enable timer interrupt once in 2 secs. */ + tn40_restore_mac(priv->ndev, priv); + + /* Pause frame */ + write_reg(priv, 0x12E0, 0x28); + write_reg(priv, REG_PAUSE_QUANT, 0xFFFF); + write_reg(priv, 0x6064, 0xF); + + write_reg(priv, REG_GMAC_RXF_A, + GMAC_RX_FILTER_OSEN | GMAC_RX_FILTER_TXFC | GMAC_RX_FILTER_AM + | GMAC_RX_FILTER_AB); + + tn40_link_changed(priv); + tn40_enable_interrupts(priv); +} + +static int tn40_hw_reset(struct tn40_priv *priv) +{ + u32 val, i; + + /* Reset sequences: read, write 1, read, write 0 */ + val = read_reg(priv, REG_CLKPLL); + write_reg(priv, REG_CLKPLL, (val | CLKPLL_SFTRST) + 0x8); + udelay(50); + val = read_reg(priv, REG_CLKPLL); + write_reg(priv, REG_CLKPLL, val & ~CLKPLL_SFTRST); + + /* Check that the PLLs are locked and reset ended */ + for (i = 0; i < 70; i++, mdelay(10)) { + if ((read_reg(priv, REG_CLKPLL) & CLKPLL_LKD) == CLKPLL_LKD) { + udelay(50); + /* Do any PCI-E read transaction */ + read_reg(priv, REG_RXD_CFG0_0); + return 0; + } + } + return 1; +} + +static void tn40_sw_reset(struct tn40_priv *priv) +{ + int i; + + /* 1. load MAC (obsolete) */ + /* 2. disable Rx (and Tx) */ + write_reg(priv, REG_GMAC_RXF_A, 0); + mdelay(100); + /* 3. Disable port */ + write_reg(priv, REG_DIS_PORT, 1); + /* 4. Disable queue */ + write_reg(priv, REG_DIS_QU, 1); + /* 5. Wait until hw is disabled */ + for (i = 0; i < 50; i++) { + if (read_reg(priv, REG_RST_PORT) & 1) + break; + mdelay(10); + } + if (i == 50) + netdev_err(priv->ndev, "SW reset timeout. continuing anyway\n"); + + /* 6. Disable interrupts */ + write_reg(priv, REG_RDINTCM0, 0); + write_reg(priv, REG_TDINTCM0, 0); + write_reg(priv, REG_IMR, 0); + read_reg(priv, REG_ISR); + + /* 7. Reset queue */ + write_reg(priv, REG_RST_QU, 1); + /* 8. Reset port */ + write_reg(priv, REG_RST_PORT, 1); + /* 9. Zero all read and write pointers */ + for (i = REG_TXD_WPTR_0; i <= REG_TXF_RPTR_3; i += 0x10) + write_reg(priv, i, 0); + /* 10. Unset port disable */ + write_reg(priv, REG_DIS_PORT, 0); + /* 11. Unset queue disable */ + write_reg(priv, REG_DIS_QU, 0); + /* 12. Unset queue reset */ + write_reg(priv, REG_RST_QU, 0); + /* 13. Unset port reset */ + write_reg(priv, REG_RST_PORT, 0); + /* 14. Enable Rx */ + /* Skipped. will be done later */ +} + +static int tn40_start(struct tn40_priv *priv) +{ + int ret; + + ret = create_tx_ring(priv); + if (ret) { + netdev_err(priv->ndev, "failed to tx init %d\n", ret); + return ret; + } + + ret = request_irq(priv->pdev->irq, &tn40_isr_napi, IRQF_SHARED, + priv->ndev->name, priv->ndev); + if (ret) { + netdev_err(priv->ndev, "failed to request irq %d\n", ret); + goto err_tx_ring; + } + + tn40_hw_start(priv); + return 0; +err_tx_ring: + destroy_tx_ring(priv); + return ret; +} + +static int tn40_close(struct net_device *ndev) +{ + struct tn40_priv *priv = netdev_priv(ndev); + + tn40_disable_interrupts(priv); + free_irq(priv->pdev->irq, priv->ndev); + tn40_sw_reset(priv); + destroy_tx_ring(priv); + return 0; +} + +static int tn40_open(struct net_device *dev) +{ + struct tn40_priv *priv = netdev_priv(dev); + int ret; + + tn40_sw_reset(priv); + ret = tn40_start(priv); + if (ret) { + netdev_err(dev, "failed to start %d\n", ret); + return ret; + } + return 0; +} + +static void __tn40_vlan_rx_vid(struct net_device *ndev, uint16_t vid, + int enable) +{ + struct tn40_priv *priv = netdev_priv(ndev); + u32 reg, bit, val; + + netdev_dbg(priv->ndev, "vid =%d value =%d\n", (int)vid, enable); + if (unlikely(vid >= 4096)) { + netdev_err(priv->ndev, "invalid VID: %u (> 4096)\n", vid); + return; + } + reg = REG_VLAN_0 + (vid / 32) * 4; + bit = 1 << vid % 32; + val = read_reg(priv, reg); + netdev_dbg(priv->ndev, "reg =%x, val =%x, bit =%d\n", reg, val, bit); + if (enable) + val |= bit; + else + val &= ~bit; + netdev_dbg(priv->ndev, "new val %x\n", val); + write_reg(priv, reg, val); +} + +static int tn40_vlan_rx_add_vid(struct net_device *ndev, + __always_unused __be16 proto, u16 vid) +{ + __tn40_vlan_rx_vid(ndev, vid, 1); + return 0; +} + +static int tn40_vlan_rx_kill_vid(struct net_device *ndev, + __always_unused __be16 proto, u16 vid) +{ + __tn40_vlan_rx_vid(ndev, vid, 0); + return 0; +} + +static void tn40_setmulti(struct net_device *ndev) +{ + struct tn40_priv *priv = netdev_priv(ndev); + + u32 rxf_val = + GMAC_RX_FILTER_AM | GMAC_RX_FILTER_AB | GMAC_RX_FILTER_OSEN | + GMAC_RX_FILTER_TXFC; + int i; + + /* IMF - imperfect (hash) rx multicast filter */ + /* PMF - perfect rx multicast filter */ + + /* FIXME: RXE(OFF) */ + if (ndev->flags & IFF_PROMISC) { + rxf_val |= GMAC_RX_FILTER_PRM; + } else if (ndev->flags & IFF_ALLMULTI) { + /* set IMF to accept all multicast frames */ + for (i = 0; i < MAC_MCST_HASH_NUM; i++) + write_reg(priv, REG_RX_MCST_HASH0 + i * 4, ~0); + } else if (netdev_mc_count(ndev)) { + u8 hash; + struct netdev_hw_addr *mclist; + u32 reg, val; + + /* Set IMF to deny all multicast frames */ + for (i = 0; i < MAC_MCST_HASH_NUM; i++) + write_reg(priv, REG_RX_MCST_HASH0 + i * 4, 0); + + /* Set PMF to deny all multicast frames */ + for (i = 0; i < MAC_MCST_NUM; i++) { + write_reg(priv, REG_RX_MAC_MCST0 + i * 8, 0); + write_reg(priv, REG_RX_MAC_MCST1 + i * 8, 0); + } + /* Use PMF to accept first MAC_MCST_NUM (15) addresses */ + + /* TBD: Sort the addresses and write them in ascending + * order into RX_MAC_MCST regs. we skip this phase now + * and accept ALL multicast frames through IMF. Accept + * the rest of addresses throw IMF. + */ + netdev_for_each_mc_addr(mclist, ndev) { + hash = 0; + for (i = 0; i < ETH_ALEN; i++) + hash ^= mclist->addr[i]; + + reg = REG_RX_MCST_HASH0 + ((hash >> 5) << 2); + val = read_reg(priv, reg); + val |= (1 << (hash % 32)); + write_reg(priv, reg, val); + } + } else { + rxf_val |= GMAC_RX_FILTER_AB; + } + write_reg(priv, REG_GMAC_RXF_A, rxf_val); + /* Enable RX */ + /* FIXME: RXE(ON) */ +} + +static int tn40_set_mac(struct net_device *ndev, void *p) +{ + struct tn40_priv *priv = netdev_priv(ndev); + struct sockaddr *addr = p; + + eth_hw_addr_set(ndev, addr->sa_data); + tn40_restore_mac(ndev, priv); + return 0; +} + +static void tn40_mac_init(struct tn40_priv *priv) +{ + u8 addr[ETH_ALEN]; + u64 val; + + val = (u64)read_reg(priv, REG_UNC_MAC0_A); + val |= (u64)read_reg(priv, REG_UNC_MAC1_A) << 16; + val |= (u64)read_reg(priv, REG_UNC_MAC2_A) << 32; + + u64_to_ether_addr(val, addr); + eth_hw_addr_set(priv->ndev, addr); +} + +static struct net_device_stats *tn40_get_stats(struct net_device *ndev) +{ + struct tn40_priv *priv = netdev_priv(ndev); + + return &priv->net_stats; +} + +static const struct net_device_ops tn40_netdev_ops = { + .ndo_open = tn40_open, + .ndo_stop = tn40_close, + .ndo_start_xmit = tn40_start_xmit, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_rx_mode = tn40_setmulti, + .ndo_get_stats = tn40_get_stats, + .ndo_set_mac_address = tn40_set_mac, + .ndo_vlan_rx_add_vid = tn40_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = tn40_vlan_rx_kill_vid, +}; + +static int tn40_priv_init(struct tn40_priv *priv) +{ + int ret; + + ret = tn40_hw_reset(priv); + if (ret) + return ret; + + /* Set GPIO[9:0] to output 0 */ + write_reg(priv, 0x51E0, 0x30010006); /* GPIO_OE_ WR CMD */ + write_reg(priv, 0x51F0, 0x0); /* GPIO_OE_ DATA */ + write_reg(priv, REG_MDIO_CMD_STAT, 0x3ec8); + + // we use tx descriptors to load a firmware. + ret = create_tx_ring(priv); + if (ret) + return ret; + ret = tn40_fw_load(priv); + destroy_tx_ring(priv); + return ret; +} + +static struct net_device *tn40_netdev_alloc(struct pci_dev *pdev) +{ + struct net_device *ndev; + + ndev = devm_alloc_etherdev(&pdev->dev, sizeof(struct tn40_priv)); + if (!ndev) + return NULL; + ndev->netdev_ops = &tn40_netdev_ops; + ndev->tx_queue_len = TN40_NDEV_TXQ_LEN; + ndev->mem_start = pci_resource_start(pdev, 0); + ndev->mem_end = pci_resource_end(pdev, 0); + ndev->min_mtu = ETH_ZLEN; + ndev->max_mtu = TN40_MAX_MTU; + + ndev->features = NETIF_F_IP_CSUM | + NETIF_F_SG | + NETIF_F_FRAGLIST | + NETIF_F_TSO | NETIF_F_GRO | + NETIF_F_RXCSUM | + NETIF_F_RXHASH | + NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_CTAG_RX | + NETIF_F_HW_VLAN_CTAG_FILTER; + ndev->vlan_features = NETIF_F_IP_CSUM | + NETIF_F_SG | + NETIF_F_TSO | NETIF_F_GRO | NETIF_F_RXHASH; + + if (dma_get_mask(&pdev->dev) == DMA_BIT_MASK(64)) { + ndev->features |= NETIF_F_HIGHDMA; + ndev->vlan_features |= NETIF_F_HIGHDMA; + } + ndev->hw_features |= ndev->features; + + SET_NETDEV_DEV(ndev, &pdev->dev); + netif_carrier_off(ndev); + netif_stop_queue(ndev); + return ndev; +} + static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { + struct net_device *ndev; + struct tn40_priv *priv; + unsigned int nvec = 1; + void __iomem *regs; int ret; + init_txd_sizes(); + ret = pci_enable_device(pdev); if (ret) return ret; @@ -18,7 +1175,84 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_disable_device; } } + + ret = pci_request_regions(pdev, TN40_DRV_NAME); + if (ret) { + dev_err(&pdev->dev, "failed to request PCI regions.\n"); + goto err_disable_device; + } + + pci_set_master(pdev); + + regs = pci_iomap(pdev, 0, TN40_REGS_SIZE); + if (!regs) { + ret = -EIO; + dev_err(&pdev->dev, "failed to map PCI bar.\n"); + goto err_free_regions; + } + + ndev = tn40_netdev_alloc(pdev); + if (!ndev) { + ret = -ENOMEM; + dev_err(&pdev->dev, "failed to allocate netdev.\n"); + goto err_iounmap; + } + + priv = netdev_priv(ndev); + pci_set_drvdata(pdev, priv); + + priv->regs = regs; + priv->pdev = pdev; + priv->ndev = ndev; + /* Initialize fifo sizes. */ + priv->txd_size = 3; + priv->txf_size = 3; + priv->rxd_size = 3; + priv->rxf_size = 3; + /* Initialize the initial coalescing registers. */ + priv->rdintcm = INT_REG_VAL(0x20, 1, 4, 12); + priv->tdintcm = INT_REG_VAL(0x20, 1, 0, 12); + + ret = tn40_hw_reset(priv); + if (ret) { + dev_err(&pdev->dev, "failed to reset HW.\n"); + goto err_unset_drvdata; + } + + ret = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_MSI); + if (ret < 0) { + dev_err(&pdev->dev, "failed to allocate irq.\n"); + goto err_unset_drvdata; + } + + priv->stats_flag = ((read_reg(priv, FPGA_VER) & 0xFFF) != 308); + + priv->isr_mask = + IR_RX_FREE_0 | IR_LNKCHG0 | IR_PSE | IR_TMR0 | IR_RX_DESC_0 | + IR_TX_FREE_0 | IR_TMR1; + + tn40_mac_init(priv); + + ret = tn40_priv_init(priv); + if (ret) { + dev_err(&pdev->dev, "failed to initialize tn40_priv.\n"); + goto err_free_irq; + } + + ret = register_netdev(ndev); + if (ret) { + dev_err(&pdev->dev, "failed to register netdev.\n"); + goto err_free_irq; + } return 0; +err_free_irq: + pci_free_irq_vectors(pdev); +err_unset_drvdata: + pci_set_drvdata(pdev, NULL); +err_iounmap: + iounmap(regs); +err_free_regions: + pci_release_regions(pdev); err_disable_device: pci_disable_device(pdev); return ret; @@ -26,6 +1260,15 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static void tn40_remove(struct pci_dev *pdev) { + struct tn40_priv *priv = pci_get_drvdata(pdev); + struct net_device *ndev = priv->ndev; + + unregister_netdev(ndev); + + pci_free_irq_vectors(priv->pdev); + pci_set_drvdata(pdev, NULL); + iounmap(priv->regs); + pci_release_regions(pdev); pci_disable_device(pdev); } @@ -54,4 +1297,5 @@ MODULE_DEVICE_TABLE(pci, tn40_id_table); MODULE_AUTHOR("Tehuti networks"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Tehuti Network TN40xx Driver"); +MODULE_FIRMWARE(FIRMWARE_NAME); MODULE_VERSION(TN40_DRV_VERSION); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index b4978f92574a..0cf2eca0ae1a 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -4,8 +4,20 @@ #ifndef _TN40_H_ #define _TN40_H_ +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include #include "tn40_regs.h" @@ -14,4 +26,171 @@ #define PCI_VENDOR_ID_EDIMAX 0x1432 +#define MDIO_SPEED_1MHZ (1) +#define MDIO_SPEED_6MHZ (6) + +/* netdev tx queue len for Luxor. The default value is 1000. + * ifconfig eth1 txqueuelen 3000 - to change it at runtime. + */ +#define TN40_NDEV_TXQ_LEN 3000 + +#define FIFO_SIZE 4096 +#define FIFO_EXTRA_SPACE 1024 + +#define TN40_TXF_DESC_SZ 16 +#define TN40_MAX_TX_LEVEL (priv->txd_fifo0.m.memsz - 16) +#define TN40_MIN_TX_LEVEL 256 +#define TN40_NO_UPD_PACKETS 40 +#define TN40_MAX_MTU BIT(14) + +#define PCK_TH_MULT 128 +#define INT_COAL_MULT 2 + +#define INT_REG_VAL(coal, coal_rc, rxf_th, pck_th) ( \ + FIELD_PREP(GENMASK(14, 0), (coal)) | \ + FIELD_PREP(BIT(15), (coal_rc)) | \ + FIELD_PREP(GENMASK(19, 16), (rxf_th)) | \ + FIELD_PREP(GENMASK(31, 20), (pck_th)) \ + ) + +struct fifo { + dma_addr_t da; /* Physical address of fifo (used by HW) */ + char *va; /* Virtual address of fifo (used by SW) */ + u32 rptr, wptr; + /* Cached values of RPTR and WPTR registers, + * they're 32 bits on both 32 and 64 archs. + */ + u16 reg_cfg0; + u16 reg_cfg1; + u16 reg_rptr; + u16 reg_wptr; + u16 memsz; /* Memory size allocated for fifo */ + u16 size_mask; + u16 pktsz; /* Skb packet size to allocate */ + u16 rcvno; /* Number of buffers that come from this RXF */ +}; + +struct txf_fifo { + struct fifo m; /* The minimal set of variables used by all fifos */ +}; + +struct txd_fifo { + struct fifo m; /* The minimal set of variables used by all fifos */ +}; + +union tx_dma_addr { + dma_addr_t dma; + struct sk_buff *skb; +}; + +/* Entry in the db. + * if len == 0 addr is dma + * if len != 0 addr is skb + */ +struct tx_map { + union tx_dma_addr addr; + int len; +}; + +/* tx database - implemented as circular fifo buffer */ +struct txdb { + struct tx_map *start; /* Points to the first element */ + struct tx_map *end; /* Points just AFTER the last element */ + struct tx_map *rptr; /* Points to the next element to read */ + struct tx_map *wptr; /* Points to the next element to write */ + int size; /* Number of elements in the db */ +}; + +struct tn40_priv { + struct net_device *ndev; + struct pci_dev *pdev; + + /* Tx FIFOs: 1 for data desc, 1 for empty (acks) desc */ + struct txd_fifo txd_fifo0; + struct txf_fifo txf_fifo0; + struct txdb txdb; + int tx_level; + int tx_update_mark; + int tx_noupd; + + int stats_flag; + struct net_device_stats net_stats; + + u8 txd_size; + u8 txf_size; + u8 rxd_size; + u8 rxf_size; + u32 rdintcm; + u32 tdintcm; + + u32 isr_mask; + int link; + u32 link_loop_cnt; + + void __iomem *regs; + + /* SHORT_PKT_FIX */ + u32 b0_len; + dma_addr_t b0_dma; /* Physical address of buffer */ + char *b0_va; /* Virtual address of buffer */ +}; + +#define MAX_PBL (19) +/* PBL describes each virtual buffer to be transmitted from the host. */ +struct pbl { + __le32 pa_lo; + __le32 pa_hi; + __le32 len; +}; + +/* First word for TXD descriptor. It means: type = 3 for regular Tx packet, + * hw_csum = 7 for IP+UDP+TCP HW checksums. + */ +#define TXD_W1_VAL(bc, checksum, vtag, lgsnd, vlan_id) ( \ + GENMASK(17, 16) | \ + FIELD_PREP(GENMASK(4, 0), (bc)) | \ + FIELD_PREP(GENMASK(7, 5), (checksum)) | \ + FIELD_PREP(BIT(8), (vtag)) | \ + FIELD_PREP(GENMASK(12, 9), (lgsnd)) | \ + FIELD_PREP(GENMASK(15, 13), \ + FIELD_GET(GENMASK(15, 13), (vlan_id))) | \ + FIELD_PREP(GENMASK(31, 20), \ + FIELD_GET(GENMASK(11, 0), (vlan_id))) \ + ) + +struct txd_desc { + __le32 txd_val1; + __le16 mss; + __le16 length; + __le32 va_lo; + __le32 va_hi; + struct pbl pbl[]; /* Fragments */ +} __packed; + +struct txf_desc { + u32 status; + u32 va_lo; /* VAdr[31:0] */ + u32 va_hi; /* VAdr[63:32] */ + u32 pad; +} __packed; + +/* 32 bit kernels use 16 bits for page_offset. Do not increase + * LUXOR__MAX_PAGE_SIZE beyond 64K! + */ +#if BITS_PER_LONG > 32 +#define LUXOR__MAX_PAGE_SIZE 0x40000 +#else +#define LUXOR__MAX_PAGE_SIZE 0x10000 +#endif + +static inline u32 read_reg(struct tn40_priv *priv, u32 reg) +{ + return readl(priv->regs + reg); +} + +static inline void write_reg(struct tn40_priv *priv, u32 reg, u32 val) +{ + writel(val, priv->regs + reg); +} + #endif /* _TN40XX_H */ From patchwork Thu Apr 25 01:03:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642765 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-oo1-f47.google.com (mail-oo1-f47.google.com [209.85.161.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0B78111AA for ; Thu, 25 Apr 2024 01:05:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007134; cv=none; b=Y3SvU+3vVyPknjPQfgFb62p+qSAqkXslFtqEQdv/y2GheadBuZJaqFcfhodUPXqd3dAvmaspiVJb695xtlcRdL2zR/wmwLYw3EB5TJoUhemO0JV27oXEE05uFUmoV4HvfsIr84R+U0MwE3SGm8twft3yGMgyfFvypaFAdvFdhhQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007134; c=relaxed/simple; bh=nTCshv0G98IB5WxsCDvDRVz4/XmsYrprGKgZeMCb+w4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QoysTdW7IYeD6TZTU0kKcHir34G1fGu8xsHQYjfbcY3u4erjbLHeF8oqYnvSKRr+tt4vW2TngHlTWY9G8oWMkwb4j1AGvvvhbMriHk7bk6GEUiiNyoc6k+kA92QGVxQZ32c68B8eJ+XPX2Id2l4Go1UXnfavWFZmatCvLgmaC3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Nh9ku5fP; arc=none smtp.client-ip=209.85.161.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nh9ku5fP" Received: by mail-oo1-f47.google.com with SMTP id 006d021491bc7-5aca32d3f78so74056eaf.1 for ; Wed, 24 Apr 2024 18:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007130; x=1714611930; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/9hKI1A+uPkUMaKEXu9wdZpJGI27vOu6Kj0breS0yjY=; b=Nh9ku5fPKeI0Dtj9LE2mZ+JNFdxSTotBWnCsiaWHdp1bhhsiq1Tpsg9GkBP23TLdX2 sVWIr9zCngzMjyZ1VY87XSdiPWOmqMqfWO69uNV50a3jqW6Gj1PenosOskw8VfrNOWsx c+U1LLxvaDXGNFt9tAdai8hxPRRC6M8QQDXTkMxYICuGyMiALWb0STiodwMvBuSCTgw+ JrSPAmuRtoBFBHXU1TFGfwkIyCIWbJU13I32d9AliWjAZsQF/JrCRLCxhceaV7oQeSVG gZhcN8zdukw2qViBp2KnTZ9HlqGryFbgi6ZYJWAL5ZTdtmpPtd4j26sh1xu6teU+slL1 ejQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007130; x=1714611930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/9hKI1A+uPkUMaKEXu9wdZpJGI27vOu6Kj0breS0yjY=; b=WLTrCvhcZYDrm7V+3/06e8hNquGjEwiuozaMS3mzM0sqE6YS00Ag20HOeKRtWEbGhP BPD9rM68NLq+p0PJIgmjoaW9RpKcu3NBxXP3mCiPIszKTwvJmE4NQLzzeHAaMHpyTPc4 dwO2Uig0dI7DcV7m2cOlr9Zbnf3ZnS+Fccy3oMGtQ2J+PAyaXpD4AeLVnarBP74jM9Ky c/h+LW/hqekijKTjDldez7BKNmdRgUfLjelegG9Tuku60Q2CiyzCYtXwR+4rDqKzB/gz bGKrOk1q7Lob/0qvnKAPPyR5OmqLPQZ+9rjYPqOHe4HAlPZ8b4Oa8AfECZS+CMB6v7ls tssg== X-Gm-Message-State: AOJu0YySwfSywQxWzZeIfrJ1mo9FFjCpffoM6j8Bi3lUrMN7vNS9WT0J ys78lX+2AIc8YXhNpkQeT47C0JvlRoBPDrHUvZVX3kAmxeXlWUoRuax4mg== X-Google-Smtp-Source: AGHT+IFmQl5OPZy8Fcje9GNCrHYbSwhu3Jc8KlXeb3cC83xiVQgjgfGoHP2NTyca7+SCllRpavz1PA== X-Received: by 2002:a05:6830:1503:b0:6eb:c386:3c3a with SMTP id k3-20020a056830150300b006ebc3863c3amr4861822otp.0.1714007129490; Wed, 24 Apr 2024 18:05:29 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:29 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 4/6] net: tn40xx: add basic Rx handling Date: Thu, 25 Apr 2024 10:03:52 +0900 Message-Id: <20240425010354.32605-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This patch adds basic Rx handling. The Rx logic uses three major data structures; two ring buffers with NIC and one database. One ring buffer is used to send information to NIC about memory to be stored packets to be received. The other is used to get information from NIC about received packets. The database is used to keep the information about DMA mapping. After a packet arrived, the db is used to pass the packet to the network stack. Signed-off-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/tn40.c | 537 ++++++++++++++++++++++++++++- drivers/net/ethernet/tehuti/tn40.h | 69 ++++ 2 files changed, 605 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index 014ef9b3fcbd..f676fc6e1d3a 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -53,6 +53,453 @@ static void tn40_fifo_free(struct tn40_priv *priv, struct fifo *f) f->memsz + FIFO_EXTRA_SPACE, f->va, f->da); } +static struct rxdb *rxdb_alloc(int nelem) +{ + size_t size = sizeof(struct rxdb) + (nelem * sizeof(int)) + + (nelem * sizeof(struct rx_map)); + struct rxdb *db; + int i; + + db = vzalloc(size); + if (db) { + db->stack = (int *)(db + 1); + db->elems = (void *)(db->stack + nelem); + db->nelem = nelem; + db->top = nelem; + /* make the first alloc close to db struct */ + for (i = 0; i < nelem; i++) + db->stack[i] = nelem - i - 1; + } + return db; +} + +static void rxdb_free(struct rxdb *db) +{ + vfree(db); +} + +static inline int rxdb_alloc_elem(struct rxdb *db) +{ + return db->stack[--(db->top)]; +} + +static inline void *rxdb_addr_elem(struct rxdb *db, unsigned int n) +{ + return db->elems + n; +} + +static inline int rxdb_available(struct rxdb *db) +{ + return db->top; +} + +static inline void rxdb_free_elem(struct rxdb *db, unsigned int n) +{ + db->stack[(db->top)++] = n; +} + +static struct rx_page *rx_page_alloc(struct tn40_priv *priv) +{ + struct rx_page *rx_page = &priv->rx_page_table.rx_pages; + int page_size = priv->rx_page_table.page_size; + struct page *page; + gfp_t gfp_mask; + dma_addr_t dma; + + gfp_mask = GFP_ATOMIC | __GFP_NOWARN; + if (page_size > PAGE_SIZE) + gfp_mask |= __GFP_COMP; + + page = alloc_pages(gfp_mask, get_order(page_size)); + if (likely(page)) { + netdev_dbg(priv->ndev, "map page %p size %d\n", + page, page_size); + dma = dma_map_page(&priv->pdev->dev, page, 0, page_size, + DMA_FROM_DEVICE); + if (unlikely(dma_mapping_error(&priv->pdev->dev, dma))) { + netdev_err(priv->ndev, "failed to map page %d\n", + page_size); + __free_pages(page, get_order(page_size)); + return NULL; + } + } else { + return NULL; + } + + rx_page->page = page; + rx_page->dma = dma; + return rx_page; +} + +static int rx_page_size(struct tn40_priv *priv) +{ + int dno = rxdb_available(priv->rxdb0) - 1; + + priv->rx_page_table.page_size = + min(LUXOR__MAX_PAGE_SIZE, dno * priv->rx_page_table.buf_size); + + return priv->rx_page_table.page_size; +} + +static void rx_page_reuse(struct tn40_priv *priv, struct rx_map *dm) +{ + if (dm->off == 0) + dma_unmap_page(&priv->pdev->dev, dm->dma, dm->size, + DMA_FROM_DEVICE); +} + +static void rx_page_ref(struct rx_page *rx_page) +{ + get_page(rx_page->page); +} + +static void rx_page_put(struct tn40_priv *priv, struct rx_map *dm) +{ + if (dm->off == 0) + dma_unmap_page(&priv->pdev->dev, dm->dma, dm->size, + DMA_FROM_DEVICE); + put_page(dm->rx_page.page); +} + +static void dm_rx_page_set(register struct rx_map *dm, struct rx_page *rx_page) +{ + dm->rx_page.page = rx_page->page; +} + +/** + * create_rx_ring - Initialize RX all related HW and SW resources + * @priv: NIC private structure + * + * create_rx_ring creates rxf and rxd fifos, updates the relevant HW registers, + * preallocates skbs for rx. It assumes that Rx is disabled in HW funcs are + * grouped for better cache usage + * + * RxD fifo is smaller then RxF fifo by design. Upon high load, RxD will be + * filled and packets will be dropped by the NIC without getting into the host + * or generating interrupts. In this situation the host has no chance of + * processing all the packets. Dropping packets by the NIC is cheaper, since it + * takes 0 CPU cycles. + * + * Return: 0 on success and negative value on error. + */ +static int create_rx_ring(struct tn40_priv *priv) +{ + int ret, pkt_size, nr; + + ret = tn40_fifo_alloc(priv, &priv->rxd_fifo0.m, priv->rxd_size, + REG_RXD_CFG0_0, REG_RXD_CFG1_0, + REG_RXD_RPTR_0, REG_RXD_WPTR_0); + if (ret) + return ret; + + ret = tn40_fifo_alloc(priv, &priv->rxf_fifo0.m, priv->rxf_size, + REG_RXF_CFG0_0, REG_RXF_CFG1_0, + REG_RXF_RPTR_0, REG_RXF_WPTR_0); + if (ret) + goto err_free_rxd; + + pkt_size = priv->ndev->mtu + VLAN_ETH_HLEN; + priv->rxf_fifo0.m.pktsz = pkt_size; + nr = priv->rxf_fifo0.m.memsz / sizeof(struct rxf_desc); + priv->rxdb0 = rxdb_alloc(nr); + if (!priv->rxdb0) { + ret = -ENOMEM; + goto err_free_rxf; + } + + priv->rx_page_table.buf_size = round_up(pkt_size, SMP_CACHE_BYTES); + return 0; +err_free_rxf: + tn40_fifo_free(priv, &priv->rxf_fifo0.m); +err_free_rxd: + tn40_fifo_free(priv, &priv->rxd_fifo0.m); + return ret; +} + +static void rx_free_buffers(struct tn40_priv *priv, struct rxdb *db, + struct rxf_fifo *f) +{ + struct rx_map *dm; + u16 i; + + netdev_dbg(priv->ndev, "total =%d free =%d busy =%d\n", db->nelem, + rxdb_available(db), db->nelem - rxdb_available(db)); + while (rxdb_available(db) > 0) { + i = rxdb_alloc_elem(db); + dm = rxdb_addr_elem(db, i); + dm->dma = 0; + } + for (i = 0; i < db->nelem; i++) { + dm = rxdb_addr_elem(db, i); + if (dm->dma && dm->rx_page.page) + rx_page_put(priv, dm); + } +} + +static void destroy_rx_ring(struct tn40_priv *priv) +{ + if (priv->rxdb0) { + rx_free_buffers(priv, priv->rxdb0, &priv->rxf_fifo0); + rxdb_free(priv->rxdb0); + priv->rxdb0 = NULL; + } + tn40_fifo_free(priv, &priv->rxf_fifo0.m); + tn40_fifo_free(priv, &priv->rxd_fifo0.m); +} + +/** + * rx_alloc_buffers - Fill rxf fifo with new skbs. + * + * @priv: NIC's private structure + * + * rx_alloc_buffers allocates skbs, builds rxf descs and pushes them (rxf + * descr) into the rxf fifo. Skb's virtual and physical addresses are stored + * in skb db. + * To calculate the free space, we uses the cached values of RPTR and WPTR + * when needed. This function also updates RPTR and WPTR. + */ +static void rx_alloc_buffers(struct tn40_priv *priv) +{ + int buf_size = priv->rx_page_table.buf_size; + struct rxf_fifo *f = &priv->rxf_fifo0; + struct rx_page *rx_page = NULL; + struct rxdb *db = priv->rxdb0; + struct rxf_desc *rxfd; + int dno, delta, idx; + struct rx_map *dm; + int page_off = -1; + int n_pages = 0; + u64 dma = 0ULL; + int page_size; + + dno = rxdb_available(db) - 1; + page_size = rx_page_size(priv); + netdev_dbg(priv->ndev, "dno %d page_size %d buf_size %d\n", dno, + page_size, priv->rx_page_table.buf_size); + while (dno > 0) { + /* We allocate large pages (i.e. 64KB) and store + * multiple packet buffers in each page. The packet + * buffers are stored backwards in each page (starting + * from the highest address). We utilize the fact that + * the last buffer in each page has a 0 offset to + * detect that all the buffers were processed in order + * to unmap the page. + */ + if (unlikely(page_off < 0)) { + rx_page = rx_page_alloc(priv); + if (!rx_page) { + u32 timeout = 1000000; /* 1/5 sec */ + + write_reg(priv, 0x5154, timeout); + netdev_dbg(priv->ndev, + "system memory is temporary low\n"); + break; + } + page_off = ((page_size / buf_size) - 1) * buf_size; + dma = rx_page->dma; + n_pages += 1; + } else { + rx_page_ref(rx_page); + /* Page is already allocated and mapped, just + * increment the page usage count. + */ + } + rxfd = (struct rxf_desc *)(f->m.va + f->m.wptr); + idx = rxdb_alloc_elem(db); + dm = rxdb_addr_elem(db, idx); + dm->size = page_size; + dm_rx_page_set(dm, rx_page); + dm->off = page_off; + dm->dma = dma + page_off; + netdev_dbg(priv->ndev, "dm size %d off %d dma %p\n", dm->size, + dm->off, (void *)dm->dma); + page_off -= buf_size; + + rxfd->info = cpu_to_le32(0x10003); /* INFO =1 BC =3 */ + rxfd->va_lo = cpu_to_le32(idx); + rxfd->pa_lo = cpu_to_le32(lower_32_bits(dm->dma)); + rxfd->pa_hi = cpu_to_le32(upper_32_bits(dm->dma)); + rxfd->len = cpu_to_le32(f->m.pktsz); + f->m.wptr += sizeof(struct rxf_desc); + delta = f->m.wptr - f->m.memsz; + if (unlikely(delta >= 0)) { + f->m.wptr = delta; + if (delta > 0) { + memcpy(f->m.va, f->m.va + f->m.memsz, delta); + netdev_dbg(priv->ndev, + "wrapped rxd descriptor\n"); + } + } + dno--; + } + netdev_dbg(priv->ndev, "n_pages %d\n", n_pages); + /* TBD: Do not update WPTR if no desc were written */ + write_reg(priv, f->m.reg_wptr, f->m.wptr & TXF_WPTR_WR_PTR); + netdev_dbg(priv->ndev, "write_reg 0x%04x f->m.reg_wptr 0x%x\n", + f->m.reg_wptr, f->m.wptr & TXF_WPTR_WR_PTR); + netdev_dbg(priv->ndev, "read_reg 0x%04x f->m.reg_rptr=0x%x\n", + f->m.reg_rptr, read_reg(priv, f->m.reg_rptr)); + netdev_dbg(priv->ndev, "write_reg 0x%04x f->m.reg_wptr=0x%x\n", + f->m.reg_wptr, read_reg(priv, f->m.reg_wptr)); +} + +static void tn40_recycle_skb(struct tn40_priv *priv, struct rxd_desc *rxdd) +{ + struct rx_map *dm = rxdb_addr_elem(priv->rxdb0, + le32_to_cpu(rxdd->va_lo)); + struct rxf_fifo *f = &priv->rxf_fifo0; + struct rxf_desc *rxfd; + int delta; + + rxfd = (struct rxf_desc *)(f->m.va + f->m.wptr); + rxfd->info = cpu_to_le32(0x10003); /* INFO=1 BC=3 */ + rxfd->va_lo = rxdd->va_lo; + rxfd->pa_lo = cpu_to_le32(lower_32_bits(dm->dma)); + rxfd->pa_hi = cpu_to_le32(upper_32_bits(dm->dma)); + rxfd->len = cpu_to_le32(f->m.pktsz); + f->m.wptr += sizeof(struct rxf_desc); + delta = f->m.wptr - f->m.memsz; + if (unlikely(delta >= 0)) { + f->m.wptr = delta; + if (delta > 0) { + memcpy(f->m.va, f->m.va + f->m.memsz, delta); + netdev_dbg(priv->ndev, "wrapped rxf descriptor\n"); + } + } +} + +static int tn40_rx_receive(struct tn40_priv *priv, struct rxd_fifo *f, + int budget) +{ + u32 rxd_val1, rxd_err, pkt_id; + int tmp_len, size, done = 0; + struct rx_page *rx_page; + struct rxdb *db = NULL; + struct rxd_desc *rxdd; + struct sk_buff *skb; + struct rx_map *dm; + u16 len, rxd_vlan; + + f->m.wptr = read_reg(priv, f->m.reg_wptr) & TXF_WPTR_WR_PTR; + size = f->m.wptr - f->m.rptr; + if (size < 0) + size += f->m.memsz; /* Size is negative :-) */ + + while (size > 0) { + rxdd = (struct rxd_desc *)(f->m.va + f->m.rptr); + db = priv->rxdb0; + + /* We have a chicken and egg problem here. If the + * descriptor is wrapped we first need to copy the tail + * of the descriptor to the end of the buffer before + * extracting values from the descriptor. However in + * order to know if the descriptor is wrapped we need to + * obtain the length of the descriptor from (the + * wrapped) descriptor. Luckily the length is the first + * word of the descriptor. Descriptor lengths are + * multiples of 8 bytes so in case of a wrapped + * descriptor the first 8 bytes guaranteed to appear + * before the end of the buffer. We first obtain the + * length, we then copy the rest of the descriptor if + * needed and then extract the rest of the values from + * the descriptor. + * + * Do not change the order of operations as it will + * break the code!!! + */ + rxd_val1 = le32_to_cpu(rxdd->rxd_val1); + tmp_len = GET_RXD_BC(rxd_val1) << 3; + pkt_id = GET_RXD_PKT_ID(rxd_val1); + size -= tmp_len; + /* CHECK FOR A PARTIALLY ARRIVED DESCRIPTOR */ + if (size < 0) { + netdev_dbg(priv->ndev, + "%s partially arrived desc tmp_len %d\n", + __func__, tmp_len); + break; + } + /* make sure that the descriptor fully is arrived + * before reading the rest of the descriptor. + */ + rmb(); + + /* A special treatment is given to non-contiguous + * descriptors that start near the end, wraps around + * and continue at the beginning. The second part is + * copied right after the first, and then descriptor + * is interpreted as normal. The fifo has an extra + * space to allow such operations. + */ + + /* HAVE WE REACHED THE END OF THE QUEUE? */ + f->m.rptr += tmp_len; + tmp_len = f->m.rptr - f->m.memsz; + if (unlikely(tmp_len >= 0)) { + f->m.rptr = tmp_len; + if (tmp_len > 0) { + /* COPY PARTIAL DESCRIPTOR + * TO THE END OF THE QUEUE + */ + netdev_dbg(priv->ndev, + "wrapped desc rptr=%d tmp_len=%d\n", + f->m.rptr, tmp_len); + memcpy(f->m.va + f->m.memsz, f->m.va, tmp_len); + } + } + dm = rxdb_addr_elem(db, le32_to_cpu(rxdd->va_lo)); + prefetch(dm); + rx_page = &dm->rx_page; + + len = le16_to_cpu(rxdd->len); + rxd_vlan = le16_to_cpu(rxdd->rxd_vlan); + /* CHECK FOR ERRORS */ + rxd_err = GET_RXD_ERR(rxd_val1); + if (unlikely(rxd_err)) { + netdev_err(priv->ndev, "rxd_err = 0x%x\n", rxd_err); + priv->net_stats.rx_errors++; + tn40_recycle_skb(priv, rxdd); + continue; + } + + /* In this case we obtain a pre-allocated skb from + * napi. We add a frag with the page/off/len tuple of + * the buffer that we have just read and then call + * vlan_gro_frags()/napi_gro_frags() to process the + * packet. The same skb is used again and again to + * handle all packets, which eliminates the need to + * allocate an skb for each packet. + */ + skb = napi_get_frags(&priv->napi); + if (!skb) { + netdev_err(priv->ndev, "napi_get_frags failed\n"); + break; + } + skb->ip_summed = + (pkt_id == 0) ? CHECKSUM_NONE : CHECKSUM_UNNECESSARY; + skb_add_rx_frag(skb, 0, rx_page->page, dm->off, len, + SKB_TRUESIZE(len)); + rxdb_free_elem(db, le32_to_cpu(rxdd->va_lo)); + + /* PROCESS PACKET */ + if (GET_RXD_VTAG(rxd_val1)) + __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), + GET_RXD_VLAN_TCI(rxd_vlan)); + napi_gro_frags(&priv->napi); + + rx_page_reuse(priv, dm); + priv->net_stats.rx_bytes += len; + + if (unlikely(++done >= budget)) + break; + } + + priv->net_stats.rx_packets += done; + /* FIXME: Do something to minimize pci accesses */ + write_reg(priv, f->m.reg_rptr, f->m.rptr & TXF_WPTR_WR_PTR); + rx_alloc_buffers(priv); + return done; +} + /* TX HW/SW interaction overview * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * There are 2 types of TX communication channels between driver and NIC. @@ -439,6 +886,56 @@ static int tn40_start_xmit(struct sk_buff *skb, struct net_device *ndev) return NETDEV_TX_OK; } +static void tn40_tx_cleanup(struct tn40_priv *priv) +{ + struct txf_fifo *f = &priv->txf_fifo0; + struct txdb *db = &priv->txdb; + int tx_level = 0; + + f->m.wptr = read_reg(priv, f->m.reg_wptr) & TXF_WPTR_MASK; + + netif_tx_lock(priv->ndev); + while (f->m.wptr != f->m.rptr) { + f->m.rptr += TN40_TXF_DESC_SZ; + f->m.rptr &= f->m.size_mask; + /* Unmap all fragments */ + /* First has to come tx_maps containing DMA */ + do { + dma_unmap_page(&priv->pdev->dev, db->rptr->addr.dma, + db->rptr->len, DMA_TO_DEVICE); + tx_db_inc_rptr(db); + } while (db->rptr->len > 0); + tx_level -= db->rptr->len; /* '-' Because the len is negative */ + + /* Now should come skb pointer - free it */ + dev_kfree_skb_any(db->rptr->addr.skb); + netdev_dbg(priv->ndev, "dev_kfree_skb_any %p %d\n", + db->rptr->addr.skb, -db->rptr->len); + tx_db_inc_rptr(db); + } + + /* Let the HW know which TXF descriptors were cleaned */ + write_reg(priv, f->m.reg_rptr, f->m.rptr & TXF_WPTR_WR_PTR); + + /* We reclaimed resources, so in case the Q is stopped by xmit + * callback, we resume the transmission and use tx_lock to + * synchronize with xmit. + */ + priv->tx_level += tx_level; + if (priv->tx_noupd) { + priv->tx_noupd = 0; + write_reg(priv, priv->txd_fifo0.m.reg_wptr, + priv->txd_fifo0.m.wptr & TXF_WPTR_WR_PTR); + } + if (unlikely(netif_queue_stopped(priv->ndev) && + netif_carrier_ok(priv->ndev) && + (priv->tx_level >= TN40_MAX_TX_LEVEL / 2))) { + netdev_dbg(priv->ndev, "TX Q WAKE level %d\n", priv->tx_level); + netif_wake_queue(priv->ndev); + } + netif_tx_unlock(priv->ndev); +} + static void tn40_tx_free_skbs(struct tn40_priv *priv) { struct txdb *db = &priv->txdb; @@ -718,6 +1215,11 @@ static irqreturn_t tn40_isr_napi(int irq, void *dev) tn40_isr_extra(priv, isr); if (isr & (IR_RX_DESC_0 | IR_TX_FREE_0 | IR_TMR1)) { + if (likely(napi_schedule_prep(&priv->napi))) { + __napi_schedule(&priv->napi); + return IRQ_HANDLED; + } + /* We get here if an interrupt has slept into the * small time window between these lines in * tn40_poll: tn40_enable_interrupts(priv); return 0; @@ -735,6 +1237,21 @@ static irqreturn_t tn40_isr_napi(int irq, void *dev) return IRQ_HANDLED; } +static int tn40_poll(struct napi_struct *napi, int budget) +{ + struct tn40_priv *priv = container_of(napi, struct tn40_priv, napi); + int work_done; + + tn40_tx_cleanup(priv); + + work_done = tn40_rx_receive(priv, &priv->rxd_fifo0, budget); + if (work_done < budget) { + napi_complete(napi); + tn40_enable_interrupts(priv); + } + return work_done; +} + static int tn40_fw_load(struct tn40_priv *priv) { const struct firmware *fw = NULL; @@ -817,6 +1334,8 @@ static void tn40_hw_start(struct tn40_priv *priv) write_reg(priv, REG_TX_FULLNESS, 0); write_reg(priv, REG_VGLB, 0); + write_reg(priv, REG_MAX_FRAME_A, + priv->rxf_fifo0.m.pktsz & MAX_FRAME_AB_VAL); write_reg(priv, REG_RDINTCM0, priv->rdintcm); write_reg(priv, REG_RDINTCM2, 0); @@ -917,15 +1436,25 @@ static int tn40_start(struct tn40_priv *priv) return ret; } + ret = create_rx_ring(priv); + if (ret) { + netdev_err(priv->ndev, "failed to rx init %d\n", ret); + goto err_tx_ring; + } + + rx_alloc_buffers(priv); + ret = request_irq(priv->pdev->irq, &tn40_isr_napi, IRQF_SHARED, priv->ndev->name, priv->ndev); if (ret) { netdev_err(priv->ndev, "failed to request irq %d\n", ret); - goto err_tx_ring; + goto err_rx_ring; } tn40_hw_start(priv); return 0; +err_rx_ring: + destroy_rx_ring(priv); err_tx_ring: destroy_tx_ring(priv); return ret; @@ -935,9 +1464,12 @@ static int tn40_close(struct net_device *ndev) { struct tn40_priv *priv = netdev_priv(ndev); + netif_napi_del(&priv->napi); + napi_disable(&priv->napi); tn40_disable_interrupts(priv); free_irq(priv->pdev->irq, priv->ndev); tn40_sw_reset(priv); + destroy_rx_ring(priv); destroy_tx_ring(priv); return 0; } @@ -953,6 +1485,8 @@ static int tn40_open(struct net_device *dev) netdev_err(dev, "failed to start %d\n", ret); return ret; } + napi_enable(&priv->napi); + netif_start_queue(priv->ndev); return 0; } @@ -1200,6 +1734,7 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) priv = netdev_priv(ndev); pci_set_drvdata(pdev, priv); + netif_napi_add(ndev, &priv->napi, tn40_poll); priv->regs = regs; priv->pdev = pdev; diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 0cf2eca0ae1a..2c24f75cab03 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -78,6 +78,33 @@ struct txd_fifo { struct fifo m; /* The minimal set of variables used by all fifos */ }; +struct rxf_fifo { + struct fifo m; /* The minimal set of variables used by all fifos */ +}; + +struct rxd_fifo { + struct fifo m; /* The minimal set of variables used by all fifos */ +}; + +struct rx_page { + struct page *page; + u64 dma; +}; + +struct rx_map { + struct rx_page rx_page; + u64 dma; + u32 off; + u32 size; /* Mapped area (i.e. page) size */ +}; + +struct rxdb { + int *stack; + struct rx_map *elems; + int nelem; + int top; +}; + union tx_dma_addr { dma_addr_t dma; struct sk_buff *skb; @@ -101,10 +128,24 @@ struct txdb { int size; /* Number of elements in the db */ }; +struct rx_page_table { + int page_size; + int buf_size; + struct rx_page rx_pages; +}; + struct tn40_priv { struct net_device *ndev; struct pci_dev *pdev; + struct napi_struct napi; + /* RX FIFOs: 1 for data (full) descs, and 2 for free descs */ + struct rxd_fifo rxd_fifo0; + struct rxf_fifo rxf_fifo0; + struct rxdb *rxdb0; /* Rx dbs to store skb pointers */ + int napi_stop; + struct vlan_group *vlgrp; + /* Tx FIFOs: 1 for data desc, 1 for empty (acks) desc */ struct txd_fifo txd_fifo0; struct txf_fifo txf_fifo0; @@ -133,6 +174,34 @@ struct tn40_priv { u32 b0_len; dma_addr_t b0_dma; /* Physical address of buffer */ char *b0_va; /* Virtual address of buffer */ + + struct rx_page_table rx_page_table; +}; + +/* RX FREE descriptor - 64bit */ +struct rxf_desc { + __le32 info; /* Buffer Count + Info - described below */ + __le32 va_lo; /* VAdr[31:0] */ + __le32 va_hi; /* VAdr[63:32] */ + __le32 pa_lo; /* PAdr[31:0] */ + __le32 pa_hi; /* PAdr[63:32] */ + __le32 len; /* Buffer Length */ +}; + +#define GET_RXD_BC(x) FIELD_GET(GENMASK(4, 0), (x)) +#define GET_RXD_ERR(x) FIELD_GET(GENMASK(26, 21), (x)) +#define GET_RXD_PKT_ID(x) FIELD_GET(GENMASK(30, 28), (x)) +#define GET_RXD_VTAG(x) FIELD_GET(BIT(31), (x)) +#define GET_RXD_VLAN_TCI(x) FIELD_GET(GENMASK(15, 0), (x)) + +struct rxd_desc { + __le32 rxd_val1; + __le16 len; + __le16 rxd_vlan; + __le32 va_lo; + __le32 va_hi; + __le32 rss_lo; + __le32 rss_hash; }; #define MAX_PBL (19) From patchwork Thu Apr 25 01:03:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642764 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 619D16AC0 for ; Thu, 25 Apr 2024 01:05:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007133; cv=none; b=Y2BvZvpP6VTPWBZzuuCVLaKhRwvjQSxI/OxmCyAsgmzNP5B4kt4kgzAf6dYG4vjysXfhHtlvWDrUPq/eY41LmWPmcUGTIC9/aioftQWdJ8HphMBkAENFPnSYczyKjTY5SunWTmxRePgqSucAtk/gvj+PvuuUJ0Q5r9boaKt9IA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007133; c=relaxed/simple; bh=K88s39uNZ4FRv021dChTTdZu5B5XLc4BZAXSflq0eDc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SA/WX7M+J2j5l83e8z//FNxfzYeLhu7OENl4rDgNqkJpPEY1wK7HEVjUUVhLzdHuJJt12cvk3NHk8ZlLfnUSDLW+jeuF9qx01Two9krGfssV6o/bGVHpPF2ayGIVMVatWOaWsiTzuKgpx/LHH/gqS1l9DbNGclywxjVRnUVKlt0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jXfnUwJG; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jXfnUwJG" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2ab936993abso98146a91.3 for ; Wed, 24 Apr 2024 18:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007131; x=1714611931; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Qj3QCDDjCWnkZXKDBMr2xGVUFiCgKqiwW62qe5EaPk=; b=jXfnUwJGC1meFOqdmkonIBGBidCTpPNfedQUxFKVh+9AqK/2lJdDmZ6q9HXyjYCwpS NEJAW3y2s0x/hA0Jz9syZchVZkE5MZ7EZlhRu+sa+RZ8vCQKFpoFcfHq7gvP7ppBNtzY iDhfmQYdpKao5ZhkIcIunE12hTFFBoyqS0YvEP+rtcbxmVWmU8jbWXpfXq4pEI2N62BQ heH8UpNDK/pRnyo/WfICr0pwQQ0H7Toqc1NQXpvvRX+Ot401o52SVm7Iozoa9F9oc2+K R0xd5kWxxOxND1ghJvYIQNfyfp+cEl2aI/rN6YgV6PPmteBfUi5CBIbe+aiKd1WDpAdf YoFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007131; x=1714611931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Qj3QCDDjCWnkZXKDBMr2xGVUFiCgKqiwW62qe5EaPk=; b=LADHfR/tK7z0RJnodp0Ve/w6e6lBSNXvPKSzwxSvyvaZutkhZA6ouysSqxvislrc0n wCPX/XUukpBwIQ3Ky+JWy4W4rM2JYGp8Vd+UkP4JvFdER5teIqBUuXEjOZbcrVxVsAX+ saCGYW74d/m6tDv+1hMYHcFNFVKC3nRPToxAT13/vu+Y8SmtZtXp0StDO4Q1EEUAYIwO ye5LhHg5uaj3G/b3w1qMNAhVkqvlbCZ/hTWJn/KYNmB0oXprbQ094yo6R2D71/cVN+L8 mKby254fFZF7qfWIR5GYqv7TForzy6LBsq2/QHq+/LNgRCttREm0w56Ag2otQcPO4F2L Waqg== X-Gm-Message-State: AOJu0YzuIHMokKra+PD9xx07Wa/DNuYnD/gbfWI3iV02dgmH7dHXFgCc 1Ifr1vGa/+QhWn1/s2YzmTzjQw7IXMTJMGwFjDVkpaqKhxiUYVEP0MEpOA== X-Google-Smtp-Source: AGHT+IGNHgsWjrkj0Z5pmcE0Ccb1Z7kqCp3FB349sob3XXVb9h8McsEoAsvRlVFodmhRboAGsPE9uQ== X-Received: by 2002:aa7:8d15:0:b0:6ec:f5d2:f641 with SMTP id j21-20020aa78d15000000b006ecf5d2f641mr4966961pfe.1.1714007131347; Wed, 24 Apr 2024 18:05:31 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:30 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 5/6] net: tn40xx: add mdio bus support Date: Thu, 25 Apr 2024 10:03:53 +0900 Message-Id: <20240425010354.32605-6-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This patch adds supports for mdio bus. A later path adds PHYLIB support on the top of this. Signed-off-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/Makefile | 2 +- drivers/net/ethernet/tehuti/tn40.c | 7 +- drivers/net/ethernet/tehuti/tn40.h | 4 + drivers/net/ethernet/tehuti/tn40_mdio.c | 129 ++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/tehuti/tn40_mdio.c diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile index 1c468d99e476..7a0fe586a243 100644 --- a/drivers/net/ethernet/tehuti/Makefile +++ b/drivers/net/ethernet/tehuti/Makefile @@ -5,5 +5,5 @@ obj-$(CONFIG_TEHUTI) += tehuti.o -tn40xx-y := tn40.o +tn40xx-y := tn40.o tn40_mdio.o obj-$(CONFIG_TEHUTI_TN40) += tn40xx.o diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index f676fc6e1d3a..0b8a063adb8c 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -1760,8 +1760,13 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_unset_drvdata; } - priv->stats_flag = ((read_reg(priv, FPGA_VER) & 0xFFF) != 308); + ret = tn40_mdiobus_init(priv); + if (ret) { + dev_err(&pdev->dev, "failed to initialize mdio bus.\n"); + goto err_free_irq; + } + priv->stats_flag = ((read_reg(priv, FPGA_VER) & 0xFFF) != 308); priv->isr_mask = IR_RX_FREE_0 | IR_LNKCHG0 | IR_PSE | IR_TMR0 | IR_RX_DESC_0 | IR_TX_FREE_0 | IR_TMR1; diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 2c24f75cab03..0f39dc70f37c 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -176,6 +177,7 @@ struct tn40_priv { char *b0_va; /* Virtual address of buffer */ struct rx_page_table rx_page_table; + struct mii_bus *mdio; }; /* RX FREE descriptor - 64bit */ @@ -262,4 +264,6 @@ static inline void write_reg(struct tn40_priv *priv, u32 reg, u32 val) writel(val, priv->regs + reg); } +int tn40_mdiobus_init(struct tn40_priv *priv); + #endif /* _TN40XX_H */ diff --git a/drivers/net/ethernet/tehuti/tn40_mdio.c b/drivers/net/ethernet/tehuti/tn40_mdio.c new file mode 100644 index 000000000000..c00421427f20 --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40_mdio.c @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) Tehuti Networks Ltd. */ + +#include "tn40.h" + +static void mdio_set_speed(struct tn40_priv *priv, u32 speed) +{ + void __iomem *regs = priv->regs; + int mdio_cfg; + + mdio_cfg = readl(regs + REG_MDIO_CMD_STAT); + if (speed == 1) + mdio_cfg = (0x7d << 7) | 0x08; /* 1MHz */ + else + mdio_cfg = 0xA08; /* 6MHz */ + mdio_cfg |= (1 << 6); + writel(mdio_cfg, regs + REG_MDIO_CMD_STAT); + msleep(100); +} + +static u32 mdio_stat(struct tn40_priv *priv) +{ + void __iomem *regs = priv->regs; + + return readl(regs + REG_MDIO_CMD_STAT); +} + +static int mdio_get(struct tn40_priv *priv, u32 *val) +{ + u32 stat; + int ret; + + ret = readx_poll_timeout_atomic(mdio_stat, priv, stat, + GET_MDIO_BUSY(stat) == 0, 10, 10000); + return ret; +} + +static int tn40_mdio_read(struct tn40_priv *priv, int port, int device, + u16 regnum) +{ + void __iomem *regs = priv->regs; + u32 tmp_reg, i; + + /* wait until MDIO is not busy */ + if (mdio_get(priv, NULL)) + return -EIO; + + i = ((device & 0x1F) | ((port & 0x1F) << 5)); + writel(i, regs + REG_MDIO_CMD); + writel((u32)regnum, regs + REG_MDIO_ADDR); + if (mdio_get(priv, NULL)) + return -EIO; + + writel(((1 << 15) | i), regs + REG_MDIO_CMD); + /* read CMD_STAT until not busy */ + if (mdio_get(priv, NULL)) + return -EIO; + + tmp_reg = readl(regs + REG_MDIO_DATA); + return lower_16_bits(tmp_reg); +} + +static int tn40_mdio_write(struct tn40_priv *priv, int port, int device, + u16 regnum, u16 data) +{ + void __iomem *regs = priv->regs; + u32 tmp_reg = 0; + int ret; + + /* wait until MDIO is not busy */ + if (mdio_get(priv, NULL)) + return -EIO; + writel(((device & 0x1F) | ((port & 0x1F) << 5)), regs + REG_MDIO_CMD); + writel((u32)regnum, regs + REG_MDIO_ADDR); + if (mdio_get(priv, NULL)) + return -EIO; + writel((u32)data, regs + REG_MDIO_DATA); + /* read CMD_STAT until not busy */ + ret = mdio_get(priv, &tmp_reg); + if (ret) + return -EIO; + + if (GET_MDIO_RD_ERR(tmp_reg)) { + dev_err(&priv->pdev->dev, "MDIO error after write command\n"); + return -EIO; + } + return 0; +} + +static int mdio_read(struct mii_bus *mii_bus, int addr, int devnum, int regnum) +{ + return tn40_mdio_read(mii_bus->priv, addr, devnum, regnum); +} + +static int mdio_write(struct mii_bus *mii_bus, int addr, int devnum, + int regnum, u16 val) +{ + return tn40_mdio_write(mii_bus->priv, addr, devnum, regnum, val); +} + +int tn40_mdiobus_init(struct tn40_priv *priv) +{ + struct pci_dev *pdev = priv->pdev; + struct mii_bus *bus; + int ret; + + bus = devm_mdiobus_alloc(&pdev->dev); + if (!bus) + return -ENOMEM; + + bus->name = TN40_DRV_NAME; + bus->parent = &pdev->dev; + snprintf(bus->id, MII_BUS_ID_SIZE, "tn40xx-%x-%x", + pci_domain_nr(pdev->bus), pci_dev_id(pdev)); + bus->priv = priv; + + bus->read_c45 = mdio_read; + bus->write_c45 = mdio_write; + + ret = devm_mdiobus_register(&pdev->dev, bus); + if (ret) { + dev_err(&pdev->dev, "failed to register mdiobus %d %u %u\n", + ret, bus->state, MDIOBUS_UNREGISTERED); + return ret; + } + mdio_set_speed(priv, MDIO_SPEED_6MHZ); + priv->mdio = bus; + return 0; +} From patchwork Thu Apr 25 01:03:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 13642766 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28AB51173F for ; Thu, 25 Apr 2024 01:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007135; cv=none; b=jiRqPXp28i8aByl6CnRlDzIIOSVmlSDLLa8tMSPz4btQYR2BATsOHkV9SZm5RPAY5SdAeoviy3sziIU/0syks+pixPChR+RQihr+I5xP8KsmIG3wRt/a0VzHQqFKJNo4icGNgl66QWvAtQhkk7M32djtB8gF0ViVbu5Ku0ckJbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714007135; c=relaxed/simple; bh=A8DxlIbeNJvU8DFCPgRL4bnzW5vLAzLtRwrL/JgVDlo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=shcz3hlj7hHv3kJpjqfZdyIr98AmEv4wP20FOohB2yVmeB+rk3pg9O+ZSWB2mfsharYs43OtzGZxsCh92JMfs0RL/+x9TGRNFhFC9DL7oAQQxIGFS+7J2ozH+mmkwE/8x+po8zvp5+5Su1ohkb6uk6miHKmTt3p/sEbpUndWWkE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IpB1Ho+j; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IpB1Ho+j" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2a2d37b8c4fso100015a91.1 for ; Wed, 24 Apr 2024 18:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714007133; x=1714611933; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=68qJ9WaB9Ukp5Xfygaabipypng7Ca+MoQhv9umL2ZgE=; b=IpB1Ho+j7hkFVfyt0AXDmJ4Z5V+Q68lu+iUjyKjZVtbF4tNJQdPmu+cgGP2xU15MSK PP8IhE7so1qodcYy/NTFI0eoanJmR8c7AvBPVEWeA6sjf0dx2JoPd//LPTmWCr1VfRe/ wZlVLIgqyv1V2cNk6ICZGop3btifS7W3LvFHAwb5VTWwIQYt8m12+KCnU47Plo7P4frr VuJqiDRQAdfP9mnBVBVAML3kXZqO8LaLZSimrDxiqVsen8BiBTQzHwRfkDM5td4mqUPb tuv8vwEa8GKAwqqbMrOtHTp1kSLSxDqssmWePgYTasMnfKx5zA9SpbUka8V67PULOeD8 Yiow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714007133; x=1714611933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=68qJ9WaB9Ukp5Xfygaabipypng7Ca+MoQhv9umL2ZgE=; b=gYtAdhI5Of+mzBolOpoN61f5KiMRz7In4Z0rLkGbSDhYK2Ykz3WCLw8c4wu4a7f/wl 3dzHoDnj0Wvy8i+J+GhDNP0qyzi330iX6eHDlRdOsSsbrJcGHoS4bf5bagwg4Kzx971/ Vv3pWEEMGh+SRNOGNUeIt5ViMs/A7C/CxHnRHa0fmk9q9oVCcvzgKhq5F4ZTSzl9r52V WsMCXYxqFwU28OGy6FbS4iYnSwhIhH/YDklJmQa6mRB6HXSrcc6BDokWA2Gfq32IJBRZ g7yZapp0s2HMFFQ5rtOAWYn6te2XeO6md6PDbsZYLXfEG49bbeQwXXyz099s0oSJ7n6Q 3Jdw== X-Gm-Message-State: AOJu0Ywjz48rv93lNuHDuacJnuPnsEBkCwmm5bBqIJOTwCCfP0D/9KA8 jz41sk6gsHMTn/Wr+PyBR+bCsgV5aXQ61lvvMqFmJ6UGQED8ZkJXhWhfZA== X-Google-Smtp-Source: AGHT+IF19mdSd2VniQGRA8N/E3LrnkuxV408WeCUUxASpsdcFKWsVlGPhlxS2Gq/wcAPCQEWusCT7A== X-Received: by 2002:a05:6a20:1f22:b0:1ab:63ac:af29 with SMTP id dn34-20020a056a201f2200b001ab63acaf29mr3868772pzb.5.1714007132996; Wed, 24 Apr 2024 18:05:32 -0700 (PDT) Received: from rpi.. (p5315239-ipxg23901hodogaya.kanagawa.ocn.ne.jp. [180.34.87.239]) by smtp.gmail.com with ESMTPSA id s27-20020a63525b000000b006008ee7e805sm5644940pgl.30.2024.04.24.18.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Apr 2024 18:05:32 -0700 (PDT) From: FUJITA Tomonori To: netdev@vger.kernel.org Cc: andrew@lunn.ch, horms@kernel.org Subject: [PATCH net-next v2 6/6] net: tn40xx: add PHYLIB support Date: Thu, 25 Apr 2024 10:03:54 +0900 Message-Id: <20240425010354.32605-7-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425010354.32605-1-fujita.tomonori@gmail.com> References: <20240425010354.32605-1-fujita.tomonori@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This patch adds supports for multiple PHY hardware with PHYLIB. The adapters with TN40xx chips use multiple PHY hardware; AMCC QT2025, TI TLK10232, Aqrate AQR105, and Marvell 88X3120, 88X3310, and MV88E2010. For now, the PCI ID table of this driver enables adapters using only QT2025 PHY. I've tested this driver and the QT2025 PHY driver with Edimax EN-9320 10G adapter. Signed-off-by: FUJITA Tomonori --- drivers/net/ethernet/tehuti/Kconfig | 2 + drivers/net/ethernet/tehuti/Makefile | 2 +- drivers/net/ethernet/tehuti/tn40.c | 34 +++++++++++--- drivers/net/ethernet/tehuti/tn40.h | 7 +++ drivers/net/ethernet/tehuti/tn40_phy.c | 61 ++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 drivers/net/ethernet/tehuti/tn40_phy.c diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig index 4198fd59e42e..94fda9fd4cc0 100644 --- a/drivers/net/ethernet/tehuti/Kconfig +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -27,6 +27,8 @@ config TEHUTI_TN40 tristate "Tehuti Networks TN40xx 10G Ethernet adapters" depends on PCI select FW_LOADER + select PHYLIB + select PHYLINK help This driver supports 10G Ethernet adapters using Tehuti Networks TN40xx chips. Currently, adapters with Applied Micro Circuits diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile index 7a0fe586a243..0d4f4d63a65c 100644 --- a/drivers/net/ethernet/tehuti/Makefile +++ b/drivers/net/ethernet/tehuti/Makefile @@ -5,5 +5,5 @@ obj-$(CONFIG_TEHUTI) += tehuti.o -tn40xx-y := tn40.o tn40_mdio.o +tn40xx-y := tn40.o tn40_mdio.o tn40_phy.o obj-$(CONFIG_TEHUTI_TN40) += tn40xx.o diff --git a/drivers/net/ethernet/tehuti/tn40.c b/drivers/net/ethernet/tehuti/tn40.c index 0b8a063adb8c..5d231c0ef48e 100644 --- a/drivers/net/ethernet/tehuti/tn40.c +++ b/drivers/net/ethernet/tehuti/tn40.c @@ -1173,21 +1173,25 @@ static void tn40_link_changed(struct tn40_priv *priv) u32 link = read_reg(priv, REG_MAC_LNK_STAT) & MAC_LINK_STAT; if (!link) { - if (netif_carrier_ok(priv->ndev) && priv->link) + if (netif_carrier_ok(priv->ndev) && priv->link) { netif_stop_queue(priv->ndev); + phylink_mac_change(priv->phylink, false); + } priv->link = 0; if (priv->link_loop_cnt++ > LINK_LOOP_MAX) { /* MAC reset */ tn40_set_link_speed(priv, 0); + tn40_set_link_speed(priv, priv->phydev->speed); priv->link_loop_cnt = 0; } write_reg(priv, 0x5150, 1000000); return; } - if (!netif_carrier_ok(priv->ndev) && !link) + if (!netif_carrier_ok(priv->ndev) && !link) { netif_wake_queue(priv->ndev); - + phylink_mac_change(priv->phylink, true); + } priv->link = link; } @@ -1195,6 +1199,7 @@ static inline void tn40_isr_extra(struct tn40_priv *priv, u32 isr) { if (isr & (IR_LNKCHG0 | IR_LNKCHG1 | IR_TMR0)) { netdev_dbg(priv->ndev, "isr = 0x%x\n", isr); + phy_mac_interrupt(priv->phydev); tn40_link_changed(priv); } } @@ -1464,6 +1469,9 @@ static int tn40_close(struct net_device *ndev) { struct tn40_priv *priv = netdev_priv(ndev); + phylink_stop(priv->phylink); + phylink_disconnect_phy(priv->phylink); + netif_napi_del(&priv->napi); napi_disable(&priv->napi); tn40_disable_interrupts(priv); @@ -1479,10 +1487,17 @@ static int tn40_open(struct net_device *dev) struct tn40_priv *priv = netdev_priv(dev); int ret; + ret = phylink_connect_phy(priv->phylink, priv->phydev); + if (ret) + return ret; + tn40_sw_reset(priv); + phylink_start(priv->phylink); ret = tn40_start(priv); if (ret) { netdev_err(dev, "failed to start %d\n", ret); + phylink_stop(priv->phylink); + phylink_disconnect_phy(priv->phylink); return ret; } napi_enable(&priv->napi); @@ -1772,19 +1787,25 @@ static int tn40_probe(struct pci_dev *pdev, const struct pci_device_id *ent) IR_TX_FREE_0 | IR_TMR1; tn40_mac_init(priv); - + ret = tn40_phy_register(priv); + if (ret) { + dev_err(&pdev->dev, "failed to set up PHY.\n"); + goto err_free_irq; + } ret = tn40_priv_init(priv); if (ret) { dev_err(&pdev->dev, "failed to initialize tn40_priv.\n"); - goto err_free_irq; + goto err_unregister_phydev; } ret = register_netdev(ndev); if (ret) { dev_err(&pdev->dev, "failed to register netdev.\n"); - goto err_free_irq; + goto err_unregister_phydev; } return 0; +err_unregister_phydev: + tn40_phy_unregister(priv); err_free_irq: pci_free_irq_vectors(pdev); err_unset_drvdata: @@ -1805,6 +1826,7 @@ static void tn40_remove(struct pci_dev *pdev) unregister_netdev(ndev); + tn40_phy_unregister(priv); pci_free_irq_vectors(priv->pdev); pci_set_drvdata(pdev, NULL); iounmap(priv->regs); diff --git a/drivers/net/ethernet/tehuti/tn40.h b/drivers/net/ethernet/tehuti/tn40.h index 0f39dc70f37c..80567da13467 100644 --- a/drivers/net/ethernet/tehuti/tn40.h +++ b/drivers/net/ethernet/tehuti/tn40.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -178,6 +179,9 @@ struct tn40_priv { struct rx_page_table rx_page_table; struct mii_bus *mdio; + struct phy_device *phydev; + struct phylink *phylink; + struct phylink_config phylink_config; }; /* RX FREE descriptor - 64bit */ @@ -266,4 +270,7 @@ static inline void write_reg(struct tn40_priv *priv, u32 reg, u32 val) int tn40_mdiobus_init(struct tn40_priv *priv); +int tn40_phy_register(struct tn40_priv *priv); +void tn40_phy_unregister(struct tn40_priv *priv); + #endif /* _TN40XX_H */ diff --git a/drivers/net/ethernet/tehuti/tn40_phy.c b/drivers/net/ethernet/tehuti/tn40_phy.c new file mode 100644 index 000000000000..63b3763f0d7b --- /dev/null +++ b/drivers/net/ethernet/tehuti/tn40_phy.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (c) Tehuti Networks Ltd. */ + +#include "tn40.h" + +static void link_up(struct phylink_config *config, struct phy_device *phy, + unsigned int mode, phy_interface_t interface, int speed, + int duplex, bool tx_pause, bool rx_pause) +{ +} + +static void link_down(struct phylink_config *config, unsigned int mode, + phy_interface_t interface) +{ +} + +static void mac_config(struct phylink_config *config, unsigned int mode, + const struct phylink_link_state *state) +{ +} + +static const struct phylink_mac_ops mac_ops = { + .mac_config = mac_config, + .mac_link_up = link_up, + .mac_link_down = link_down, +}; + +int tn40_phy_register(struct tn40_priv *priv) +{ + struct phylink_config *config; + struct phy_device *phydev; + struct phylink *phylink; + + phydev = phy_find_first(priv->mdio); + if (!phydev) { + dev_err(&priv->pdev->dev, "PHY isn't found\n"); + return -1; + } + + phydev->irq = PHY_MAC_INTERRUPT; + + config = &priv->phylink_config; + config->dev = &priv->ndev->dev; + config->type = PHYLINK_NETDEV; + config->mac_capabilities = MAC_10000FD | MLO_AN_PHY; + __set_bit(PHY_INTERFACE_MODE_XAUI, config->supported_interfaces); + + phylink = phylink_create(config, NULL, PHY_INTERFACE_MODE_XAUI, + &mac_ops); + if (IS_ERR(phylink)) + return PTR_ERR(phylink); + + priv->phydev = phydev; + priv->phylink = phylink; + return 0; +} + +void tn40_phy_unregister(struct tn40_priv *priv) +{ + phylink_destroy(priv->phylink); +}