staging: octeon: delete driver
Greg Kroah-Hartman
maintainerPATCH 1/2 staging: octeon: delete driver
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
--- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/octeon/Kconfig | 16 - drivers/staging/octeon/Makefile | 19 - drivers/staging/octeon/TODO | 9 - drivers/staging/octeon/ethernet-defines.h | 40 - drivers/staging/octeon/ethernet-mdio.c | 178 --- drivers/staging/octeon/ethernet-mdio.h | 28 - drivers/staging/octeon/ethernet-mem.c | 154 --- drivers/staging/octeon/ethernet-mem.h | 9 - drivers/staging/octeon/ethernet-rgmii.c | 158 --- drivers/staging/octeon/ethernet-rx.c | 538 -------- drivers/staging/octeon/ethernet-rx.h | 31 - drivers/staging/octeon/ethernet-sgmii.c | 30 - drivers/staging/octeon/ethernet-spi.c | 226 ---- drivers/staging/octeon/ethernet-tx.c | 717 ----------- drivers/staging/octeon/ethernet-tx.h | 14 - drivers/staging/octeon/ethernet-util.h | 47 - drivers/staging/octeon/ethernet.c | 992 -------------- drivers/staging/octeon/octeon-ethernet.h | 107 -- drivers/staging/octeon/octeon-stubs.h | 1433 --------------------- 21 files changed, 4749 deletions(-) delete mode 100644 drivers/staging/octeon/Kconfig delete mode 100644 drivers/staging/octeon/Makefile delete mode 100644 drivers/staging/octeon/TODO delete mode 100644 drivers/staging/octeon/ethernet-defines.h delete mode 100644 drivers/staging/octeon/ethernet-mdio.c delete mode 100644 drivers/staging/octeon/ethernet-mdio.h delete mode 100644 drivers/staging/octeon/ethernet-mem.c delete mode 100644 drivers/staging/octeon/ethernet-mem.h delete mode 100644 drivers/staging/octeon/ethernet-rgmii.c delete mode 100644 drivers/staging/octeon/ethernet-rx.c delete mode 100644 drivers/staging/octeon/ethernet-rx.h delete mode 100644 drivers/staging/octeon/ethernet-sgmii.c delete mode 100644 drivers/staging/octeon/ethernet-spi.c delete mode 100644 drivers/staging/octeon/ethernet-tx.c delete mode 100644 drivers/staging/octeon/ethernet-tx.h delete mode 100644 drivers/staging/octeon/ethernet-util.h delete mode 100644 drivers/staging/octeon/ethernet.c delete mode 100644 drivers/staging/octeon/octeon-ethernet.h delete mode 100644 drivers/staging/octeon/octeon-stubs.h
drivers/staging/Kconfig +0 -2
@@ -42,8 +42,6 @@ source "drivers/staging/rtl8188eu/Kconfig" source "drivers/staging/rts5208/Kconfig" -source "drivers/staging/octeon/Kconfig" - source "drivers/staging/octeon-usb/Kconfig" source "drivers/staging/vt6655/Kconfig"
drivers/staging/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ obj-$(CONFIG_R8188EU) += rtl8188eu/ obj-$(CONFIG_RTS5208) += rts5208/ obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/ -obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/
drivers/staging/octeon/Kconfig deleted +0 -16
@@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config OCTEON_ETHERNET - tristate "Cavium Networks Octeon Ethernet support" - depends on CAVIUM_OCTEON_SOC || COMPILE_TEST - depends on NETDEVICES - depends on BROKEN - select PHYLIB - select MDIO_OCTEON - help - This driver supports the builtin ethernet ports on Cavium - Networks' products in the Octeon family. This driver supports the - CN3XXX and CN5XXX Octeon processors. - - To compile this driver as a module, choose M here. The module - will be called octeon-ethernet. -
drivers/staging/octeon/Makefile deleted +0 -19
@@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Copyright (C) 2005-2009 Cavium Networks -# - -# -# Makefile for Cavium OCTEON on-board ethernet driver -# - -obj-${CONFIG_OCTEON_ETHERNET} := octeon-ethernet.o - -octeon-ethernet-y := ethernet.o -octeon-ethernet-y += ethernet-mdio.o -octeon-ethernet-y += ethernet-mem.o -octeon-ethernet-y += ethernet-rgmii.o -octeon-ethernet-y += ethernet-rx.o -octeon-ethernet-y += ethernet-sgmii.o -octeon-ethernet-y += ethernet-spi.o -octeon-ethernet-y += ethernet-tx.o
drivers/staging/octeon/TODO deleted +0 -9
@@ -1,9 +0,0 @@ -This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 -chips at least up to CN7030. - -TODO: - - general code review and clean up - - make driver self-contained instead of being split between staging and - arch/mips/cavium-octeon. - -Contact: Aaro Koskinen <[email protected]>
drivers/staging/octeon/ethernet-defines.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -/* -* A few defines are used to control the operation of this driver: -* USE_ASYNC_IOBDMA -* Use asynchronous IO access to hardware. This uses Octeon's asynchronous -* IOBDMAs to issue IO accesses without stalling. Set this to zero -* to disable this. Note that IOBDMAs require CVMSEG. -* REUSE_SKBUFFS_WITHOUT_FREE -* Allows the TX path to free an skbuff into the FPA hardware pool. This -* can significantly improve performance for forwarding and bridging, but -* may be somewhat dangerous. Checks are made, but if any buffer is reused -* without the proper Linux cleanup, the networking stack may have very -* bizarre bugs. -*/ -#ifndef __ETHERNET_DEFINES_H__ -#define __ETHERNET_DEFINES_H__ - -#ifdef CONFIG_NETFILTER -#define REUSE_SKBUFFS_WITHOUT_FREE 0 -#else -#define REUSE_SKBUFFS_WITHOUT_FREE 1 -#endif - -#define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) - -/* Maximum number of SKBs to try to free per xmit packet. */ -#define MAX_OUT_QUEUE_DEPTH 1000 - -#define FAU_TOTAL_TX_TO_CLEAN (CVMX_FAU_REG_END - sizeof(u32)) -#define FAU_NUM_PACKET_BUFFERS_TO_FREE (FAU_TOTAL_TX_TO_CLEAN - sizeof(u32)) - -#define TOTAL_NUMBER_OF_PORTS (CVMX_PIP_NUM_INPUT_PORTS + 1) - -#endif /* __ETHERNET_DEFINES_H__ */
drivers/staging/octeon/ethernet-mdio.c deleted +0 -178
178 lines not on this page · raw message
drivers/staging/octeon/ethernet-mdio.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/ip.h> -#include <linux/string.h> -#include <linux/ethtool.h> -#include <linux/seq_file.h> -#include <linux/proc_fs.h> -#include <net/dst.h> -#ifdef CONFIG_XFRM -#include <linux/xfrm.h> -#include <net/xfrm.h> -#endif /* CONFIG_XFRM */ - -extern const struct ethtool_ops cvm_oct_ethtool_ops; - -void octeon_mdiobus_force_mod_depencency (void ); - -int cvm_oct_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -int cvm_oct_phy_setup_device (struct net_device *dev);
drivers/staging/octeon/ethernet-mem.c deleted +0 -154
154 lines not on this page · raw message
drivers/staging/octeon/ethernet-mem.h deleted +0 -9
@@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -int cvm_oct_mem_fill_fpa (int pool,int size,int elements); -void cvm_oct_mem_empty_fpa (int pool,int size,int elements);
drivers/staging/octeon/ethernet-rgmii.c deleted +0 -158
158 lines not on this page · raw message
drivers/staging/octeon/ethernet-rx.c deleted +0 -538
538 lines not on this page · raw message
drivers/staging/octeon/ethernet-rx.h deleted +0 -31
@@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -void cvm_oct_poll_controller (struct net_device *dev); -void cvm_oct_rx_initialize (void ); -void cvm_oct_rx_shutdown (void ); - -static inline void cvm_oct_rx_refill_pool (int fill_threshold) -{ -int number_to_free; -int num_freed; -/* Refill the packet buffer pool */ - number_to_free = -cvmx_fau_fetch_and_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE ,0 ); - -if (number_to_free > fill_threshold) { -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE , - -number_to_free); - num_freed =cvm_oct_mem_fill_fpa (CVMX_FPA_PACKET_POOL , -CVMX_FPA_PACKET_POOL_SIZE , - number_to_free); -if (num_freed != number_to_free) { -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE , - number_to_free - num_freed); - } - } -}
drivers/staging/octeon/ethernet-sgmii.c deleted +0 -30
@@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/phy.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/ratelimit.h> -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-util.h" -#include "ethernet-mdio.h" - -int cvm_oct_sgmii_open (struct net_device *dev) -{ -return cvm_oct_common_open (dev, cvm_oct_link_poll); -} - -int cvm_oct_sgmii_init (struct net_device *dev) -{ -cvm_oct_common_init (dev); - -/* FIXME: Need autoneg logic */ -return 0 ; -}
drivers/staging/octeon/ethernet-spi.c deleted +0 -226
226 lines not on this page · raw message
drivers/staging/octeon/ethernet-tx.c deleted +0 -717
717 lines not on this page · raw message
drivers/staging/octeon/ethernet-tx.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -int cvm_oct_xmit (struct sk_buff *skb,struct net_device *dev); -int cvm_oct_xmit_pow (struct sk_buff *skb,struct net_device *dev); -int cvm_oct_transmit_qos (struct net_device *dev,void *work_queue_entry, -int do_free,int qos); -void cvm_oct_tx_initialize (void ); -void cvm_oct_tx_shutdown (void ); -void cvm_oct_tx_shutdown_dev (struct net_device *dev);
drivers/staging/octeon/ethernet-util.h deleted +0 -47
47 lines not on this page · raw message
drivers/staging/octeon/ethernet.c deleted +0 -992
771 lines not on this page · raw message
drivers/staging/octeon/octeon-ethernet.h deleted +0 -107
107 lines not on this page · raw message
drivers/staging/octeon/octeon-stubs.h deleted +0 -1433
1,433 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.24.0
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 2/2 staging: octeon-usb: delete the octeon usb host controller driver
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel. The code doesn't even build for anyone unless you have the specific hardware platform selected, so odds are it doesn't even work anymore.
Remove it for now and is someone comes along that has the hardware and is willing to fix it up, it can be reverted.
--- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/octeon-usb/Kconfig | 11 - drivers/staging/octeon-usb/Makefile | 2 - drivers/staging/octeon-usb/TODO | 8 - drivers/staging/octeon-usb/octeon-hcd.c | 3737 ----------------------- drivers/staging/octeon-usb/octeon-hcd.h | 1847 ----------- 7 files changed, 5608 deletions(-) delete mode 100644 drivers/staging/octeon-usb/Kconfig delete mode 100644 drivers/staging/octeon-usb/Makefile delete mode 100644 drivers/staging/octeon-usb/TODO delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.c delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.h
drivers/staging/Kconfig +0 -2
@@ -42,8 +42,6 @@ source "drivers/staging/rtl8188eu/Kconfig" source "drivers/staging/rts5208/Kconfig" -source "drivers/staging/octeon-usb/Kconfig" - source "drivers/staging/vt6655/Kconfig" source "drivers/staging/vt6656/Kconfig"
drivers/staging/Makefile +0 -1
@@ -12,7 +12,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ obj-$(CONFIG_R8188EU) += rtl8188eu/ obj-$(CONFIG_RTS5208) += rts5208/ obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/ -obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_VME_BUS) += vme/
drivers/staging/octeon-usb/Kconfig deleted +0 -11
@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config OCTEON_USB - tristate "Cavium Networks Octeon USB support" - depends on CAVIUM_OCTEON_SOC && USB - help - This driver supports USB host controller on some Cavium - Networks' products in the Octeon family. - - To compile this driver as a module, choose M here. The module - will be called octeon-hcd. -
drivers/staging/octeon-usb/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-${CONFIG_OCTEON_USB} := octeon-hcd.o
drivers/staging/octeon-usb/TODO deleted +0 -8
@@ -1,8 +0,0 @@ -This driver is functional and has been tested on EdgeRouter Lite, -D-Link DSR-1000N and EBH5600 evaluation board with USB mass storage. - -TODO: - - kernel coding style - - checkpatch warnings - -Contact: Aaro Koskinen <[email protected]>
drivers/staging/octeon-usb/octeon-hcd.c deleted +0 -3737
2,964 lines not on this page · raw message
drivers/staging/octeon-usb/octeon-hcd.h deleted +0 -1847
1,847 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.24.0
Part of the diff is not shown here. View the raw message.
Re: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
Hi,
Quoted 2 lines · Greg Kroah-Hartman
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel.
Do you mean all the patches since 2013 were "no progress"? Thanks.
Quoted 2 lines
The code doesn't even build for anyone unless you have the specific hardware platform selected, so odds are it doesn't even work anymore.
I used it in production almost a decade with no issues with unpatched mainline kernel. All reported issues were fixed. Last kernel I ran was v5.3.
Quoted 2 lines
Remove it for now and is someone comes along that has the hardware and is willing to fix it up, it can be reverted.
Probably the next one who tries it, should try add support in dwc2. Originally the maintainer of that driver did not prefer this, maybe the current one does not mind...
A.
Greg Kroah-Hartman
maintainerRe: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
Quoted 7 lines · Aaro Koskinen
Hi,
Quoted 2 lines · Greg Kroah-Hartman
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel.
Do you mean all the patches since 2013 were "no progress"? Thanks.
I have not seen any proposals to get it out of staging at all. If the only thing left really is just those two simple TODO lines, then why has it taken 6 years to do that?
Quoted 6 lines
Quoted 2 lines
The code doesn't even build for anyone unless you have the specific hardware platform selected, so odds are it doesn't even work anymore.
I used it in production almost a decade with no issues with unpatched mainline kernel. All reported issues were fixed. Last kernel I ran was v5.3.
Then why has it not been merged out of staging?
thanks,
greg k-h
Re: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
Quoted 4 lines · Greg Kroah-Hartman
Quoted 3 lines · Aaro Koskinen
Hi,
On Tue, Dec 10, 2019 at 10:15:09AM +0100, Greg Kroah-Hartman wrote:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel.
Do you mean all the patches since 2013 were "no progress"? Thanks.
I have not seen any proposals to get it out of staging at all. If the only thing left really is just those two simple TODO lines, then why has it taken 6 years to do that?
Do you mean you did not see the below thread when I asked for help; it was a kind of propsal, no? Also things take time when you are just a hobbyist reverse engineering undocumented hardware that you also run in production. Yes, I'm slow, but the starting point wasn't also a very good.
https://marc.info/?t=155839354700002&r=1&w=2
I don't mind you deleting the driver, and if you think that "no progress" is true then I'm very sorry for all those commits/noise.
A.
Greg Kroah-Hartman
maintainerRe: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
Quoted 14 lines · Aaro Koskinen
Quoted 4 lines · Greg Kroah-Hartman
Quoted 3 lines · Aaro Koskinen
Hi,
On Tue, Dec 10, 2019 at 10:15:09AM +0100, Greg Kroah-Hartman wrote:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel.
Do you mean all the patches since 2013 were "no progress"? Thanks.
I have not seen any proposals to get it out of staging at all. If the only thing left really is just those two simple TODO lines, then why has it taken 6 years to do that?
Quoted 6 lines
Do you mean you did not see the below thread when I asked for help; it was a kind of propsal, no? Also things take time when you are just a hobbyist reverse engineering undocumented hardware that you also run in production. Yes, I'm slow, but the starting point wasn't also a very good.
I have the short-term memory of a squirrel, remember I get 1000 emails a day to deal with.
That thread was from back in May, the instructions on what was needed to be done is quite simple, so there should not have been a multi-month delay from then until now. What happened?
Quoted 2 lines
I don't mind you deleting the driver, and if you think that "no progress" is true then I'm very sorry for all those commits/noise.
Don't be sorry, you have fixed it up to make it ready to be merged properly. But yes, there is no progress being made now, so it should either be dropped or merged properly.
If you don't have the time now to do it, that's fine, the revert to get the code back just takes one single git command when you, or someone else, can get the chance to do it.
Don't take it personally, this is about to happen to almost all of the staging drivers that have been languishing around :)
thanks,
greg k-h
Re: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
In reply to Greg Kroah-HartmanQuoted 16 lines · Greg Kroah-Hartman
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel. The code doesn't even build for anyone unless you have the specific hardware platform selected, so odds are it doesn't even work anymore.
Remove it for now and is someone comes along that has the hardware and is willing to fix it up, it can be reverted.
Cc Aaro Koskinen <[email protected]>Cc David Daney <[email protected]>Cc Nishka Dasgupta <[email protected]>Cc Himadri Pandya <[email protected]>Cc "Frank A. Cancio Bello" <[email protected]>Cc Sumit Pundir <[email protected]>Cc Laura Lazzati <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 1 line
---
Similarly we'd really like to keep this too.
Quoted 5,674 lines
drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/octeon-usb/Kconfig | 11 - drivers/staging/octeon-usb/Makefile | 2 - drivers/staging/octeon-usb/TODO | 8 - drivers/staging/octeon-usb/octeon-hcd.c | 3737 ----------------------- drivers/staging/octeon-usb/octeon-hcd.h | 1847 ----------- 7 files changed, 5608 deletions(-) delete mode 100644 drivers/staging/octeon-usb/Kconfig delete mode 100644 drivers/staging/octeon-usb/Makefile delete mode 100644 drivers/staging/octeon-usb/TODO delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.c delete mode 100644 drivers/staging/octeon-usb/octeon-hcd.hdrivers/staging/Kconfig +0
-2@@ -42,8 +42,6 @@ source "drivers/staging/rtl8188eu/Kconfig" source "drivers/staging/rts5208/Kconfig" -source "drivers/staging/octeon-usb/Kconfig" - source "drivers/staging/vt6655/Kconfig" source "drivers/staging/vt6656/Kconfig"drivers/staging/Makefile +0
-1@@ -12,7 +12,6 @@ obj-$(CONFIG_R8712U) += rtl8712/ obj-$(CONFIG_R8188EU) += rtl8188eu/ obj-$(CONFIG_RTS5208) += rts5208/ obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/ -obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/ obj-$(CONFIG_VME_BUS) += vme/drivers/staging/octeon-usb/Kconfig deleted +0
-11@@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config OCTEON_USB - tristate "Cavium Networks Octeon USB support" - depends on CAVIUM_OCTEON_SOC && USB - help - This driver supports USB host controller on some Cavium - Networks' products in the Octeon family. - - To compile this driver as a module, choose M here. The module - will be called octeon-hcd. -drivers/staging/octeon-usb/Makefile deleted +0
-2@@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -obj-${CONFIG_OCTEON_USB} := octeon-hcd.odrivers/staging/octeon-usb/TODO deleted +0
-8@@ -1,8 +0,0 @@ -This driver is functional and has been tested on EdgeRouter Lite, -D-Link DSR-1000N and EBH5600 evaluation board with USB mass storage. - -TODO: - - kernel coding style - - checkpatch warnings - -Contact: Aaro Koskinen <[email protected]>drivers/staging/octeon-usb/octeon-hcd.c deleted +0
-3737@@ -1,3737 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* -* Copyright (C) 2008 Cavium Networks -* -* Some parts of the code were originally released under BSD license: -* -* Copyright (c) 2003-2010 Cavium Networks ([email protected]). All rights -* reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are -* met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* * Redistributions in binary form must reproduce the above -* copyright notice, this list of conditions and the following -* disclaimer in the documentation and/or other materials provided -* with the distribution. -* -* * Neither the name of Cavium Networks nor the names of -* its contributors may be used to endorse or promote products -* derived from this software without specific prior written -* permission. -* -* This Software, including technical data, may be subject to U.S. export -* control laws, including the U.S. Export Administration Act and its associated -* regulations, and may be subject to export or import regulations in other -* countries. -* -* TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS" -* AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR -* WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO -* THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION -* OR DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM -* SPECIFICALLY DISCLAIMS ALL IMPLIED (IF ANY) WARRANTIES OF TITLE, -* MERCHANTABILITY, NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF -* VIRUSES, ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR -* CORRESPONDENCE TO DESCRIPTION. THE ENTIRE RISK ARISING OUT OF USE OR -* PERFORMANCE OF THE SOFTWARE LIES WITH YOU. -*/ - -#include <linux/usb.h> -#include <linux/slab.h> -#include <linux/module.h> -#include <linux/usb/hcd.h> -#include <linux/prefetch.h> -#include <linux/dma-mapping.h> -#include <linux/platform_device.h> - -#include <asm/octeon/octeon.h> - -#include "octeon-hcd.h" - -/** -* enum cvmx_usb_speed - the possible USB device speeds -* -* @CVMX_USB_SPEED_HIGH: Device is operation at 480Mbps -* @CVMX_USB_SPEED_FULL: Device is operation at 12Mbps -* @CVMX_USB_SPEED_LOW: Device is operation at 1.5Mbps -*/ -enum cvmx_usb_speed { -CVMX_USB_SPEED_HIGH =0 , -CVMX_USB_SPEED_FULL =1 , -CVMX_USB_SPEED_LOW =2 , -}; - -/** -* enum cvmx_usb_transfer - the possible USB transfer types -* -* @CVMX_USB_TRANSFER_CONTROL: USB transfer type control for hub and status -* transfers -* @CVMX_USB_TRANSFER_ISOCHRONOUS: USB transfer type isochronous for low -* priority periodic transfers -* @CVMX_USB_TRANSFER_BULK: USB transfer type bulk for large low priority -* transfers -* @CVMX_USB_TRANSFER_INTERRUPT: USB transfer type interrupt for high priority -* periodic transfers -*/ -enum cvmx_usb_transfer { -CVMX_USB_TRANSFER_CONTROL =0 , -CVMX_USB_TRANSFER_ISOCHRONOUS =1 , -CVMX_USB_TRANSFER_BULK =2 , -CVMX_USB_TRANSFER_INTERRUPT =3 , -}; - -/** -* enum cvmx_usb_direction - the transfer directions -* -* @CVMX_USB_DIRECTION_OUT: Data is transferring from Octeon to the device/host -* @CVMX_USB_DIRECTION_IN: Data is transferring from the device/host to Octeon -*/ -enum cvmx_usb_direction { -CVMX_USB_DIRECTION_OUT , -CVMX_USB_DIRECTION_IN , -}; - -/** -* enum cvmx_usb_status - possible callback function status codes -* -* @CVMX_USB_STATUS_OK: The transaction / operation finished without -* any errors -* @CVMX_USB_STATUS_SHORT: FIXME: This is currently not implemented -* @CVMX_USB_STATUS_CANCEL: The transaction was canceled while in flight -* by a user call to cvmx_usb_cancel -* @CVMX_USB_STATUS_ERROR: The transaction aborted with an unexpected -* error status -* @CVMX_USB_STATUS_STALL: The transaction received a USB STALL response -* from the device -* @CVMX_USB_STATUS_XACTERR: The transaction failed with an error from the -* device even after a number of retries -* @CVMX_USB_STATUS_DATATGLERR: The transaction failed with a data toggle -* error even after a number of retries -* @CVMX_USB_STATUS_BABBLEERR: The transaction failed with a babble error -* @CVMX_USB_STATUS_FRAMEERR: The transaction failed with a frame error -* even after a number of retries -*/ -enum cvmx_usb_status { -CVMX_USB_STATUS_OK , -CVMX_USB_STATUS_SHORT , -CVMX_USB_STATUS_CANCEL , -CVMX_USB_STATUS_ERROR , -CVMX_USB_STATUS_STALL , -CVMX_USB_STATUS_XACTERR , -CVMX_USB_STATUS_DATATGLERR , -CVMX_USB_STATUS_BABBLEERR , -CVMX_USB_STATUS_FRAMEERR , -}; - -/** -* struct cvmx_usb_port_status - the USB port status information -* -* @port_enabled: 1 = Usb port is enabled, 0 = disabled -* @port_over_current: 1 = Over current detected, 0 = Over current not -* detected. Octeon doesn't support over current detection. -* @port_powered: 1 = Port power is being supplied to the device, 0 = -* power is off. Octeon doesn't support turning port power -* off. -* @port_speed: Current port speed. -* @connected: 1 = A device is connected to the port, 0 = No device is -* connected. -* @connect_change: 1 = Device connected state changed since the last set -* status call. -*/ -struct cvmx_usb_port_status { -u32 reserved :25 ; -u32 port_enabled :1 ; -u32 port_over_current :1 ; -u32 port_powered :1 ; -enum cvmx_usb_speed port_speed :2 ; -u32 connected :1 ; -u32 connect_change :1 ; -}; - -/** -* struct cvmx_usb_iso_packet - descriptor for Isochronous packets -* -* @offset: This is the offset in bytes into the main buffer where this data -* is stored. -* @length: This is the length in bytes of the data. -* @status: This is the status of this individual packet transfer. -*/ -struct cvmx_usb_iso_packet { -int offset; -int length; -enum cvmx_usb_status status; -}; - -/** -* enum cvmx_usb_initialize_flags - flags used by the initialization function -* -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_XO_XI: The USB port uses a 12MHz crystal -* as clock source at USB_XO and -* USB_XI. -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_XO_GND: The USB port uses 12/24/48MHz 2.5V -* board clock source at USB_XO. -* USB_XI should be tied to GND. -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_MHZ_MASK: Mask for clock speed field -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_12MHZ: Speed of reference clock or -* crystal -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_24MHZ: Speed of reference clock -* @CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ: Speed of reference clock -* @CVMX_USB_INITIALIZE_FLAGS_NO_DMA: Disable DMA and used polled IO for -* data transfer use for the USB -*/ -enum cvmx_usb_initialize_flags { -CVMX_USB_INITIALIZE_FLAGS_CLOCK_XO_XI =1 <<0 , -CVMX_USB_INITIALIZE_FLAGS_CLOCK_XO_GND =1 <<1 , -CVMX_USB_INITIALIZE_FLAGS_CLOCK_MHZ_MASK =3 <<3 , -CVMX_USB_INITIALIZE_FLAGS_CLOCK_12MHZ =1 <<3 , -CVMX_USB_INITIALIZE_FLAGS_CLOCK_24MHZ =2 <<3 , -CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ =3 <<3 , -/* Bits 3-4 used to encode the clock frequency */ -CVMX_USB_INITIALIZE_FLAGS_NO_DMA =1 <<5 , -}; - -/** -* enum cvmx_usb_pipe_flags - internal flags for a pipe. -* -* @CVMX_USB_PIPE_FLAGS_SCHEDULED: Used internally to determine if a pipe is -* actively using hardware. -* @CVMX_USB_PIPE_FLAGS_NEED_PING: Used internally to determine if a high speed -* pipe is in the ping state. -*/ -enum cvmx_usb_pipe_flags { -CVMX_USB_PIPE_FLAGS_SCHEDULED =1 <<17 , -CVMX_USB_PIPE_FLAGS_NEED_PING =1 <<18 , -}; - -/* Maximum number of times to retry failed transactions */ -#define MAX_RETRIES 3 - -/* Maximum number of hardware channels supported by the USB block */ -#define MAX_CHANNELS 8 - -/* -* The low level hardware can transfer a maximum of this number of bytes in each -* transfer. The field is 19 bits wide -*/ -#define MAX_TRANSFER_BYTES ((1 << 19) - 1) - -/* -* The low level hardware can transfer a maximum of this number of packets in -* each transfer. The field is 10 bits wide -*/ -#define MAX_TRANSFER_PACKETS ((1 << 10) - 1) - -/** -* Logical transactions may take numerous low level -* transactions, especially when splits are concerned. This -* enum represents all of the possible stages a transaction can -* be in. Note that split completes are always even. This is so -* the NAK handler can backup to the previous low level -* transaction with a simple clearing of bit 0. -*/ -enum cvmx_usb_stage { -CVMX_USB_STAGE_NON_CONTROL , -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE , -CVMX_USB_STAGE_SETUP , -CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE , -CVMX_USB_STAGE_DATA , -CVMX_USB_STAGE_DATA_SPLIT_COMPLETE , -CVMX_USB_STAGE_STATUS , -CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE , -}; - -/** -* struct cvmx_usb_transaction - describes each pending USB transaction -* regardless of type. These are linked together -* to form a list of pending requests for a pipe. -* -* @node: List node for transactions in the pipe. -* @type: Type of transaction, duplicated of the pipe. -* @flags: State flags for this transaction. -* @buffer: User's physical buffer address to read/write. -* @buffer_length: Size of the user's buffer in bytes. -* @control_header: For control transactions, physical address of the 8 -* byte standard header. -* @iso_start_frame: For ISO transactions, the starting frame number. -* @iso_number_packets: For ISO transactions, the number of packets in the -* request. -* @iso_packets: For ISO transactions, the sub packets in the request. -* @actual_bytes: Actual bytes transfer for this transaction. -* @stage: For control transactions, the current stage. -* @urb: URB. -*/ -struct cvmx_usb_transaction { -struct list_head node; -enum cvmx_usb_transfer type; -u64 buffer; -int buffer_length; -u64 control_header; -int iso_start_frame; -int iso_number_packets; -struct cvmx_usb_iso_packet *iso_packets; -int xfersize; -int pktcnt; -int retries; -int actual_bytes; -enum cvmx_usb_stage stage; -struct urb *urb; -}; - -/** -* struct cvmx_usb_pipe - a pipe represents a virtual connection between Octeon -* and some USB device. It contains a list of pending -* request to the device. -* -* @node: List node for pipe list -* @next: Pipe after this one in the list -* @transactions: List of pending transactions -* @interval: For periodic pipes, the interval between packets in -* frames -* @next_tx_frame: The next frame this pipe is allowed to transmit on -* @flags: State flags for this pipe -* @device_speed: Speed of device connected to this pipe -* @transfer_type: Type of transaction supported by this pipe -* @transfer_dir: IN or OUT. Ignored for Control -* @multi_count: Max packet in a row for the device -* @max_packet: The device's maximum packet size in bytes -* @device_addr: USB device address at other end of pipe -* @endpoint_num: USB endpoint number at other end of pipe -* @hub_device_addr: Hub address this device is connected to -* @hub_port: Hub port this device is connected to -* @pid_toggle: This toggles between 0/1 on every packet send to track -* the data pid needed -* @channel: Hardware DMA channel for this pipe -* @split_sc_frame: The low order bits of the frame number the split -* complete should be sent on -*/ -struct cvmx_usb_pipe { -struct list_head node; -struct list_head transactions; -u64 interval; -u64 next_tx_frame; -enum cvmx_usb_pipe_flags flags; -enum cvmx_usb_speed device_speed; -enum cvmx_usb_transfer transfer_type; -enum cvmx_usb_direction transfer_dir; -int multi_count; -u16 max_packet; -u8 device_addr; -u8 endpoint_num; -u8 hub_device_addr; -u8 hub_port; -u8 pid_toggle; -u8 channel; -s8 split_sc_frame; -}; - -struct cvmx_usb_tx_fifo { -struct { -int channel; -int size; -u64 address; - } entry[MAX_CHANNELS +1 ]; -int head; -int tail; -}; - -/** -* struct octeon_hcd - the state of the USB block -* -* lock: Serialization lock. -* init_flags: Flags passed to initialize. -* index: Which USB block this is for. -* idle_hardware_channels: Bit set for every idle hardware channel. -* usbcx_hprt: Stored port status so we don't need to read a CSR to -* determine splits. -* pipe_for_channel: Map channels to pipes. -* pipe: Storage for pipes. -* indent: Used by debug output to indent functions. -* port_status: Last port status used for change notification. -* idle_pipes: List of open pipes that have no transactions. -* active_pipes: Active pipes indexed by transfer type. -* frame_number: Increments every SOF interrupt for time keeping. -* active_split: Points to the current active split, or NULL. -*/ -struct octeon_hcd { -spinlock_t lock;/* serialization lock */ -int init_flags; -int index; -int idle_hardware_channels; -union cvmx_usbcx_hprt usbcx_hprt; -struct cvmx_usb_pipe *pipe_for_channel[MAX_CHANNELS ]; -int indent; -struct cvmx_usb_port_status port_status; -struct list_head idle_pipes; -struct list_head active_pipes[4 ]; -u64 frame_number; -struct cvmx_usb_transaction *active_split; -struct cvmx_usb_tx_fifo periodic; -struct cvmx_usb_tx_fifo nonperiodic; -}; - -/* -* This macro logically sets a single field in a CSR. It does the sequence -* read, modify, and write -*/ -#define USB_SET_FIELD32 (address, _union, field, value) \ - do { \ - union _union c; \ - \ - c.u32 = cvmx_usb_read_csr32(usb, address); \ - c.s.field = value; \ - cvmx_usb_write_csr32(usb, address, c.u32); \ - } while (0) - -/* Returns the IO address to push/pop stuff data from the FIFOs */ -#define USB_FIFO_ADDRESS (channel, usb_index) \ - (CVMX_USBCX_GOTGCTL(usb_index) + ((channel) + 1) * 0x1000) - -/** -* struct octeon_temp_buffer - a bounce buffer for USB transfers -* @orig_buffer: the original buffer passed by the USB stack -* @data: the newly allocated temporary buffer (excluding meta-data) -* -* Both the DMA engine and FIFO mode will always transfer full 32-bit words. If -* the buffer is too short, we need to allocate a temporary one, and this struct -* represents it. -*/ -struct octeon_temp_buffer { -void *orig_buffer; -u8 data[0 ]; -}; - -static inline struct usb_hcd *octeon_to_hcd (struct octeon_hcd *p) -{ - return container_of((void *)p, struct usb_hcd, hcd_priv); -} - -/** -* octeon_alloc_temp_buffer - allocate a temporary buffer for USB transfer -* (if needed) -* @urb: URB. -* @mem_flags: Memory allocation flags. -* -* This function allocates a temporary bounce buffer whenever it's needed -* due to HW limitations. -*/ -static int octeon_alloc_temp_buffer (struct urb *urb,gfp_t mem_flags) -{ -struct octeon_temp_buffer *temp; - -if (urb->num_sgs || urb->sg || - (urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ) || - !(urb->transfer_buffer_length %sizeof (u32))) -return 0 ; - - temp =kmalloc (ALIGN (urb->transfer_buffer_length,sizeof (u32)) + -sizeof (*temp), mem_flags); -if (!temp) -return -ENOMEM ; - - temp->orig_buffer = urb->transfer_buffer; -if (usb_urb_dir_out (urb)) -memcpy (temp->data, urb->transfer_buffer, - urb->transfer_buffer_length); - urb->transfer_buffer = temp->data; - urb->transfer_flags |=URB_ALIGNED_TEMP_BUFFER ; - -return 0 ; -} - -/** -* octeon_free_temp_buffer - free a temporary buffer used by USB transfers. -* @urb: URB. -* -* Frees a buffer allocated by octeon_alloc_temp_buffer(). -*/ -static void octeon_free_temp_buffer (struct urb *urb) -{ -struct octeon_temp_buffer *temp; -size_t length; - -if (!(urb->transfer_flags &URB_ALIGNED_TEMP_BUFFER )) -return ; - - temp = container_of(urb->transfer_buffer, struct octeon_temp_buffer, - data); -if (usb_urb_dir_in (urb)) { -if (usb_pipeisoc (urb->pipe)) - length = urb->transfer_buffer_length; -else - length = urb->actual_length; - -memcpy (temp->orig_buffer, urb->transfer_buffer, length); - } - urb->transfer_buffer = temp->orig_buffer; - urb->transfer_flags &= ~URB_ALIGNED_TEMP_BUFFER ; -kfree (temp); -} - -/** -* octeon_map_urb_for_dma - Octeon-specific map_urb_for_dma(). -* @hcd: USB HCD structure. -* @urb: URB. -* @mem_flags: Memory allocation flags. -*/ -static int octeon_map_urb_for_dma (struct usb_hcd *hcd,struct urb *urb, -gfp_t mem_flags) -{ -int ret; - - ret =octeon_alloc_temp_buffer (urb, mem_flags); -if (ret) -return ret; - - ret =usb_hcd_map_urb_for_dma (hcd, urb, mem_flags); -if (ret) -octeon_free_temp_buffer (urb); - -return ret; -} - -/** -* octeon_unmap_urb_for_dma - Octeon-specific unmap_urb_for_dma() -* @hcd: USB HCD structure. -* @urb: URB. -*/ -static void octeon_unmap_urb_for_dma (struct usb_hcd *hcd,struct urb *urb) -{ -usb_hcd_unmap_urb_for_dma (hcd, urb); -octeon_free_temp_buffer (urb); -} - -/** -* Read a USB 32bit CSR. It performs the necessary address swizzle -* for 32bit CSRs and logs the value in a readable format if -* debugging is on. -* -* @usb: USB block this access is for -* @address: 64bit address to read -* -* Returns: Result of the read -*/ -static inline u32 cvmx_usb_read_csr32 (struct octeon_hcd *usb,u64 address) -{ -return cvmx_read64_uint32 (address ^4 ); -} - -/** -* Write a USB 32bit CSR. It performs the necessary address -* swizzle for 32bit CSRs and logs the value in a readable format -* if debugging is on. -* -* @usb: USB block this access is for -* @address: 64bit address to write -* @value: Value to write -*/ -static inline void cvmx_usb_write_csr32 (struct octeon_hcd *usb, -u64 address,u32 value) -{ -cvmx_write64_uint32 (address ^4 , value); -cvmx_read64_uint64 (CVMX_USBNX_DMA0_INB_CHN0 (usb->index)); -} - -/** -* Return non zero if this pipe connects to a non HIGH speed -* device through a high speed hub. -* -* @usb: USB block this access is for -* @pipe: Pipe to check -* -* Returns: Non zero if we need to do split transactions -*/ -static inline int cvmx_usb_pipe_needs_split (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe) -{ -return pipe->device_speed !=CVMX_USB_SPEED_HIGH && - usb->usbcx_hprt.s.prtspd ==CVMX_USB_SPEED_HIGH ; -} - -/** -* Trivial utility function to return the correct PID for a pipe -* -* @pipe: pipe to check -* -* Returns: PID for pipe -*/ -static inline int cvmx_usb_get_data_pid (struct cvmx_usb_pipe *pipe) -{ -if (pipe->pid_toggle) -return 2 ;/* Data1 */ -return 0 ;/* Data0 */ -} - -/* Loops through register until txfflsh or rxfflsh become zero.*/ -static int cvmx_wait_tx_rx (struct octeon_hcd *usb,int fflsh_type) -{ -int result; -u64 address =CVMX_USBCX_GRSTCTL (usb->index); -u64 done =cvmx_get_cycle () +100 * - (u64 )octeon_get_clock_rate /1000000 ; -union cvmx_usbcx_grstctl c; - -while (1 ) { - c.u32 =cvmx_usb_read_csr32 (usb, address); -if (fflsh_type ==0 && c.s.txfflsh ==0 ) { - result =0 ; -break ; - }else if (fflsh_type ==1 && c.s.rxfflsh ==0 ) { - result =0 ; -break ; - }else if (cvmx_get_cycle () > done) { - result =-1 ; -break ; - } - -__delay (100 ); - } -return result; -} - -static void cvmx_fifo_setup (struct octeon_hcd *usb) -{ -union cvmx_usbcx_ghwcfg3 usbcx_ghwcfg3; -union cvmx_usbcx_gnptxfsiz npsiz; -union cvmx_usbcx_hptxfsiz psiz; - - usbcx_ghwcfg3.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GHWCFG3 (usb->index)); - -/* -* Program the USBC_GRXFSIZ register to select the size of the receive -* FIFO (25%). -*/ -USB_SET_FIELD32 (CVMX_USBCX_GRXFSIZ (usb->index), cvmx_usbcx_grxfsiz, - rxfdep, usbcx_ghwcfg3.s.dfifodepth /4 ); - -/* -* Program the USBC_GNPTXFSIZ register to select the size and the start -* address of the non-periodic transmit FIFO for nonperiodic -* transactions (50%). -*/ - npsiz.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_GNPTXFSIZ (usb->index)); - npsiz.s.nptxfdep = usbcx_ghwcfg3.s.dfifodepth /2 ; - npsiz.s.nptxfstaddr = usbcx_ghwcfg3.s.dfifodepth /4 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GNPTXFSIZ (usb->index), npsiz.u32); - -/* -* Program the USBC_HPTXFSIZ register to select the size and start -* address of the periodic transmit FIFO for periodic transactions -* (25%). -*/ - psiz.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_HPTXFSIZ (usb->index)); - psiz.s.ptxfsize = usbcx_ghwcfg3.s.dfifodepth /4 ; - psiz.s.ptxfstaddr =3 * usbcx_ghwcfg3.s.dfifodepth /4 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_HPTXFSIZ (usb->index), psiz.u32); - -/* Flush all FIFOs */ -USB_SET_FIELD32 (CVMX_USBCX_GRSTCTL (usb->index), - cvmx_usbcx_grstctl, txfnum,0x10 ); -USB_SET_FIELD32 (CVMX_USBCX_GRSTCTL (usb->index), - cvmx_usbcx_grstctl, txfflsh,1 ); -cvmx_wait_tx_rx (usb,0 ); -USB_SET_FIELD32 (CVMX_USBCX_GRSTCTL (usb->index), - cvmx_usbcx_grstctl, rxfflsh,1 ); -cvmx_wait_tx_rx (usb,1 ); -} - -/** -* Shutdown a USB port after a call to cvmx_usb_initialize(). -* The port should be disabled with all pipes closed when this -* function is called. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_shutdown (struct octeon_hcd *usb) -{ -union cvmx_usbnx_clk_ctl usbn_clk_ctl; - -/* Make sure all pipes are closed */ -if (!list_empty (&usb->idle_pipes) || - !list_empty (&usb->active_pipes[CVMX_USB_TRANSFER_ISOCHRONOUS ]) || - !list_empty (&usb->active_pipes[CVMX_USB_TRANSFER_INTERRUPT ]) || - !list_empty (&usb->active_pipes[CVMX_USB_TRANSFER_CONTROL ]) || - !list_empty (&usb->active_pipes[CVMX_USB_TRANSFER_BULK ])) -return -EBUSY ; - -/* Disable the clocks and put them in power on reset */ - usbn_clk_ctl.u64 =cvmx_read64_uint64 (CVMX_USBNX_CLK_CTL (usb->index)); - usbn_clk_ctl.s.enable =1 ; - usbn_clk_ctl.s.por =1 ; - usbn_clk_ctl.s.hclk_rst =1 ; - usbn_clk_ctl.s.prst =0 ; - usbn_clk_ctl.s.hrst =0 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -return 0 ; -} - -/** -* Initialize a USB port for use. This must be called before any -* other access to the Octeon USB port is made. The port starts -* off in the disabled state. -* -* @dev: Pointer to struct device for logging purposes. -* @usb: Pointer to struct octeon_hcd. -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_initialize (struct device *dev, -struct octeon_hcd *usb) -{ -int channel; -int divisor; -int retries =0 ; -union cvmx_usbcx_hcfg usbcx_hcfg; -union cvmx_usbnx_clk_ctl usbn_clk_ctl; -union cvmx_usbcx_gintsts usbc_gintsts; -union cvmx_usbcx_gahbcfg usbcx_gahbcfg; -union cvmx_usbcx_gintmsk usbcx_gintmsk; -union cvmx_usbcx_gusbcfg usbcx_gusbcfg; -union cvmx_usbnx_usbp_ctl_status usbn_usbp_ctl_status; - -retry: -/* -* Power On Reset and PHY Initialization -* -* 1. Wait for DCOK to assert (nothing to do) -* -* 2a. Write USBN0/1_CLK_CTL[POR] = 1 and -* USBN0/1_CLK_CTL[HRST,PRST,HCLK_RST] = 0 -*/ - usbn_clk_ctl.u64 =cvmx_read64_uint64 (CVMX_USBNX_CLK_CTL (usb->index)); - usbn_clk_ctl.s.por =1 ; - usbn_clk_ctl.s.hrst =0 ; - usbn_clk_ctl.s.prst =0 ; - usbn_clk_ctl.s.hclk_rst =0 ; - usbn_clk_ctl.s.enable =0 ; -/* -* 2b. Select the USB reference clock/crystal parameters by writing -* appropriate values to USBN0/1_CLK_CTL[P_C_SEL, P_RTYPE, P_COM_ON] -*/ -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_CLOCK_XO_GND ) { -/* -* The USB port uses 12/24/48MHz 2.5V board clock -* source at USB_XO. USB_XI should be tied to GND. -* Most Octeon evaluation boards require this setting -*/ -if (OCTEON_IS_MODEL (OCTEON_CN3XXX ) || -OCTEON_IS_MODEL (OCTEON_CN56XX ) || -OCTEON_IS_MODEL (OCTEON_CN50XX )) -/* From CN56XX,CN50XX,CN31XX,CN30XX manuals */ - usbn_clk_ctl.s.p_rtype =2 ;/* p_rclk=1 & p_xenbn=0 */ -else -/* From CN52XX manual */ - usbn_clk_ctl.s.p_rtype =1 ; - -switch (usb->init_flags & -CVMX_USB_INITIALIZE_FLAGS_CLOCK_MHZ_MASK ) { -case CVMX_USB_INITIALIZE_FLAGS_CLOCK_12MHZ : - usbn_clk_ctl.s.p_c_sel =0 ; -break ; -case CVMX_USB_INITIALIZE_FLAGS_CLOCK_24MHZ : - usbn_clk_ctl.s.p_c_sel =1 ; -break ; -case CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ : - usbn_clk_ctl.s.p_c_sel =2 ; -break ; - } - }else { -/* -* The USB port uses a 12MHz crystal as clock source -* at USB_XO and USB_XI -*/ -if (OCTEON_IS_MODEL (OCTEON_CN3XXX )) -/* From CN31XX,CN30XX manual */ - usbn_clk_ctl.s.p_rtype =3 ;/* p_rclk=1 & p_xenbn=1 */ -else -/* From CN56XX,CN52XX,CN50XX manuals. */ - usbn_clk_ctl.s.p_rtype =0 ; - - usbn_clk_ctl.s.p_c_sel =0 ; - } -/* -* 2c. Select the HCLK via writing USBN0/1_CLK_CTL[DIVIDE, DIVIDE2] and -* setting USBN0/1_CLK_CTL[ENABLE] = 1. Divide the core clock down -* such that USB is as close as possible to 125Mhz -*/ - divisor =DIV_ROUND_UP (octeon_get_clock_rate (),125000000 ); -/* Lower than 4 doesn't seem to work properly */ -if (divisor <4 ) - divisor =4 ; - usbn_clk_ctl.s.divide = divisor; - usbn_clk_ctl.s.divide2 =0 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); - -/* 2d. Write USBN0/1_CLK_CTL[HCLK_RST] = 1 */ - usbn_clk_ctl.s.hclk_rst =1 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -/* 2e. Wait 64 core-clock cycles for HCLK to stabilize */ -__delay (64 ); -/* -* 3. Program the power-on reset field in the USBN clock-control -* register: -* USBN_CLK_CTL[POR] = 0 -*/ - usbn_clk_ctl.s.por =0 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -/* 4. Wait 1 ms for PHY clock to start */ -mdelay (1 ); -/* -* 5. Program the Reset input from automatic test equipment field in the -* USBP control and status register: -* USBN_USBP_CTL_STATUS[ATE_RESET] = 1 -*/ - usbn_usbp_ctl_status.u64 = -cvmx_read64_uint64 (CVMX_USBNX_USBP_CTL_STATUS (usb->index)); - usbn_usbp_ctl_status.s.ate_reset =1 ; -cvmx_write64_uint64 (CVMX_USBNX_USBP_CTL_STATUS (usb->index), - usbn_usbp_ctl_status.u64); -/* 6. Wait 10 cycles */ -__delay (10 ); -/* -* 7. Clear ATE_RESET field in the USBN clock-control register: -* USBN_USBP_CTL_STATUS[ATE_RESET] = 0 -*/ - usbn_usbp_ctl_status.s.ate_reset =0 ; -cvmx_write64_uint64 (CVMX_USBNX_USBP_CTL_STATUS (usb->index), - usbn_usbp_ctl_status.u64); -/* -* 8. Program the PHY reset field in the USBN clock-control register: -* USBN_CLK_CTL[PRST] = 1 -*/ - usbn_clk_ctl.s.prst =1 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -/* -* 9. Program the USBP control and status register to select host or -* device mode. USBN_USBP_CTL_STATUS[HST_MODE] = 0 for host, = 1 for -* device -*/ - usbn_usbp_ctl_status.s.hst_mode =0 ; -cvmx_write64_uint64 (CVMX_USBNX_USBP_CTL_STATUS (usb->index), - usbn_usbp_ctl_status.u64); -/* 10. Wait 1 us */ -udelay (1 ); -/* -* 11. Program the hreset_n field in the USBN clock-control register: -* USBN_CLK_CTL[HRST] = 1 -*/ - usbn_clk_ctl.s.hrst =1 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -/* 12. Proceed to USB core initialization */ - usbn_clk_ctl.s.enable =1 ; -cvmx_write64_uint64 (CVMX_USBNX_CLK_CTL (usb->index), usbn_clk_ctl.u64); -udelay (1 ); - -/* -* USB Core Initialization -* -* 1. Read USBC_GHWCFG1, USBC_GHWCFG2, USBC_GHWCFG3, USBC_GHWCFG4 to -* determine USB core configuration parameters. -* -* Nothing needed -* -* 2. Program the following fields in the global AHB configuration -* register (USBC_GAHBCFG) -* DMA mode, USBC_GAHBCFG[DMAEn]: 1 = DMA mode, 0 = slave mode -* Burst length, USBC_GAHBCFG[HBSTLEN] = 0 -* Nonperiodic TxFIFO empty level (slave mode only), -* USBC_GAHBCFG[NPTXFEMPLVL] -* Periodic TxFIFO empty level (slave mode only), -* USBC_GAHBCFG[PTXFEMPLVL] -* Global interrupt mask, USBC_GAHBCFG[GLBLINTRMSK] = 1 -*/ - usbcx_gahbcfg.u32 =0 ; - usbcx_gahbcfg.s.dmaen = !(usb->init_flags & -CVMX_USB_INITIALIZE_FLAGS_NO_DMA ); - usbcx_gahbcfg.s.hbstlen =0 ; - usbcx_gahbcfg.s.nptxfemplvl =1 ; - usbcx_gahbcfg.s.ptxfemplvl =1 ; - usbcx_gahbcfg.s.glblintrmsk =1 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GAHBCFG (usb->index), - usbcx_gahbcfg.u32); - -/* -* 3. Program the following fields in USBC_GUSBCFG register. -* HS/FS timeout calibration, USBC_GUSBCFG[TOUTCAL] = 0 -* ULPI DDR select, USBC_GUSBCFG[DDRSEL] = 0 -* USB turnaround time, USBC_GUSBCFG[USBTRDTIM] = 0x5 -* PHY low-power clock select, USBC_GUSBCFG[PHYLPWRCLKSEL] = 0 -*/ - usbcx_gusbcfg.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GUSBCFG (usb->index)); - usbcx_gusbcfg.s.toutcal =0 ; - usbcx_gusbcfg.s.ddrsel =0 ; - usbcx_gusbcfg.s.usbtrdtim =0x5 ; - usbcx_gusbcfg.s.phylpwrclksel =0 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GUSBCFG (usb->index), - usbcx_gusbcfg.u32); - -/* -* 4. The software must unmask the following bits in the USBC_GINTMSK -* register. -* OTG interrupt mask, USBC_GINTMSK[OTGINTMSK] = 1 -* Mode mismatch interrupt mask, USBC_GINTMSK[MODEMISMSK] = 1 -*/ - usbcx_gintmsk.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GINTMSK (usb->index)); - usbcx_gintmsk.s.otgintmsk =1 ; - usbcx_gintmsk.s.modemismsk =1 ; - usbcx_gintmsk.s.hchintmsk =1 ; - usbcx_gintmsk.s.sofmsk =0 ; -/* We need RX FIFO interrupts if we don't have DMA */ -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA ) - usbcx_gintmsk.s.rxflvlmsk =1 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GINTMSK (usb->index), - usbcx_gintmsk.u32); - -/* -* Disable all channel interrupts. We'll enable them per channel later. -*/ -for (channel =0 ; channel <8 ; channel++) -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCINTMSKX (channel, usb->index), -0 ); - -/* -* Host Port Initialization -* -* 1. Program the host-port interrupt-mask field to unmask, -* USBC_GINTMSK[PRTINT] = 1 -*/ -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, prtintmsk,1 ); -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, disconnintmsk,1 ); - -/* -* 2. Program the USBC_HCFG register to select full-speed host -* or high-speed host. -*/ - usbcx_hcfg.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_HCFG (usb->index)); - usbcx_hcfg.s.fslssupp =0 ; - usbcx_hcfg.s.fslspclksel =0 ; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCFG (usb->index), usbcx_hcfg.u32); - -cvmx_fifo_setup (usb); - -/* -* If the controller is getting port events right after the reset, it -* means the initialization failed. Try resetting the controller again -* in such case. This is seen to happen after cold boot on DSR-1000N. -*/ - usbc_gintsts.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GINTSTS (usb->index)); -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GINTSTS (usb->index), - usbc_gintsts.u32); -dev_dbg (dev,"gintsts after reset: 0x%x\n" , (int )usbc_gintsts.u32); -if (!usbc_gintsts.s.disconnint && !usbc_gintsts.s.prtint) -return 0 ; -if (retries++ >=5 ) -return -EAGAIN ; -dev_info (dev,"controller reset failed (gintsts=0x%x) - retrying\n" , - (int )usbc_gintsts.u32); -msleep (50 ); -cvmx_usb_shutdown (usb); -msleep (50 ); - goto retry; -} - -/** -* Reset a USB port. After this call succeeds, the USB port is -* online and servicing requests. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -*/ -static void cvmx_usb_reset_port (struct octeon_hcd *usb) -{ - usb->usbcx_hprt.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HPRT (usb->index)); - -/* Program the port reset bit to start the reset process */ -USB_SET_FIELD32 (CVMX_USBCX_HPRT (usb->index), cvmx_usbcx_hprt, - prtrst,1 ); - -/* -* Wait at least 50ms (high speed), or 10ms (full speed) for the reset -* process to complete. -*/ -mdelay (50 ); - -/* Program the port reset bit to 0, USBC_HPRT[PRTRST] = 0 */ -USB_SET_FIELD32 (CVMX_USBCX_HPRT (usb->index), cvmx_usbcx_hprt, - prtrst,0 ); - -/* -* Read the port speed field to get the enumerated speed, -* USBC_HPRT[PRTSPD]. -*/ - usb->usbcx_hprt.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HPRT (usb->index)); -} - -/** -* Disable a USB port. After this call the USB port will not -* generate data transfers and will not generate events. -* Transactions in process will fail and call their -* associated callbacks. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_disable (struct octeon_hcd *usb) -{ -/* Disable the port */ -USB_SET_FIELD32 (CVMX_USBCX_HPRT (usb->index), cvmx_usbcx_hprt, - prtena,1 ); -return 0 ; -} - -/** -* Get the current state of the USB port. Use this call to -* determine if the usb port has anything connected, is enabled, -* or has some sort of error condition. The return value of this -* call has "changed" bits to signal of the value of some fields -* have changed between calls. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* -* Returns: Port status information -*/ -static struct cvmx_usb_port_status cvmx_usb_get_status (struct octeon_hcd *usb) -{ -union cvmx_usbcx_hprt usbc_hprt; -struct cvmx_usb_port_status result; - -memset (&result,0 ,sizeof (result)); - - usbc_hprt.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_HPRT (usb->index)); - result.port_enabled = usbc_hprt.s.prtena; - result.port_over_current = usbc_hprt.s.prtovrcurract; - result.port_powered = usbc_hprt.s.prtpwr; - result.port_speed = usbc_hprt.s.prtspd; - result.connected = usbc_hprt.s.prtconnsts; - result.connect_change = - result.connected != usb->port_status.connected; - -return result; -} - -/** -* Open a virtual pipe between the host and a USB device. A pipe -* must be opened before data can be transferred between a device -* and Octeon. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @device_addr: -* USB device address to open the pipe to -* (0-127). -* @endpoint_num: -* USB endpoint number to open the pipe to -* (0-15). -* @device_speed: -* The speed of the device the pipe is going -* to. This must match the device's speed, -* which may be different than the port speed. -* @max_packet: The maximum packet length the device can -* transmit/receive (low speed=0-8, full -* speed=0-1023, high speed=0-1024). This value -* comes from the standard endpoint descriptor -* field wMaxPacketSize bits <10:0>. -* @transfer_type: -* The type of transfer this pipe is for. -* @transfer_dir: -* The direction the pipe is in. This is not -* used for control pipes. -* @interval: For ISOCHRONOUS and INTERRUPT transfers, -* this is how often the transfer is scheduled -* for. All other transfers should specify -* zero. The units are in frames (8000/sec at -* high speed, 1000/sec for full speed). -* @multi_count: -* For high speed devices, this is the maximum -* allowed number of packet per microframe. -* Specify zero for non high speed devices. This -* value comes from the standard endpoint descriptor -* field wMaxPacketSize bits <12:11>. -* @hub_device_addr: -* Hub device address this device is connected -* to. Devices connected directly to Octeon -* use zero. This is only used when the device -* is full/low speed behind a high speed hub. -* The address will be of the high speed hub, -* not and full speed hubs after it. -* @hub_port: Which port on the hub the device is -* connected. Use zero for devices connected -* directly to Octeon. Like hub_device_addr, -* this is only used for full/low speed -* devices behind a high speed hub. -* -* Returns: A non-NULL value is a pipe. NULL means an error. -*/ -static struct cvmx_usb_pipe *cvmx_usb_open_pipe (struct octeon_hcd *usb, -int device_addr, -int endpoint_num, -enum cvmx_usb_speed - device_speed, -int max_packet, -enum cvmx_usb_transfer - transfer_type, -enum cvmx_usb_direction - transfer_dir, -int interval,int multi_count, -int hub_device_addr, -int hub_port) -{ -struct cvmx_usb_pipe *pipe; - - pipe =kzalloc (sizeof (*pipe),GFP_ATOMIC ); -if (!pipe) -return NULL ; -if ((device_speed ==CVMX_USB_SPEED_HIGH ) && - (transfer_dir ==CVMX_USB_DIRECTION_OUT ) && - (transfer_type ==CVMX_USB_TRANSFER_BULK )) - pipe->flags |=CVMX_USB_PIPE_FLAGS_NEED_PING ; - pipe->device_addr = device_addr; - pipe->endpoint_num = endpoint_num; - pipe->device_speed = device_speed; - pipe->max_packet = max_packet; - pipe->transfer_type = transfer_type; - pipe->transfer_dir = transfer_dir; -INIT_LIST_HEAD (&pipe->transactions); - -/* -* All pipes use interval to rate limit NAK processing. Force an -* interval if one wasn't supplied -*/ -if (!interval) - interval =1 ; -if (cvmx_usb_pipe_needs_split (usb, pipe)) { - pipe->interval = interval *8 ; -/* Force start splits to be schedule on uFrame 0 */ - pipe->next_tx_frame = ((usb->frame_number +7 ) & ~7 ) + - pipe->interval; - }else { - pipe->interval = interval; - pipe->next_tx_frame = usb->frame_number + pipe->interval; - } - pipe->multi_count = multi_count; - pipe->hub_device_addr = hub_device_addr; - pipe->hub_port = hub_port; - pipe->pid_toggle =0 ; - pipe->split_sc_frame =-1 ; -list_add_tail (&pipe->node, &usb->idle_pipes); - -/* -* We don't need to tell the hardware about this pipe yet since -* it doesn't have any submitted requests -*/ - -return pipe; -} - -/** -* Poll the RX FIFOs and remove data as needed. This function is only used -* in non DMA mode. It is very important that this function be called quickly -* enough to prevent FIFO overflow. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -*/ -static void cvmx_usb_poll_rx_fifo (struct octeon_hcd *usb) -{ -union cvmx_usbcx_grxstsph rx_status; -int channel; -int bytes; -u64 address; -u32 *ptr; - - rx_status.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GRXSTSPH (usb->index)); -/* Only read data if IN data is there */ -if (rx_status.s.pktsts !=2 ) -return ; -/* Check if no data is available */ -if (!rx_status.s.bcnt) -return ; - - channel = rx_status.s.chnum; - bytes = rx_status.s.bcnt; -if (!bytes) -return ; - -/* Get where the DMA engine would have written this data */ - address =cvmx_read64_uint64 (CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + - channel *8 ); - - ptr =cvmx_phys_to_ptr (address); -cvmx_write64_uint64 (CVMX_USBNX_DMA0_INB_CHN0 (usb->index) + channel *8 , - address + bytes); - -/* Loop writing the FIFO data for this packet into memory */ -while (bytes >0 ) { - *ptr++ =cvmx_usb_read_csr32 (usb, -USB_FIFO_ADDRESS (channel, usb->index)); - bytes -=4 ; - } -CVMX_SYNCW ; -} - -/** -* Fill the TX hardware fifo with data out of the software -* fifos -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @fifo: Software fifo to use -* @available: Amount of space in the hardware fifo -* -* Returns: Non zero if the hardware fifo was too small and needs -* to be serviced again. -*/ -static int cvmx_usb_fill_tx_hw (struct octeon_hcd *usb, -struct cvmx_usb_tx_fifo *fifo,int available) -{ -/* -* We're done either when there isn't anymore space or the software FIFO -* is empty -*/ -while (available && (fifo->head != fifo->tail)) { -int i = fifo->tail; -const u32 *ptr =cvmx_phys_to_ptr (fifo->entry[i].address); -u64 csr_address =USB_FIFO_ADDRESS (fifo->entry[i].channel, - usb->index) ^4 ; -int words = available; - -/* Limit the amount of data to what the SW fifo has */ -if (fifo->entry[i].size <= available) { - words = fifo->entry[i].size; - fifo->tail++; -if (fifo->tail >MAX_CHANNELS ) - fifo->tail =0 ; - } - -/* Update the next locations and counts */ - available -= words; - fifo->entry[i].address += words *4 ; - fifo->entry[i].size -= words; - -/* -* Write the HW fifo data. The read every three writes is due -* to an errata on CN3XXX chips -*/ -while (words >3 ) { -cvmx_write64_uint32 (csr_address, *ptr++); -cvmx_write64_uint32 (csr_address, *ptr++); -cvmx_write64_uint32 (csr_address, *ptr++); -cvmx_read64_uint64 ( -CVMX_USBNX_DMA0_INB_CHN0 (usb->index)); - words -=3 ; - } -cvmx_write64_uint32 (csr_address, *ptr++); -if (--words) { -cvmx_write64_uint32 (csr_address, *ptr++); -if (--words) -cvmx_write64_uint32 (csr_address, *ptr++); - } -cvmx_read64_uint64 (CVMX_USBNX_DMA0_INB_CHN0 (usb->index)); - } -return fifo->head != fifo->tail; -} - -/** -* Check the hardware FIFOs and fill them as needed -* -* @usb: USB device state populated by cvmx_usb_initialize(). -*/ -static void cvmx_usb_poll_tx_fifo (struct octeon_hcd *usb) -{ -if (usb->periodic.head != usb->periodic.tail) { -union cvmx_usbcx_hptxsts tx_status; - - tx_status.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HPTXSTS (usb->index)); -if (cvmx_usb_fill_tx_hw (usb, &usb->periodic, - tx_status.s.ptxfspcavail)) -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, ptxfempmsk,1 ); -else -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, ptxfempmsk,0 ); - } - -if (usb->nonperiodic.head != usb->nonperiodic.tail) { -union cvmx_usbcx_gnptxsts tx_status; - - tx_status.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GNPTXSTS (usb->index)); -if (cvmx_usb_fill_tx_hw (usb, &usb->nonperiodic, - tx_status.s.nptxfspcavail)) -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, nptxfempmsk,1 ); -else -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, nptxfempmsk,0 ); - } -} - -/** -* Fill the TX FIFO with an outgoing packet -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @channel: Channel number to get packet from -*/ -static void cvmx_usb_fill_tx_fifo (struct octeon_hcd *usb,int channel) -{ -union cvmx_usbcx_hccharx hcchar; -union cvmx_usbcx_hcspltx usbc_hcsplt; -union cvmx_usbcx_hctsizx usbc_hctsiz; -struct cvmx_usb_tx_fifo *fifo; - -/* We only need to fill data on outbound channels */ - hcchar.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, usb->index)); -if (hcchar.s.epdir !=CVMX_USB_DIRECTION_OUT ) -return ; - -/* OUT Splits only have data on the start and not the complete */ - usbc_hcsplt.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCSPLTX (channel, usb->index)); -if (usbc_hcsplt.s.spltena && usbc_hcsplt.s.compsplt) -return ; - -/* -* Find out how many bytes we need to fill and convert it into 32bit -* words. -*/ - usbc_hctsiz.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCTSIZX (channel, usb->index)); -if (!usbc_hctsiz.s.xfersize) -return ; - -if ((hcchar.s.eptype ==CVMX_USB_TRANSFER_INTERRUPT ) || - (hcchar.s.eptype ==CVMX_USB_TRANSFER_ISOCHRONOUS )) - fifo = &usb->periodic; -else - fifo = &usb->nonperiodic; - - fifo->entry[fifo->head].channel = channel; - fifo->entry[fifo->head].address = -cvmx_read64_uint64 (CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + - channel *8 ); - fifo->entry[fifo->head].size = (usbc_hctsiz.s.xfersize +3 ) >>2 ; - fifo->head++; -if (fifo->head >MAX_CHANNELS ) - fifo->head =0 ; - -cvmx_usb_poll_tx_fifo (usb); -} - -/** -* Perform channel specific setup for Control transactions. All -* the generic stuff will already have been done in cvmx_usb_start_channel(). -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @channel: Channel to setup -* @pipe: Pipe for control transaction -*/ -static void cvmx_usb_start_channel_control (struct octeon_hcd *usb, -int channel, -struct cvmx_usb_pipe *pipe) -{ -struct usb_hcd *hcd =octeon_to_hcd (usb); -struct device *dev = hcd->self.controller; -struct cvmx_usb_transaction *transaction = -list_first_entry (&pipe->transactions,typeof (*transaction), - node); -struct usb_ctrlrequest *header = -cvmx_phys_to_ptr (transaction->control_header); -int bytes_to_transfer = transaction->buffer_length - - transaction->actual_bytes; -int packets_to_transfer; -union cvmx_usbcx_hctsizx usbc_hctsiz; - - usbc_hctsiz.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCTSIZX (channel, usb->index)); - -switch (transaction->stage) { -case CVMX_USB_STAGE_NON_CONTROL : -case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE : -dev_err (dev,"%s: ERROR - Non control stage\n" , __func__); -break ; -case CVMX_USB_STAGE_SETUP : - usbc_hctsiz.s.pid =3 ;/* Setup */ - bytes_to_transfer =sizeof (*header); -/* All Control operations start with a setup going OUT */ -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, -CVMX_USB_DIRECTION_OUT ); -/* -* Setup send the control header instead of the buffer data. The -* buffer data will be used in the next stage -*/ -cvmx_write64_uint64 (CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index) + - channel *8 , - transaction->control_header); -break ; -case CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE : - usbc_hctsiz.s.pid =3 ;/* Setup */ - bytes_to_transfer =0 ; -/* All Control operations start with a setup going OUT */ -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, -CVMX_USB_DIRECTION_OUT ); - -USB_SET_FIELD32 (CVMX_USBCX_HCSPLTX (channel, usb->index), - cvmx_usbcx_hcspltx, compsplt,1 ); -break ; -case CVMX_USB_STAGE_DATA : - usbc_hctsiz.s.pid =cvmx_usb_get_data_pid (pipe); -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -if (header->bRequestType &USB_DIR_IN ) - bytes_to_transfer =0 ; -else if (bytes_to_transfer > pipe->max_packet) - bytes_to_transfer = pipe->max_packet; - } -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, - ((header->bRequestType &USB_DIR_IN ) ? -CVMX_USB_DIRECTION_IN : -CVMX_USB_DIRECTION_OUT )); -break ; -case CVMX_USB_STAGE_DATA_SPLIT_COMPLETE : - usbc_hctsiz.s.pid =cvmx_usb_get_data_pid (pipe); -if (!(header->bRequestType &USB_DIR_IN )) - bytes_to_transfer =0 ; -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, - ((header->bRequestType &USB_DIR_IN ) ? -CVMX_USB_DIRECTION_IN : -CVMX_USB_DIRECTION_OUT )); -USB_SET_FIELD32 (CVMX_USBCX_HCSPLTX (channel, usb->index), - cvmx_usbcx_hcspltx, compsplt,1 ); -break ; -case CVMX_USB_STAGE_STATUS : - usbc_hctsiz.s.pid =cvmx_usb_get_data_pid (pipe); - bytes_to_transfer =0 ; -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, - ((header->bRequestType &USB_DIR_IN ) ? -CVMX_USB_DIRECTION_OUT : -CVMX_USB_DIRECTION_IN )); -break ; -case CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE : - usbc_hctsiz.s.pid =cvmx_usb_get_data_pid (pipe); - bytes_to_transfer =0 ; -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, epdir, - ((header->bRequestType &USB_DIR_IN ) ? -CVMX_USB_DIRECTION_OUT : -CVMX_USB_DIRECTION_IN )); -USB_SET_FIELD32 (CVMX_USBCX_HCSPLTX (channel, usb->index), - cvmx_usbcx_hcspltx, compsplt,1 ); -break ; - } - -/* -* Make sure the transfer never exceeds the byte limit of the hardware. -* Further bytes will be sent as continued transactions -*/ -if (bytes_to_transfer >MAX_TRANSFER_BYTES ) { -/* Round MAX_TRANSFER_BYTES to a multiple of out packet size */ - bytes_to_transfer =MAX_TRANSFER_BYTES / pipe->max_packet; - bytes_to_transfer *= pipe->max_packet; - } - -/* -* Calculate the number of packets to transfer. If the length is zero -* we still need to transfer one packet -*/ - packets_to_transfer =DIV_ROUND_UP (bytes_to_transfer, - pipe->max_packet); -if (packets_to_transfer ==0 ) { - packets_to_transfer =1 ; - }else if ((packets_to_transfer >1 ) && - (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA )) { -/* -* Limit to one packet when not using DMA. Channels must be -* restarted between every packet for IN transactions, so there -* is no reason to do multiple packets in a row -*/ - packets_to_transfer =1 ; - bytes_to_transfer = packets_to_transfer * pipe->max_packet; - }else if (packets_to_transfer >MAX_TRANSFER_PACKETS ) { -/* -* Limit the number of packet and data transferred to what the -* hardware can handle -*/ - packets_to_transfer =MAX_TRANSFER_PACKETS ; - bytes_to_transfer = packets_to_transfer * pipe->max_packet; - } - - usbc_hctsiz.s.xfersize = bytes_to_transfer; - usbc_hctsiz.s.pktcnt = packets_to_transfer; - -cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCTSIZX (channel, usb->index), - usbc_hctsiz.u32); -} - -/** -* Start a channel to perform the pipe's head transaction -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @channel: Channel to setup -* @pipe: Pipe to start -*/ -static void cvmx_usb_start_channel (struct octeon_hcd *usb,int channel, -struct cvmx_usb_pipe *pipe) -{ -struct cvmx_usb_transaction *transaction = -list_first_entry (&pipe->transactions,typeof (*transaction), - node); - -/* Make sure all writes to the DMA region get flushed */ -CVMX_SYNCW ; - -/* Attach the channel to the pipe */ - usb->pipe_for_channel[channel] = pipe; - pipe->channel = channel; - pipe->flags |=CVMX_USB_PIPE_FLAGS_SCHEDULED ; - -/* Mark this channel as in use */ - usb->idle_hardware_channels &= ~(1 << channel); - -/* Enable the channel interrupt bits */ - { -union cvmx_usbcx_hcintx usbc_hcint; -union cvmx_usbcx_hcintmskx usbc_hcintmsk; -union cvmx_usbcx_haintmsk usbc_haintmsk; - -/* Clear all channel status bits */ - usbc_hcint.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCINTX (channel, usb->index)); - -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCINTX (channel, usb->index), - usbc_hcint.u32); - - usbc_hcintmsk.u32 =0 ; - usbc_hcintmsk.s.chhltdmsk =1 ; -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA ) { -/* -* Channels need these extra interrupts when we aren't -* in DMA mode. -*/ - usbc_hcintmsk.s.datatglerrmsk =1 ; - usbc_hcintmsk.s.frmovrunmsk =1 ; - usbc_hcintmsk.s.bblerrmsk =1 ; - usbc_hcintmsk.s.xacterrmsk =1 ; -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -/* -* Splits don't generate xfercompl, so we need -* ACK and NYET. -*/ - usbc_hcintmsk.s.nyetmsk =1 ; - usbc_hcintmsk.s.ackmsk =1 ; - } - usbc_hcintmsk.s.nakmsk =1 ; - usbc_hcintmsk.s.stallmsk =1 ; - usbc_hcintmsk.s.xfercomplmsk =1 ; - } -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCINTMSKX (channel, usb->index), - usbc_hcintmsk.u32); - -/* Enable the channel interrupt to propagate */ - usbc_haintmsk.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HAINTMSK (usb->index)); - usbc_haintmsk.s.haintmsk |=1 << channel; -cvmx_usb_write_csr32 (usb,CVMX_USBCX_HAINTMSK (usb->index), - usbc_haintmsk.u32); - } - -/* Setup the location the DMA engine uses. */ - { -u64 reg; -u64 dma_address = transaction->buffer + - transaction->actual_bytes; - -if (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS ) - dma_address = transaction->buffer + - transaction->iso_packets[0 ].offset + - transaction->actual_bytes; - -if (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT ) - reg =CVMX_USBNX_DMA0_OUTB_CHN0 (usb->index); -else - reg =CVMX_USBNX_DMA0_INB_CHN0 (usb->index); -cvmx_write64_uint64 (reg + channel *8 , dma_address); - } - -/* Setup both the size of the transfer and the SPLIT characteristics */ - { -union cvmx_usbcx_hcspltx usbc_hcsplt = {.u32 =0 }; -union cvmx_usbcx_hctsizx usbc_hctsiz = {.u32 =0 }; -int packets_to_transfer; -int bytes_to_transfer = transaction->buffer_length - - transaction->actual_bytes; - -/* -* ISOCHRONOUS transactions store each individual transfer size -* in the packet structure, not the global buffer_length -*/ -if (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS ) - bytes_to_transfer = - transaction->iso_packets[0 ].length - - transaction->actual_bytes; - -/* -* We need to do split transactions when we are talking to non -* high speed devices that are behind a high speed hub -*/ -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -/* -* On the start split phase (stage is even) record the -* frame number we will need to send the split complete. -* We only store the lower two bits since the time ahead -* can only be two frames -*/ -if ((transaction->stage &1 ) ==0 ) { -if (transaction->type ==CVMX_USB_TRANSFER_BULK ) - pipe->split_sc_frame = - (usb->frame_number +1 ) &0x7f ; -else - pipe->split_sc_frame = - (usb->frame_number +2 ) &0x7f ; - }else { - pipe->split_sc_frame =-1 ; - } - - usbc_hcsplt.s.spltena =1 ; - usbc_hcsplt.s.hubaddr = pipe->hub_device_addr; - usbc_hcsplt.s.prtaddr = pipe->hub_port; - usbc_hcsplt.s.compsplt = (transaction->stage == -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE ); - -/* -* SPLIT transactions can only ever transmit one data -* packet so limit the transfer size to the max packet -* size -*/ -if (bytes_to_transfer > pipe->max_packet) - bytes_to_transfer = pipe->max_packet; - -/* -* ISOCHRONOUS OUT splits are unique in that they limit -* data transfers to 188 byte chunks representing the -* begin/middle/end of the data or all -*/ -if (!usbc_hcsplt.s.compsplt && - (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT ) && - (pipe->transfer_type == -CVMX_USB_TRANSFER_ISOCHRONOUS )) { -/* -* Clear the split complete frame number as -* there isn't going to be a split complete -*/ - pipe->split_sc_frame =-1 ; -/* -* See if we've started this transfer and sent -* data -*/ -if (transaction->actual_bytes ==0 ) { -/* -* Nothing sent yet, this is either a -* begin or the entire payload -*/ -if (bytes_to_transfer <=188 ) -/* Entire payload in one go */ - usbc_hcsplt.s.xactpos =3 ; -else -/* First part of payload */ - usbc_hcsplt.s.xactpos =2 ; - }else { -/* -* Continuing the previous data, we must -* either be in the middle or at the end -*/ -if (bytes_to_transfer <=188 ) -/* End of payload */ - usbc_hcsplt.s.xactpos =1 ; -else -/* Middle of payload */ - usbc_hcsplt.s.xactpos =0 ; - } -/* -* Again, the transfer size is limited to 188 -* bytes -*/ -if (bytes_to_transfer >188 ) - bytes_to_transfer =188 ; - } - } - -/* -* Make sure the transfer never exceeds the byte limit of the -* hardware. Further bytes will be sent as continued -* transactions -*/ -if (bytes_to_transfer >MAX_TRANSFER_BYTES ) { -/* -* Round MAX_TRANSFER_BYTES to a multiple of out packet -* size -*/ - bytes_to_transfer =MAX_TRANSFER_BYTES / - pipe->max_packet; - bytes_to_transfer *= pipe->max_packet; - } - -/* -* Calculate the number of packets to transfer. If the length is -* zero we still need to transfer one packet -*/ - packets_to_transfer = -DIV_ROUND_UP (bytes_to_transfer, pipe->max_packet); -if (packets_to_transfer ==0 ) { - packets_to_transfer =1 ; - }else if ((packets_to_transfer >1 ) && - (usb->init_flags & -CVMX_USB_INITIALIZE_FLAGS_NO_DMA )) { -/* -* Limit to one packet when not using DMA. Channels must -* be restarted between every packet for IN -* transactions, so there is no reason to do multiple -* packets in a row -*/ - packets_to_transfer =1 ; - bytes_to_transfer = packets_to_transfer * - pipe->max_packet; - }else if (packets_to_transfer >MAX_TRANSFER_PACKETS ) { -/* -* Limit the number of packet and data transferred to -* what the hardware can handle -*/ - packets_to_transfer =MAX_TRANSFER_PACKETS ; - bytes_to_transfer = packets_to_transfer * - pipe->max_packet; - } - - usbc_hctsiz.s.xfersize = bytes_to_transfer; - usbc_hctsiz.s.pktcnt = packets_to_transfer; - -/* Update the DATA0/DATA1 toggle */ - usbc_hctsiz.s.pid =cvmx_usb_get_data_pid (pipe); -/* -* High speed pipes may need a hardware ping before they start -*/ -if (pipe->flags &CVMX_USB_PIPE_FLAGS_NEED_PING ) - usbc_hctsiz.s.dopng =1 ; - -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCSPLTX (channel, usb->index), - usbc_hcsplt.u32); -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCTSIZX (channel, usb->index), - usbc_hctsiz.u32); - } - -/* Setup the Host Channel Characteristics Register */ - { -union cvmx_usbcx_hccharx usbc_hcchar = {.u32 =0 }; - -/* -* Set the startframe odd/even properly. This is only used for -* periodic -*/ - usbc_hcchar.s.oddfrm = usb->frame_number &1 ; - -/* -* Set the number of back to back packets allowed by this -* endpoint. Split transactions interpret "ec" as the number of -* immediate retries of failure. These retries happen too -* quickly, so we disable these entirely for splits -*/ -if (cvmx_usb_pipe_needs_split (usb, pipe)) - usbc_hcchar.s.ec =1 ; -else if (pipe->multi_count <1 ) - usbc_hcchar.s.ec =1 ; -else if (pipe->multi_count >3 ) - usbc_hcchar.s.ec =3 ; -else - usbc_hcchar.s.ec = pipe->multi_count; - -/* Set the rest of the endpoint specific settings */ - usbc_hcchar.s.devaddr = pipe->device_addr; - usbc_hcchar.s.eptype = transaction->type; - usbc_hcchar.s.lspddev = - (pipe->device_speed ==CVMX_USB_SPEED_LOW ); - usbc_hcchar.s.epdir = pipe->transfer_dir; - usbc_hcchar.s.epnum = pipe->endpoint_num; - usbc_hcchar.s.mps = pipe->max_packet; -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, usb->index), - usbc_hcchar.u32); - } - -/* Do transaction type specific fixups as needed */ -switch (transaction->type) { -case CVMX_USB_TRANSFER_CONTROL : -cvmx_usb_start_channel_control (usb, channel, pipe); -break ; -case CVMX_USB_TRANSFER_BULK : -case CVMX_USB_TRANSFER_INTERRUPT : -break ; -case CVMX_USB_TRANSFER_ISOCHRONOUS : -if (!cvmx_usb_pipe_needs_split (usb, pipe)) { -/* -* ISO transactions require different PIDs depending on -* direction and how many packets are needed -*/ -if (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT ) { -if (pipe->multi_count <2 )/* Need DATA0 */ -USB_SET_FIELD32 ( -CVMX_USBCX_HCTSIZX (channel, - usb->index), - cvmx_usbcx_hctsizx, pid,0 ); -else /* Need MDATA */ -USB_SET_FIELD32 ( -CVMX_USBCX_HCTSIZX (channel, - usb->index), - cvmx_usbcx_hctsizx, pid,3 ); - } - } -break ; - } - { -union cvmx_usbcx_hctsizx usbc_hctsiz = { .u32 = -cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCTSIZX (channel, - usb->index)) - }; - transaction->xfersize = usbc_hctsiz.s.xfersize; - transaction->pktcnt = usbc_hctsiz.s.pktcnt; - } -/* Remember when we start a split transaction */ -if (cvmx_usb_pipe_needs_split (usb, pipe)) - usb->active_split = transaction; -USB_SET_FIELD32 (CVMX_USBCX_HCCHARX (channel, usb->index), - cvmx_usbcx_hccharx, chena,1 ); -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA ) -cvmx_usb_fill_tx_fifo (usb, channel); -} - -/** -* Find a pipe that is ready to be scheduled to hardware. -* @usb: USB device state populated by cvmx_usb_initialize(). -* @xfer_type: Transfer type -* -* Returns: Pipe or NULL if none are ready -*/ -static struct cvmx_usb_pipe *cvmx_usb_find_ready_pipe (struct octeon_hcd *usb, -enum cvmx_usb_transfer xfer_type) -{ -struct list_head *list = usb->active_pipes + xfer_type; -u64 current_frame = usb->frame_number; -struct cvmx_usb_pipe *pipe; - -list_for_each_entry (pipe, list, node) { -struct cvmx_usb_transaction *t = -list_first_entry (&pipe->transactions,typeof (*t), - node); -if (!(pipe->flags &CVMX_USB_PIPE_FLAGS_SCHEDULED ) && t && - (pipe->next_tx_frame <= current_frame) && - ((pipe->split_sc_frame ==-1 ) || - ((((int )current_frame - pipe->split_sc_frame) &0x7f ) < -0x40 )) && - (!usb->active_split || (usb->active_split == t))) { -prefetch (t); -return pipe; - } - } -return NULL ; -} - -static struct cvmx_usb_pipe *cvmx_usb_next_pipe (struct octeon_hcd *usb, -int is_sof) -{ -struct cvmx_usb_pipe *pipe; - -/* Find a pipe needing service. */ -if (is_sof) { -/* -* Only process periodic pipes on SOF interrupts. This way we -* are sure that the periodic data is sent in the beginning of -* the frame. -*/ - pipe =cvmx_usb_find_ready_pipe (usb, -CVMX_USB_TRANSFER_ISOCHRONOUS ); -if (pipe) -return pipe; - pipe =cvmx_usb_find_ready_pipe (usb, -CVMX_USB_TRANSFER_INTERRUPT ); -if (pipe) -return pipe; - } - pipe =cvmx_usb_find_ready_pipe (usb,CVMX_USB_TRANSFER_CONTROL ); -if (pipe) -return pipe; -return cvmx_usb_find_ready_pipe (usb,CVMX_USB_TRANSFER_BULK ); -} - -/** -* Called whenever a pipe might need to be scheduled to the -* hardware. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @is_sof: True if this schedule was called on a SOF interrupt. -*/ -static void cvmx_usb_schedule (struct octeon_hcd *usb,int is_sof) -{ -int channel; -struct cvmx_usb_pipe *pipe; -int need_sof; -enum cvmx_usb_transfer ttype; - -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA ) { -/* -* Without DMA we need to be careful to not schedule something -* at the end of a frame and cause an overrun. -*/ -union cvmx_usbcx_hfnum hfnum = { - .u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HFNUM (usb->index)) - }; - -union cvmx_usbcx_hfir hfir = { - .u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HFIR (usb->index)) - }; - -if (hfnum.s.frrem < hfir.s.frint /4 ) - goto done; - } - -while (usb->idle_hardware_channels) { -/* Find an idle channel */ - channel =__fls (usb->idle_hardware_channels); -if (unlikely (channel >7 )) -break ; - - pipe =cvmx_usb_next_pipe (usb, is_sof); -if (!pipe) -break ; - -cvmx_usb_start_channel (usb, channel, pipe); - } - -done: -/* -* Only enable SOF interrupts when we have transactions pending in the -* future that might need to be scheduled -*/ - need_sof =0 ; -for (ttype =CVMX_USB_TRANSFER_CONTROL ; - ttype <=CVMX_USB_TRANSFER_INTERRUPT ; ttype++) { -list_for_each_entry (pipe, &usb->active_pipes[ttype], node) { -if (pipe->next_tx_frame > usb->frame_number) { - need_sof =1 ; -break ; - } - } - } -USB_SET_FIELD32 (CVMX_USBCX_GINTMSK (usb->index), - cvmx_usbcx_gintmsk, sofmsk, need_sof); -} - -static void octeon_usb_urb_complete_callback (struct octeon_hcd *usb, -enum cvmx_usb_status status, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction - *transaction, -int bytes_transferred, -struct urb *urb) -{ -struct usb_hcd *hcd =octeon_to_hcd (usb); -struct device *dev = hcd->self.controller; - -if (likely (status ==CVMX_USB_STATUS_OK )) - urb->actual_length = bytes_transferred; -else - urb->actual_length =0 ; - - urb->hcpriv =NULL ; - -/* For Isochronous transactions we need to update the URB packet status -* list from data in our private copy -*/ -if (usb_pipetype (urb->pipe) ==PIPE_ISOCHRONOUS ) { -int i; -/* -* The pointer to the private list is stored in the setup_packet -* field. -*/ -struct cvmx_usb_iso_packet *iso_packet = - (struct cvmx_usb_iso_packet *)urb->setup_packet; -/* Recalculate the transfer size by adding up each packet */ - urb->actual_length =0 ; -for (i =0 ; i < urb->number_of_packets; i++) { -if (iso_packet[i].status ==CVMX_USB_STATUS_OK ) { - urb->iso_frame_desc[i].status =0 ; - urb->iso_frame_desc[i].actual_length = - iso_packet[i].length; - urb->actual_length += - urb->iso_frame_desc[i].actual_length; - }else { -dev_dbg (dev,"ISOCHRONOUS packet=%d of %d status=%d pipe=%p transaction=%p size=%d\n" , - i, urb->number_of_packets, - iso_packet[i].status, pipe, - transaction, iso_packet[i].length); - urb->iso_frame_desc[i].status = -EREMOTEIO ; - } - } -/* Free the private list now that we don't need it anymore */ -kfree (iso_packet); - urb->setup_packet =NULL ; - } - -switch (status) { -case CVMX_USB_STATUS_OK : - urb->status =0 ; -break ; -case CVMX_USB_STATUS_CANCEL : -if (urb->status ==0 ) - urb->status = -ENOENT ; -break ; -case CVMX_USB_STATUS_STALL : -dev_dbg (dev,"status=stall pipe=%p transaction=%p size=%d\n" , - pipe, transaction, bytes_transferred); - urb->status = -EPIPE ; -break ; -case CVMX_USB_STATUS_BABBLEERR : -dev_dbg (dev,"status=babble pipe=%p transaction=%p size=%d\n" , - pipe, transaction, bytes_transferred); - urb->status = -EPIPE ; -break ; -case CVMX_USB_STATUS_SHORT : -dev_dbg (dev,"status=short pipe=%p transaction=%p size=%d\n" , - pipe, transaction, bytes_transferred); - urb->status = -EREMOTEIO ; -break ; -case CVMX_USB_STATUS_ERROR : -case CVMX_USB_STATUS_XACTERR : -case CVMX_USB_STATUS_DATATGLERR : -case CVMX_USB_STATUS_FRAMEERR : -dev_dbg (dev,"status=%d pipe=%p transaction=%p size=%d\n" , - status, pipe, transaction, bytes_transferred); - urb->status = -EPROTO ; -break ; - } -usb_hcd_unlink_urb_from_ep (octeon_to_hcd (usb), urb); -spin_unlock (&usb->lock); -usb_hcd_giveback_urb (octeon_to_hcd (usb), urb, urb->status); -spin_lock (&usb->lock); -} - -/** -* Signal the completion of a transaction and free it. The -* transaction will be removed from the pipe transaction list. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Pipe the transaction is on -* @transaction: -* Transaction that completed -* @complete_code: -* Completion code -*/ -static void cvmx_usb_complete (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction, -enum cvmx_usb_status complete_code) -{ -/* If this was a split then clear our split in progress marker */ -if (usb->active_split == transaction) - usb->active_split =NULL ; - -/* -* Isochronous transactions need extra processing as they might not be -* done after a single data transfer -*/ -if (unlikely (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS )) { -/* Update the number of bytes transferred in this ISO packet */ - transaction->iso_packets[0 ].length = transaction->actual_bytes; - transaction->iso_packets[0 ].status = complete_code; - -/* -* If there are more ISOs pending and we succeeded, schedule the -* next one -*/ -if ((transaction->iso_number_packets >1 ) && - (complete_code ==CVMX_USB_STATUS_OK )) { -/* No bytes transferred for this packet as of yet */ - transaction->actual_bytes =0 ; -/* One less ISO waiting to transfer */ - transaction->iso_number_packets--; -/* Increment to the next location in our packet array */ - transaction->iso_packets++; - transaction->stage =CVMX_USB_STAGE_NON_CONTROL ; -return ; - } - } - -/* Remove the transaction from the pipe list */ -list_del (&transaction->node); -if (list_empty (&pipe->transactions)) -list_move_tail (&pipe->node, &usb->idle_pipes); -octeon_usb_urb_complete_callback (usb, complete_code, pipe, - transaction, - transaction->actual_bytes, - transaction->urb); -kfree (transaction); -} - -/** -* Submit a usb transaction to a pipe. Called for all types -* of transactions. -* -* @usb: -* @pipe: Which pipe to submit to. -* @type: Transaction type -* @buffer: User buffer for the transaction -* @buffer_length: -* User buffer's length in bytes -* @control_header: -* For control transactions, the 8 byte standard header -* @iso_start_frame: -* For ISO transactions, the start frame -* @iso_number_packets: -* For ISO, the number of packet in the transaction. -* @iso_packets: -* A description of each ISO packet -* @urb: URB for the callback -* -* Returns: Transaction or NULL on failure. -*/ -static struct cvmx_usb_transaction *cvmx_usb_submit_transaction ( -struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -enum cvmx_usb_transfer type, -u64 buffer, -int buffer_length, -u64 control_header, -int iso_start_frame, -int iso_number_packets, -struct cvmx_usb_iso_packet *iso_packets, -struct urb *urb) -{ -struct cvmx_usb_transaction *transaction; - -if (unlikely (pipe->transfer_type != type)) -return NULL ; - - transaction =kzalloc (sizeof (*transaction),GFP_ATOMIC ); -if (unlikely (!transaction)) -return NULL ; - - transaction->type = type; - transaction->buffer = buffer; - transaction->buffer_length = buffer_length; - transaction->control_header = control_header; -/* FIXME: This is not used, implement it. */ - transaction->iso_start_frame = iso_start_frame; - transaction->iso_number_packets = iso_number_packets; - transaction->iso_packets = iso_packets; - transaction->urb = urb; -if (transaction->type ==CVMX_USB_TRANSFER_CONTROL ) - transaction->stage =CVMX_USB_STAGE_SETUP ; -else - transaction->stage =CVMX_USB_STAGE_NON_CONTROL ; - -if (!list_empty (&pipe->transactions)) { -list_add_tail (&transaction->node, &pipe->transactions); - }else { -list_add_tail (&transaction->node, &pipe->transactions); -list_move_tail (&pipe->node, - &usb->active_pipes[pipe->transfer_type]); - -/* -* We may need to schedule the pipe if this was the head of the -* pipe. -*/ -cvmx_usb_schedule (usb,0 ); - } - -return transaction; -} - -/** -* Call to submit a USB Bulk transfer to a pipe. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Handle to the pipe for the transfer. -* @urb: URB. -* -* Returns: A submitted transaction or NULL on failure. -*/ -static struct cvmx_usb_transaction *cvmx_usb_submit_bulk ( -struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct urb *urb) -{ -return cvmx_usb_submit_transaction (usb, pipe,CVMX_USB_TRANSFER_BULK , - urb->transfer_dma, - urb->transfer_buffer_length, -0 ,/* control_header */ -0 ,/* iso_start_frame */ -0 ,/* iso_number_packets */ -NULL ,/* iso_packets */ - urb); -} - -/** -* Call to submit a USB Interrupt transfer to a pipe. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Handle to the pipe for the transfer. -* @urb: URB returned when the callback is called. -* -* Returns: A submitted transaction or NULL on failure. -*/ -static struct cvmx_usb_transaction *cvmx_usb_submit_interrupt ( -struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct urb *urb) -{ -return cvmx_usb_submit_transaction (usb, pipe, -CVMX_USB_TRANSFER_INTERRUPT , - urb->transfer_dma, - urb->transfer_buffer_length, -0 ,/* control_header */ -0 ,/* iso_start_frame */ -0 ,/* iso_number_packets */ -NULL ,/* iso_packets */ - urb); -} - -/** -* Call to submit a USB Control transfer to a pipe. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Handle to the pipe for the transfer. -* @urb: URB. -* -* Returns: A submitted transaction or NULL on failure. -*/ -static struct cvmx_usb_transaction *cvmx_usb_submit_control ( -struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct urb *urb) -{ -int buffer_length = urb->transfer_buffer_length; -u64 control_header = urb->setup_dma; -struct usb_ctrlrequest *header =cvmx_phys_to_ptr (control_header); - -if ((header->bRequestType &USB_DIR_IN ) ==0 ) - buffer_length =le16_to_cpu (header->wLength); - -return cvmx_usb_submit_transaction (usb, pipe, -CVMX_USB_TRANSFER_CONTROL , - urb->transfer_dma, buffer_length, - control_header, -0 ,/* iso_start_frame */ -0 ,/* iso_number_packets */ -NULL ,/* iso_packets */ - urb); -} - -/** -* Call to submit a USB Isochronous transfer to a pipe. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Handle to the pipe for the transfer. -* @urb: URB returned when the callback is called. -* -* Returns: A submitted transaction or NULL on failure. -*/ -static struct cvmx_usb_transaction *cvmx_usb_submit_isochronous ( -struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct urb *urb) -{ -struct cvmx_usb_iso_packet *packets; - - packets = (struct cvmx_usb_iso_packet *)urb->setup_packet; -return cvmx_usb_submit_transaction (usb, pipe, -CVMX_USB_TRANSFER_ISOCHRONOUS , - urb->transfer_dma, - urb->transfer_buffer_length, -0 ,/* control_header */ - urb->start_frame, - urb->number_of_packets, - packets, urb); -} - -/** -* Cancel one outstanding request in a pipe. Canceling a request -* can fail if the transaction has already completed before cancel -* is called. Even after a successful cancel call, it may take -* a frame or two for the cvmx_usb_poll() function to call the -* associated callback. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Pipe to cancel requests in. -* @transaction: Transaction to cancel, returned by the submit function. -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_cancel (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction) -{ -/* -* If the transaction is the HEAD of the queue and scheduled. We need to -* treat it special -*/ -if (list_first_entry (&pipe->transactions,typeof (*transaction), node) == - transaction && (pipe->flags &CVMX_USB_PIPE_FLAGS_SCHEDULED )) { -union cvmx_usbcx_hccharx usbc_hcchar; - - usb->pipe_for_channel[pipe->channel] =NULL ; - pipe->flags &= ~CVMX_USB_PIPE_FLAGS_SCHEDULED ; - -CVMX_SYNCW ; - - usbc_hcchar.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCCHARX (pipe->channel, usb->index)); -/* -* If the channel isn't enabled then the transaction already -* completed. -*/ -if (usbc_hcchar.s.chena) { - usbc_hcchar.s.chdis =1 ; -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCCHARX (pipe->channel, - usb->index), - usbc_hcchar.u32); - } - } -cvmx_usb_complete (usb, pipe, transaction,CVMX_USB_STATUS_CANCEL ); -return 0 ; -} - -/** -* Cancel all outstanding requests in a pipe. Logically all this -* does is call cvmx_usb_cancel() in a loop. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Pipe to cancel requests in. -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_cancel_all (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe) -{ -struct cvmx_usb_transaction *transaction, *next; - -/* Simply loop through and attempt to cancel each transaction */ -list_for_each_entry_safe (transaction, next, &pipe->transactions, node) { -int result =cvmx_usb_cancel (usb, pipe, transaction); - -if (unlikely (result !=0 )) -return result; - } -return 0 ; -} - -/** -* Close a pipe created with cvmx_usb_open_pipe(). -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* @pipe: Pipe to close. -* -* Returns: 0 or a negative error code. EBUSY is returned if the pipe has -* outstanding transfers. -*/ -static int cvmx_usb_close_pipe (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe) -{ -/* Fail if the pipe has pending transactions */ -if (!list_empty (&pipe->transactions)) -return -EBUSY ; - -list_del (&pipe->node); -kfree (pipe); - -return 0 ; -} - -/** -* Get the current USB protocol level frame number. The frame -* number is always in the range of 0-0x7ff. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* -* Returns: USB frame number -*/ -static int cvmx_usb_get_frame_number (struct octeon_hcd *usb) -{ -union cvmx_usbcx_hfnum usbc_hfnum; - - usbc_hfnum.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFNUM (usb->index)); - -return usbc_hfnum.s.frnum; -} - -static void cvmx_usb_transfer_control (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction, -union cvmx_usbcx_hccharx usbc_hcchar, -int buffer_space_left, -int bytes_in_last_packet) -{ -switch (transaction->stage) { -case CVMX_USB_STAGE_NON_CONTROL : -case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE : -/* This should be impossible */ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_ERROR ); -break ; -case CVMX_USB_STAGE_SETUP : - pipe->pid_toggle =1 ; -if (cvmx_usb_pipe_needs_split (usb, pipe)) { - transaction->stage = -CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE ; - }else { -struct usb_ctrlrequest *header = -cvmx_phys_to_ptr (transaction->control_header); -if (header->wLength) - transaction->stage =CVMX_USB_STAGE_DATA ; -else - transaction->stage =CVMX_USB_STAGE_STATUS ; - } -break ; -case CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE : - { -struct usb_ctrlrequest *header = -cvmx_phys_to_ptr (transaction->control_header); -if (header->wLength) - transaction->stage =CVMX_USB_STAGE_DATA ; -else - transaction->stage =CVMX_USB_STAGE_STATUS ; - } -break ; -case CVMX_USB_STAGE_DATA : -if (cvmx_usb_pipe_needs_split (usb, pipe)) { - transaction->stage =CVMX_USB_STAGE_DATA_SPLIT_COMPLETE ; -/* -* For setup OUT data that are splits, -* the hardware doesn't appear to count -* transferred data. Here we manually -* update the data transferred -*/ -if (!usbc_hcchar.s.epdir) { -if (buffer_space_left < pipe->max_packet) - transaction->actual_bytes += - buffer_space_left; -else - transaction->actual_bytes += - pipe->max_packet; - } - }else if ((buffer_space_left ==0 ) || - (bytes_in_last_packet < pipe->max_packet)) { - pipe->pid_toggle =1 ; - transaction->stage =CVMX_USB_STAGE_STATUS ; - } -break ; -case CVMX_USB_STAGE_DATA_SPLIT_COMPLETE : -if ((buffer_space_left ==0 ) || - (bytes_in_last_packet < pipe->max_packet)) { - pipe->pid_toggle =1 ; - transaction->stage =CVMX_USB_STAGE_STATUS ; - }else { - transaction->stage =CVMX_USB_STAGE_DATA ; - } -break ; -case CVMX_USB_STAGE_STATUS : -if (cvmx_usb_pipe_needs_split (usb, pipe)) - transaction->stage = -CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE ; -else -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); -break ; -case CVMX_USB_STAGE_STATUS_SPLIT_COMPLETE : -cvmx_usb_complete (usb, pipe, transaction,CVMX_USB_STATUS_OK ); -break ; - } -} - -static void cvmx_usb_transfer_bulk (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction, -union cvmx_usbcx_hcintx usbc_hcint, -int buffer_space_left, -int bytes_in_last_packet) -{ -/* -* The only time a bulk transfer isn't complete when it finishes with -* an ACK is during a split transaction. For splits we need to continue -* the transfer if more data is needed. -*/ -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -if (transaction->stage ==CVMX_USB_STAGE_NON_CONTROL ) - transaction->stage = -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE ; -else if (buffer_space_left && - (bytes_in_last_packet == pipe->max_packet)) - transaction->stage =CVMX_USB_STAGE_NON_CONTROL ; -else -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); - }else { -if ((pipe->device_speed ==CVMX_USB_SPEED_HIGH ) && - (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT ) && - (usbc_hcint.s.nak)) - pipe->flags |=CVMX_USB_PIPE_FLAGS_NEED_PING ; -if (!buffer_space_left || - (bytes_in_last_packet < pipe->max_packet)) -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); - } -} - -static void cvmx_usb_transfer_intr (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction, -int buffer_space_left, -int bytes_in_last_packet) -{ -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -if (transaction->stage ==CVMX_USB_STAGE_NON_CONTROL ) { - transaction->stage = -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE ; - }else if (buffer_space_left && - (bytes_in_last_packet == pipe->max_packet)) { - transaction->stage =CVMX_USB_STAGE_NON_CONTROL ; - }else { - pipe->next_tx_frame += pipe->interval; -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); - } - }else if (!buffer_space_left || - (bytes_in_last_packet < pipe->max_packet)) { - pipe->next_tx_frame += pipe->interval; -cvmx_usb_complete (usb, pipe, transaction,CVMX_USB_STATUS_OK ); - } -} - -static void cvmx_usb_transfer_isoc (struct octeon_hcd *usb, -struct cvmx_usb_pipe *pipe, -struct cvmx_usb_transaction *transaction, -int buffer_space_left, -int bytes_in_last_packet, -int bytes_this_transfer) -{ -if (cvmx_usb_pipe_needs_split (usb, pipe)) { -/* -* ISOCHRONOUS OUT splits don't require a complete split stage. -* Instead they use a sequence of begin OUT splits to transfer -* the data 188 bytes at a time. Once the transfer is complete, -* the pipe sleeps until the next schedule interval. -*/ -if (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT ) { -/* -* If no space left or this wasn't a max size packet -* then this transfer is complete. Otherwise start it -* again to send the next 188 bytes -*/ -if (!buffer_space_left || (bytes_this_transfer <188 )) { - pipe->next_tx_frame += pipe->interval; -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); - } -return ; - } -if (transaction->stage == -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE ) { -/* -* We are in the incoming data phase. Keep getting data -* until we run out of space or get a small packet -*/ -if ((buffer_space_left ==0 ) || - (bytes_in_last_packet < pipe->max_packet)) { - pipe->next_tx_frame += pipe->interval; -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_OK ); - } - }else { - transaction->stage = -CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE ; - } - }else { - pipe->next_tx_frame += pipe->interval; -cvmx_usb_complete (usb, pipe, transaction,CVMX_USB_STATUS_OK ); - } -} - -/** -* Poll a channel for status -* -* @usb: USB device -* @channel: Channel to poll -* -* Returns: Zero on success -*/ -static int cvmx_usb_poll_channel (struct octeon_hcd *usb,int channel) -{ -struct usb_hcd *hcd =octeon_to_hcd (usb); -struct device *dev = hcd->self.controller; -union cvmx_usbcx_hcintx usbc_hcint; -union cvmx_usbcx_hctsizx usbc_hctsiz; -union cvmx_usbcx_hccharx usbc_hcchar; -struct cvmx_usb_pipe *pipe; -struct cvmx_usb_transaction *transaction; -int bytes_this_transfer; -int bytes_in_last_packet; -int packets_processed; -int buffer_space_left; - -/* Read the interrupt status bits for the channel */ - usbc_hcint.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCINTX (channel, usb->index)); - -if (usb->init_flags &CVMX_USB_INITIALIZE_FLAGS_NO_DMA ) { - usbc_hcchar.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, usb->index)); - -if (usbc_hcchar.s.chena && usbc_hcchar.s.chdis) { -/* -* There seems to be a bug in CN31XX which can cause -* interrupt IN transfers to get stuck until we do a -* write of HCCHARX without changing things -*/ -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, - usb->index), - usbc_hcchar.u32); -return 0 ; - } - -/* -* In non DMA mode the channels don't halt themselves. We need -* to manually disable channels that are left running -*/ -if (!usbc_hcint.s.chhltd) { -if (usbc_hcchar.s.chena) { -union cvmx_usbcx_hcintmskx hcintmsk; -/* Disable all interrupts except CHHLTD */ - hcintmsk.u32 =0 ; - hcintmsk.s.chhltdmsk =1 ; -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCINTMSKX (channel, usb->index), - hcintmsk.u32); - usbc_hcchar.s.chdis =1 ; -cvmx_usb_write_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, usb->index), - usbc_hcchar.u32); -return 0 ; - }else if (usbc_hcint.s.xfercompl) { -/* -* Successful IN/OUT with transfer complete. -* Channel halt isn't needed. -*/ - }else { -dev_err (dev,"USB%d: Channel %d interrupt without halt\n" , - usb->index, channel); -return 0 ; - } - } - }else { -/* -* There is are no interrupts that we need to process when the -* channel is still running -*/ -if (!usbc_hcint.s.chhltd) -return 0 ; - } - -/* Disable the channel interrupts now that it is done */ -cvmx_usb_write_csr32 (usb,CVMX_USBCX_HCINTMSKX (channel, usb->index),0 ); - usb->idle_hardware_channels |= (1 << channel); - -/* Make sure this channel is tied to a valid pipe */ - pipe = usb->pipe_for_channel[channel]; -prefetch (pipe); -if (!pipe) -return 0 ; - transaction =list_first_entry (&pipe->transactions, -typeof (*transaction), - node); -prefetch (transaction); - -/* -* Disconnect this pipe from the HW channel. Later the schedule -* function will figure out which pipe needs to go -*/ - usb->pipe_for_channel[channel] =NULL ; - pipe->flags &= ~CVMX_USB_PIPE_FLAGS_SCHEDULED ; - -/* -* Read the channel config info so we can figure out how much data -* transferred -*/ - usbc_hcchar.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCCHARX (channel, usb->index)); - usbc_hctsiz.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_HCTSIZX (channel, usb->index)); - -/* -* Calculating the number of bytes successfully transferred is dependent -* on the transfer direction -*/ - packets_processed = transaction->pktcnt - usbc_hctsiz.s.pktcnt; -if (usbc_hcchar.s.epdir) { -/* -* IN transactions are easy. For every byte received the -* hardware decrements xfersize. All we need to do is subtract -* the current value of xfersize from its starting value and we -* know how many bytes were written to the buffer -*/ - bytes_this_transfer = transaction->xfersize - - usbc_hctsiz.s.xfersize; - }else { -/* -* OUT transaction don't decrement xfersize. Instead pktcnt is -* decremented on every successful packet send. The hardware -* does this when it receives an ACK, or NYET. If it doesn't -* receive one of these responses pktcnt doesn't change -*/ - bytes_this_transfer = packets_processed * usbc_hcchar.s.mps; -/* -* The last packet may not be a full transfer if we didn't have -* enough data -*/ -if (bytes_this_transfer > transaction->xfersize) - bytes_this_transfer = transaction->xfersize; - } -/* Figure out how many bytes were in the last packet of the transfer */ -if (packets_processed) - bytes_in_last_packet = bytes_this_transfer - - (packets_processed -1 ) * usbc_hcchar.s.mps; -else - bytes_in_last_packet = bytes_this_transfer; - -/* -* As a special case, setup transactions output the setup header, not -* the user's data. For this reason we don't count setup data as bytes -* transferred -*/ -if ((transaction->stage ==CVMX_USB_STAGE_SETUP ) || - (transaction->stage ==CVMX_USB_STAGE_SETUP_SPLIT_COMPLETE )) - bytes_this_transfer =0 ; - -/* -* Add the bytes transferred to the running total. It is important that -* bytes_this_transfer doesn't count any data that needs to be -* retransmitted -*/ - transaction->actual_bytes += bytes_this_transfer; -if (transaction->type ==CVMX_USB_TRANSFER_ISOCHRONOUS ) - buffer_space_left = transaction->iso_packets[0 ].length - - transaction->actual_bytes; -else - buffer_space_left = transaction->buffer_length - - transaction->actual_bytes; - -/* -* We need to remember the PID toggle state for the next transaction. -* The hardware already updated it for the next transaction -*/ - pipe->pid_toggle = !(usbc_hctsiz.s.pid ==0 ); - -/* -* For high speed bulk out, assume the next transaction will need to do -* a ping before proceeding. If this isn't true the ACK processing below -* will clear this flag -*/ -if ((pipe->device_speed ==CVMX_USB_SPEED_HIGH ) && - (pipe->transfer_type ==CVMX_USB_TRANSFER_BULK ) && - (pipe->transfer_dir ==CVMX_USB_DIRECTION_OUT )) - pipe->flags |=CVMX_USB_PIPE_FLAGS_NEED_PING ; - -if (WARN_ON_ONCE (bytes_this_transfer <0 )) { -/* -* In some rare cases the DMA engine seems to get stuck and -* keeps substracting same byte count over and over again. In -* such case we just need to fail every transaction. -*/ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_ERROR ); -return 0 ; - } - -if (usbc_hcint.s.stall) { -/* -* STALL as a response means this transaction cannot be -* completed because the device can't process transactions. Tell -* the user. Any data that was transferred will be counted on -* the actual bytes transferred -*/ - pipe->pid_toggle =0 ; -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_STALL ); - }else if (usbc_hcint.s.xacterr) { -/* -* XactErr as a response means the device signaled -* something wrong with the transfer. For example, PID -* toggle errors cause these. -*/ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_XACTERR ); - }else if (usbc_hcint.s.bblerr) { -/* Babble Error (BblErr) */ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_BABBLEERR ); - }else if (usbc_hcint.s.datatglerr) { -/* Data toggle error */ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_DATATGLERR ); - }else if (usbc_hcint.s.nyet) { -/* -* NYET as a response is only allowed in three cases: as a -* response to a ping, as a response to a split transaction, and -* as a response to a bulk out. The ping case is handled by -* hardware, so we only have splits and bulk out -*/ -if (!cvmx_usb_pipe_needs_split (usb, pipe)) { - transaction->retries =0 ; -/* -* If there is more data to go then we need to try -* again. Otherwise this transaction is complete -*/ -if ((buffer_space_left ==0 ) || - (bytes_in_last_packet < pipe->max_packet)) -cvmx_usb_complete (usb, pipe, - transaction, -CVMX_USB_STATUS_OK ); - }else { -/* -* Split transactions retry the split complete 4 times -* then rewind to the start split and do the entire -* transactions again -*/ - transaction->retries++; -if ((transaction->retries &0x3 ) ==0 ) { -/* -* Rewind to the beginning of the transaction by -* anding off the split complete bit -*/ - transaction->stage &= ~1 ; - pipe->split_sc_frame =-1 ; - } - } - }else if (usbc_hcint.s.ack) { - transaction->retries =0 ; -/* -* The ACK bit can only be checked after the other error bits. -* This is because a multi packet transfer may succeed in a -* number of packets and then get a different response on the -* last packet. In this case both ACK and the last response bit -* will be set. If none of the other response bits is set, then -* the last packet must have been an ACK -* -* Since we got an ACK, we know we don't need to do a ping on -* this pipe -*/ - pipe->flags &= ~CVMX_USB_PIPE_FLAGS_NEED_PING ; - -switch (transaction->type) { -case CVMX_USB_TRANSFER_CONTROL : -cvmx_usb_transfer_control (usb, pipe, transaction, - usbc_hcchar, - buffer_space_left, - bytes_in_last_packet); -break ; -case CVMX_USB_TRANSFER_BULK : -cvmx_usb_transfer_bulk (usb, pipe, transaction, - usbc_hcint, buffer_space_left, - bytes_in_last_packet); -break ; -case CVMX_USB_TRANSFER_INTERRUPT : -cvmx_usb_transfer_intr (usb, pipe, transaction, - buffer_space_left, - bytes_in_last_packet); -break ; -case CVMX_USB_TRANSFER_ISOCHRONOUS : -cvmx_usb_transfer_isoc (usb, pipe, transaction, - buffer_space_left, - bytes_in_last_packet, - bytes_this_transfer); -break ; - } - }else if (usbc_hcint.s.nak) { -/* -* If this was a split then clear our split in progress marker. -*/ -if (usb->active_split == transaction) - usb->active_split =NULL ; -/* -* NAK as a response means the device couldn't accept the -* transaction, but it should be retried in the future. Rewind -* to the beginning of the transaction by anding off the split -* complete bit. Retry in the next interval -*/ - transaction->retries =0 ; - transaction->stage &= ~1 ; - pipe->next_tx_frame += pipe->interval; -if (pipe->next_tx_frame < usb->frame_number) - pipe->next_tx_frame = usb->frame_number + - pipe->interval - - (usb->frame_number - pipe->next_tx_frame) % - pipe->interval; - }else { -struct cvmx_usb_port_status port; - - port =cvmx_usb_get_status (usb); -if (port.port_enabled) { -/* We'll retry the exact same transaction again */ - transaction->retries++; - }else { -/* -* We get channel halted interrupts with no result bits -* sets when the cable is unplugged -*/ -cvmx_usb_complete (usb, pipe, transaction, -CVMX_USB_STATUS_ERROR ); - } - } -return 0 ; -} - -static void octeon_usb_port_callback (struct octeon_hcd *usb) -{ -spin_unlock (&usb->lock); -usb_hcd_poll_rh_status (octeon_to_hcd (usb)); -spin_lock (&usb->lock); -} - -/** -* Poll the USB block for status and call all needed callback -* handlers. This function is meant to be called in the interrupt -* handler for the USB controller. It can also be called -* periodically in a loop for non-interrupt based operation. -* -* @usb: USB device state populated by cvmx_usb_initialize(). -* -* Returns: 0 or a negative error code. -*/ -static int cvmx_usb_poll (struct octeon_hcd *usb) -{ -union cvmx_usbcx_hfnum usbc_hfnum; -union cvmx_usbcx_gintsts usbc_gintsts; - -prefetch_range (usb,sizeof (*usb)); - -/* Update the frame counter */ - usbc_hfnum.u32 =cvmx_usb_read_csr32 (usb,CVMX_USBCX_HFNUM (usb->index)); -if ((usb->frame_number &0x3fff ) > usbc_hfnum.s.frnum) - usb->frame_number +=0x4000 ; - usb->frame_number &= ~0x3fffull ; - usb->frame_number |= usbc_hfnum.s.frnum; - -/* Read the pending interrupts */ - usbc_gintsts.u32 =cvmx_usb_read_csr32 (usb, -CVMX_USBCX_GINTSTS (usb->index)); - -/* Clear the interrupts now that we know about them */ -cvmx_usb_write_csr32 (usb,CVMX_USBCX_GINTSTS (usb->index), - usbc_gintsts.u32); - -if (usbc_gintsts.s.rxflvl) { -/* -* RxFIFO Non-Empty (RxFLvl) -* Indicates that there is at least one packet pending to be -* read from the RxFIFO. -* -* In DMA mode this is handled by hardware Lines of this file are not shown. View the raw message.
drivers/staging/octeon-usb/octeon-hcd.h deleted +0
-1847Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
[email protected]
maintainerRe: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
Quoted 19 lines · Chris Packham
Quoted 16 lines · Greg Kroah-Hartman
This driver was merged back in 2013 and shows no progress toward every being merged into the "correct" part of the kernel. The code doesn't even build for anyone unless you have the specific hardware platform selected, so odds are it doesn't even work anymore.
Remove it for now and is someone comes along that has the hardware and is willing to fix it up, it can be reverted.
Cc Aaro Koskinen <[email protected]>Cc David Daney <[email protected]>Cc Nishka Dasgupta <[email protected]>Cc Himadri Pandya <[email protected]>Cc "Frank A. Cancio Bello" <[email protected]>Cc Sumit Pundir <[email protected]>Cc Laura Lazzati <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Quoted 1 line
---
Quoted 1 line
Similarly we'd really like to keep this too.
Great, same thing here!
thanks,
greg k-h
Re: [PATCH 2/2] staging: octeon-usb: delete the octeon usb host controller driver
My advice is to delete all the COMPILE_TEST code. That stuff was a constant source of confusion and headaches.
regards,
dan carpenter
Quoted 18 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>
Quoted 8 lines
Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
I'll pipe up on this thread too
Quoted 28 lines · Guenter Roeck
Quoted 18 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Quoted 8 lines
Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 1 line
Acked-by Guenter Roeck <[email protected]>
Please can we keep this driver. We do have platforms using it and we would like it to stay around.
Clearly we'll need to sort things out to a point where they build successfully. We've been hoping to see this move out of staging ever since we selected Cavium as a vendor.
[email protected]
maintainerQuoted 31 lines · Chris Packham
I'll pipe up on this thread too
Quoted 28 lines · Guenter Roeck
Quoted 26 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
Quoted 1 line
Acked-by Guenter Roeck <[email protected]>Please can we keep this driver. We do have platforms using it and we would like it to stay around.
Clearly we'll need to sort things out to a point where they build successfully. We've been hoping to see this move out of staging ever since we selected Cavium as a vendor.
Great, can you send me a patchset that reverts this and fixes the build issues and accept maintainership of the code?
thanks,
greg k-h
Quoted 37 lines · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
Quoted 36 lines · Chris Packham
I'll pipe up on this thread too
Quoted 28 lines · Guenter Roeck
Quoted 18 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Quoted 8 lines
Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Quoted 1 line
Acked-by Guenter Roeck <[email protected]>Please can we keep this driver. We do have platforms using it and we would like it to stay around.
Quoted 7 lines
Quoted 3 lines
Clearly we'll need to sort things out to a point where they build successfully. We've been hoping to see this move out of staging ever since we selected Cavium as a vendor.
Great, can you send me a patchset that reverts this and fixes the build issues and accept maintainership of the code?
Yep will do.
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.
I was also going to suggest this. Since the COMPILE_TEST has been a source of trouble I was going to propose dropping the || COMPILE_TEST from the Kconfig for the octeon drivers.
Quoted 48 lines · Chris Packham
Quoted 37 lines · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
Quoted 36 lines · Chris Packham
I'll pipe up on this thread too
Quoted 28 lines · Guenter Roeck
Quoted 18 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Quoted 8 lines
Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Quoted 1 line
Acked-by Guenter Roeck <[email protected]>Please can we keep this driver. We do have platforms using it and we would like it to stay around.
Quoted 7 lines
Quoted 3 lines
Clearly we'll need to sort things out to a point where they build successfully. We've been hoping to see this move out of staging ever since we selected Cavium as a vendor.
Great, can you send me a patchset that reverts this and fixes the build issues and accept maintainership of the code?
Yep will do.
Quoted 7 lines
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.
Not having it also causes problems. I didn't originally add it for shits and giggles.
[email protected]
maintainerQuoted 53 lines · Matthew Wilcox
Quoted 52 lines · Chris Packham
Quoted 37 lines · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
Quoted 36 lines · Chris Packham
I'll pipe up on this thread too
Quoted 28 lines · Guenter Roeck
Quoted 18 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Quoted 8 lines
Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Quoted 1 line
Acked-by Guenter Roeck <[email protected]>Please can we keep this driver. We do have platforms using it and we would like it to stay around.
Quoted 7 lines
Quoted 3 lines
Clearly we'll need to sort things out to a point where they build successfully. We've been hoping to see this move out of staging ever since we selected Cavium as a vendor.
Great, can you send me a patchset that reverts this and fixes the build issues and accept maintainership of the code?
Yep will do.
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.
Quoted 6 lines
Quoted 3 lines
I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.Not having it also causes problems. I didn't originally add it for shits and giggles.
Yes, without this option, the code bit-rotted horribly. It needs to be able to be built otherwise people will change the code and it will break and no one will notice except Guenter's build bots and then no one will fix it :(
i.e. exactly what was happening before...
So this needs to all be fixed up properly, and really, should be merged to the "real" part of the kernel...
thanks,
greg k-h
Quoted 7 lines · Matthew Wilcox
Quoted 6 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.
Quoted 6 lines
Quoted 3 lines
I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where COMPILE_TEST isn't required.
One of the things about having a bunch of dummy functions for COMPILE_TEST is that they introduce a lot of static checker warnings. The real function is supposed to initialize stuff but the dummy function just returns so now we get uninitialized variable warnings etc.
regards,
dan carpenter
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.
Quoted 6 lines
Quoted 2 lines
Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where
COMPILE_TESTisn't required.
Well, that was the problem. I posted the patch and Dave Miller merged it before the build bot had the chance to point out that I'd missed it. So relying on the build bot is not sufficient.
Quoted 4 lines
One of the things about having a bunch of dummy functions for
COMPILE_TESTis that they introduce a lot of static checker warnings. The real function is supposed to initialize stuff but the dummy function just returns so now we get uninitialized variable warnings etc.
Perhaps we need a better solution for the dummy functions than just returning. We can initialise the variables / structs to 0, for example. I fully accept that I did a poor job of writing the dummy functions.
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.
Quoted 7 lines
Quoted 2 lines
Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where
COMPILE_TESTisn't required.
Not really. Looking at the build failures in the mainline kernel right now:
Failed builds:
alpha:allmodconfig
arm:allmodconfig
i386:allyesconfig
i386:allmodconfig
m68k:allmodconfig
microblaze:mmu_defconfig
mips:allmodconfig
parisc:allmodconfig
powerpc:allmodconfig
s390:allmodconfig
sparc64:allmodconfig
Many of those don't even _have_ specific configurations causing the build failures.
Guenter
Quoted 13 lines · Guenter Roeck
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where
COMPILE_TESTisn't required.
It depends...
Quoted 14 lines
Not really. Looking at the build failures in the mainline kernel right now:
Failed builds:
alpha:allmodconfig
arm:allmodconfig
i386:allyesconfig
i386:allmodconfig
m68k:allmodconfig
microblaze:mmu_defconfig
mips:allmodconfig
parisc:allmodconfig
powerpc:allmodconfig
s390:allmodconfig
sparc64:allmodconfig
I did receive a report from [email protected] for the m68k build failure. But that was sent to me only, not to the offender, and I do my own builds anyway.
More interesting, that report happened after the offending commit landed upstream, while it had been in next for 4 weeks.
Quoted 1 line
Many of those don't even _have_ specific configurations causing the build failures.
Exactly. These are the "easy" ones, as the all*config builds enable as much infrastructure as possible. It's much harder if some common dependency is not fulfilled in some specific config.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 38 lines · Geert Uytterhoeven
Quoted 13 lines · Guenter Roeck
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where
COMPILE_TESTisn't required.It depends...
Quoted 14 lines
Not really. Looking at the build failures in the mainline kernel right now:
Failed builds:
alpha:allmodconfig
arm:allmodconfig
i386:allyesconfig
i386:allmodconfig
m68k:allmodconfig
microblaze:mmu_defconfig
mips:allmodconfig
parisc:allmodconfig
powerpc:allmodconfig
s390:allmodconfig
sparc64:allmodconfig
Quoted 7 lines
I did receive a report from [email protected] for the m68k build failure. But that was sent to me only, not to the offender, and I do my own builds anyway.
More interesting, that report happened after the offending commit landed upstream, while it had been in next for 4 weeks.
m68k in -next builds fine for me, and did for a while. I have not seen a build failure there. There must be a context commit causing this failure, or what is (or was) in -next differs from what is in mainline.
Quoted 6 lines
Quoted 1 line
Many of those don't even _have_ specific configurations causing the build failures.
Exactly. These are the "easy" ones, as the all*config builds enable as much infrastructure as possible. It's much harder if some common dependency is not fulfilled in some specific config.
Yes, that is correct. But that doesn't mean that it would be a good idea to retire COMPILE_TEST.
Guenter
Hi Günter,
Quoted 43 lines · Guenter Roeck
Quoted 42 lines · Geert Uytterhoeven
Quoted 13 lines · Guenter Roeck
Quoted 12 lines · Dan Carpenter
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Chris Packham
Quoted 1 line · On Tue, 2020-02-04 at 07:09 +0000, [email protected] wrote:
On Tue, Feb 04, 2020 at 04:02:15AM +0000, Chris Packham wrote:
Quoted 2 lines · Dan Carpenter
My advice is to delete all the
COMPILE_TESTcode. That stuff was a constant source of confusion and headaches.I was also going to suggest this. Since the
COMPILE_TESThas been a source of trouble I was going to propose dropping the ||COMPILE_TESTfrom theKconfigfor the octeon drivers.Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Not having it also causes problems. I didn't originally add it for shits and giggles.
I wonder if the kbuild bot does enough cross compile build testing these days to detect compile problems. It might have improved to the point where
COMPILE_TESTisn't required.It depends...
Quoted 14 lines
Not really. Looking at the build failures in the mainline kernel right now:
Failed builds:
alpha:allmodconfig
arm:allmodconfig
i386:allyesconfig
i386:allmodconfig
m68k:allmodconfig
microblaze:mmu_defconfig
mips:allmodconfig
parisc:allmodconfig
powerpc:allmodconfig
s390:allmodconfig
sparc64:allmodconfigI did receive a report from [email protected] for the m68k build failure. But that was sent to me only, not to the offender, and I do my own builds anyway.
Quoted 6 lines
Quoted 2 lines
More interesting, that report happened after the offending commit landed upstream, while it had been in next for 4 weeks.
m68k in -next builds fine for me, and did for a while. I have not seen a build failure there. There must be a context commit causing this failure, or what is (or was) in -next differs from what is in mainline.
Indeed. The offending symbol depended on another symbol, which never made it to next before it hit mainline, thus hiding the issue.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Many of those don't even _have_ specific configurations causing the build failures.
Exactly. These are the "easy" ones, as the all*config builds enable as much infrastructure as possible. It's much harder if some common dependency is not fulfilled in some specific config.
Yes, that is correct. But that doesn't mean that it would be a good idea to retire
COMPILE_TEST.
I agree.
Retiring COMPILE_TEST could have a positive side-effect, though: it would reduce the compile time for all*config, which might give the overloaded build bots spare cycles to cover other configs.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Doesn't octeon have drivers out of staging already? What is this module for?
Sandro V
Quoted 4,959 lines · Greg Kroah-Hartman
This driver has been in the tree since 2009 with no real movement to get it out. Now it is starting to cause build issues and other problems for people who want to fix coding style problems, but can not actually build it.
As nothing is happening here, just delete the module entirely.
Reported-by Guenter Roeck <[email protected]>Cc David Daney <[email protected]>Cc "David S. Miller" <[email protected]>Cc "Matthew Wilcox (Oracle)" <[email protected]>Cc Guenter Roeck <[email protected]>Cc YueHaibing <[email protected]>Cc Aaro Koskinen <[email protected]>Cc Wambui Karuga <[email protected]>Cc Julia Lawall <[email protected]>Cc Florian Westphal <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Branden Bonaby <[email protected]>Cc "Petr Štetiar" <[email protected]>Cc Sandro Volery <[email protected]>Cc Paul Burton <[email protected]>Cc Dan Carpenter <[email protected]>Cc Giovanni Gherdovich <[email protected]>Cc Valery Ivanov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>---
drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/octeon/Kconfig | 16 - drivers/staging/octeon/Makefile | 19 - drivers/staging/octeon/TODO | 9 - drivers/staging/octeon/ethernet-defines.h | 40 - drivers/staging/octeon/ethernet-mdio.c | 178 --- drivers/staging/octeon/ethernet-mdio.h | 28 - drivers/staging/octeon/ethernet-mem.c | 154 --- drivers/staging/octeon/ethernet-mem.h | 9 - drivers/staging/octeon/ethernet-rgmii.c | 158 --- drivers/staging/octeon/ethernet-rx.c | 538 -------- drivers/staging/octeon/ethernet-rx.h | 31 - drivers/staging/octeon/ethernet-sgmii.c | 30 - drivers/staging/octeon/ethernet-spi.c | 226 ---- drivers/staging/octeon/ethernet-tx.c | 717 ----------- drivers/staging/octeon/ethernet-tx.h | 14 - drivers/staging/octeon/ethernet-util.h | 47 - drivers/staging/octeon/ethernet.c | 992 -------------- drivers/staging/octeon/octeon-ethernet.h | 107 -- drivers/staging/octeon/octeon-stubs.h | 1433 --------------------- 21 files changed, 4749 deletions(-)delete mode 100644
drivers/staging/octeon/Kconfigdelete mode 100644drivers/staging/octeon/Makefiledelete mode 100644drivers/staging/octeon/TODOdelete mode 100644drivers/staging/octeon/ethernet-defines.hdelete mode 100644drivers/staging/octeon/ethernet-mdio.cdelete mode 100644drivers/staging/octeon/ethernet-mdio.hdelete mode 100644drivers/staging/octeon/ethernet-mem.cdelete mode 100644drivers/staging/octeon/ethernet-mem.hdelete mode 100644drivers/staging/octeon/ethernet-rgmii.cdelete mode 100644drivers/staging/octeon/ethernet-rx.cdelete mode 100644drivers/staging/octeon/ethernet-rx.hdelete mode 100644drivers/staging/octeon/ethernet-sgmii.cdelete mode 100644drivers/staging/octeon/ethernet-spi.cdelete mode 100644drivers/staging/octeon/ethernet-tx.cdelete mode 100644drivers/staging/octeon/ethernet-tx.hdelete mode 100644drivers/staging/octeon/ethernet-util.hdelete mode 100644drivers/staging/octeon/ethernet.cdelete mode 100644drivers/staging/octeon/octeon-ethernet.hdelete mode 100644drivers/staging/octeon/octeon-stubs.hdrivers/staging/Kconfig +0
-0@@ -42,8 +42,6 @@ source "drivers/staging/rtl8188eu/Kconfig"source "
drivers/staging/rts5208/Kconfig"drivers/staging/Kconfig +0
-2-source "drivers/staging/octeon/Kconfig" -source "
drivers/staging/octeon-usb/Kconfig"source "
drivers/staging/vt6655/Kconfig"drivers/staging/Makefile +0
-0@@ -12,7 +12,6 @@ obj-$(CONFIG_R8712U) += rtl8712/obj-$(CONFIG_R8188EU) += rtl8188eu/
obj-$(CONFIG_RTS5208) += rts5208/
obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/
-obj-$(CONFIG_OCTEON_ETHERNET) += octeon/obj-$(CONFIG_OCTEON_USB) += octeon-usb/ obj-$(CONFIG_VT6655) += vt6655/ obj-$(CONFIG_VT6656) += vt6656/drivers/staging/octeon/Kconfig deleted +0
-16@@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config OCTEON_ETHERNET - tristate "Cavium Networks Octeon Ethernet support" - depends on CAVIUM_OCTEON_SOC || COMPILE_TEST - depends on NETDEVICES - depends on BROKEN - select PHYLIB - select MDIO_OCTEON - help - This driver supports the builtin ethernet ports on Cavium - Networks' products in the Octeon family. This driver supports the - CN3XXX and CN5XXX Octeon processors. - - To compile this driver as a module, choose M here. The module - will be called octeon-ethernet. -drivers/staging/octeon/Makefile deleted +0
-19@@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Copyright (C) 2005-2009 Cavium Networks -# - -# -# Makefile for Cavium OCTEON on-board ethernet driver -# - -obj-${CONFIG_OCTEON_ETHERNET} := octeon-ethernet.o - -octeon-ethernet-y := ethernet.o -octeon-ethernet-y += ethernet-mdio.o -octeon-ethernet-y += ethernet-mem.o -octeon-ethernet-y += ethernet-rgmii.o -octeon-ethernet-y += ethernet-rx.o -octeon-ethernet-y += ethernet-sgmii.o -octeon-ethernet-y += ethernet-spi.o -octeon-ethernet-y += ethernet-tx.odrivers/staging/octeon/TODO deleted +0
-9@@ -1,9 +0,0 @@ -This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 -chips at least up to CN7030. - -TODO: - - general code review and clean up - - make driver self-contained instead of being split between staging and - arch/mips/cavium-octeon. - -Contact: Aaro Koskinen <[email protected]>drivers/staging/octeon/ethernet-defines.h deleted +0
-40@@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -/* -* A few defines are used to control the operation of this driver: -* USE_ASYNC_IOBDMA -* Use asynchronous IO access to hardware. This uses Octeon's asynchronous -* IOBDMAs to issue IO accesses without stalling. Set this to zero -* to disable this. Note that IOBDMAs require CVMSEG. -* REUSE_SKBUFFS_WITHOUT_FREE -* Allows the TX path to free an skbuff into the FPA hardware pool. This -* can significantly improve performance for forwarding and bridging, but -* may be somewhat dangerous. Checks are made, but if any buffer is reused -* without the proper Linux cleanup, the networking stack may have very -* bizarre bugs. -*/ -#ifndef __ETHERNET_DEFINES_H__ -#define __ETHERNET_DEFINES_H__ - -#ifdef CONFIG_NETFILTER -#define REUSE_SKBUFFS_WITHOUT_FREE 0 -#else -#define REUSE_SKBUFFS_WITHOUT_FREE 1 -#endif - -#define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) - -/* Maximum number of SKBs to try to free per xmit packet. */ -#define MAX_OUT_QUEUE_DEPTH 1000 - -#define FAU_TOTAL_TX_TO_CLEAN (CVMX_FAU_REG_END - sizeof(u32)) -#define FAU_NUM_PACKET_BUFFERS_TO_FREE (FAU_TOTAL_TX_TO_CLEAN - sizeof(u32)) - -#define TOTAL_NUMBER_OF_PORTS (CVMX_PIP_NUM_INPUT_PORTS + 1) - -#endif /* __ETHERNET_DEFINES_H__ */ drivers/staging/octeon/ethernet-mdio.c deleted +0
-178@@ -1,178 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/kernel.h> -#include <linux/ethtool.h> -#include <linux/phy.h> -#include <linux/ratelimit.h> -#include <linux/of_mdio.h> -#include <generated/utsrelease.h> -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-mdio.h" -#include "ethernet-util.h" - -static void cvm_oct_get_drvinfo (struct net_device *dev, -struct ethtool_drvinfo *info) -{ -strlcpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); -strlcpy (info->version,UTS_RELEASE ,sizeof (info->version)); -strlcpy (info->bus_info,"Builtin" ,sizeof (info->bus_info)); -} - -static int cvm_oct_nway_reset (struct net_device *dev) -{ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; - -if (dev->phydev) -return phy_start_aneg (dev->phydev); - -return -EINVAL ; -} - -const struct ethtool_ops cvm_oct_ethtool_ops = { - .get_drvinfo = cvm_oct_get_drvinfo, - .nway_reset = cvm_oct_nway_reset, - .get_link = ethtool_op_get_link, - .get_link_ksettings = phy_ethtool_get_link_ksettings, - .set_link_ksettings = phy_ethtool_set_link_ksettings, -}; - -/** -* cvm_oct_ioctl - IOCTL support for PHY control -* @dev: Device to change -* @rq: the request -* @cmd: the command -* -* Returns Zero on success -*/ -int cvm_oct_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) -{ -if (!netif_running (dev)) -return -EINVAL ; - -if (!dev->phydev) -return -EINVAL ; - -return phy_mii_ioctl (dev->phydev, rq, cmd); -} - -void cvm_oct_note_carrier (struct octeon_ethernet *priv, -union cvmx_helper_link_info li) -{ -if (li.s.link_up) { -pr_notice_ratelimited ("%s: %u Mbps %s duplex, port %d, queue %d\n" , -netdev_name (priv->netdev), li.s.speed, - (li.s.full_duplex) ?"Full" :"Half" , - priv->port, priv->queue); - }else { -pr_notice_ratelimited ("%s: Link down\n" , -netdev_name (priv->netdev)); - } -} - -void cvm_oct_adjust_link (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -union cvmx_helper_link_info link_info; - - link_info.u64 =0 ; - link_info.s.link_up = dev->phydev->link ?1 :0 ; - link_info.s.full_duplex = dev->phydev->duplex ?1 :0 ; - link_info.s.speed = dev->phydev->speed; - priv->link_info = link_info.u64; - -/* -* The polling task need to know about link status changes. -*/ -if (priv->poll) - priv->poll (dev); - -if (priv->last_link != dev->phydev->link) { - priv->last_link = dev->phydev->link; -cvmx_helper_link_set (priv->port, link_info); -cvm_oct_note_carrier (priv, link_info); - } -} - -int cvm_oct_common_stop (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -int interface =INTERFACE (priv->port); -union cvmx_helper_link_info link_info; -union cvmx_gmxx_prtx_cfg gmx_cfg; -int index =INDEX (priv->port); - - gmx_cfg.u64 =cvmx_read_csr (CVMX_GMXX_PRTX_CFG (index, interface)); - gmx_cfg.s.en =0 ; -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), gmx_cfg.u64); - - priv->poll =NULL ; - -if (dev->phydev) -phy_disconnect (dev->phydev); - -if (priv->last_link) { - link_info.u64 =0 ; - priv->last_link =0 ; - -cvmx_helper_link_set (priv->port, link_info); -cvm_oct_note_carrier (priv, link_info); - } -return 0 ; -} - -/** -* cvm_oct_phy_setup_device - setup the PHY -* -* @dev: Device to setup -* -* Returns Zero on success, negative on failure -*/ -int cvm_oct_phy_setup_device (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -struct device_node *phy_node; -struct phy_device *phydev =NULL ; - -if (!priv->of_node) - goto no_phy; - - phy_node =of_parse_phandle (priv->of_node,"phy-handle" ,0 ); -if (!phy_node &&of_phy_is_fixed_link (priv->of_node)) { -int rc; - - rc =of_phy_register_fixed_link (priv->of_node); -if (rc) -return rc; - - phy_node =of_node_get (priv->of_node); - } -if (!phy_node) - goto no_phy; - - phydev =of_phy_connect (dev, phy_node, cvm_oct_adjust_link,0 , - priv->phy_mode); -of_node_put (phy_node); - -if (!phydev) -return -ENODEV ; - - priv->last_link =0 ; -phy_start (phydev); - -return 0 ; -no_phy: -/* If there is no phy, assume a direct MAC connection and that -* the link is up. -*/ -netif_carrier_on (dev); -return 0 ; -}drivers/staging/octeon/ethernet-mdio.h deleted +0
-28@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/ip.h> -#include <linux/string.h> -#include <linux/ethtool.h> -#include <linux/seq_file.h> -#include <linux/proc_fs.h> -#include <net/dst.h> -#ifdef CONFIG_XFRM -#include <linux/xfrm.h> -#include <net/xfrm.h> -#endif /* CONFIG_XFRM */ - -extern const struct ethtool_ops cvm_oct_ethtool_ops; - -void octeon_mdiobus_force_mod_depencency (void ); - -int cvm_oct_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -int cvm_oct_phy_setup_device (struct net_device *dev);drivers/staging/octeon/ethernet-mem.c deleted +0
-154@@ -1,154 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2010 Cavium Networks -*/ - -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/slab.h> - -#include "octeon-ethernet.h" -#include "ethernet-mem.h" -#include "ethernet-defines.h" - -/** -* cvm_oct_fill_hw_skbuff - fill the supplied hardware pool with skbuffs -* @pool: Pool to allocate an skbuff for -* @size: Size of the buffer needed for the pool -* @elements: Number of buffers to allocate -* -* Returns the actual number of buffers allocated. -*/ -static int cvm_oct_fill_hw_skbuff (int pool,int size,int elements) -{ -int freed = elements; - -while (freed) { -struct sk_buff *skb =dev_alloc_skb (size +256 ); - -if (unlikely (!skb)) -break ; -skb_reserve (skb,256 - (((unsigned long )skb->data) &0x7f )); - *(struct sk_buff **)(skb->data -sizeof (void *)) = skb; -cvmx_fpa_free (skb->data, pool, size /128 ); - freed--; - } -return elements - freed; -} - -/** -* cvm_oct_free_hw_skbuff- free hardware pool skbuffs -* @pool: Pool to allocate an skbuff for -* @size: Size of the buffer needed for the pool -* @elements: Number of buffers to allocate -*/ -static void cvm_oct_free_hw_skbuff (int pool,int size,int elements) -{ -char *memory; - -do { - memory =cvmx_fpa_alloc (pool); -if (memory) { -struct sk_buff *skb = - *(struct sk_buff **)(memory -sizeof (void *)); - elements--; -dev_kfree_skb (skb); - } - }while (memory); - -if (elements <0 ) -pr_warn ("Freeing of pool %u had too many skbuffs (%d)\n" , - pool, elements); -else if (elements >0 ) -pr_warn ("Freeing of pool %u is missing %d skbuffs\n" , - pool, elements); -} - -/** -* cvm_oct_fill_hw_memory - fill a hardware pool with memory. -* @pool: Pool to populate -* @size: Size of each buffer in the pool -* @elements: Number of buffers to allocate -* -* Returns the actual number of buffers allocated. -*/ -static int cvm_oct_fill_hw_memory (int pool,int size,int elements) -{ -char *memory; -char *fpa; -int freed = elements; - -while (freed) { -/* -* FPA memory must be 128 byte aligned. Since we are -* aligning we need to save the original pointer so we -* can feed it to kfree when the memory is returned to -* the kernel. -* -* We allocate an extra 256 bytes to allow for -* alignment and space for the original pointer saved -* just before the block. -*/ - memory =kmalloc (size +256 ,GFP_ATOMIC ); -if (unlikely (!memory)) { -pr_warn ("Unable to allocate %u bytes for FPA pool %d\n" , - elements * size, pool); -break ; - } - fpa = (char *)(((unsigned long )memory +256 ) & ~0x7fUL ); - *((char **)fpa -1 ) = memory; -cvmx_fpa_free (fpa, pool,0 ); - freed--; - } -return elements - freed; -} - -/** -* cvm_oct_free_hw_memory - Free memory allocated by cvm_oct_fill_hw_memory -* @pool: FPA pool to free -* @size: Size of each buffer in the pool -* @elements: Number of buffers that should be in the pool -*/ -static void cvm_oct_free_hw_memory (int pool,int size,int elements) -{ -char *memory; -char *fpa; - -do { - fpa =cvmx_fpa_alloc (pool); -if (fpa) { - elements--; - fpa = (char *)phys_to_virt (cvmx_ptr_to_phys (fpa)); - memory = *((char **)fpa -1 ); -kfree (memory); - } - }while (fpa); - -if (elements <0 ) -pr_warn ("Freeing of pool %u had too many buffers (%d)\n" , - pool, elements); -else if (elements >0 ) -pr_warn ("Warning: Freeing of pool %u is missing %d buffers\n" , - pool, elements); -} - -int cvm_oct_mem_fill_fpa (int pool,int size,int elements) -{ -int freed; - -if (pool ==CVMX_FPA_PACKET_POOL ) - freed =cvm_oct_fill_hw_skbuff (pool, size, elements); -else - freed =cvm_oct_fill_hw_memory (pool, size, elements); -return freed; -} - -void cvm_oct_mem_empty_fpa (int pool,int size,int elements) -{ -if (pool ==CVMX_FPA_PACKET_POOL ) -cvm_oct_free_hw_skbuff (pool, size, elements); -else -cvm_oct_free_hw_memory (pool, size, elements); -}drivers/staging/octeon/ethernet-mem.h deleted +0
-9@@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -int cvm_oct_mem_fill_fpa (int pool,int size,int elements); -void cvm_oct_mem_empty_fpa (int pool,int size,int elements);drivers/staging/octeon/ethernet-rgmii.c deleted +0
-158@@ -1,158 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/interrupt.h> -#include <linux/phy.h> -#include <linux/ratelimit.h> -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-util.h" -#include "ethernet-mdio.h" - -static DEFINE_SPINLOCK (global_register_lock); - -static void cvm_oct_set_hw_preamble (struct octeon_ethernet *priv,bool enable) -{ -union cvmx_gmxx_rxx_frm_ctl gmxx_rxx_frm_ctl; -union cvmx_ipd_sub_port_fcs ipd_sub_port_fcs; -union cvmx_gmxx_rxx_int_reg gmxx_rxx_int_reg; -int interface =INTERFACE (priv->port); -int index =INDEX (priv->port); - -/* Set preamble checking. */ - gmxx_rxx_frm_ctl.u64 =cvmx_read_csr (CVMX_GMXX_RXX_FRM_CTL (index, - interface)); - gmxx_rxx_frm_ctl.s.pre_chk = enable; -cvmx_write_csr (CVMX_GMXX_RXX_FRM_CTL (index, interface), - gmxx_rxx_frm_ctl.u64); - -/* Set FCS stripping. */ - ipd_sub_port_fcs.u64 =cvmx_read_csr (CVMX_IPD_SUB_PORT_FCS ); -if (enable) - ipd_sub_port_fcs.s.port_bit |=1ull << priv->port; -else - ipd_sub_port_fcs.s.port_bit &= -0xffffffffull ^ (1ull << priv->port); -cvmx_write_csr (CVMX_IPD_SUB_PORT_FCS , ipd_sub_port_fcs.u64); - -/* Clear any error bits. */ - gmxx_rxx_int_reg.u64 =cvmx_read_csr (CVMX_GMXX_RXX_INT_REG (index, - interface)); -cvmx_write_csr (CVMX_GMXX_RXX_INT_REG (index, interface), - gmxx_rxx_int_reg.u64); -} - -static void cvm_oct_check_preamble_errors (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -union cvmx_helper_link_info link_info; -unsigned long flags; - - link_info.u64 = priv->link_info; - -/* -* Take the global register lock since we are going to -* touch registers that affect more than one port. -*/ -spin_lock_irqsave (&global_register_lock, flags); - -if (link_info.s.speed ==10 && priv->last_speed ==10 ) { -/* -* Read the GMXX_RXX_INT_REG[PCTERR] bit and see if we are -* getting preamble errors. -*/ -int interface =INTERFACE (priv->port); -int index =INDEX (priv->port); -union cvmx_gmxx_rxx_int_reg gmxx_rxx_int_reg; - - gmxx_rxx_int_reg.u64 =cvmx_read_csr (CVMX_GMXX_RXX_INT_REG - (index, interface)); -if (gmxx_rxx_int_reg.s.pcterr) { -/* -* We are getting preamble errors at 10Mbps. Most -* likely the PHY is giving us packets with misaligned -* preambles. In order to get these packets we need to -* disable preamble checking and do it in software. -*/ -cvm_oct_set_hw_preamble (priv, false); -printk_ratelimited ("%s: Using 10Mbps with software preamble removal\n" , - dev->name); - } - }else { -/* -* Since the 10Mbps preamble workaround is allowed we need to -* enable preamble checking, FCS stripping, and clear error -* bits on every speed change. If errors occur during 10Mbps -* operation the above code will change this stuff -*/ -if (priv->last_speed != link_info.s.speed) -cvm_oct_set_hw_preamble (priv, true); - priv->last_speed = link_info.s.speed; - } -spin_unlock_irqrestore (&global_register_lock, flags); -} - -static void cvm_oct_rgmii_poll (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -union cvmx_helper_link_info link_info; -bool status_change; - - link_info =cvmx_helper_link_get (priv->port); -if (priv->link_info != link_info.u64 && -cvmx_helper_link_set (priv->port, link_info)) - link_info.u64 = priv->link_info; - status_change = priv->link_info != link_info.u64; - priv->link_info = link_info.u64; - -cvm_oct_check_preamble_errors (dev); - -if (likely (!status_change)) -return ; - -/* Tell core. */ -if (link_info.s.link_up) { -if (!netif_carrier_ok (dev)) -netif_carrier_on (dev); - }else if (netif_carrier_ok (dev)) { -netif_carrier_off (dev); - } -cvm_oct_note_carrier (priv, link_info); -} - -int cvm_oct_rgmii_open (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -int ret; - - ret =cvm_oct_common_open (dev, cvm_oct_rgmii_poll); -if (ret) -return ret; - -if (dev->phydev) { -/* -* In phydev mode, we need still periodic polling for the -* preamble error checking, and we also need to call this -* function on every link state change. -* -* Only true RGMII ports need to be polled. In GMII mode, port -* 0 is really a RGMII port. -*/ -if ((priv->imode ==CVMX_HELPER_INTERFACE_MODE_GMII && - priv->port ==0 ) || - (priv->imode ==CVMX_HELPER_INTERFACE_MODE_RGMII )) { - priv->poll = cvm_oct_check_preamble_errors; -cvm_oct_check_preamble_errors (dev); - } - } - -return 0 ; -}drivers/staging/octeon/ethernet-rx.c deleted +0
-538@@ -1,538 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2010 Cavium Networks -*/ - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/cache.h> -#include <linux/cpumask.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/ip.h> -#include <linux/string.h> -#include <linux/prefetch.h> -#include <linux/ratelimit.h> -#include <linux/smp.h> -#include <linux/interrupt.h> -#include <net/dst.h> -#ifdef CONFIG_XFRM -#include <linux/xfrm.h> -#include <net/xfrm.h> -#endif /* CONFIG_XFRM */ - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-mem.h" -#include "ethernet-rx.h" -#include "ethernet-util.h" - -static atomic_t oct_rx_ready =ATOMIC_INIT (0 ); - -static struct oct_rx_group { -int irq; -int group; -struct napi_struct napi; -} oct_rx_group[16 ]; - -/** -* cvm_oct_do_interrupt - interrupt handler. -* @irq: Interrupt number. -* @napi_id: Cookie to identify the NAPI instance. -* -* The interrupt occurs whenever the POW has packets in our group. -* -*/ -static irqreturn_t cvm_oct_do_interrupt (int irq,void *napi_id) -{ -/* Disable the IRQ and start napi_poll. */ -disable_irq_nosync (irq); -napi_schedule (napi_id); - -return IRQ_HANDLED ; -} - -/** -* cvm_oct_check_rcv_error - process receive errors -* @work: Work queue entry pointing to the packet. -* -* Returns Non-zero if the packet can be dropped, zero otherwise. -*/ -static inline int cvm_oct_check_rcv_error (struct cvmx_wqe *work) -{ -int port; - -if (octeon_has_feature (OCTEON_FEATURE_PKND )) - port = work->word0.pip.cn68xx.pknd; -else - port = work->word1.cn38xx.ipprt; - -if ((work->word2.snoip.err_code ==10 ) && (work->word1.len <=64 )) { -/* -* Ignore length errors on min size packets. Some -* equipment incorrectly pads packets to 64+4FCS -* instead of 60+4FCS. Note these packets still get -* counted as frame errors. -*/ - }else if (work->word2.snoip.err_code ==5 || - work->word2.snoip.err_code ==7 ) { -/* -* We received a packet with either an alignment error -* or a FCS error. This may be signalling that we are -* running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK] -* off. If this is the case we need to parse the -* packet to determine if we can remove a non spec -* preamble and generate a correct packet. -*/ -int interface =cvmx_helper_get_interface_num (port); -int index =cvmx_helper_get_interface_index_num (port); -union cvmx_gmxx_rxx_frm_ctl gmxx_rxx_frm_ctl; - - gmxx_rxx_frm_ctl.u64 = -cvmx_read_csr (CVMX_GMXX_RXX_FRM_CTL (index, interface)); -if (gmxx_rxx_frm_ctl.s.pre_chk ==0 ) { -u8 *ptr = -cvmx_phys_to_ptr (work->packet_ptr.s.addr); -int i =0 ; - -while (i < work->word1.len -1 ) { -if (*ptr !=0x55 ) -break ; - ptr++; - i++; - } - -if (*ptr ==0xd5 ) { -/* Port received 0xd5 preamble */ - work->packet_ptr.s.addr += i +1 ; - work->word1.len -= i +5 ; - }else if ((*ptr &0xf ) ==0xd ) { -/* Port received 0xd preamble */ - work->packet_ptr.s.addr += i; - work->word1.len -= i +4 ; -for (i =0 ; i < work->word1.len; i++) { - *ptr = - ((*ptr &0xf0 ) >>4 ) | - ((*(ptr +1 ) &0xf ) <<4 ); - ptr++; - } - }else { -printk_ratelimited ("Port %d unknown preamble, packet dropped\n" , - port); -cvm_oct_free_work (work); -return 1 ; - } - } - }else { -printk_ratelimited ("Port %d receive error code %d, packet dropped\n" , - port, work->word2.snoip.err_code); -cvm_oct_free_work (work); -return 1 ; - } - -return 0 ; -} - -static void copy_segments_to_skb (struct cvmx_wqe *work,struct sk_buff *skb) -{ -int segments = work->word2.s.bufs; -union cvmx_buf_ptr segment_ptr = work->packet_ptr; -int len = work->word1.len; -int segment_size; - -while (segments--) { -union cvmx_buf_ptr next_ptr; - - next_ptr = *(union cvmx_buf_ptr *) -cvmx_phys_to_ptr (segment_ptr.s.addr -8 ); - -/* -* Octeon Errata PKI-100: The segment size is wrong. -* -* Until it is fixed, calculate the segment size based on -* the packet pool buffer size. -* When it is fixed, the following line should be replaced -* with this one: -* int segment_size = segment_ptr.s.size; -*/ - segment_size = -CVMX_FPA_PACKET_POOL_SIZE - - (segment_ptr.s.addr - - (((segment_ptr.s.addr >>7 ) - - segment_ptr.s.back) <<7 )); - -/* Don't copy more than what is left in the packet */ -if (segment_size > len) - segment_size = len; - -/* Copy the data into the packet */ -skb_put_data (skb,cvmx_phys_to_ptr (segment_ptr.s.addr), - segment_size); - len -= segment_size; - segment_ptr = next_ptr; - } -} - -static int cvm_oct_poll (struct oct_rx_group *rx_group,int budget) -{ -const int coreid =cvmx_get_core_num (); -u64 old_group_mask; -u64 old_scratch; -int rx_count =0 ; -int did_work_request =0 ; -int packet_not_copied; - -/* Prefetch cvm_oct_device since we know we need it soon */ -prefetch (cvm_oct_device); - -if (USE_ASYNC_IOBDMA ) { -/* Save scratch in case userspace is using it */ -CVMX_SYNCIOBDMA ; - old_scratch =cvmx_scratch_read64 (CVMX_SCR_SCRATCH ); - } - -/* Only allow work for our group (and preserve priorities) */ -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) { - old_group_mask =cvmx_read_csr (CVMX_SSO_PPX_GRP_MSK (coreid)); -cvmx_write_csr (CVMX_SSO_PPX_GRP_MSK (coreid), -BIT (rx_group->group)); -cvmx_read_csr (CVMX_SSO_PPX_GRP_MSK (coreid));/* Flush */ - }else { - old_group_mask =cvmx_read_csr (CVMX_POW_PP_GRP_MSKX (coreid)); -cvmx_write_csr (CVMX_POW_PP_GRP_MSKX (coreid), - (old_group_mask & ~0xFFFFull ) | -BIT (rx_group->group)); - } - -if (USE_ASYNC_IOBDMA ) { -cvmx_pow_work_request_async (CVMX_SCR_SCRATCH ,CVMX_POW_NO_WAIT ); - did_work_request =1 ; - } - -while (rx_count < budget) { -struct sk_buff *skb =NULL ; -struct sk_buff **pskb =NULL ; -int skb_in_hw; -struct cvmx_wqe *work; -int port; - -if (USE_ASYNC_IOBDMA && did_work_request) - work =cvmx_pow_work_response_async (CVMX_SCR_SCRATCH ); -else - work =cvmx_pow_work_request_sync (CVMX_POW_NO_WAIT ); - -prefetch (work); - did_work_request =0 ; -if (!work) { -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) { -cvmx_write_csr (CVMX_SSO_WQ_IQ_DIS , -BIT (rx_group->group)); -cvmx_write_csr (CVMX_SSO_WQ_INT , -BIT (rx_group->group)); - }else { -union cvmx_pow_wq_int wq_int; - - wq_int.u64 =0 ; - wq_int.s.iq_dis =BIT (rx_group->group); - wq_int.s.wq_int =BIT (rx_group->group); -cvmx_write_csr (CVMX_POW_WQ_INT , wq_int.u64); - } -break ; - } - pskb = (struct sk_buff **) - (cvm_oct_get_buffer_ptr (work->packet_ptr) - -sizeof (void *)); -prefetch (pskb); - -if (USE_ASYNC_IOBDMA && rx_count < (budget -1 )) { -cvmx_pow_work_request_async_nocheck (CVMX_SCR_SCRATCH , -CVMX_POW_NO_WAIT ); - did_work_request =1 ; - } - rx_count++; - - skb_in_hw = work->word2.s.bufs ==1 ; -if (likely (skb_in_hw)) { - skb = *pskb; -prefetch (&skb->head); -prefetch (&skb->len); - } - -if (octeon_has_feature (OCTEON_FEATURE_PKND )) - port = work->word0.pip.cn68xx.pknd; -else - port = work->word1.cn38xx.ipprt; - -prefetch (cvm_oct_device[port]); - -/* Immediately throw away all packets with receive errors */ -if (unlikely (work->word2.snoip.rcv_error)) { -if (cvm_oct_check_rcv_error (work)) -continue ; - } - -/* -* We can only use the zero copy path if skbuffs are -* in the FPA pool and the packet fits in a single -* buffer. -*/ -if (likely (skb_in_hw)) { - skb->data = skb->head + work->packet_ptr.s.addr - -cvmx_ptr_to_phys (skb->head); -prefetch (skb->data); - skb->len = work->word1.len; -skb_set_tail_pointer (skb, skb->len); - packet_not_copied =1 ; - }else { -/* -* We have to copy the packet. First allocate -* an skbuff for it. -*/ - skb =dev_alloc_skb (work->word1.len); -if (!skb) { -cvm_oct_free_work (work); -continue ; - } - -/* -* Check if we've received a packet that was -* entirely stored in the work entry. -*/ -if (unlikely (work->word2.s.bufs ==0 )) { -u8 *ptr = work->packet_data; - -if (likely (!work->word2.s.not_IP)) { -/* -* The beginning of the packet -* moves for IP packets. -*/ -if (work->word2.s.is_v6) - ptr +=2 ; -else - ptr +=6 ; - } -skb_put_data (skb, ptr, work->word1.len); -/* No packet buffers to free */ - }else { -copy_segments_to_skb (work, skb); - } - packet_not_copied =0 ; - } -if (likely ((port <TOTAL_NUMBER_OF_PORTS ) && - cvm_oct_device[port])) { -struct net_device *dev = cvm_oct_device[port]; - -/* -* Only accept packets for devices that are -* currently up. -*/ -if (likely (dev->flags &IFF_UP )) { - skb->protocol =eth_type_trans (skb, dev); - skb->dev = dev; - -if (unlikely (work->word2.s.not_IP || - work->word2.s.IP_exc || - work->word2.s.L4_error || - !work->word2.s.tcp_or_udp)) - skb->ip_summed =CHECKSUM_NONE ; -else - skb->ip_summed =CHECKSUM_UNNECESSARY ; - -/* Increment RX stats for virtual ports */ -if (port >=CVMX_PIP_NUM_INPUT_PORTS ) { - dev->stats.rx_packets++; - dev->stats.rx_bytes += skb->len; - } -netif_receive_skb (skb); - }else { -/* -* Drop any packet received for a device that -* isn't up. -*/ - dev->stats.rx_dropped++; -dev_kfree_skb_irq (skb); - } - }else { -/* -* Drop any packet received for a device that -* doesn't exist. -*/ -printk_ratelimited ("Port %d not controlled by Linux, packet dropped\n" , - port); -dev_kfree_skb_irq (skb); - } -/* -* Check to see if the skbuff and work share the same -* packet buffer. -*/ -if (likely (packet_not_copied)) { -/* -* This buffer needs to be replaced, increment -* the number of buffers we need to free by -* one. -*/ -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE , -1 ); - -cvmx_fpa_free (work,CVMX_FPA_WQE_POOL ,1 ); - }else { -cvm_oct_free_work (work); - } - } -/* Restore the original POW group mask */ -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) { -cvmx_write_csr (CVMX_SSO_PPX_GRP_MSK (coreid), old_group_mask); -cvmx_read_csr (CVMX_SSO_PPX_GRP_MSK (coreid));/* Flush */ - }else { -cvmx_write_csr (CVMX_POW_PP_GRP_MSKX (coreid), old_group_mask); - } - -if (USE_ASYNC_IOBDMA ) { -/* Restore the scratch area */ -cvmx_scratch_write64 (CVMX_SCR_SCRATCH , old_scratch); - } -cvm_oct_rx_refill_pool (0 ); - -return rx_count; -} - -/** -* cvm_oct_napi_poll - the NAPI poll function. -* @napi: The NAPI instance. -* @budget: Maximum number of packets to receive. -* -* Returns the number of packets processed. -*/ -static int cvm_oct_napi_poll (struct napi_struct *napi,int budget) -{ - struct oct_rx_group *rx_group = container_of(napi, struct oct_rx_group, - napi); -int rx_count; - - rx_count =cvm_oct_poll (rx_group, budget); - -if (rx_count < budget) { -/* No more work */ -napi_complete_done (napi, rx_count); -enable_irq (rx_group->irq); - } -return rx_count; -} - -#ifdef CONFIG_NET_POLL_CONTROLLER -/** -* cvm_oct_poll_controller - poll for receive packets -* device. -* -* @dev: Device to poll. Unused -*/ -void cvm_oct_poll_controller (struct net_device *dev) -{ -int i; - -if (!atomic_read (&oct_rx_ready)) -return ; - -for (i =0 ; i <ARRAY_SIZE (oct_rx_group); i++) { -if (!(pow_receive_groups &BIT (i))) -continue ; - -cvm_oct_poll (&oct_rx_group[i],16 ); - } -} -#endif - -void cvm_oct_rx_initialize (void ) -{ -int i; -struct net_device *dev_for_napi =NULL ; - -for (i =0 ; i <TOTAL_NUMBER_OF_PORTS ; i++) { -if (cvm_oct_device[i]) { - dev_for_napi = cvm_oct_device[i]; -break ; - } - } - -if (!dev_for_napi) -panic ("No net_devices were allocated." ); - -for (i =0 ; i <ARRAY_SIZE (oct_rx_group); i++) { -int ret; - -if (!(pow_receive_groups &BIT (i))) -continue ; - -netif_napi_add (dev_for_napi, &oct_rx_group[i].napi, - cvm_oct_napi_poll, rx_napi_weight); -napi_enable (&oct_rx_group[i].napi); - - oct_rx_group[i].irq =OCTEON_IRQ_WORKQ0 + i; - oct_rx_group[i].group = i; - -/* Register an IRQ handler to receive POW interrupts */ - ret =request_irq (oct_rx_group[i].irq, cvm_oct_do_interrupt,0 , -"Ethernet" , &oct_rx_group[i].napi); -if (ret) -panic ("Could not acquire Ethernet IRQ %d\n" , - oct_rx_group[i].irq); - -disable_irq_nosync (oct_rx_group[i].irq); - -/* Enable POW interrupt when our port has at least one packet */ -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) { -union cvmx_sso_wq_int_thrx int_thr; -union cvmx_pow_wq_int_pc int_pc; - - int_thr.u64 =0 ; - int_thr.s.tc_en =1 ; - int_thr.s.tc_thr =1 ; -cvmx_write_csr (CVMX_SSO_WQ_INT_THRX (i), int_thr.u64); - - int_pc.u64 =0 ; - int_pc.s.pc_thr =5 ; -cvmx_write_csr (CVMX_SSO_WQ_INT_PC , int_pc.u64); - }else { -union cvmx_pow_wq_int_thrx int_thr; -union cvmx_pow_wq_int_pc int_pc; - - int_thr.u64 =0 ; - int_thr.s.tc_en =1 ; - int_thr.s.tc_thr =1 ; -cvmx_write_csr (CVMX_POW_WQ_INT_THRX (i), int_thr.u64); - - int_pc.u64 =0 ; - int_pc.s.pc_thr =5 ; -cvmx_write_csr (CVMX_POW_WQ_INT_PC , int_pc.u64); - } - -/* Schedule NAPI now. This will indirectly enable the -* interrupt. -*/ -napi_schedule (&oct_rx_group[i].napi); - } -atomic_inc (&oct_rx_ready); -} - -void cvm_oct_rx_shutdown (void ) -{ -int i; - -for (i =0 ; i <ARRAY_SIZE (oct_rx_group); i++) { -if (!(pow_receive_groups &BIT (i))) -continue ; - -/* Disable POW interrupt */ -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) -cvmx_write_csr (CVMX_SSO_WQ_INT_THRX (i),0 ); -else -cvmx_write_csr (CVMX_POW_WQ_INT_THRX (i),0 ); - -/* Free the interrupt handler */ -free_irq (oct_rx_group[i].irq, cvm_oct_device); - -netif_napi_del (&oct_rx_group[i].napi); - } -}drivers/staging/octeon/ethernet-rx.h deleted +0
-31@@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -void cvm_oct_poll_controller (struct net_device *dev); -void cvm_oct_rx_initialize (void ); -void cvm_oct_rx_shutdown (void ); - -static inline void cvm_oct_rx_refill_pool (int fill_threshold) -{ -int number_to_free; -int num_freed; -/* Refill the packet buffer pool */ - number_to_free = -cvmx_fau_fetch_and_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE ,0 ); - -if (number_to_free > fill_threshold) { -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE , - -number_to_free); - num_freed =cvm_oct_mem_fill_fpa (CVMX_FPA_PACKET_POOL , -CVMX_FPA_PACKET_POOL_SIZE , - number_to_free); -if (num_freed != number_to_free) { -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE , - number_to_free - num_freed); - } - } -}drivers/staging/octeon/ethernet-sgmii.c deleted +0
-30@@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/phy.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/ratelimit.h> -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-util.h" -#include "ethernet-mdio.h" - -int cvm_oct_sgmii_open (struct net_device *dev) -{ -return cvm_oct_common_open (dev, cvm_oct_link_poll); -} - -int cvm_oct_sgmii_init (struct net_device *dev) -{ -cvm_oct_common_init (dev); - -/* FIXME: Need autoneg logic */ -return 0 ; -}drivers/staging/octeon/ethernet-spi.c deleted +0
-226@@ -1,226 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/interrupt.h> -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-util.h" - -static int number_spi_ports; -static int need_retrain[2 ] = {0 ,0 }; - -static void cvm_oct_spxx_int_pr (union cvmx_spxx_int_reg spx_int_reg,int index) -{ -if (spx_int_reg.s.spf) -pr_err ("SPI%d: SRX Spi4 interface down\n" , index); -if (spx_int_reg.s.calerr) -pr_err ("SPI%d: SRX Spi4 Calendar table parity error\n" , index); -if (spx_int_reg.s.syncerr) -pr_err ("SPI%d: SRX Consecutive Spi4 DIP4 errors have exceeded SPX_ERR_CTL[ERRCNT]\n" , - index); -if (spx_int_reg.s.diperr) -pr_err ("SPI%d: SRX Spi4 DIP4 error\n" , index); -if (spx_int_reg.s.tpaovr) -pr_err ("SPI%d: SRX Selected port has hit TPA overflow\n" , - index); -if (spx_int_reg.s.rsverr) -pr_err ("SPI%d: SRX Spi4 reserved control word detected\n" , - index); -if (spx_int_reg.s.drwnng) -pr_err ("SPI%d: SRX Spi4 receive FIFO drowning/overflow\n" , - index); -if (spx_int_reg.s.clserr) -pr_err ("SPI%d: SRX Spi4 packet closed on non-16B alignment without EOP\n" , - index); -if (spx_int_reg.s.spiovr) -pr_err ("SPI%d: SRX Spi4 async FIFO overflow\n" , index); -if (spx_int_reg.s.abnorm) -pr_err ("SPI%d: SRX Abnormal packet termination (ERR bit)\n" , - index); -if (spx_int_reg.s.prtnxa) -pr_err ("SPI%d: SRX Port out of range\n" , index); -} - -static void cvm_oct_stxx_int_pr (union cvmx_stxx_int_reg stx_int_reg,int index) -{ -if (stx_int_reg.s.syncerr) -pr_err ("SPI%d: STX Interface encountered a fatal error\n" , - index); -if (stx_int_reg.s.frmerr) -pr_err ("SPI%d: STX FRMCNT has exceeded STX_DIP_CNT[MAXFRM]\n" , - index); -if (stx_int_reg.s.unxfrm) -pr_err ("SPI%d: STX Unexpected framing sequence\n" , index); -if (stx_int_reg.s.nosync) -pr_err ("SPI%d: STX ERRCNT has exceeded STX_DIP_CNT[MAXDIP]\n" , - index); -if (stx_int_reg.s.diperr) -pr_err ("SPI%d: STX DIP2 error on the Spi4 Status channel\n" , - index); -if (stx_int_reg.s.datovr) -pr_err ("SPI%d: STX Spi4 FIFO overflow error\n" , index); -if (stx_int_reg.s.ovrbst) -pr_err ("SPI%d: STX Transmit packet burst too big\n" , index); -if (stx_int_reg.s.calpar1) -pr_err ("SPI%d: STX Calendar Table Parity Error Bank%d\n" , - index,1 ); -if (stx_int_reg.s.calpar0) -pr_err ("SPI%d: STX Calendar Table Parity Error Bank%d\n" , - index,0 ); -} - -static irqreturn_t cvm_oct_spi_spx_int (int index) -{ -union cvmx_spxx_int_reg spx_int_reg; -union cvmx_stxx_int_reg stx_int_reg; - - spx_int_reg.u64 =cvmx_read_csr (CVMX_SPXX_INT_REG (index)); -cvmx_write_csr (CVMX_SPXX_INT_REG (index), spx_int_reg.u64); -if (!need_retrain[index]) { - spx_int_reg.u64 &=cvmx_read_csr (CVMX_SPXX_INT_MSK (index)); -cvm_oct_spxx_int_pr (spx_int_reg, index); - } - - stx_int_reg.u64 =cvmx_read_csr (CVMX_STXX_INT_REG (index)); -cvmx_write_csr (CVMX_STXX_INT_REG (index), stx_int_reg.u64); -if (!need_retrain[index]) { - stx_int_reg.u64 &=cvmx_read_csr (CVMX_STXX_INT_MSK (index)); -cvm_oct_stxx_int_pr (stx_int_reg, index); - } - -cvmx_write_csr (CVMX_SPXX_INT_MSK (index),0 ); -cvmx_write_csr (CVMX_STXX_INT_MSK (index),0 ); - need_retrain[index] =1 ; - -return IRQ_HANDLED ; -} - -static irqreturn_t cvm_oct_spi_rml_interrupt (int cpl,void *dev_id) -{ -irqreturn_t return_status =IRQ_NONE ; -union cvmx_npi_rsl_int_blocks rsl_int_blocks; - -/* Check and see if this interrupt was caused by the GMX block */ - rsl_int_blocks.u64 =cvmx_read_csr (CVMX_NPI_RSL_INT_BLOCKS ); -if (rsl_int_blocks.s.spx1)/* 19 - SPX1_INT_REG & STX1_INT_REG */ - return_status =cvm_oct_spi_spx_int (1 ); - -if (rsl_int_blocks.s.spx0)/* 18 - SPX0_INT_REG & STX0_INT_REG */ - return_status =cvm_oct_spi_spx_int (0 ); - -return return_status; -} - -static void cvm_oct_spi_enable_error_reporting (int interface) -{ -union cvmx_spxx_int_msk spxx_int_msk; -union cvmx_stxx_int_msk stxx_int_msk; - - spxx_int_msk.u64 =cvmx_read_csr (CVMX_SPXX_INT_MSK (interface)); - spxx_int_msk.s.calerr =1 ; - spxx_int_msk.s.syncerr =1 ; - spxx_int_msk.s.diperr =1 ; - spxx_int_msk.s.tpaovr =1 ; - spxx_int_msk.s.rsverr =1 ; - spxx_int_msk.s.drwnng =1 ; - spxx_int_msk.s.clserr =1 ; - spxx_int_msk.s.spiovr =1 ; - spxx_int_msk.s.abnorm =1 ; - spxx_int_msk.s.prtnxa =1 ; -cvmx_write_csr (CVMX_SPXX_INT_MSK (interface), spxx_int_msk.u64); - - stxx_int_msk.u64 =cvmx_read_csr (CVMX_STXX_INT_MSK (interface)); - stxx_int_msk.s.frmerr =1 ; - stxx_int_msk.s.unxfrm =1 ; - stxx_int_msk.s.nosync =1 ; - stxx_int_msk.s.diperr =1 ; - stxx_int_msk.s.datovr =1 ; - stxx_int_msk.s.ovrbst =1 ; - stxx_int_msk.s.calpar1 =1 ; - stxx_int_msk.s.calpar0 =1 ; -cvmx_write_csr (CVMX_STXX_INT_MSK (interface), stxx_int_msk.u64); -} - -static void cvm_oct_spi_poll (struct net_device *dev) -{ -static int spi4000_port; -struct octeon_ethernet *priv =netdev_priv (dev); -int interface; - -for (interface =0 ; interface <2 ; interface++) { -if ((priv->port == interface *16 ) && need_retrain[interface]) { -if (cvmx_spi_restart_interface - (interface,CVMX_SPI_MODE_DUPLEX ,10 ) ==0 ) { - need_retrain[interface] =0 ; -cvm_oct_spi_enable_error_reporting (interface); - } - } - -/* -* The SPI4000 TWSI interface is very slow. In order -* not to bring the system to a crawl, we only poll a -* single port every second. This means negotiation -* speed changes take up to 10 seconds, but at least -* we don't waste absurd amounts of time waiting for -* TWSI. -*/ -if (priv->port == spi4000_port) { -/* -* This function does nothing if it is called on an -* interface without a SPI4000. -*/ -cvmx_spi4000_check_speed (interface, priv->port); -/* -* Normal ordering increments. By decrementing -* we only match once per iteration. -*/ - spi4000_port--; -if (spi4000_port <0 ) - spi4000_port =10 ; - } - } -} - -int cvm_oct_spi_init (struct net_device *dev) -{ -int r; -struct octeon_ethernet *priv =netdev_priv (dev); - -if (number_spi_ports ==0 ) { - r =request_irq (OCTEON_IRQ_RML , cvm_oct_spi_rml_interrupt, -IRQF_SHARED ,"SPI" , &number_spi_ports); -if (r) -return r; - } - number_spi_ports++; - -if ((priv->port ==0 ) || (priv->port ==16 )) { -cvm_oct_spi_enable_error_reporting (INTERFACE (priv->port)); - priv->poll = cvm_oct_spi_poll; - } -cvm_oct_common_init (dev); -return 0 ; -} - -void cvm_oct_spi_uninit (struct net_device *dev) -{ -int interface; - -cvm_oct_common_uninit (dev); - number_spi_ports--; -if (number_spi_ports ==0 ) { -for (interface =0 ; interface <2 ; interface++) { -cvmx_write_csr (CVMX_SPXX_INT_MSK (interface),0 ); -cvmx_write_csr (CVMX_STXX_INT_MSK (interface),0 ); - } -free_irq (OCTEON_IRQ_RML , &number_spi_ports); - } -}drivers/staging/octeon/ethernet-tx.c deleted +0
-717@@ -1,717 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2010 Cavium Networks -*/ - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/ip.h> -#include <linux/ratelimit.h> -#include <linux/string.h> -#include <linux/interrupt.h> -#include <net/dst.h> -#ifdef CONFIG_XFRM -#include <linux/xfrm.h> -#include <net/xfrm.h> -#endif /* CONFIG_XFRM */ - -#include <linux/atomic.h> -#include <net/sch_generic.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-tx.h" -#include "ethernet-util.h" - -#define CVM_OCT_SKB_CB (skb) ((u64 *)((skb)->cb)) - -/* -* You can define GET_SKBUFF_QOS() to override how the skbuff output -* function determines which output queue is used. The default -* implementation always uses the base queue for the port. If, for -* example, you wanted to use the skb->priority field, define -* GET_SKBUFF_QOS as: #define GET_SKBUFF_QOS(skb) ((skb)->priority) -*/ -#ifndef GET_SKBUFF_QOS -#define GET_SKBUFF_QOS (skb) 0 -#endif - -static void cvm_oct_tx_do_cleanup (unsigned long arg); -static DECLARE_TASKLET(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup, 0); - -/* Maximum number of SKBs to try to free per xmit packet. */ -#define MAX_SKB_TO_FREE (MAX_OUT_QUEUE_DEPTH * 2) - -static inline int cvm_oct_adjust_skb_to_free (int skb_to_free,int fau) -{ -int undo; - - undo = skb_to_free >0 ?MAX_SKB_TO_FREE : skb_to_free + -MAX_SKB_TO_FREE ; -if (undo >0 ) -cvmx_fau_atomic_add32 (fau, -undo); - skb_to_free = -skb_to_free >MAX_SKB_TO_FREE ?MAX_SKB_TO_FREE : - -skb_to_free; -return skb_to_free; -} - -static void cvm_oct_kick_tx_poll_watchdog (void ) -{ -union cvmx_ciu_timx ciu_timx; - - ciu_timx.u64 =0 ; - ciu_timx.s.one_shot =1 ; - ciu_timx.s.len = cvm_oct_tx_poll_interval; -cvmx_write_csr (CVMX_CIU_TIMX (1 ), ciu_timx.u64); -} - -static void cvm_oct_free_tx_skbs (struct net_device *dev) -{ -int skb_to_free; -int qos, queues_per_port; -int total_freed =0 ; -int total_remaining =0 ; -unsigned long flags; -struct octeon_ethernet *priv =netdev_priv (dev); - - queues_per_port =cvmx_pko_get_num_queues (priv->port); -/* Drain any pending packets in the free list */ -for (qos =0 ; qos < queues_per_port; qos++) { -if (skb_queue_len (&priv->tx_free_list[qos]) ==0 ) -continue ; - skb_to_free =cvmx_fau_fetch_and_add32 (priv->fau + qos *4 , -MAX_SKB_TO_FREE ); - skb_to_free =cvm_oct_adjust_skb_to_free (skb_to_free, - priv->fau + qos *4 ); - total_freed += skb_to_free; -if (skb_to_free >0 ) { -struct sk_buff *to_free_list =NULL ; - -spin_lock_irqsave (&priv->tx_free_list[qos].lock, flags); -while (skb_to_free >0 ) { -struct sk_buff *t; - - t =__skb_dequeue (&priv->tx_free_list[qos]); - t->next = to_free_list; - to_free_list = t; - skb_to_free--; - } -spin_unlock_irqrestore (&priv->tx_free_list[qos].lock, - flags); -/* Do the actual freeing outside of the lock. */ -while (to_free_list) { -struct sk_buff *t = to_free_list; - - to_free_list = to_free_list->next; -dev_kfree_skb_any (t); - } - } - total_remaining +=skb_queue_len (&priv->tx_free_list[qos]); - } -if (total_remaining <MAX_OUT_QUEUE_DEPTH &&netif_queue_stopped (dev)) -netif_wake_queue (dev); -if (total_remaining) -cvm_oct_kick_tx_poll_watchdog (); -} - -/** -* cvm_oct_xmit - transmit a packet -* @skb: Packet to send -* @dev: Device info structure -* -* Returns Always returns NETDEV_TX_OK -*/ -int cvm_oct_xmit (struct sk_buff *skb,struct net_device *dev) -{ -union cvmx_pko_command_word0 pko_command; -union cvmx_buf_ptr hw_buffer; -u64 old_scratch; -u64 old_scratch2; -int qos; -int i; -enum {QUEUE_CORE ,QUEUE_HW ,QUEUE_DROP } queue_type; -struct octeon_ethernet *priv =netdev_priv (dev); -struct sk_buff *to_free_list; -int skb_to_free; -int buffers_to_free; -u32 total_to_clean; -unsigned long flags; -#if REUSE_SKBUFFS_WITHOUT_FREE -unsigned char *fpa_head; -#endif - -/* -* Prefetch the private data structure. It is larger than the -* one cache line. -*/ -prefetch (priv); - -/* -* The check on CVMX_PKO_QUEUES_PER_PORT_* is designed to -* completely remove "qos" in the event neither interface -* supports multiple queues per port. -*/ -if ((CVMX_PKO_QUEUES_PER_PORT_INTERFACE0 >1 ) || - (CVMX_PKO_QUEUES_PER_PORT_INTERFACE1 >1 )) { - qos =GET_SKBUFF_QOS (skb); -if (qos <=0 ) - qos =0 ; -else if (qos >=cvmx_pko_get_num_queues (priv->port)) - qos =0 ; - }else { - qos =0 ; - } - -if (USE_ASYNC_IOBDMA ) { -/* Save scratch in case userspace is using it */ -CVMX_SYNCIOBDMA ; - old_scratch =cvmx_scratch_read64 (CVMX_SCR_SCRATCH ); - old_scratch2 =cvmx_scratch_read64 (CVMX_SCR_SCRATCH +8 ); - -/* -* Fetch and increment the number of packets to be -* freed. -*/ -cvmx_fau_async_fetch_and_add32 (CVMX_SCR_SCRATCH +8 , -FAU_NUM_PACKET_BUFFERS_TO_FREE , -0 ); -cvmx_fau_async_fetch_and_add32 (CVMX_SCR_SCRATCH , - priv->fau + qos *4 , -MAX_SKB_TO_FREE ); - } - -/* -* We have space for 6 segment pointers, If there will be more -* than that, we must linearize. -*/ -if (unlikely (skb_shinfo (skb)->nr_frags >5 )) { -if (unlikely (__skb_linearize (skb))) { - queue_type =QUEUE_DROP ; -if (USE_ASYNC_IOBDMA ) { -/* -* Get the number of skbuffs in use -* by the hardware -*/ -CVMX_SYNCIOBDMA ; - skb_to_free = -cvmx_scratch_read64 (CVMX_SCR_SCRATCH ); - }else { -/* -* Get the number of skbuffs in use -* by the hardware -*/ - skb_to_free = -cvmx_fau_fetch_and_add32 (priv->fau + - qos *4 , -MAX_SKB_TO_FREE ); - } - skb_to_free =cvm_oct_adjust_skb_to_free (skb_to_free, - priv->fau + - qos *4 ); -spin_lock_irqsave (&priv->tx_free_list[qos].lock, flags); - goto skip_xmit; - } - } - -/* -* The CN3XXX series of parts has an errata (GMX-401) which -* causes the GMX block to hang if a collision occurs towards -* the end of a <68 byte packet. As a workaround for this, we -* pad packets to be 68 bytes whenever we are in half duplex -* mode. We don't handle the case of having a small packet but -* no room to add the padding. The kernel should always give -* us at least a cache line -*/ -if ((skb->len <64 ) &&OCTEON_IS_MODEL (OCTEON_CN3XXX )) { -union cvmx_gmxx_prtx_cfg gmx_prt_cfg; -int interface =INTERFACE (priv->port); -int index =INDEX (priv->port); - -if (interface <2 ) { -/* We only need to pad packet in half duplex mode */ - gmx_prt_cfg.u64 = -cvmx_read_csr (CVMX_GMXX_PRTX_CFG (index, interface)); -if (gmx_prt_cfg.s.duplex ==0 ) { -int add_bytes =64 - skb->len; - -if ((skb_tail_pointer (skb) + add_bytes) <= -skb_end_pointer (skb)) -__skb_put_zero (skb, add_bytes); - } - } - } - -/* Build the PKO command */ - pko_command.u64 =0 ; -#ifdef __LITTLE_ENDIAN - pko_command.s.le =1 ; -#endif - pko_command.s.n2 =1 ;/* Don't pollute L2 with the outgoing packet */ - pko_command.s.segs =1 ; - pko_command.s.total_bytes = skb->len; - pko_command.s.size0 =CVMX_FAU_OP_SIZE_32 ; - pko_command.s.subone0 =1 ; - - pko_command.s.dontfree =1 ; - -/* Build the PKO buffer pointer */ - hw_buffer.u64 =0 ; -if (skb_shinfo (skb)->nr_frags ==0 ) { - hw_buffer.s.addr =XKPHYS_TO_PHYS ((uintptr_t )skb->data); - hw_buffer.s.pool =0 ; - hw_buffer.s.size = skb->len; - }else { - hw_buffer.s.addr =XKPHYS_TO_PHYS ((uintptr_t )skb->data); - hw_buffer.s.pool =0 ; - hw_buffer.s.size =skb_headlen (skb); -CVM_OCT_SKB_CB (skb)[0 ] = hw_buffer.u64; -for (i =0 ; i <skb_shinfo (skb)->nr_frags; i++) { -skb_frag_t *fs =skb_shinfo (skb)->frags + i; - - hw_buffer.s.addr = -XKPHYS_TO_PHYS ((uintptr_t )skb_frag_address (fs)); - hw_buffer.s.size =skb_frag_size (fs); -CVM_OCT_SKB_CB (skb)[i +1 ] = hw_buffer.u64; - } - hw_buffer.s.addr = -XKPHYS_TO_PHYS ((uintptr_t )CVM_OCT_SKB_CB (skb)); - hw_buffer.s.size =skb_shinfo (skb)->nr_frags +1 ; - pko_command.s.segs =skb_shinfo (skb)->nr_frags +1 ; - pko_command.s.gather =1 ; - goto dont_put_skbuff_in_hw; - } - -/* -* See if we can put this skb in the FPA pool. Any strange -* behavior from the Linux networking stack will most likely -* be caused by a bug in the following code. If some field is -* in use by the network stack and gets carried over when a -* buffer is reused, bad things may happen. If in doubt and -* you dont need the absolute best performance, disable the -* define REUSE_SKBUFFS_WITHOUT_FREE. The reuse of buffers has -* shown a 25% increase in performance under some loads. -*/ -#if REUSE_SKBUFFS_WITHOUT_FREE - fpa_head = skb->head +256 - ((unsigned long )skb->head &0x7f ); -if (unlikely (skb->data < fpa_head)) { -/* TX buffer beginning can't meet FPA alignment constraints */ - goto dont_put_skbuff_in_hw; - } -if (unlikely - ((skb_end_pointer (skb) - fpa_head) <CVMX_FPA_PACKET_POOL_SIZE )) { -/* TX buffer isn't large enough for the FPA */ - goto dont_put_skbuff_in_hw; - } -if (unlikely (skb_shared (skb))) { -/* TX buffer sharing data with someone else */ - goto dont_put_skbuff_in_hw; - } -if (unlikely (skb_cloned (skb))) { -/* TX buffer has been cloned */ - goto dont_put_skbuff_in_hw; - } -if (unlikely (skb_header_cloned (skb))) { -/* TX buffer header has been cloned */ - goto dont_put_skbuff_in_hw; - } -if (unlikely (skb->destructor)) { -/* TX buffer has a destructor */ - goto dont_put_skbuff_in_hw; - } -if (unlikely (skb_shinfo (skb)->nr_frags)) { -/* TX buffer has fragments */ - goto dont_put_skbuff_in_hw; - } -if (unlikely - (skb->truesize != -sizeof (*skb) +skb_end_offset (skb))) { -/* TX buffer truesize has been changed */ - goto dont_put_skbuff_in_hw; - } - -/* -* We can use this buffer in the FPA. We don't need the FAU -* update anymore -*/ - pko_command.s.dontfree =0 ; - - hw_buffer.s.back = ((unsigned long )skb->data >>7 ) - - ((unsigned long )fpa_head >>7 ); - - *(struct sk_buff **)(fpa_head -sizeof (void *)) = skb; - -/* -* The skbuff will be reused without ever being freed. We must -* cleanup a bunch of core things. -*/ -dst_release (skb_dst (skb)); -skb_dst_set (skb,NULL ); -skb_ext_reset (skb); -nf_reset_ct (skb); - -#ifdef CONFIG_NET_SCHED - skb->tc_index =0 ; -skb_reset_tc (skb); -#endif /* CONFIG_NET_SCHED */ -#endif /* REUSE_SKBUFFS_WITHOUT_FREE */ - -dont_put_skbuff_in_hw: - -/* Check if we can use the hardware checksumming */ -if ((skb->protocol ==htons (ETH_P_IP )) && - (ip_hdr (skb)->version ==4 ) && - (ip_hdr (skb)->ihl ==5 ) && - ((ip_hdr (skb)->frag_off ==0 ) || - (ip_hdr (skb)->frag_off ==htons (1 <<14 ))) && - ((ip_hdr (skb)->protocol ==IPPROTO_TCP ) || - (ip_hdr (skb)->protocol ==IPPROTO_UDP ))) { -/* Use hardware checksum calc */ - pko_command.s.ipoffp1 =skb_network_offset (skb) +1 ; - } - -if (USE_ASYNC_IOBDMA ) { -/* Get the number of skbuffs in use by the hardware */ -CVMX_SYNCIOBDMA ; - skb_to_free =cvmx_scratch_read64 (CVMX_SCR_SCRATCH ); - buffers_to_free =cvmx_scratch_read64 (CVMX_SCR_SCRATCH +8 ); - }else { -/* Get the number of skbuffs in use by the hardware */ - skb_to_free =cvmx_fau_fetch_and_add32 (priv->fau + qos *4 , -MAX_SKB_TO_FREE ); - buffers_to_free = -cvmx_fau_fetch_and_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE ,0 ); - } - - skb_to_free =cvm_oct_adjust_skb_to_free (skb_to_free, - priv->fau + qos *4 ); - -/* -* If we're sending faster than the receive can free them then -* don't do the HW free. -*/ -if ((buffers_to_free <-100 ) && !pko_command.s.dontfree) - pko_command.s.dontfree =1 ; - -if (pko_command.s.dontfree) { - queue_type =QUEUE_CORE ; - pko_command.s.reg0 = priv->fau + qos *4 ; - }else { - queue_type =QUEUE_HW ; - } -if (USE_ASYNC_IOBDMA ) -cvmx_fau_async_fetch_and_add32 (CVMX_SCR_SCRATCH , -FAU_TOTAL_TX_TO_CLEAN ,1 ); - -spin_lock_irqsave (&priv->tx_free_list[qos].lock, flags); - -/* Drop this packet if we have too many already queued to the HW */ -if (unlikely (skb_queue_len (&priv->tx_free_list[qos]) >= -MAX_OUT_QUEUE_DEPTH )) { -if (dev->tx_queue_len !=0 ) { -/* Drop the lock when notifying the core. */ -spin_unlock_irqrestore (&priv->tx_free_list[qos].lock, - flags); -netif_stop_queue (dev); -spin_lock_irqsave (&priv->tx_free_list[qos].lock, - flags); - }else { -/* If not using normal queueing. */ - queue_type =QUEUE_DROP ; - goto skip_xmit; - } - } - -cvmx_pko_send_packet_prepare (priv->port, priv->queue + qos, -CVMX_PKO_LOCK_NONE ); - -/* Send the packet to the output queue */ -if (unlikely (cvmx_pko_send_packet_finish (priv->port, - priv->queue + qos, - pko_command, hw_buffer, -CVMX_PKO_LOCK_NONE ))) { -printk_ratelimited ("%s: Failed to send the packet\n" , - dev->name); - queue_type =QUEUE_DROP ; - } -skip_xmit: - to_free_list =NULL ; - -switch (queue_type) { -case QUEUE_DROP : - skb->next = to_free_list; - to_free_list = skb; - dev->stats.tx_dropped++; -break ; -case QUEUE_HW : -cvmx_fau_atomic_add32 (FAU_NUM_PACKET_BUFFERS_TO_FREE ,-1 ); -break ; -case QUEUE_CORE : -__skb_queue_tail (&priv->tx_free_list[qos], skb); -break ; -default : -BUG (); - } - -while (skb_to_free >0 ) { -struct sk_buff *t =__skb_dequeue (&priv->tx_free_list[qos]); - - t->next = to_free_list; - to_free_list = t; - skb_to_free--; - } - -spin_unlock_irqrestore (&priv->tx_free_list[qos].lock, flags); - -/* Do the actual freeing outside of the lock. */ -while (to_free_list) { -struct sk_buff *t = to_free_list; - - to_free_list = to_free_list->next; -dev_kfree_skb_any (t); - } - -if (USE_ASYNC_IOBDMA ) { -CVMX_SYNCIOBDMA ; - total_to_clean =cvmx_scratch_read64 (CVMX_SCR_SCRATCH ); -/* Restore the scratch area */ -cvmx_scratch_write64 (CVMX_SCR_SCRATCH , old_scratch); -cvmx_scratch_write64 (CVMX_SCR_SCRATCH +8 , old_scratch2); - }else { - total_to_clean = -cvmx_fau_fetch_and_add32 (FAU_TOTAL_TX_TO_CLEAN ,1 ); - } - -if (total_to_clean &0x3ff ) { -/* -* Schedule the cleanup tasklet every 1024 packets for -* the pathological case of high traffic on one port -* delaying clean up of packets on a different port -* that is blocked waiting for the cleanup. -*/ -tasklet_schedule (&cvm_oct_tx_cleanup_tasklet); - } - -cvm_oct_kick_tx_poll_watchdog (); - -return NETDEV_TX_OK ; -} - -/** -* cvm_oct_xmit_pow - transmit a packet to the POW -* @skb: Packet to send -* @dev: Device info structure - -* Returns Always returns zero -*/ -int cvm_oct_xmit_pow (struct sk_buff *skb,struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -void *packet_buffer; -void *copy_location; - -/* Get a work queue entry */ -struct cvmx_wqe *work =cvmx_fpa_alloc (CVMX_FPA_WQE_POOL ); - -if (unlikely (!work)) { -printk_ratelimited ("%s: Failed to allocate a work queue entry\n" , - dev->name); - dev->stats.tx_dropped++; -dev_kfree_skb_any (skb); -return 0 ; - } - -/* Get a packet buffer */ - packet_buffer =cvmx_fpa_alloc (CVMX_FPA_PACKET_POOL ); -if (unlikely (!packet_buffer)) { -printk_ratelimited ("%s: Failed to allocate a packet buffer\n" , - dev->name); -cvmx_fpa_free (work,CVMX_FPA_WQE_POOL ,1 ); - dev->stats.tx_dropped++; -dev_kfree_skb_any (skb); -return 0 ; - } - -/* -* Calculate where we need to copy the data to. We need to -* leave 8 bytes for a next pointer (unused). We also need to -* include any configure skip. Then we need to align the IP -* packet src and dest into the same 64bit word. The below -* calculation may add a little extra, but that doesn't -* hurt. -*/ - copy_location = packet_buffer +sizeof (u64); - copy_location += ((CVMX_HELPER_FIRST_MBUFF_SKIP +7 ) &0xfff8 ) +6 ; - -/* -* We have to copy the packet since whoever processes this -* packet will free it to a hardware pool. We can't use the -* trick of counting outstanding packets like in -* cvm_oct_xmit. -*/ -memcpy (copy_location, skb->data, skb->len); - -/* -* Fill in some of the work queue fields. We may need to add -* more if the software at the other end needs them. -*/ -if (!OCTEON_IS_MODEL (OCTEON_CN68XX )) - work->word0.pip.cn38xx.hw_chksum = skb->csum; - work->word1.len = skb->len; -cvmx_wqe_set_port (work, priv->port); -cvmx_wqe_set_qos (work, priv->port &0x7 ); -cvmx_wqe_set_grp (work, pow_send_group); - work->word1.tag_type =CVMX_HELPER_INPUT_TAG_TYPE ; - work->word1.tag = pow_send_group;/* FIXME */ -/* Default to zero. Sets of zero later are commented out */ - work->word2.u64 =0 ; - work->word2.s.bufs =1 ; - work->packet_ptr.u64 =0 ; - work->packet_ptr.s.addr =cvmx_ptr_to_phys (copy_location); - work->packet_ptr.s.pool =CVMX_FPA_PACKET_POOL ; - work->packet_ptr.s.size =CVMX_FPA_PACKET_POOL_SIZE ; - work->packet_ptr.s.back = (copy_location - packet_buffer) >>7 ; - -if (skb->protocol ==htons (ETH_P_IP )) { - work->word2.s.ip_offset =14 ; -#if 0 - work->word2.s.vlan_valid =0 ;/* FIXME */ - work->word2.s.vlan_cfi =0 ;/* FIXME */ - work->word2.s.vlan_id =0 ;/* FIXME */ - work->word2.s.dec_ipcomp =0 ;/* FIXME */ -#endif - work->word2.s.tcp_or_udp = - (ip_hdr (skb)->protocol ==IPPROTO_TCP ) || - (ip_hdr (skb)->protocol ==IPPROTO_UDP ); -#if 0 -/* FIXME */ - work->word2.s.dec_ipsec =0 ; -/* We only support IPv4 right now */ - work->word2.s.is_v6 =0 ; -/* Hardware would set to zero */ - work->word2.s.software =0 ; -/* No error, packet is internal */ - work->word2.s.L4_error =0 ; -#endif - work->word2.s.is_frag = !((ip_hdr (skb)->frag_off ==0 ) || - (ip_hdr (skb)->frag_off == -cpu_to_be16 (1 <<14 ))); -#if 0 -/* Assume Linux is sending a good packet */ - work->word2.s.IP_exc =0 ; -#endif - work->word2.s.is_bcast = (skb->pkt_type ==PACKET_BROADCAST ); - work->word2.s.is_mcast = (skb->pkt_type ==PACKET_MULTICAST ); -#if 0 -/* This is an IP packet */ - work->word2.s.not_IP =0 ; -/* No error, packet is internal */ - work->word2.s.rcv_error =0 ; -/* No error, packet is internal */ - work->word2.s.err_code =0 ; -#endif - -/* -* When copying the data, include 4 bytes of the -* ethernet header to align the same way hardware -* does. -*/ -memcpy (work->packet_data, skb->data +10 , -sizeof (work->packet_data)); - }else { -#if 0 - work->word2.snoip.vlan_valid =0 ;/* FIXME */ - work->word2.snoip.vlan_cfi =0 ;/* FIXME */ - work->word2.snoip.vlan_id =0 ;/* FIXME */ - work->word2.snoip.software =0 ;/* Hardware would set to zero */ -#endif - work->word2.snoip.is_rarp = skb->protocol ==htons (ETH_P_RARP ); - work->word2.snoip.is_arp = skb->protocol ==htons (ETH_P_ARP ); - work->word2.snoip.is_bcast = - (skb->pkt_type ==PACKET_BROADCAST ); - work->word2.snoip.is_mcast = - (skb->pkt_type ==PACKET_MULTICAST ); - work->word2.snoip.not_IP =1 ;/* IP was done up above */ -#if 0 -/* No error, packet is internal */ - work->word2.snoip.rcv_error =0 ; -/* No error, packet is internal */ - work->word2.snoip.err_code =0 ; -#endif -memcpy (work->packet_data, skb->data,sizeof (work->packet_data)); - } - -/* Submit the packet to the POW */ -cvmx_pow_work_submit (work, work->word1.tag, work->word1.tag_type, -cvmx_wqe_get_qos (work),cvmx_wqe_get_grp (work)); - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; -dev_consume_skb_any (skb); -return 0 ; -} - -/** -* cvm_oct_tx_shutdown_dev - free all skb that are currently queued for TX. -* @dev: Device being shutdown -* -*/ -void cvm_oct_tx_shutdown_dev (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -unsigned long flags; -int qos; - -for (qos =0 ; qos <16 ; qos++) { -spin_lock_irqsave (&priv->tx_free_list[qos].lock, flags); -while (skb_queue_len (&priv->tx_free_list[qos])) -dev_kfree_skb_any (__skb_dequeue - (&priv->tx_free_list[qos])); -spin_unlock_irqrestore (&priv->tx_free_list[qos].lock, flags); - } -} - -static void cvm_oct_tx_do_cleanup (unsigned long arg) -{ -int port; - -for (port =0 ; port <TOTAL_NUMBER_OF_PORTS ; port++) { -if (cvm_oct_device[port]) { -struct net_device *dev = cvm_oct_device[port]; - -cvm_oct_free_tx_skbs (dev); - } - } -} - -static irqreturn_t cvm_oct_tx_cleanup_watchdog (int cpl,void *dev_id) -{ -/* Disable the interrupt. */ -cvmx_write_csr (CVMX_CIU_TIMX (1 ),0 ); -/* Do the work in the tasklet. */ -tasklet_schedule (&cvm_oct_tx_cleanup_tasklet); -return IRQ_HANDLED ; -} - -void cvm_oct_tx_initialize (void ) -{ -int i; - -/* Disable the interrupt. */ -cvmx_write_csr (CVMX_CIU_TIMX (1 ),0 ); -/* Register an IRQ handler to receive CIU_TIMX(1) interrupts */ - i =request_irq (OCTEON_IRQ_TIMER1 , - cvm_oct_tx_cleanup_watchdog,0 , -"Ethernet" , cvm_oct_device); - -if (i) -panic ("Could not acquire Ethernet IRQ %d\n" ,OCTEON_IRQ_TIMER1 ); -} - -void cvm_oct_tx_shutdown (void ) -{ -/* Free the interrupt handler */ -free_irq (OCTEON_IRQ_TIMER1 , cvm_oct_device); -}drivers/staging/octeon/ethernet-tx.h deleted +0
-14@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -int cvm_oct_xmit (struct sk_buff *skb,struct net_device *dev); -int cvm_oct_xmit_pow (struct sk_buff *skb,struct net_device *dev); -int cvm_oct_transmit_qos (struct net_device *dev,void *work_queue_entry, -int do_free,int qos); -void cvm_oct_tx_initialize (void ); -void cvm_oct_tx_shutdown (void ); -void cvm_oct_tx_shutdown_dev (struct net_device *dev);drivers/staging/octeon/ethernet-util.h deleted +0
-47@@ -1,47 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -/** -* cvm_oct_get_buffer_ptr - convert packet data address to pointer -* @packet_ptr: Packet data hardware address -* -* Returns Packet buffer pointer -*/ -static inline void *cvm_oct_get_buffer_ptr (union cvmx_buf_ptr packet_ptr) -{ -return cvmx_phys_to_ptr (((packet_ptr.s.addr >>7 ) - packet_ptr.s.back) - <<7 ); -} - -/** -* INTERFACE - convert IPD port to logical interface -* @ipd_port: Port to check -* -* Returns Logical interface -*/ -static inline int INTERFACE (int ipd_port) -{ -int interface; - -if (ipd_port ==CVMX_PIP_NUM_INPUT_PORTS ) -return 10 ; - interface =cvmx_helper_get_interface_num (ipd_port); -if (interface >=0 ) -return interface; -panic ("Illegal ipd_port %d passed to %s\n" , ipd_port, __func__); -} - -/** -* INDEX - convert IPD/PKO port number to the port's interface index -* @ipd_port: Port to check -* -* Returns Index into interface port list -*/ -static inline int INDEX (int ipd_port) -{ -return cvmx_helper_get_interface_index_num (ipd_port); -}drivers/staging/octeon/ethernet.c deleted +0
-992@@ -1,992 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* -* This file is based on code from OCTEON SDK by Cavium Networks. -* -* Copyright (c) 2003-2007 Cavium Networks -*/ - -#include <linux/platform_device.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/netdevice.h> -#include <linux/etherdevice.h> -#include <linux/phy.h> -#include <linux/slab.h> -#include <linux/interrupt.h> -#include <linux/of_net.h> -#include <linux/if_ether.h> -#include <linux/if_vlan.h> - -#include <net/dst.h> - -#include "octeon-ethernet.h" -#include "ethernet-defines.h" -#include "ethernet-mem.h" -#include "ethernet-rx.h" -#include "ethernet-tx.h" -#include "ethernet-mdio.h" -#include "ethernet-util.h" - -#define OCTEON_MAX_MTU 65392 - -static int num_packet_buffers =1024 ; -module_param (num_packet_buffers, int,0444 ); -MODULE_PARM_DESC (num_packet_buffers,"\n" -"\tNumber of packet buffers to allocate and store in the\n" -"\tFPA. By default, 1024 packet buffers are used.\n" ); - -static int pow_receive_group =15 ; -module_param (pow_receive_group, int,0444 ); -MODULE_PARM_DESC (pow_receive_group,"\n" -"\tPOW group to receive packets from. All ethernet hardware\n" -"\twill be configured to send incoming packets to this POW\n" -"\tgroup. Also any other software can submit packets to this\n" -"\tgroup for the kernel to process." ); - -static int receive_group_order; -module_param (receive_group_order, int,0444 ); -MODULE_PARM_DESC (receive_group_order,"\n" -"\tOrder (0..4) of receive groups to take into use. Ethernet hardware\n" -"\twill be configured to send incoming packets to multiple POW\n" -"\tgroups. pow_receive_group parameter is ignored when multiple\n" -"\tgroups are taken into use and groups are allocated starting\n" -"\tfrom 0. By default, a single group is used.\n" ); - -int pow_send_group =-1 ; -module_param (pow_send_group, int,0644 ); -MODULE_PARM_DESC (pow_send_group,"\n" -"\tPOW group to send packets to other software on. This\n" -"\tcontrols the creation of the virtual device pow0.\n" -"\talways_use_pow also depends on this value." ); - -int always_use_pow; -module_param (always_use_pow, int,0444 ); -MODULE_PARM_DESC (always_use_pow,"\n" -"\tWhen set, always send to the pow group. This will cause\n" -"\tpackets sent to real ethernet devices to be sent to the\n" -"\tPOW group instead of the hardware. Unless some other\n" -"\tapplication changes the config, packets will still be\n" -"\treceived from the low level hardware. Use this option\n" -"\tto allow a CVMX app to intercept all packets from the\n" -"\tlinux kernel. You must specify pow_send_group along with\n" -"\tthis option." ); - -char pow_send_list[128 ] ="" ; -module_param_string (pow_send_list, pow_send_list,sizeof (pow_send_list),0444 ); -MODULE_PARM_DESC (pow_send_list,"\n" -"\tComma separated list of ethernet devices that should use the\n" -"\tPOW for transmit instead of the actual ethernet hardware. This\n" -"\tis a per port version of always_use_pow. always_use_pow takes\n" -"\tprecedence over this list. For example, setting this to\n" -"\t\"eth2,spi3,spi7\" would cause these three devices to transmit\n" -"\tusing the pow_send_group." ); - -int rx_napi_weight =32 ; -module_param (rx_napi_weight, int,0444 ); -MODULE_PARM_DESC (rx_napi_weight,"The NAPI WEIGHT parameter." ); - -/* Mask indicating which receive groups are in use. */ -int pow_receive_groups; - -/* -* cvm_oct_poll_queue_stopping - flag to indicate polling should stop. -* -* Set to one right before cvm_oct_poll_queue is destroyed. -*/ -atomic_t cvm_oct_poll_queue_stopping =ATOMIC_INIT (0 ); - -/* -* Array of every ethernet device owned by this driver indexed by -* the ipd input port number. -*/ -struct net_device *cvm_oct_device[TOTAL_NUMBER_OF_PORTS ]; - -u64 cvm_oct_tx_poll_interval; - -static void cvm_oct_rx_refill_worker (struct work_struct *work); -static DECLARE_DELAYED_WORK(cvm_oct_rx_refill_work, cvm_oct_rx_refill_worker); - -static void cvm_oct_rx_refill_worker (struct work_struct *work) -{ -/* -* FPA 0 may have been drained, try to refill it if we need -* more than num_packet_buffers / 2, otherwise normal receive -* processing will refill it. If it were drained, no packets -* could be received so cvm_oct_napi_poll would never be -* invoked to do the refill. -*/ -cvm_oct_rx_refill_pool (num_packet_buffers /2 ); - -if (!atomic_read (&cvm_oct_poll_queue_stopping)) -schedule_delayed_work (&cvm_oct_rx_refill_work,HZ ); -} - -static void cvm_oct_periodic_worker (struct work_struct *work) -{ -struct octeon_ethernet *priv =container_of (work, - struct octeon_ethernet, - port_periodic_work.work); - -if (priv->poll) - priv->poll (cvm_oct_device[priv->port]); - - cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats - (cvm_oct_device[priv->port]); - -if (!atomic_read (&cvm_oct_poll_queue_stopping)) -schedule_delayed_work (&priv->port_periodic_work,HZ ); -} - -static void cvm_oct_configure_common_hw (void ) -{ -/* Setup the FPA */ -cvmx_fpa_enable (); -cvm_oct_mem_fill_fpa (CVMX_FPA_PACKET_POOL ,CVMX_FPA_PACKET_POOL_SIZE , - num_packet_buffers); -cvm_oct_mem_fill_fpa (CVMX_FPA_WQE_POOL ,CVMX_FPA_WQE_POOL_SIZE , - num_packet_buffers); -if (CVMX_FPA_OUTPUT_BUFFER_POOL !=CVMX_FPA_PACKET_POOL ) -cvm_oct_mem_fill_fpa (CVMX_FPA_OUTPUT_BUFFER_POOL , -CVMX_FPA_OUTPUT_BUFFER_POOL_SIZE ,1024 ); - -#ifdef __LITTLE_ENDIAN - { -union cvmx_ipd_ctl_status ipd_ctl_status; - - ipd_ctl_status.u64 =cvmx_read_csr (CVMX_IPD_CTL_STATUS ); - ipd_ctl_status.s.pkt_lend =1 ; - ipd_ctl_status.s.wqe_lend =1 ; -cvmx_write_csr (CVMX_IPD_CTL_STATUS , ipd_ctl_status.u64); - } -#endif - -cvmx_helper_setup_red (num_packet_buffers /4 , num_packet_buffers /8 ); -} - -/** -* cvm_oct_free_work- Free a work queue entry -* -* @work_queue_entry: Work queue entry to free -* -* Returns Zero on success, Negative on failure. -*/ -int cvm_oct_free_work (void *work_queue_entry) -{ -struct cvmx_wqe *work = work_queue_entry; - -int segments = work->word2.s.bufs; -union cvmx_buf_ptr segment_ptr = work->packet_ptr; - -while (segments--) { -union cvmx_buf_ptr next_ptr = *(union cvmx_buf_ptr *) -cvmx_phys_to_ptr (segment_ptr.s.addr -8 ); -if (unlikely (!segment_ptr.s.i)) -cvmx_fpa_free (cvm_oct_get_buffer_ptr (segment_ptr), - segment_ptr.s.pool, -CVMX_FPA_PACKET_POOL_SIZE /128 ); - segment_ptr = next_ptr; - } -cvmx_fpa_free (work,CVMX_FPA_WQE_POOL ,1 ); - -return 0 ; -} -EXPORT_SYMBOL (cvm_oct_free_work); - -/** -* cvm_oct_common_get_stats - get the low level ethernet statistics -* @dev: Device to get the statistics from -* -* Returns Pointer to the statistics -*/ -static struct net_device_stats *cvm_oct_common_get_stats (struct net_device *dev) -{ -cvmx_pip_port_status_t rx_status; -cvmx_pko_port_status_t tx_status; -struct octeon_ethernet *priv =netdev_priv (dev); - -if (priv->port <CVMX_PIP_NUM_INPUT_PORTS ) { -if (octeon_is_simulation ()) { -/* The simulator doesn't support statistics */ -memset (&rx_status,0 ,sizeof (rx_status)); -memset (&tx_status,0 ,sizeof (tx_status)); - }else { -cvmx_pip_get_port_status (priv->port,1 , &rx_status); -cvmx_pko_get_port_status (priv->port,1 , &tx_status); - } - - dev->stats.rx_packets += rx_status.inb_packets; - dev->stats.tx_packets += tx_status.packets; - dev->stats.rx_bytes += rx_status.inb_octets; - dev->stats.tx_bytes += tx_status.octets; - dev->stats.multicast += rx_status.multicast_packets; - dev->stats.rx_crc_errors += rx_status.inb_errors; - dev->stats.rx_frame_errors += rx_status.fcs_align_err_packets; - dev->stats.rx_dropped += rx_status.dropped_packets; - } - -return &dev->stats; -} - -/** -* cvm_oct_common_change_mtu - change the link MTU -* @dev: Device to change -* @new_mtu: The new MTU -* -* Returns Zero on success -*/ -static int cvm_oct_common_change_mtu (struct net_device *dev,int new_mtu) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -int interface =INTERFACE (priv->port); -#if IS_ENABLED (CONFIG_VLAN_8021Q ) -int vlan_bytes =VLAN_HLEN ; -#else -int vlan_bytes =0 ; -#endif -int mtu_overhead =ETH_HLEN +ETH_FCS_LEN + vlan_bytes; - - dev->mtu = new_mtu; - -if ((interface <2 ) && - (cvmx_helper_interface_get_mode (interface) != -CVMX_HELPER_INTERFACE_MODE_SPI )) { -int index =INDEX (priv->port); -/* Add ethernet header and FCS, and VLAN if configured. */ -int max_packet = new_mtu + mtu_overhead; - -if (OCTEON_IS_MODEL (OCTEON_CN3XXX ) || -OCTEON_IS_MODEL (OCTEON_CN58XX )) { -/* Signal errors on packets larger than the MTU */ -cvmx_write_csr (CVMX_GMXX_RXX_FRM_MAX (index, interface), - max_packet); - }else { -/* -* Set the hardware to truncate packets larger -* than the MTU and smaller the 64 bytes. -*/ -union cvmx_pip_frm_len_chkx frm_len_chk; - - frm_len_chk.u64 =0 ; - frm_len_chk.s.minlen =VLAN_ETH_ZLEN ; - frm_len_chk.s.maxlen = max_packet; -cvmx_write_csr (CVMX_PIP_FRM_LEN_CHKX (interface), - frm_len_chk.u64); - } -/* -* Set the hardware to truncate packets larger than -* the MTU. The jabber register must be set to a -* multiple of 8 bytes, so round up. -*/ -cvmx_write_csr (CVMX_GMXX_RXX_JABBER (index, interface), - (max_packet +7 ) & ~7u ); - } -return 0 ; -} - -/** -* cvm_oct_common_set_multicast_list - set the multicast list -* @dev: Device to work on -*/ -static void cvm_oct_common_set_multicast_list (struct net_device *dev) -{ -union cvmx_gmxx_prtx_cfg gmx_cfg; -struct octeon_ethernet *priv =netdev_priv (dev); -int interface =INTERFACE (priv->port); - -if ((interface <2 ) && - (cvmx_helper_interface_get_mode (interface) != -CVMX_HELPER_INTERFACE_MODE_SPI )) { -union cvmx_gmxx_rxx_adr_ctl control; -int index =INDEX (priv->port); - - control.u64 =0 ; - control.s.bcst =1 ;/* Allow broadcast MAC addresses */ - -if (!netdev_mc_empty (dev) || (dev->flags &IFF_ALLMULTI ) || - (dev->flags &IFF_PROMISC )) -/* Force accept multicast packets */ - control.s.mcst =2 ; -else -/* Force reject multicast packets */ - control.s.mcst =1 ; - -if (dev->flags &IFF_PROMISC ) -/* -* Reject matches if promisc. Since CAM is -* shut off, should accept everything. -*/ - control.s.cam_mode =0 ; -else -/* Filter packets based on the CAM */ - control.s.cam_mode =1 ; - - gmx_cfg.u64 = -cvmx_read_csr (CVMX_GMXX_PRTX_CFG (index, interface)); -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), - gmx_cfg.u64 & ~1ull ); - -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CTL (index, interface), - control.u64); -if (dev->flags &IFF_PROMISC ) -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM_EN - (index, interface),0 ); -else -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM_EN - (index, interface),1 ); - -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), - gmx_cfg.u64); - } -} - -static int cvm_oct_set_mac_filter (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -union cvmx_gmxx_prtx_cfg gmx_cfg; -int interface =INTERFACE (priv->port); - -if ((interface <2 ) && - (cvmx_helper_interface_get_mode (interface) != -CVMX_HELPER_INTERFACE_MODE_SPI )) { -int i; -u8 *ptr = dev->dev_addr; -u64 mac =0 ; -int index =INDEX (priv->port); - -for (i =0 ; i <6 ; i++) - mac = (mac <<8 ) | (u64 )ptr[i]; - - gmx_cfg.u64 = -cvmx_read_csr (CVMX_GMXX_PRTX_CFG (index, interface)); -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), - gmx_cfg.u64 & ~1ull ); - -cvmx_write_csr (CVMX_GMXX_SMACX (index, interface), mac); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM0 (index, interface), - ptr[0 ]); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM1 (index, interface), - ptr[1 ]); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM2 (index, interface), - ptr[2 ]); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM3 (index, interface), - ptr[3 ]); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM4 (index, interface), - ptr[4 ]); -cvmx_write_csr (CVMX_GMXX_RXX_ADR_CAM5 (index, interface), - ptr[5 ]); -cvm_oct_common_set_multicast_list (dev); -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), - gmx_cfg.u64); - } -return 0 ; -} - -/** -* cvm_oct_common_set_mac_address - set the hardware MAC address for a device -* @dev: The device in question. -* @addr: Socket address. -* -* Returns Zero on success -*/ -static int cvm_oct_common_set_mac_address (struct net_device *dev,void *addr) -{ -int r =eth_mac_addr (dev, addr); - -if (r) -return r; -return cvm_oct_set_mac_filter (dev); -} - -/** -* cvm_oct_common_init - per network device initialization -* @dev: Device to initialize -* -* Returns Zero on success -*/ -int cvm_oct_common_init (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -const u8 *mac =NULL ; - -if (priv->of_node) - mac =of_get_mac_address (priv->of_node); - -if (!IS_ERR_OR_NULL (mac)) -ether_addr_copy (dev->dev_addr, mac); -else -eth_hw_addr_random (dev); - -/* -* Force the interface to use the POW send if always_use_pow -* was specified or it is in the pow send list. -*/ -if ((pow_send_group !=-1 ) && - (always_use_pow ||strstr (pow_send_list, dev->name))) - priv->queue =-1 ; - -if (priv->queue !=-1 ) - dev->features |=NETIF_F_SG |NETIF_F_IP_CSUM ; - -/* We do our own locking, Linux doesn't need to */ - dev->features |=NETIF_F_LLTX ; - dev->ethtool_ops = &cvm_oct_ethtool_ops; - -cvm_oct_set_mac_filter (dev); -dev_set_mtu (dev, dev->mtu); - -/* -* Zero out stats for port so we won't mistakenly show -* counters from the bootloader. -*/ -memset (dev->netdev_ops->ndo_get_stats (dev),0 , -sizeof (struct net_device_stats )); - -if (dev->netdev_ops->ndo_stop) - dev->netdev_ops->ndo_stop (dev); - -return 0 ; -} - -void cvm_oct_common_uninit (struct net_device *dev) -{ -if (dev->phydev) -phy_disconnect (dev->phydev); -} - -int cvm_oct_common_open (struct net_device *dev, -void (*link_poll)(struct net_device *)) -{ -union cvmx_gmxx_prtx_cfg gmx_cfg; -struct octeon_ethernet *priv =netdev_priv (dev); -int interface =INTERFACE (priv->port); -int index =INDEX (priv->port); -union cvmx_helper_link_info link_info; -int rv; - - rv =cvm_oct_phy_setup_device (dev); -if (rv) -return rv; - - gmx_cfg.u64 =cvmx_read_csr (CVMX_GMXX_PRTX_CFG (index, interface)); - gmx_cfg.s.en =1 ; -if (octeon_has_feature (OCTEON_FEATURE_PKND )) - gmx_cfg.s.pknd = priv->port; -cvmx_write_csr (CVMX_GMXX_PRTX_CFG (index, interface), gmx_cfg.u64); - -if (octeon_is_simulation ()) -return 0 ; - -if (dev->phydev) { -int r =phy_read_status (dev->phydev); - -if (r ==0 && dev->phydev->link ==0 ) -netif_carrier_off (dev); -cvm_oct_adjust_link (dev); - }else { - link_info =cvmx_helper_link_get (priv->port); -if (!link_info.s.link_up) -netif_carrier_off (dev); - priv->poll = link_poll; -link_poll (dev); - } - -return 0 ; -} - -void cvm_oct_link_poll (struct net_device *dev) -{ -struct octeon_ethernet *priv =netdev_priv (dev); -union cvmx_helper_link_info link_info; - - link_info =cvmx_helper_link_get (priv->port); -if (link_info.u64 == priv->link_info) -return ; - -if (cvmx_helper_link_set (priv->port, link_info)) - link_info.u64 = priv->link_info; -else - priv->link_info = link_info.u64; - -if (link_info.s.link_up) { -if (!netif_carrier_ok (dev)) -netif_carrier_on (dev); - }else if (netif_carrier_ok (dev)) { -netif_carrier_off (dev); - } -cvm_oct_note_carrier (priv, link_info); -} - -static int cvm_oct_xaui_open (struct net_device *dev) -{ -return cvm_oct_common_open (dev, cvm_oct_link_poll); -} - -static const struct net_device_ops cvm_oct_npi_netdev_ops = { - .ndo_init = cvm_oct_common_init, - .ndo_uninit = cvm_oct_common_uninit, - .ndo_start_xmit = cvm_oct_xmit, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static const struct net_device_ops cvm_oct_xaui_netdev_ops = { - .ndo_init = cvm_oct_common_init, - .ndo_uninit = cvm_oct_common_uninit, - .ndo_open = cvm_oct_xaui_open, - .ndo_stop = cvm_oct_common_stop, - .ndo_start_xmit = cvm_oct_xmit, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static const struct net_device_ops cvm_oct_sgmii_netdev_ops = { - .ndo_init = cvm_oct_sgmii_init, - .ndo_uninit = cvm_oct_common_uninit, - .ndo_open = cvm_oct_sgmii_open, - .ndo_stop = cvm_oct_common_stop, - .ndo_start_xmit = cvm_oct_xmit, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static const struct net_device_ops cvm_oct_spi_netdev_ops = { - .ndo_init = cvm_oct_spi_init, - .ndo_uninit = cvm_oct_spi_uninit, - .ndo_start_xmit = cvm_oct_xmit, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static const struct net_device_ops cvm_oct_rgmii_netdev_ops = { - .ndo_init = cvm_oct_common_init, - .ndo_uninit = cvm_oct_common_uninit, - .ndo_open = cvm_oct_rgmii_open, - .ndo_stop = cvm_oct_common_stop, - .ndo_start_xmit = cvm_oct_xmit, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static const struct net_device_ops cvm_oct_pow_netdev_ops = { - .ndo_init = cvm_oct_common_init, - .ndo_start_xmit = cvm_oct_xmit_pow, - .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, - .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, - .ndo_change_mtu = cvm_oct_common_change_mtu, - .ndo_get_stats = cvm_oct_common_get_stats, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = cvm_oct_poll_controller, -#endif -}; - -static struct device_node *cvm_oct_of_get_child - (const struct device_node *parent,int reg_val) -{ -struct device_node *node =NULL ; -int size; -const __be32 *addr; - -for (;;) { - node =of_get_next_child (parent, node); -if (!node) -break ; - addr =of_get_property (node,"reg" , &size); -if (addr && (be32_to_cpu (*addr) == reg_val)) -break ; - } -return node; -} - -static struct device_node *cvm_oct_node_for_port (struct device_node *pip, -int interface,int port) -{ -struct device_node *ni, *np; - - ni =cvm_oct_of_get_child (pip, interface); -if (!ni) -return NULL ; - - np =cvm_oct_of_get_child (ni, port); -of_node_put (ni); - -return np; -} - -static void cvm_set_rgmii_delay (struct octeon_ethernet *priv,int iface, -int port) -{ -struct device_node *np = priv->of_node; -u32 delay_value; -bool rx_delay; -bool tx_delay; - -/* By default, both RX/TX delay is enabled in -* __cvmx_helper_rgmii_enable(). -*/ - rx_delay = true; - tx_delay = true; - -if (!of_property_read_u32 (np,"rx-delay" , &delay_value)) { -cvmx_write_csr (CVMX_ASXX_RX_CLK_SETX (port, iface), delay_value); - rx_delay = delay_value >0 ; - } -if (!of_property_read_u32 (np,"tx-delay" , &delay_value)) { -cvmx_write_csr (CVMX_ASXX_TX_CLK_SETX (port, iface), delay_value); - tx_delay = delay_value >0 ; - } - -if (!rx_delay && !tx_delay) - priv->phy_mode =PHY_INTERFACE_MODE_RGMII_ID ; -else if (!rx_delay) - priv->phy_mode =PHY_INTERFACE_MODE_RGMII_RXID ; -else if (!tx_delay) - priv->phy_mode =PHY_INTERFACE_MODE_RGMII_TXID ; -else - priv->phy_mode =PHY_INTERFACE_MODE_RGMII ; -} - -static int cvm_oct_probe (struct platform_device *pdev) -{ -int num_interfaces; -int interface; -int fau =FAU_NUM_PACKET_BUFFERS_TO_FREE ; -int qos; -struct device_node *pip; -int mtu_overhead =ETH_HLEN +ETH_FCS_LEN ; - -#if IS_ENABLED (CONFIG_VLAN_8021Q ) - mtu_overhead +=VLAN_HLEN ; -#endif - -octeon_mdiobus_force_mod_depencency (); - - pip = pdev->dev.of_node; -if (!pip) { -pr_err ("Error: No 'pip' in /aliases\n" ); -return -EINVAL ; - } - -cvm_oct_configure_common_hw (); - -cvmx_helper_initialize_packet_io_global (); - -if (receive_group_order) { -if (receive_group_order >4 ) - receive_group_order =4 ; - pow_receive_groups = (1 << (1 << receive_group_order)) -1 ; - }else { - pow_receive_groups =BIT (pow_receive_group); - } - -/* Change the input group for all ports before input is enabled */ - num_interfaces =cvmx_helper_get_number_of_interfaces (); -for (interface =0 ; interface < num_interfaces; interface++) { -int num_ports =cvmx_helper_ports_on_interface (interface); -int port; - -for (port =cvmx_helper_get_ipd_port (interface,0 ); - port <cvmx_helper_get_ipd_port (interface, num_ports); - port++) { -union cvmx_pip_prt_tagx pip_prt_tagx; - - pip_prt_tagx.u64 = -cvmx_read_csr (CVMX_PIP_PRT_TAGX (port)); - -if (receive_group_order) { -int tag_mask; - -/* We support only 16 groups at the moment, so -* always disable the two additional "hidden" -* tag_mask bits on CN68XX. -*/ -if (OCTEON_IS_MODEL (OCTEON_CN68XX )) - pip_prt_tagx.u64 |=0x3ull <<44 ; - - tag_mask = ~((1 << receive_group_order) -1 ); - pip_prt_tagx.s.grptagbase =0 ; - pip_prt_tagx.s.grptagmask = tag_mask; - pip_prt_tagx.s.grptag =1 ; - pip_prt_tagx.s.tag_mode =0 ; - pip_prt_tagx.s.inc_prt_flag =1 ; - pip_prt_tagx.s.ip6_dprt_flag =1 ; - pip_prt_tagx.s.ip4_dprt_flag =1 ; - pip_prt_tagx.s.ip6_sprt_flag =1 ; - pip_prt_tagx.s.ip4_sprt_flag =1 ; - pip_prt_tagx.s.ip6_dst_flag =1 ; - pip_prt_tagx.s.ip4_dst_flag =1 ; - pip_prt_tagx.s.ip6_src_flag =1 ; - pip_prt_tagx.s.ip4_src_flag =1 ; - pip_prt_tagx.s.grp =0 ; - }else { - pip_prt_tagx.s.grptag =0 ; - pip_prt_tagx.s.grp = pow_receive_group; - } - -cvmx_write_csr (CVMX_PIP_PRT_TAGX (port), - pip_prt_tagx.u64); - } - } - -cvmx_helper_ipd_and_packet_input_enable (); - -memset (cvm_oct_device,0 ,sizeof (cvm_oct_device)); - -/* -* Initialize the FAU used for counting packet buffers that -* need to be freed. -*/ -cvmx_fau_atomic_write32 (FAU_NUM_PACKET_BUFFERS_TO_FREE ,0 ); - -/* Initialize the FAU used for counting tx SKBs that need to be freed */ -cvmx_fau_atomic_write32 (FAU_TOTAL_TX_TO_CLEAN ,0 ); - -if ((pow_send_group !=-1 )) { -struct net_device *dev; - - dev =alloc_etherdev (sizeof (struct octeon_ethernet )); -if (dev) { -/* Initialize the device private structure. */ -struct octeon_ethernet *priv =netdev_priv (dev); - -SET_NETDEV_DEV (dev, &pdev->dev); - dev->netdev_ops = &cvm_oct_pow_netdev_ops;Lines of this file are not shown. View the raw message.
drivers/staging/octeon/octeon-ethernet.h deleted +0
-107Lines of this file are not shown. View the raw message.
drivers/staging/octeon/octeon-stubs.h deleted +0
-1433Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.24.0
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerQuoted 2 lines · Sandro Volery
Doesn't octeon have drivers out of staging already? What is this module for?
I have no idea :(
Well if documentation is missing then it's their fault.. Go ahead and delete it, even tho it kills me since my first patch was in there :)
Sandro V
Quoted 8 lines · Greg Kroah-Hartman
Quoted 2 lines · Sandro Volery
Doesn't octeon have drivers out of staging already? What is this module for?
I have no idea :(
Quoted 5 lines · Greg Kroah-Hartman
Quoted 2 lines · Sandro Volery
Doesn't octeon have drivers out of staging already? What is this module for?
I have no idea :(
It's stated in the TODO file you are deleting (visible in your patch): "This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 chips at least up to CN7030."
This includes e.g. some D-Link routers and Uniquiti EdgeRouters. You can check from /proc/cpuinfo if you are running on this MIPS SoC.
A.
Quoted 5 lines · Aaro Koskinen
Quoted 4 lines · Greg Kroah-Hartman
Quoted 2 lines · Sandro Volery
Doesn't octeon have drivers out of staging already? What is this module for?
Quoted 9 lines
Quoted 1 line
I have no idea :(
It's stated in the TODO file you are deleting (visible in your patch): "This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 chips at least up to CN7030."
This includes e.g. some D-Link routers and Uniquiti EdgeRouters. You can check from
/proc/cpuinfoif you are running on this MIPS SoC.
It also results in "mips:allmodconfig" build failures in mainline and is for that reason being marked as BROKEN. Unfortunately, misguided attempts to clean it up had the opposite effect.
Guenter
Quoted 8 lines · Guenter Roeck
Quoted 7 lines · Aaro Koskinen
Quoted 1 line · Greg Kroah-Hartman
I have no idea :(
It's stated in the TODO file you are deleting (visible in your patch): "This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 chips at least up to CN7030."
Quoted 6 lines
Quoted 2 lines
This includes e.g. some D-Link routers and Uniquiti EdgeRouters. You can check from
/proc/cpuinfoif you are running on this MIPS SoC.It also results in "mips:allmodconfig" build failures in mainline and is for that reason being marked as BROKEN. Unfortunately, misguided attempts to clean it up had the opposite effect.
This was because of stubs hack added by someone - people who do not run or care about the hardware can now break it for others with their silly x86 "compile test"s.
A.
Quoted 12 lines · Aaro Koskinen
Quoted 11 lines · Guenter Roeck
Quoted 9 lines · Aaro Koskinen
Quoted 1 line · Greg Kroah-Hartman
I have no idea :(
It's stated in the TODO file you are deleting (visible in your patch): "This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 chips at least up to CN7030."
This includes e.g. some D-Link routers and Uniquiti EdgeRouters. You can check from
/proc/cpuinfoif you are running on this MIPS SoC.
Quoted 8 lines
Quoted 3 lines
It also results in "mips:allmodconfig" build failures in mainline and is for that reason being marked as BROKEN. Unfortunately, misguided attempts to clean it up had the opposite effect.
This was because of stubs hack added by someone - people who do not run or care about the hardware can now break it for others with their silly x86 "compile test"s.
Thast was the first breakage. The second was to replace typedefs with structures without considering that those typedefs are still used throughout the Cavium code, creating conflicts between "mystruct_t" and "struct mystruct" in various API calls. It may well be that this "improvement" was tested with x86_64:allmodconfig - if it was tested in the first place. It was most definitely not tested with cavium_octeon_defconfig, much less with real hardware.
Pretty much none of the changes made to the driver in the recent past have improved it. On the contrary, it is getting worse. With no one committed to get the driver out of staging, I don't think there is a reasonable alternative to removing it. For my part I am for sure not looking forward having to deal with it breaking over and over again and having to spend time tracking down the breakage.
Guenter
Quoted 12 lines · Aaro Koskinen
Quoted 11 lines · Guenter Roeck
Quoted 9 lines · Aaro Koskinen
Quoted 1 line · Greg Kroah-Hartman
I have no idea :(
It's stated in the TODO file you are deleting (visible in your patch): "This driver is functional and supports Ethernet on OCTEON+/OCTEON2/OCTEON3 chips at least up to CN7030."
This includes e.g. some D-Link routers and Uniquiti EdgeRouters. You can check from
/proc/cpuinfoif you are running on this MIPS SoC.
Quoted 7 lines
Quoted 3 lines
It also results in "mips:allmodconfig" build failures in mainline and is for that reason being marked as BROKEN. Unfortunately, misguided attempts to clean it up had the opposite effect.
This was because of stubs hack added by someone - people who do not run or care about the hardware can now break it for others with their silly x86 "compile test"s.
Compile tests are nice in theory for finding static analysis bugs but often they introduce static checker false positives because we don't initialize *param variables in the stub functions.
And those compat stubs in particular were a headache to review. We broke the build a couple times, but we *almost* broke the build a *lot* of times...
regards,
dan carpenter