diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2016-08-22 17:35:47 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2016-08-23 15:41:27 +0200 |
| commit | 58df34b5e14d82d43c76c1c7140a04e515297261 (patch) | |
| tree | 13ce4ab2e122c4dc7da40f51aa147a5c8b59761c | |
| parent | f046737e92f9a13acbe9139e1ded83287d31eeb5 (diff) | |
| download | upstream-58df34b5e14d82d43c76c1c7140a04e515297261.tar.gz upstream-58df34b5e14d82d43c76c1c7140a04e515297261.tar.bz2 upstream-58df34b5e14d82d43c76c1c7140a04e515297261.zip | |
gemini: drop Linux 4.1 support
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
42 files changed, 1 insertions, 6743 deletions
diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index 42f8c1e243..f02e4b179f 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs pci rtc CPU_TYPE:=fa526 MAINTAINER:=Roman Yeryomin <roman@advem.lv> -KERNEL_PATCHVER:=4.1 +KERNEL_PATCHVER:=4.4 KERNELNAME:=zImage diff --git a/target/linux/gemini/config-4.1 b/target/linux/gemini/config-4.1 deleted file mode 100644 index b2ef7d7da2..0000000000 --- a/target/linux/gemini/config-4.1 +++ /dev/null @@ -1,164 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y -CONFIG_ARCH_GEMINI=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_REQUIRE_GPIOLIB=y -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_USES_GETTIMEOFFSET=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_NR_BANKS=8 -CONFIG_ARM_PATCH_PHYS_VIRT=y -# CONFIG_ARPD is not set -CONFIG_ATA=y -CONFIG_ATAGS=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=32M" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_CPU_32v4=y -CONFIG_CPU_ABRT_EV4=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CPU_CACHE_FA=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_COPY_FA=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -# CONFIG_CPU_DCACHE_WRITETHROUGH is not set -CONFIG_CPU_FA526=y -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_LEGACY=y -CONFIG_CPU_TLB_FA=y -CONFIG_CPU_USE_DOMAINS=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_USER is not set -CONFIG_DEBUG_UART_PHYS=0x42000000 -CONFIG_DEBUG_UART_VIRT=0xf4200000 -CONFIG_DEBUG_UART_8250_SHIFT=2 -# CONFIG_DEBUG_UART_8250_WORD is not set -# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set -# CONFIG_DLCI is not set -CONFIG_DMADEVICES=y -CONFIG_DNOTIFY=y -# CONFIG_DW_DMAC_CORE is not set -# CONFIG_DW_DMAC_PCI is not set -CONFIG_FRAME_POINTER=y -CONFIG_GEMINI_MEM_SWAP=y -CONFIG_GEMINI_SL351X=y -CONFIG_GEMINI_WATCHDOG=y -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIO_SYSFS=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_BPF_JIT=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_GENERIC_HARDIRQS=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -# CONFIG_HSU_DMA_PCI is not set -CONFIG_HWMON=y -CONFIG_HW_RANDOM=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y -CONFIG_IRQ_WORK=y -CONFIG_KTIME_SCALAR=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_MACH_NAS4220B is not set -# CONFIG_MACH_RUT100 is not set -CONFIG_MACH_WBD111=y -CONFIG_MACH_WBD222=y -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_BOARDINFO=y -CONFIG_MDIO_GPIO=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MTD_PHYSMAP=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_GPIO_H=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NET_VENDOR_GEMINI=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PATA_GEMINI=y -CONFIG_PCI=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PHYLIB=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_GEMINI=y -# CONFIG_SCHED_HRTICK is not set -# CONFIG_SCSI_DMA is not set -CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_UID16=y -CONFIG_UIDGID_CONVERTED=y -CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" -CONFIG_USB_ARCH_HAS_XHCI=y -CONFIG_USB_SUPPORT=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WAN=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/gemini/config-4.4 b/target/linux/gemini/config-default index 9572196ae8..9572196ae8 100644 --- a/target/linux/gemini/config-4.4 +++ b/target/linux/gemini/config-default diff --git a/target/linux/gemini/files-4.4/drivers/ata/pata_gemini.c b/target/linux/gemini/files-4.4/drivers/ata/pata_gemini.c deleted file mode 100644 index 707e8703bf..0000000000 --- a/target/linux/gemini/files-4.4/drivers/ata/pata_gemini.c +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Support for Gemini PATA - * - * Copyright (C) 2009 Janos Laube <janos.dev@gmail.com> - * Copyright (C) 2010 Frederic Pecourt <opengemini@free.fr> - * Copyright (C) 2011 Tobias Waldvogel <tobias.waldvogel@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* Values of IOMUX - * 26:24 bits is "IDE IO Select" - * 111:100 - Reserved - * 011 - ata0 <-> sata0, sata1; bring out ata1 - * 010 - ata1 <-> sata1, sata0; bring out ata0 - * 001 - ata0 <-> sata0, ata1 <-> sata1; bring out ata1 - * 000 - ata0 <-> sata0, ata1 <-> sata1; bring out ata0 - * - */ - -#include <linux/platform_device.h> -#include <linux/module.h> -#include <linux/moduleparam.h> -#include <linux/libata.h> -#include <linux/leds.h> - -#include <mach/hardware.h> -#include <mach/global_reg.h> - -#define DRV_NAME "pata-gemini" - -#define PATA_GEMINI_PORTS 1 - -#define PIO_TIMING_REG 0x10 -#define MDMA_TIMING_REG 0x11 -#define UDMA_TIMING0_REG 0x12 -#define UDMA_TIMING1_REG 0x13 -#define CLK_MOD_REG 0x14 - -#define CLK_MOD_66M_DEV0_BIT 0 -#define CLK_MOD_66M_DEV1_BIT 1 -#define CLK_MOD_UDMA_DEV0_BIT 4 -#define CLK_MOD_UDMA_DEV1_BIT 5 - -#define CLK_MOD_66M_DEV0 (1 << CLK_MOD_66M_DEV0_BIT) -#define CLK_MOD_66M_DEV1 (1 << CLK_MOD_66M_DEV1_BIT) -#define CLK_MOD_UDMA_DEV0 (1 << CLK_MOD_UDMA_DEV0_BIT) -#define CLK_MOD_UDMA_DEV1 (1 << CLK_MOD_UDMA_DEV1_BIT) - -#define SATA_ENABLE_PDEV_MASK 0x01 -#define SATA_ENABLE_PDEV_PM 0x02 -#define SATA_ENABLE_PDEV_ADDED 0x04 -#define SATA_ENABLE_PDEV_REMOVED 0x08 -#define SATA_ENABLE_SDEV_MASK 0x10 -#define SATA_ENABLE_SDEV_PM 0x20 -#define SATA_ENABLE_SDEV_ADDED 0x40 -#define SATA_ENABLE_SDEV_REMOVED 0x80 - -MODULE_AUTHOR("Janos Laube <janos.dev@gmail.com>"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME); - -static unsigned char PIO_TIMING[5] = { - 0xaa, 0xa3, 0xa1, 0x33, 0x31 -}; - -static unsigned char TIMING_MW_DMA[4][2] = { - { 0x44, 1 }, // 480 4.2 - { 0x42, 1 }, // 150 13.3 - { 0x31, 1 }, // 120 16.7 - { 0x21, 1 }, // 100 20 -}; - -static unsigned char TIMING_UDMA[7][2] = { - { 0x33, 0 }, //240 16.7 - { 0x31, 0 }, //160 25 - { 0x21, 0 }, //120 33.3 - { 0x21, 1 }, //90 44.4 - { 0x11, 1 }, //60 66.7 - { 0x11 | 0x80, 0 }, //40 100 - { 0x11 | 0x80, 1 }, //30 133 -}; - -static struct scsi_host_template pata_gemini_sht = { - ATA_NCQ_SHT(DRV_NAME), - .can_queue = 1, - .sg_tablesize = 128, - .dma_boundary = 0xffffU, -}; - -static void gemini_set_dmamode(struct ata_port *ap, struct ata_device *adev) -{ - void __iomem *clk_reg = ap->ioaddr.bmdma_addr + CLK_MOD_REG; - void __iomem *tim_reg = ap->ioaddr.bmdma_addr + UDMA_TIMING0_REG; - unsigned short udma = adev->dma_mode; - unsigned short speed = udma; - unsigned short devno = adev->devno & 1; - unsigned short i; - u8 mod_udma_mask = 1 << (CLK_MOD_UDMA_DEV0_BIT + devno); - u8 mod_66m_mask = 1 << (CLK_MOD_66M_DEV0_BIT + devno); - u8 clk_mod; - u8 timing; - - clk_mod = ioread8(clk_reg); - clk_mod &= ~mod_udma_mask; - - if (speed & XFER_UDMA_0) { - i = speed & ~XFER_UDMA_0; - timing = TIMING_UDMA[i][0]; - clk_mod |= mod_udma_mask; - if (TIMING_UDMA[i][1]) - clk_mod |= mod_66m_mask; - } else { - i = speed & ~XFER_MW_DMA_0; - timing = TIMING_MW_DMA[i][0]; - clk_mod |= mod_udma_mask; - if (TIMING_MW_DMA[i][1]) - clk_mod |= mod_66m_mask; - } - - iowrite8(clk_mod, clk_reg); - iowrite8(timing, tim_reg + devno); - return; -} - -static void gemini_set_piomode(struct ata_port *ap, struct ata_device *adev) -{ - void __iomem *pio_reg = ap->ioaddr.bmdma_addr + PIO_TIMING_REG; - unsigned int pio = adev->pio_mode - XFER_PIO_0; - - iowrite8(PIO_TIMING[pio], pio_reg); -} - -unsigned int gemini_qc_issue(struct ata_queued_cmd *qc) -{ - ledtrig_ide_activity(); - return ata_bmdma_qc_issue(qc); -} - -static struct ata_port_operations pata_gemini_port_ops = { - .inherits = &ata_bmdma_port_ops, - .set_dmamode = gemini_set_dmamode, - .set_piomode = gemini_set_piomode, - .qc_issue = gemini_qc_issue, -}; - -static struct ata_port_info pata_gemini_portinfo = { - .flags = 0, - .udma_mask = ATA_UDMA6, - .pio_mask = ATA_PIO4, - .port_ops = &pata_gemini_port_ops, -}; - -static const struct ata_port_info *pata_gemini_ports = &pata_gemini_portinfo; - -static int pata_gemini_probe(struct platform_device *pdev) -{ - struct ata_host *host; - struct resource *res; - unsigned int irq, i; - void __iomem *mmio_base; - - /* standard bdma init */ - irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - - pr_info(DRV_NAME ": irq %d, io base 0x%08x\n", irq, res->start); - - mmio_base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - - host = ata_host_alloc_pinfo(&pdev->dev, &pata_gemini_ports, 1); - if (!host) - return -ENOMEM; - - for (i = 0; i < host->n_ports; i++) { - struct ata_port *ap = host->ports[i]; - struct ata_ioports *ioaddr = &ap->ioaddr; - - ioaddr->bmdma_addr = mmio_base; - ioaddr->cmd_addr = mmio_base + 0x20; - ioaddr->ctl_addr = mmio_base + 0x36; - ioaddr->altstatus_addr = ioaddr->ctl_addr; - ata_sff_std_ports(ioaddr); - host->ports[i]->cbl = ATA_CBL_SATA; - } - - return ata_host_activate(host, irq, ata_bmdma_interrupt, - IRQF_SHARED, &pata_gemini_sht); -} - -static int pata_gemini_remove(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct ata_host *host = dev_get_drvdata(dev); - ata_host_detach(host); - return 0; -} - -static struct platform_driver pata_gemini_driver = { - .probe = pata_gemini_probe, - .remove = pata_gemini_remove, - .driver.owner = THIS_MODULE, - .driver.name = DRV_NAME, -}; - -static int __init pata_gemini_module_init(void) -{ - return platform_driver_probe(&pata_gemini_driver, pata_gemini_probe); -} - -static void __exit pata_gemini_module_exit(void) -{ - platform_driver_unregister(&pata_gemini_driver); -} - -module_init(pata_gemini_module_init); -module_exit(pata_gemini_module_exit); diff --git a/target/linux/gemini/files-4.4/drivers/usb/host/ehci-fotg2.c b/target/linux/gemini/files-4.4/drivers/usb/host/ehci-fotg2.c deleted file mode 100644 index 0717abce9c..0000000000 --- a/target/linux/gemini/files-4.4/drivers/usb/host/ehci-fotg2.c +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Gemini EHCI Host Controller driver - * - * Copyright (C) 2014 Roman Yeryomin <roman@advem.lv> - * Copyright (C) 2012 Tobias Waldvogel - * based on GPLd code from Sony Computer Entertainment Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - */ -#include <linux/kernel.h> -#include <linux/hrtimer.h> -#include <linux/io.h> -#include <linux/module.h> -#include <linux/platform_device.h> -#include <linux/usb.h> -#include <linux/usb/hcd.h> -#include <linux/usb/ehci_pdriver.h> - -#include <mach/hardware.h> -#include <mach/global_reg.h> - -#include "ehci.h" - -#define DRV_NAME "ehci-fotg2" - -#define HCD_MISC 0x40 - -#define OTGC_SCR 0x80 -#define OTGC_INT_STS 0x84 -#define OTGC_INT_EN 0x88 - -#define GLOBAL_ISR 0xC0 -#define GLOBAL_ICR 0xC4 - -#define GLOBAL_INT_POLARITY (1 << 3) -#define GLOBAL_INT_MASK_HC (1 << 2) -#define GLOBAL_INT_MASK_OTG (1 << 1) -#define GLOBAL_INT_MASK_DEV (1 << 0) - -#define OTGC_SCR_ID (1 << 21) -#define OTGC_SCR_CROLE (1 << 20) -#define OTGC_SCR_VBUS_VLD (1 << 19) -#define OTGC_SCR_A_SRP_RESP_TYPE (1 << 8) -#define OTGC_SCR_A_SRP_DET_EN (1 << 7) -#define OTGC_SCR_A_SET_B_HNP_EN (1 << 6) -#define OTGC_SCR_A_BUS_DROP (1 << 5) -#define OTGC_SCR_A_BUS_REQ (1 << 4) - -#define OTGC_INT_APLGRMV (1 << 12) -#define OTGC_INT_BPLGRMV (1 << 11) -#define OTGC_INT_OVC (1 << 10) -#define OTGC_INT_IDCHG (1 << 9) -#define OTGC_INT_RLCHG (1 << 8) -#define OTGC_INT_AVBUSERR (1 << 5) -#define OTGC_INT_ASRPDET (1 << 4) -#define OTGC_INT_BSRPDN (1 << 0) - -#define OTGC_INT_A_TYPE ( \ - OTGC_INT_ASRPDET | \ - OTGC_INT_AVBUSERR | \ - OTGC_INT_OVC | \ - OTGC_INT_RLCHG | \ - OTGC_INT_IDCHG | \ - OTGC_INT_APLGRMV \ - ) -#define OTGC_INT_B_TYPE ( \ - OTGC_INT_AVBUSERR | \ - OTGC_INT_OVC | \ - OTGC_INT_RLCHG | \ - OTGC_INT_IDCHG \ - ) - - -static void fotg2_otg_init(struct usb_hcd *hcd) -{ - u32 val; - - writel(GLOBAL_INT_POLARITY | GLOBAL_INT_MASK_HC | - GLOBAL_INT_MASK_OTG | GLOBAL_INT_MASK_DEV, - hcd->regs + GLOBAL_ICR); - - val = readl(hcd->regs + OTGC_SCR); - val &= ~(OTGC_SCR_A_SRP_RESP_TYPE | OTGC_SCR_A_SRP_DET_EN | - OTGC_SCR_A_BUS_DROP | OTGC_SCR_A_SET_B_HNP_EN); - val |= OTGC_SCR_A_BUS_REQ; - writel(val, hcd->regs + OTGC_SCR); - - writel(OTGC_INT_A_TYPE, hcd->regs + OTGC_INT_EN); - - /* setup MISC register, fixes timing problems */ - val = readl(hcd->regs + HCD_MISC); - val |= 0xD; - writel(val, hcd->regs + HCD_MISC); - - writel(~0, hcd->regs + GLOBAL_ISR); - writel(~0, hcd->regs + OTGC_INT_STS); -} - -static int fotg2_ehci_reset(struct usb_hcd *hcd) -{ - int retval; - - retval = ehci_setup(hcd); - if (retval) - return retval; - - writel(GLOBAL_INT_POLARITY, hcd->regs + GLOBAL_ICR); - return 0; -} - -static const struct hc_driver fotg2_ehci_hc_driver = { - .description = hcd_name, - .product_desc = "FOTG2 EHCI Host Controller", - .hcd_priv_size = sizeof(struct ehci_hcd), - .irq = ehci_irq, - .flags = HCD_MEMORY | HCD_USB2, - .reset = fotg2_ehci_reset, - .start = ehci_run, - .stop = ehci_stop, - .shutdown = ehci_shutdown, - .urb_enqueue = ehci_urb_enqueue, - .urb_dequeue = ehci_urb_dequeue, - .endpoint_disable = ehci_endpoint_disable, - .endpoint_reset = ehci_endpoint_reset, - .get_frame_number = ehci_get_frame, - .hub_status_data = ehci_hub_status_data, - .hub_control = ehci_hub_control, -#if defined(CONFIG_PM) - .bus_suspend = ehci_bus_suspend, - .bus_resume = ehci_bus_resume, -#endif - .relinquish_port = ehci_relinquish_port, - .port_handed_over = ehci_port_handed_over, - - .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, -}; - -static irqreturn_t fotg2_ehci_irq(int irq, void *data) -{ - struct usb_hcd *hcd = data; - u32 icr, sts; - irqreturn_t retval; - - icr = readl(hcd->regs + GLOBAL_ICR); - writel(GLOBAL_INT_POLARITY | GLOBAL_INT_MASK_HC | - GLOBAL_INT_MASK_OTG | GLOBAL_INT_MASK_DEV, - hcd->regs + GLOBAL_ICR); - - retval = IRQ_NONE; - - sts = ~icr; - sts &= GLOBAL_INT_MASK_HC | GLOBAL_INT_MASK_OTG | GLOBAL_INT_MASK_DEV; - sts &= readl(hcd->regs + GLOBAL_ISR); - writel(sts, hcd->regs + GLOBAL_ISR); - - if (unlikely(sts & GLOBAL_INT_MASK_DEV)) { - ehci_warn(hcd_to_ehci(hcd), - "Received unexpected irq for device role\n"); - retval = IRQ_HANDLED; - } - - if (unlikely(sts & GLOBAL_INT_MASK_OTG)) { - u32 otg_sts; - - otg_sts = readl(hcd->regs + OTGC_INT_STS); - writel(otg_sts, hcd->regs + OTGC_INT_STS); - - ehci_warn(hcd_to_ehci(hcd), - "Received unexpected irq for OTG management\n"); - retval = IRQ_HANDLED; - } - - if (sts & GLOBAL_INT_MASK_HC) { - retval = IRQ_NONE; - } - - writel(icr, hcd->regs + GLOBAL_ICR); - return retval; -} - -static int fotg2_ehci_probe(struct platform_device *pdev) -{ - struct usb_hcd *hcd; - struct resource *res; - int irq , err; - - irq = platform_get_irq(pdev, 0); - if (irq < 0) { - pr_err("no irq provided"); - return irq; - } - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - pr_err("no memory resource provided"); - return -ENXIO; - } - - hcd = usb_create_hcd(&fotg2_ehci_hc_driver, &pdev->dev, - dev_name(&pdev->dev)); - if (!hcd) - return -ENOMEM; - - hcd->rsrc_start = res->start; - hcd->rsrc_len = resource_size(res); - - hcd->regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(hcd->regs)) { - err = -ENOMEM; - goto err_put_hcd; - } - - hcd->has_tt = 1; - hcd_to_ehci(hcd)->caps = hcd->regs; - - fotg2_otg_init(hcd); - - err = request_irq(irq, &fotg2_ehci_irq, IRQF_SHARED, "fotg2", hcd); - if (err) - goto err_put_hcd; - - err = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (err) - goto err_put_hcd; - - platform_set_drvdata(pdev, hcd); - return 0; - -err_put_hcd: - usb_put_hcd(hcd); - return err; -} - -static int fotg2_ehci_remove(struct platform_device *pdev) -{ - struct usb_hcd *hcd = platform_get_drvdata(pdev); - - writel(GLOBAL_INT_POLARITY | GLOBAL_INT_MASK_HC | - GLOBAL_INT_MASK_OTG | GLOBAL_INT_MASK_DEV, - hcd->regs + GLOBAL_ICR); - - free_irq(hcd->irq, hcd); - usb_remove_hcd(hcd); - usb_put_hcd(hcd); - platform_set_drvdata(pdev, NULL); - - return 0; -} - -MODULE_ALIAS("platform:" DRV_NAME); - -static struct platform_driver ehci_fotg2_driver = { - .probe = fotg2_ehci_probe, - .remove = fotg2_ehci_remove, - .driver.name = DRV_NAME, -}; diff --git a/target/linux/gemini/files-4.4/arch/arm/mach-gemini/include/mach/gmac.h b/target/linux/gemini/files/arch/arm/mach-gemini/include/mach/gmac.h index 04ca5699fa..04ca5699fa 100644 --- a/target/linux/gemini/files-4.4/arch/arm/mach-gemini/include/mach/gmac.h +++ b/target/linux/gemini/files/arch/arm/mach-gemini/include/mach/gmac.h diff --git a/target/linux/gemini/files-4.4/arch/arm/mach-gemini/pci.c b/target/linux/gemini/files/arch/arm/mach-gemini/pci.c index 51cd44754c..51cd44754c 100644 --- a/target/linux/gemini/files-4.4/arch/arm/mach-gemini/pci.c +++ b/target/linux/gemini/files/arch/arm/mach-gemini/pci.c diff --git a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/Kconfig b/target/linux/gemini/files/drivers/net/ethernet/gemini/Kconfig index 12d58163d0..12d58163d0 100644 --- a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/Kconfig +++ b/target/linux/gemini/files/drivers/net/ethernet/gemini/Kconfig diff --git a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/Makefile b/target/linux/gemini/files/drivers/net/ethernet/gemini/Makefile index 3a1987c4fa..3a1987c4fa 100644 --- a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/Makefile +++ b/target/linux/gemini/files/drivers/net/ethernet/gemini/Makefile diff --git a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/sl351x.c b/target/linux/gemini/files/drivers/net/ethernet/gemini/sl351x.c index 83455c4003..83455c4003 100644 --- a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/sl351x.c +++ b/target/linux/gemini/files/drivers/net/ethernet/gemini/sl351x.c diff --git a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/sl351x_hw.h b/target/linux/gemini/files/drivers/net/ethernet/gemini/sl351x_hw.h index f7bff5ace2..f7bff5ace2 100644 --- a/target/linux/gemini/files-4.4/drivers/net/ethernet/gemini/sl351x_hw.h +++ b/target/linux/gemini/files/drivers/net/ethernet/gemini/sl351x_hw.h diff --git a/target/linux/gemini/files/drivers/rtc/rtc-gemini.c b/target/linux/gemini/files/drivers/rtc/rtc-gemini.c deleted file mode 100644 index 587d8122b2..0000000000 --- a/target/linux/gemini/files/drivers/rtc/rtc-gemini.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Gemini OnChip RTC - * - * Copyright (C) 2009 Janos Laube <janos.dev@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Original code for older kernel 2.6.15 are form Stormlinksemi - * first update from Janos Laube for > 2.6.29 kernels - * - * checkpatch fixes and usage off rtc-lib code - * Hans Ulli Kroll <ulli.kroll@googlemail.com> - */ - -#include <linux/rtc.h> -#include <linux/io.h> -#include <linux/slab.h> -#include <linux/platform_device.h> -#include <linux/kernel.h> -#include <linux/module.h> - -#include <mach/hardware.h> - -#define DRV_NAME "rtc-gemini" - -MODULE_DESCRIPTION("RTC driver for Gemini SoC"); -MODULE_ALIAS("platform:" DRV_NAME); -MODULE_AUTHOR("Hans Ulli Kroll <ulli.kroll@googlemail.com>"); -MODULE_LICENSE("GPL"); - -struct gemini_rtc { - struct rtc_device *dev; - void __iomem *base; - int irq; -}; - -enum gemini_rtc_offsets { - GEMINI_RTC_SECOND = 0x00, - GEMINI_RTC_MINUTE = 0x04, - GEMINI_RTC_HOUR = 0x08, - GEMINI_RTC_DAYS = 0x0C, - GEMINI_RTC_ALARM_SECOND = 0x10, - GEMINI_RTC_ALARM_MINUTE = 0x14, - GEMINI_RTC_ALARM_HOUR = 0x18, - GEMINI_RTC_RECORD = 0x1C, - GEMINI_RTC_CR = 0x20 -}; - -static irqreturn_t gemini_rtc_interrupt(int irq, void *dev) -{ - return IRQ_HANDLED; -} - -/* - * Looks like the RTC in the Gemini SoC is (totaly) broken - * We can't read/write directly the time from RTC registers. - * We must do some "offset" calculation to get the real time - * - * The register "day" seams to be fixed, and the register "hour" - * has his own mind. - * - * Maybe we can write directly the hour and days since EPOCH - * but in this case the RTC will recalucate to some (other) strange values. - * If you write time to the registers you will not read the same values. - * - * This FIX works pretty fine and Stormlinksemi aka Cortina-Networks does - * the same thing, without the rtc-lib.c calls. - */ - -static int gemini_rtc_read_time(struct device *dev, struct rtc_time *tm) -{ - struct gemini_rtc *rtc = dev_get_drvdata(dev); - - unsigned int days, hour, min, sec; - unsigned long offset, time; - - sec = readl(rtc->base + GEMINI_RTC_SECOND); - min = readl(rtc->base + GEMINI_RTC_MINUTE); - hour = readl(rtc->base + GEMINI_RTC_HOUR); - days = readl(rtc->base + GEMINI_RTC_DAYS); - offset = readl(rtc->base + GEMINI_RTC_RECORD); - - time = offset + days * 86400 + hour * 3600 + min * 60 + sec; - - rtc_time_to_tm(time, tm); - return 0; -} - -/* - * Maybe there is some hidden register to care ? - * looks like register GEMINI_RTC_DAY can count - * 365 days * 179 years >= 65535 (uint16) - */ - -static int gemini_rtc_set_time(struct device *dev, struct rtc_time *tm) -{ - struct gemini_rtc *rtc = dev_get_drvdata(dev); - unsigned int sec, min, hour, day; - unsigned long offset, time; - - if (tm->tm_year >= 2148) /* EPOCH Year + 179 */ - return -EINVAL; - - rtc_tm_to_time(tm , &time); - - sec = readl(rtc->base + GEMINI_RTC_SECOND); - min = readl(rtc->base + GEMINI_RTC_MINUTE); - hour = readl(rtc->base + GEMINI_RTC_HOUR); - day = readl(rtc->base + GEMINI_RTC_DAYS); - - offset = time - (day*86400 + hour*3600 + min*60 + sec); - - writel(offset, rtc->base + GEMINI_RTC_RECORD); - writel(0x01, rtc->base + GEMINI_RTC_CR); - return 0; -} - -static struct rtc_class_ops gemini_rtc_ops = { - .read_time = gemini_rtc_read_time, - .set_time = gemini_rtc_set_time, -}; - -static int gemini_rtc_probe(struct platform_device *pdev) -{ - struct gemini_rtc *rtc; - struct device *dev = &pdev->dev; - struct resource *res; - int ret; - - rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); - if (unlikely(!rtc)) - return -ENOMEM; - platform_set_drvdata(pdev, rtc); - - rtc->irq = platform_get_irq(pdev, 0); - if (rtc->irq < 0) { - ret = -rtc->irq; - goto err_mem; - } - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - ret = -ENODEV; - goto err_mem; - } - rtc->base = devm_ioremap(&pdev->dev, res->start, - res->end - res->start + 1); - - ret = request_irq(rtc->irq, gemini_rtc_interrupt, - IRQF_SHARED, pdev->name, dev); - if (unlikely(ret)) - goto err_mem; - - rtc->dev = rtc_device_register(pdev->name, dev, - &gemini_rtc_ops, THIS_MODULE); - if (unlikely(IS_ERR(rtc->dev))) { - ret = PTR_ERR(rtc->dev); - goto err_irq; - } - return 0; - -err_irq: - free_irq(rtc->irq, dev); - -err_mem: - kfree(rtc); - return ret; -} - -static int gemini_rtc_remove(struct platform_device *pdev) -{ - struct gemini_rtc *rtc = platform_get_drvdata(pdev); - struct device *dev = &pdev->dev; - - free_irq(rtc->irq, dev); - rtc_device_unregister(rtc->dev); - platform_set_drvdata(pdev, NULL); - kfree(rtc); - - return 0; -} - -static struct platform_driver gemini_rtc_driver = { - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - }, - .probe = gemini_rtc_probe, - .remove = gemini_rtc_remove, -}; - -static int __init gemini_rtc_init(void) -{ - int retval; - - retval = platform_driver_register(&gemini_rtc_driver); - if (retval == 0) - pr_info(DRV_NAME ": registered successfully"); - return retval; -} - -static void __exit gemini_rtc_exit(void) -{ - platform_driver_unregister(&gemini_rtc_driver); -} - -module_init(gemini_rtc_init); -module_exit(gemini_rtc_exit); diff --git a/target/linux/gemini/files-4.4/drivers/watchdog/gemini_wdt.c b/target/linux/gemini/files/drivers/watchdog/gemini_wdt.c index 20d30b64eb..20d30b64eb 100644 --- a/target/linux/gemini/files-4.4/drivers/watchdog/gemini_wdt.c +++ b/target/linux/gemini/files/drivers/watchdog/gemini_wdt.c diff --git a/target/linux/gemini/patches-4.1/002-gemini-rtc.patch b/target/linux/gemini/patches-4.1/002-gemini-rtc.patch deleted file mode 100644 index c795569c3e..0000000000 --- a/target/linux/gemini/patches-4.1/002-gemini-rtc.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/drivers/rtc/Kconfig -+++ b/drivers/rtc/Kconfig -@@ -1300,6 +1300,15 @@ config RTC_DRV_BFIN - This driver can also be built as a module. If so, the module - will be called rtc-bfin. - -+config RTC_DRV_GEMINI -+ tristate "Gemini SoC RTC" -+ help -+ If you say Y here you will get support for the -+ RTC found on Gemini SoC's. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-gemini. -+ - config RTC_DRV_RS5C313 - tristate "Ricoh RS5C313" - depends on SH_LANDISK ---- a/drivers/rtc/Makefile -+++ b/drivers/rtc/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_RTC_DRV_EFI) += rtc-efi.o - obj-$(CONFIG_RTC_DRV_EM3027) += rtc-em3027.o - obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o - obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o -+obj-$(CONFIG_RTC_DRV_GEMINI) += rtc-gemini.o - obj-$(CONFIG_RTC_DRV_GENERIC) += rtc-generic.o - obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o - obj-$(CONFIG_RTC_DRV_HYM8563) += rtc-hym8563.o ---- a/arch/arm/mach-gemini/common.h -+++ b/arch/arm/mach-gemini/common.h -@@ -20,9 +20,9 @@ extern void gemini_map_io(void); - extern void gemini_init_irq(void); - extern void gemini_timer_init(void); - extern void gemini_gpio_init(void); --extern void platform_register_rtc(void); - - /* Common platform devices registration functions */ -+extern int platform_register_rtc(void); - extern int platform_register_uart(void); - extern int platform_register_pflash(unsigned int size, - struct mtd_partition *parts, ---- a/arch/arm/mach-gemini/devices.c -+++ b/arch/arm/mach-gemini/devices.c -@@ -17,6 +17,7 @@ - #include <mach/irqs.h> - #include <mach/hardware.h> - #include <mach/global_reg.h> -+#include "common.h" - - static struct plat_serial8250_port serial_platform_data[] = { - { diff --git a/target/linux/gemini/patches-4.1/110-watchdog-add-gemini_wdt-driver.patch b/target/linux/gemini/patches-4.1/110-watchdog-add-gemini_wdt-driver.patch deleted file mode 100644 index 3b767ae632..0000000000 --- a/target/linux/gemini/patches-4.1/110-watchdog-add-gemini_wdt-driver.patch +++ /dev/null @@ -1,410 +0,0 @@ ---- /dev/null -+++ b/drivers/watchdog/gemini_wdt.c -@@ -0,0 +1,378 @@ -+/* -+ * Watchdog driver for Cortina Systems Gemini SoC -+ * -+ * Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/module.h> -+#include <linux/io.h> -+#include <linux/fs.h> -+#include <linux/uaccess.h> -+#include <linux/miscdevice.h> -+#include <linux/platform_device.h> -+#include <linux/watchdog.h> -+#include <linux/slab.h> -+ -+#define GEMINI_WDCOUNTER 0x0 -+#define GEMINI_WDLOAD 0x4 -+#define GEMINI_WDRESTART 0x8 -+ -+#define WDRESTART_MAGIC 0x5AB9 -+ -+#define GEMINI_WDCR 0xC -+ -+#define WDCR_CLOCK_5MHZ (1 << 4) -+#define WDCR_SYS_RST (1 << 1) -+#define WDCR_ENABLE (1 << 0) -+ -+#define WDT_CLOCK 5000000 /* 5 MHz */ -+#define WDT_DEFAULT_TIMEOUT 13 -+#define WDT_MAX_TIMEOUT (0xFFFFFFFF / WDT_CLOCK) -+ -+/* status bits */ -+#define WDT_ACTIVE 0 -+#define WDT_OK_TO_CLOSE 1 -+ -+static unsigned int timeout = WDT_DEFAULT_TIMEOUT; -+static int nowayout = WATCHDOG_NOWAYOUT; -+ -+static DEFINE_SPINLOCK(gemini_wdt_lock); -+ -+static struct platform_device *gemini_wdt_dev; -+ -+struct gemini_wdt_struct { -+ struct resource *res; -+ struct device *dev; -+ void __iomem *base; -+ unsigned long status; -+}; -+ -+static struct watchdog_info gemini_wdt_info = { -+ .identity = "Gemini watchdog", -+ .options = WDIOF_MAGICCLOSE | WDIOF_KEEPALIVEPING | -+ WDIOF_SETTIMEOUT, -+}; -+ -+/* Disable the watchdog. */ -+static void gemini_wdt_stop(struct gemini_wdt_struct *gemini_wdt) -+{ -+ spin_lock(&gemini_wdt_lock); -+ -+ __raw_writel(0, gemini_wdt->base + GEMINI_WDCR); -+ -+ clear_bit(WDT_ACTIVE, &gemini_wdt->status); -+ -+ spin_unlock(&gemini_wdt_lock); -+} -+ -+/* Service the watchdog */ -+static void gemini_wdt_service(struct gemini_wdt_struct *gemini_wdt) -+{ -+ __raw_writel(WDRESTART_MAGIC, gemini_wdt->base + GEMINI_WDRESTART); -+} -+ -+/* Enable and reset the watchdog. */ -+static void gemini_wdt_start(struct gemini_wdt_struct *gemini_wdt) -+{ -+ spin_lock(&gemini_wdt_lock); -+ -+ __raw_writel(timeout * WDT_CLOCK, gemini_wdt->base + GEMINI_WDLOAD); -+ -+ gemini_wdt_service(gemini_wdt); -+ -+ /* set clock before enabling */ -+ __raw_writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST, -+ gemini_wdt->base + GEMINI_WDCR); -+ -+ __raw_writel(WDCR_CLOCK_5MHZ | WDCR_SYS_RST | WDCR_ENABLE, -+ gemini_wdt->base + GEMINI_WDCR); -+ -+ set_bit(WDT_ACTIVE, &gemini_wdt->status); -+ -+ spin_unlock(&gemini_wdt_lock); -+} -+ -+/* Watchdog device is opened, and watchdog starts running. */ -+static int gemini_wdt_open(struct inode *inode, struct file *file) -+{ -+ struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(gemini_wdt_dev); -+ -+ if (test_bit(WDT_ACTIVE, &gemini_wdt->status)) -+ return -EBUSY; -+ -+ file->private_data = gemini_wdt; -+ -+ gemini_wdt_start(gemini_wdt); -+ -+ return nonseekable_open(inode, file); -+} -+ -+/* Close the watchdog device. */ -+static int gemini_wdt_close(struct inode *inode, struct file *file) -+{ -+ struct gemini_wdt_struct *gemini_wdt = file->private_data; -+ -+ /* Disable the watchdog if possible */ -+ if (test_bit(WDT_OK_TO_CLOSE, &gemini_wdt->status)) -+ gemini_wdt_stop(gemini_wdt); -+ else -+ dev_warn(gemini_wdt->dev, "Device closed unexpectedly - timer will not stop\n"); -+ -+ return 0; -+} -+ -+/* Handle commands from user-space. */ -+static long gemini_wdt_ioctl(struct file *file, unsigned int cmd, -+ unsigned long arg) -+{ -+ struct gemini_wdt_struct *gemini_wdt = file->private_data; -+ -+ int value; -+ -+ switch (cmd) { -+ case WDIOC_KEEPALIVE: -+ gemini_wdt_service(gemini_wdt); -+ return 0; -+ -+ case WDIOC_GETSUPPORT: -+ return copy_to_user((struct watchdog_info *)arg, &gemini_wdt_info, -+ sizeof(gemini_wdt_info)) ? -EFAULT : 0; -+ -+ case WDIOC_SETTIMEOUT: -+ if (get_user(value, (int *)arg)) -+ return -EFAULT; -+ -+ if ((value < 1) || (value > WDT_MAX_TIMEOUT)) -+ return -EINVAL; -+ -+ timeout = value; -+ -+ /* restart wdt to use new timeout */ -+ gemini_wdt_stop(gemini_wdt); -+ gemini_wdt_start(gemini_wdt); -+ -+ /* Fall through */ -+ case WDIOC_GETTIMEOUT: -+ return put_user(timeout, (int *)arg); -+ -+ case WDIOC_GETTIMELEFT: -+ value = __raw_readl(gemini_wdt->base + GEMINI_WDCOUNTER); -+ return put_user(value / WDT_CLOCK, (int *)arg); -+ -+ default: -+ return -ENOTTY; -+ } -+} -+ -+/* Refresh the watchdog whenever device is written to. */ -+static ssize_t gemini_wdt_write(struct file *file, const char *data, -+ size_t len, loff_t *ppos) -+{ -+ struct gemini_wdt_struct *gemini_wdt = file->private_data; -+ -+ if (len) { -+ if (!nowayout) { -+ size_t i; -+ -+ clear_bit(WDT_OK_TO_CLOSE, &gemini_wdt->status); -+ for (i = 0; i != len; i++) { -+ char c; -+ -+ if (get_user(c, data + i)) -+ return -EFAULT; -+ if (c == 'V') -+ set_bit(WDT_OK_TO_CLOSE, -+ &gemini_wdt->status); -+ } -+ } -+ gemini_wdt_service(gemini_wdt); -+ } -+ -+ return len; -+} -+ -+static const struct file_operations gemini_wdt_fops = { -+ .owner = THIS_MODULE, -+ .llseek = no_llseek, -+ .unlocked_ioctl = gemini_wdt_ioctl, -+ .open = gemini_wdt_open, -+ .release = gemini_wdt_close, -+ .write = gemini_wdt_write, -+}; -+ -+static struct miscdevice gemini_wdt_miscdev = { -+ .minor = WATCHDOG_MINOR, -+ .name = "watchdog", -+ .fops = &gemini_wdt_fops, -+}; -+ -+static void gemini_wdt_shutdown(struct platform_device *pdev) -+{ -+ struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev); -+ -+ gemini_wdt_stop(gemini_wdt); -+} -+ -+static int gemini_wdt_probe(struct platform_device *pdev) -+{ -+ int ret; -+ int res_size; -+ struct resource *res; -+ void __iomem *base; -+ struct gemini_wdt_struct *gemini_wdt; -+ unsigned int reg; -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!res) { -+ dev_err(&pdev->dev, "can't get device resources\n"); -+ return -ENODEV; -+ } -+ -+ res_size = resource_size(res); -+ if (!request_mem_region(res->start, res_size, res->name)) { -+ dev_err(&pdev->dev, "can't allocate %d bytes at %d address\n", -+ res_size, res->start); -+ return -ENOMEM; -+ } -+ -+ base = ioremap(res->start, res_size); -+ if (!base) { -+ dev_err(&pdev->dev, "ioremap failed\n"); -+ ret = -EIO; -+ goto fail0; -+ } -+ -+ gemini_wdt = kzalloc(sizeof(struct gemini_wdt_struct), GFP_KERNEL); -+ if (!gemini_wdt) { -+ dev_err(&pdev->dev, "can't allocate interface\n"); -+ ret = -ENOMEM; -+ goto fail1; -+ } -+ -+ /* Setup gemini_wdt driver structure */ -+ gemini_wdt->base = base; -+ gemini_wdt->res = res; -+ -+ /* Set up platform driver data */ -+ platform_set_drvdata(pdev, gemini_wdt); -+ gemini_wdt_dev = pdev; -+ -+ if (gemini_wdt_miscdev.parent) { -+ ret = -EBUSY; -+ goto fail2; -+ } -+ -+ gemini_wdt_miscdev.parent = &pdev->dev; -+ -+ reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR); -+ if (reg & WDCR_ENABLE) { -+ /* Watchdog was enabled by the bootloader, disable it. */ -+ reg &= ~(WDCR_ENABLE); -+ __raw_writel(reg, gemini_wdt->base + GEMINI_WDCR); -+ } -+ -+ ret = misc_register(&gemini_wdt_miscdev); -+ if (ret) -+ goto fail2; -+ -+ return 0; -+ -+fail2: -+ platform_set_drvdata(pdev, NULL); -+ kfree(gemini_wdt); -+fail1: -+ iounmap(base); -+fail0: -+ release_mem_region(res->start, res_size); -+ -+ return ret; -+} -+ -+static int gemini_wdt_remove(struct platform_device *pdev) -+{ -+ struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev); -+ -+ platform_set_drvdata(pdev, NULL); -+ misc_deregister(&gemini_wdt_miscdev); -+ gemini_wdt_dev = NULL; -+ iounmap(gemini_wdt->base); -+ release_mem_region(gemini_wdt->res->start, resource_size(gemini_wdt->res)); -+ -+ kfree(gemini_wdt); -+ -+ return 0; -+} -+ -+#ifdef CONFIG_PM -+static int gemini_wdt_suspend(struct platform_device *pdev, pm_message_t message) -+{ -+ struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev); -+ unsigned int reg; -+ -+ reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR); -+ reg &= ~(WDCR_WDENABLE); -+ __raw_writel(reg, gemini_wdt->base + GEMINI_WDCR); -+ -+ return 0; -+} -+ -+static int gemini_wdt_resume(struct platform_device *pdev) -+{ -+ struct gemini_wdt_struct *gemini_wdt = platform_get_drvdata(pdev); -+ unsigned int reg; -+ -+ if (gemini_wdt->status) { -+ reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR); -+ reg |= WDCR_WDENABLE; -+ __raw_writel(reg, gemini_wdt->base + GEMINI_WDCR); -+ } -+ -+ return 0; -+} -+#else -+#define gemini_wdt_suspend NULL -+#define gemini_wdt_resume NULL -+#endif -+ -+static struct platform_driver gemini_wdt_driver = { -+ .probe = gemini_wdt_probe, -+ .remove = gemini_wdt_remove, -+ .shutdown = gemini_wdt_shutdown, -+ .suspend = gemini_wdt_suspend, -+ .resume = gemini_wdt_resume, -+ .driver = { -+ .name = "gemini-wdt", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init gemini_wdt_init(void) -+{ -+ return platform_driver_probe(&gemini_wdt_driver, gemini_wdt_probe); -+} -+ -+static void __exit gemini_wdt_exit(void) -+{ -+ platform_driver_unregister(&gemini_wdt_driver); -+} -+ -+module_init(gemini_wdt_init); -+module_exit(gemini_wdt_exit); -+ -+module_param(timeout, uint, 0); -+MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds"); -+ -+module_param(nowayout, int, 0); -+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); -+ -+MODULE_AUTHOR("Paulius Zaleckas"); -+MODULE_DESCRIPTION("Watchdog driver for Gemini"); -+MODULE_LICENSE("GPL"); -+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); -+MODULE_ALIAS("platform:gemini-wdt"); ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -198,6 +198,16 @@ config 977_WATCHDOG - - Not sure? It's safe to say N. - -+config GEMINI_WATCHDOG -+ tristate "Gemini watchdog" -+ depends on ARCH_GEMINI -+ help -+ Say Y here if to include support for the watchdog timer -+ embedded in the Cortina Systems Gemini family of devices. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called gemini_wdt. -+ - config IXP4XX_WATCHDOG - tristate "IXP4xx Watchdog" - depends on ARCH_IXP4XX ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -37,6 +37,7 @@ obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt. - obj-$(CONFIG_TWL4030_WATCHDOG) += twl4030_wdt.o - obj-$(CONFIG_21285_WATCHDOG) += wdt285.o - obj-$(CONFIG_977_WATCHDOG) += wdt977.o -+obj-$(CONFIG_GEMINI_WATCHDOG) += gemini_wdt.o - obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o - obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o - obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o diff --git a/target/linux/gemini/patches-4.1/111-arm-gemini-add-watchdog-device.patch b/target/linux/gemini/patches-4.1/111-arm-gemini-add-watchdog-device.patch deleted file mode 100644 index a0435d3cdc..0000000000 --- a/target/linux/gemini/patches-4.1/111-arm-gemini-add-watchdog-device.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/arch/arm/mach-gemini/devices.c -+++ b/arch/arm/mach-gemini/devices.c -@@ -117,3 +117,20 @@ int __init platform_register_rtc(void) - return platform_device_register(&gemini_rtc_device); - } - -+static struct resource wdt_resource = { -+ .start = GEMINI_WAQTCHDOG_BASE, -+ .end = GEMINI_WAQTCHDOG_BASE + 0x18, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device wdt_device = { -+ .name = "gemini-wdt", -+ .id = 0, -+ .resource = &wdt_resource, -+ .num_resources = 1, -+}; -+ -+int __init platform_register_watchdog(void) -+{ -+ return platform_device_register(&wdt_device); -+} ---- a/arch/arm/mach-gemini/common.h -+++ b/arch/arm/mach-gemini/common.h -@@ -27,6 +27,7 @@ extern int platform_register_uart(void); - extern int platform_register_pflash(unsigned int size, - struct mtd_partition *parts, - unsigned int nr_parts); -+extern int platform_register_watchdog(void); - - extern void gemini_restart(enum reboot_mode mode, const char *cmd); - diff --git a/target/linux/gemini/patches-4.1/112-arm-gemini-register-watchdog-devices.patch b/target/linux/gemini/patches-4.1/112-arm-gemini-register-watchdog-devices.patch deleted file mode 100644 index 74564b199e..0000000000 --- a/target/linux/gemini/patches-4.1/112-arm-gemini-register-watchdog-devices.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/arch/arm/mach-gemini/board-nas4220b.c -+++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -95,6 +95,7 @@ static void __init ib4220b_init(void) - platform_device_register(&ib4220b_led_device); - platform_device_register(&ib4220b_key_device); - platform_register_rtc(); -+ platform_register_watchdog(); - } - - MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") ---- a/arch/arm/mach-gemini/board-wbd111.c -+++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -122,6 +122,7 @@ static void __init wbd111_init(void) - platform_device_register(&wbd111_leds_device); - platform_device_register(&wbd111_keys_device); - platform_register_rtc(); -+ platform_register_watchdog(); - } - - MACHINE_START(WBD111, "Wiliboard WBD-111") ---- a/arch/arm/mach-gemini/board-wbd222.c -+++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -122,6 +122,7 @@ static void __init wbd222_init(void) - platform_device_register(&wbd222_leds_device); - platform_device_register(&wbd222_keys_device); - platform_register_rtc(); -+ platform_register_watchdog(); - } - - MACHINE_START(WBD222, "Wiliboard WBD-222") ---- a/arch/arm/mach-gemini/board-rut1xx.c -+++ b/arch/arm/mach-gemini/board-rut1xx.c -@@ -80,6 +80,7 @@ static void __init rut1xx_init(void) - platform_device_register(&rut1xx_leds); - platform_device_register(&rut1xx_keys_device); - platform_register_rtc(); -+ platform_register_watchdog(); - } - - MACHINE_START(RUT100, "Teltonika RUT100") diff --git a/target/linux/gemini/patches-4.1/120-net-add-gemini-gmac-driver.patch b/target/linux/gemini/patches-4.1/120-net-add-gemini-gmac-driver.patch deleted file mode 100644 index fd5045cae8..0000000000 --- a/target/linux/gemini/patches-4.1/120-net-add-gemini-gmac-driver.patch +++ /dev/null @@ -1,3953 +0,0 @@ ---- /dev/null -+++ b/arch/arm/mach-gemini/include/mach/gmac.h -@@ -0,0 +1,21 @@ -+/* -+ * Gemini GMAC specific defines -+ * -+ * Copyright (C) 2008, Paulius Zaleckas <paulius.zaleckas@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+#ifndef __NET_GEMINI_PLATFORM_H__ -+#define __NET_GEMINI_PLATFORM_H__ -+ -+#include <linux/phy.h> -+ -+struct gemini_gmac_platform_data { -+ char *bus_id[2]; /* NULL means that this port is not used */ -+ phy_interface_t interface[2]; -+}; -+ -+#endif /* __NET_GEMINI_PLATFORM_H__ */ ---- a/arch/arm/mach-gemini/common.h -+++ b/arch/arm/mach-gemini/common.h -@@ -15,6 +15,7 @@ - #include <linux/reboot.h> - - struct mtd_partition; -+struct gemini_gmac_platform_data; - - extern void gemini_map_io(void); - extern void gemini_init_irq(void); -@@ -28,6 +29,7 @@ extern int platform_register_pflash(unsi - struct mtd_partition *parts, - unsigned int nr_parts); - extern int platform_register_watchdog(void); -+extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata); - - extern void gemini_restart(enum reboot_mode mode, const char *cmd); - ---- a/arch/arm/mach-gemini/devices.c -+++ b/arch/arm/mach-gemini/devices.c -@@ -17,6 +17,7 @@ - #include <mach/irqs.h> - #include <mach/hardware.h> - #include <mach/global_reg.h> -+#include <mach/gmac.h> - #include "common.h" - - static struct plat_serial8250_port serial_platform_data[] = { -@@ -134,3 +135,56 @@ int __init platform_register_watchdog(vo - { - return platform_device_register(&wdt_device); - } -+ -+static struct resource gmac_resources[] = { -+ { -+ .start = GEMINI_TOE_BASE, -+ .end = GEMINI_TOE_BASE + 0xffff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IRQ_GMAC0, -+ .end = IRQ_GMAC0, -+ .flags = IORESOURCE_IRQ, -+ }, -+ { -+ .start = IRQ_GMAC1, -+ .end = IRQ_GMAC1, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static u64 gmac_dmamask = 0xffffffffUL; -+ -+static struct platform_device ethernet_device = { -+ .name = "gmac-gemini", -+ .id = 0, -+ .dev = { -+ .dma_mask = &gmac_dmamask, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+ .num_resources = ARRAY_SIZE(gmac_resources), -+ .resource = gmac_resources, -+}; -+ -+int platform_register_ethernet(struct gemini_gmac_platform_data *pdata) -+{ -+ unsigned int reg; -+ -+ reg = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+ -+ reg &= ~(GMAC_GMII | GMAC_1_ENABLE); -+ -+ if (pdata->bus_id[1]) -+ reg |= GMAC_1_ENABLE; -+ else if (pdata->interface[0] == PHY_INTERFACE_MODE_GMII) -+ reg |= GMAC_GMII; -+ -+ writel(reg, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+ -+ ethernet_device.dev.platform_data = pdata; -+ -+ return platform_device_register(ðernet_device); -+} ---- a/drivers/net/ethernet/Kconfig -+++ b/drivers/net/ethernet/Kconfig -@@ -70,6 +70,7 @@ source "drivers/net/ethernet/neterion/Kc - source "drivers/net/ethernet/faraday/Kconfig" - source "drivers/net/ethernet/freescale/Kconfig" - source "drivers/net/ethernet/fujitsu/Kconfig" -+source "drivers/net/ethernet/gemini/Kconfig" - source "drivers/net/ethernet/hisilicon/Kconfig" - source "drivers/net/ethernet/hp/Kconfig" - source "drivers/net/ethernet/ibm/Kconfig" ---- a/drivers/net/ethernet/Makefile -+++ b/drivers/net/ethernet/Makefile -@@ -33,6 +33,7 @@ obj-$(CONFIG_NET_VENDOR_EXAR) += neterio - obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/ - obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/ - obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/ -+obj-$(CONFIG_NET_VENDOR_GEMINI) += gemini/ - obj-$(CONFIG_NET_VENDOR_HISILICON) += hisilicon/ - obj-$(CONFIG_NET_VENDOR_HP) += hp/ - obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ ---- /dev/null -+++ b/drivers/net/ethernet/gemini/Kconfig -@@ -0,0 +1,31 @@ -+# -+# Gemini device configuration -+# -+ -+config NET_VENDOR_GEMINI -+ bool "Cortina Gemini devices" -+ default y -+ depends on ARCH_GEMINI -+ ---help--- -+ If you have a network (Ethernet) card belonging to this class, say Y -+ and read the Ethernet-HOWTO, available from -+ <http://www.tldp.org/docs.html#howto>. -+ -+ Note that the answer to this question doesn't directly affect the -+ kernel: saying N will just cause the configurator to skip all -+ the questions about D-Link devices. If you say Y, you will be asked for -+ your specific card in the following questions. -+ -+if NET_VENDOR_GEMINI -+ -+config GEMINI_SL351X -+ tristate "StorLink SL351x Gigabit Ethernet support" -+ depends on ARCH_GEMINI -+ select PHYLIB -+ select MDIO_BITBANG -+ select MDIO_GPIO -+ select CRC32 -+ ---help--- -+ This driver supports StorLink SL351x (Gemini) dual Gigabit Ethernet. -+ -+endif # NET_VENDOR_GEMINI ---- /dev/null -+++ b/drivers/net/ethernet/gemini/Makefile -@@ -0,0 +1,5 @@ -+# -+# Makefile for the Cortina Gemini network device drivers. -+# -+ -+obj-$(CONFIG_GEMINI_SL351X) += sl351x.o ---- /dev/null -+++ b/drivers/net/ethernet/gemini/sl351x.c -@@ -0,0 +1,2340 @@ -+/* -+ * Ethernet device driver for Gemini SoC (SL351x GMAC). -+ * -+ * Copyright (C) 2011, Tobias Waldvogel <tobias.waldvogel@gmail.com> -+ * -+ * Based on work by MichaÅ‚ MirosÅ‚aw <mirq-linux@rere.qmqm.pl> and -+ * Paulius Zaleckas <paulius.zaleckas@gmail.com> and -+ * Giuseppe De Robertis <Giuseppe.DeRobertis@ba.infn.it> and -+ * GPLd spaghetti code from Raidsonic and other Gemini-based NAS vendors. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+ -+#include <linux/module.h> -+#include <linux/kernel.h> -+#include <linux/init.h> -+ -+#include <linux/spinlock.h> -+#include <linux/slab.h> -+#include <linux/dma-mapping.h> -+#include <linux/cache.h> -+#include <linux/interrupt.h> -+ -+#include <linux/platform_device.h> -+#include <linux/etherdevice.h> -+#include <linux/if_vlan.h> -+#include <linux/skbuff.h> -+#include <linux/phy.h> -+#include <linux/crc32.h> -+#include <linux/ethtool.h> -+#include <linux/tcp.h> -+#include <linux/u64_stats_sync.h> -+ -+#include <linux/in.h> -+#include <linux/ip.h> -+#include <linux/ipv6.h> -+ -+#include <mach/hardware.h> -+#include <mach/global_reg.h> -+ -+#include <mach/gmac.h> -+#include "sl351x_hw.h" -+ -+#define DRV_NAME "gmac-gemini" -+#define DRV_VERSION "1.0" -+ -+#define HSIZE_8 0b00 -+#define HSIZE_16 0b01 -+#define HSIZE_32 0b10 -+ -+#define HBURST_SINGLE 0b00 -+#define HBURST_INCR 0b01 -+#define HBURST_INCR4 0b10 -+#define HBURST_INCR8 0b11 -+ -+#define HPROT_DATA_CACHE BIT(0) -+#define HPROT_PRIVILIGED BIT(1) -+#define HPROT_BUFFERABLE BIT(2) -+#define HPROT_CACHABLE BIT(3) -+ -+#define DEFAULT_RX_COALESCE_NSECS 0 -+#define DEFAULT_GMAC_RXQ_ORDER 9 -+#define DEFAULT_GMAC_TXQ_ORDER 8 -+#define DEFAULT_RX_BUF_ORDER 11 -+#define DEFAULT_NAPI_WEIGHT 64 -+#define TX_MAX_FRAGS 16 -+#define TX_QUEUE_NUM 1 /* max: 6 */ -+#define RX_MAX_ALLOC_ORDER 2 -+ -+#define GMAC0_IRQ0_2 (GMAC0_TXDERR_INT_BIT|GMAC0_TXPERR_INT_BIT| \ -+ GMAC0_RXDERR_INT_BIT|GMAC0_RXPERR_INT_BIT) -+#define GMAC0_IRQ0_TXQ0_INTS (GMAC0_SWTQ00_EOF_INT_BIT| \ -+ GMAC0_SWTQ00_FIN_INT_BIT) -+#define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT|GMAC0_RX_OVERRUN_INT_BIT) -+ -+#define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \ -+ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \ -+ NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6) -+ -+MODULE_AUTHOR("Tobias Waldvogel"); -+MODULE_DESCRIPTION("StorLink SL351x (Gemini) ethernet driver"); -+MODULE_LICENSE("GPL"); -+MODULE_ALIAS("platform:" DRV_NAME); -+ -+struct toe_private { -+ void __iomem *iomem; -+ spinlock_t irq_lock; -+ -+ struct net_device *netdev[2]; -+ __le32 mac_addr[2][3]; -+ -+ struct device *dev; -+ int irq; -+ -+ unsigned int freeq_order; -+ unsigned int freeq_frag_order; -+ GMAC_RXDESC_T *freeq_ring; -+ dma_addr_t freeq_dma_base; -+ struct page **freeq_page_tab; -+ spinlock_t freeq_lock; -+}; -+ -+struct gmac_txq { -+ GMAC_TXDESC_T *ring; -+ struct sk_buff **skb; -+ unsigned int cptr; -+ unsigned int noirq_packets; -+}; -+ -+struct gmac_private { -+ unsigned int num; -+ struct toe_private *toe; -+ void __iomem *ctl_iomem; -+ void __iomem *dma_iomem; -+ -+ void __iomem *rxq_rwptr; -+ GMAC_RXDESC_T *rxq_ring; -+ unsigned int rxq_order; -+ -+ struct napi_struct napi; -+ struct hrtimer rx_coalesce_timer; -+ unsigned int rx_coalesce_nsecs; -+ unsigned int freeq_refill; -+ struct gmac_txq txq[TX_QUEUE_NUM]; -+ unsigned int txq_order; -+ unsigned int irq_every_tx_packets; -+ -+ dma_addr_t rxq_dma_base; -+ dma_addr_t txq_dma_base; -+ -+ unsigned int msg_enable; -+ spinlock_t config_lock; -+ -+ struct u64_stats_sync tx_stats_syncp; -+ struct u64_stats_sync rx_stats_syncp; -+ struct u64_stats_sync ir_stats_syncp; -+ -+ struct rtnl_link_stats64 stats; -+ u64 hw_stats[RX_STATS_NUM]; -+ u64 rx_stats[RX_STATUS_NUM]; -+ u64 rx_csum_stats[RX_CHKSUM_NUM]; -+ u64 rx_napi_exits; -+ u64 tx_frag_stats[TX_MAX_FRAGS]; -+ u64 tx_frags_linearized; -+ u64 tx_hw_csummed; -+}; -+ -+#define GMAC_STATS_NUM ( \ -+ RX_STATS_NUM + RX_STATUS_NUM + RX_CHKSUM_NUM + 1 + \ -+ TX_MAX_FRAGS + 2) -+ -+static const char gmac_stats_strings[GMAC_STATS_NUM][ETH_GSTRING_LEN] = { -+ "GMAC_IN_DISCARDS", -+ "GMAC_IN_ERRORS", -+ "GMAC_IN_MCAST", -+ "GMAC_IN_BCAST", -+ "GMAC_IN_MAC1", -+ "GMAC_IN_MAC2", -+ "RX_STATUS_GOOD_FRAME", -+ "RX_STATUS_TOO_LONG_GOOD_CRC", -+ "RX_STATUS_RUNT_FRAME", -+ "RX_STATUS_SFD_NOT_FOUND", -+ "RX_STATUS_CRC_ERROR", -+ "RX_STATUS_TOO_LONG_BAD_CRC", -+ "RX_STATUS_ALIGNMENT_ERROR", -+ "RX_STATUS_TOO_LONG_BAD_ALIGN", -+ "RX_STATUS_RX_ERR", -+ "RX_STATUS_DA_FILTERED", -+ "RX_STATUS_BUFFER_FULL", -+ "RX_STATUS_11", -+ "RX_STATUS_12", -+ "RX_STATUS_13", -+ "RX_STATUS_14", -+ "RX_STATUS_15", -+ "RX_CHKSUM_IP_UDP_TCP_OK", -+ "RX_CHKSUM_IP_OK_ONLY", -+ "RX_CHKSUM_NONE", -+ "RX_CHKSUM_3", -+ "RX_CHKSUM_IP_ERR_UNKNOWN", -+ "RX_CHKSUM_IP_ERR", -+ "RX_CHKSUM_TCP_UDP_ERR", -+ "RX_CHKSUM_7", -+ "RX_NAPI_EXITS", -+ "TX_FRAGS[1]", -+ "TX_FRAGS[2]", -+ "TX_FRAGS[3]", -+ "TX_FRAGS[4]", -+ "TX_FRAGS[5]", -+ "TX_FRAGS[6]", -+ "TX_FRAGS[7]", -+ "TX_FRAGS[8]", -+ "TX_FRAGS[9]", -+ "TX_FRAGS[10]", -+ "TX_FRAGS[11]", -+ "TX_FRAGS[12]", -+ "TX_FRAGS[13]", -+ "TX_FRAGS[14]", -+ "TX_FRAGS[15]", -+ "TX_FRAGS[16+]", -+ "TX_FRAGS_LINEARIZED", -+ "TX_HW_CSUMMED", -+}; -+ -+static void gmac_dump_dma_state(struct net_device *dev); -+ -+static void gmac_update_config0_reg(struct net_device *dev, u32 val, u32 vmask) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ unsigned long flags; -+ u32 reg; -+ -+ spin_lock_irqsave(&gmac->config_lock, flags); -+ -+ reg = readl(gmac->ctl_iomem + GMAC_CONFIG0); -+ reg = (reg & ~vmask) | val; -+ writel(reg, gmac->ctl_iomem + GMAC_CONFIG0); -+ -+ spin_unlock_irqrestore(&gmac->config_lock, flags); -+} -+ -+static void gmac_enable_tx_rx(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0; -+ unsigned long flags; -+ u32 reg; -+ -+ spin_lock_irqsave(&gmac->config_lock, flags); -+ -+ reg = readl(config0); -+ reg &= ~CONFIG0_TX_RX_DISABLE; -+ writel(reg, config0); -+ -+ spin_unlock_irqrestore(&gmac->config_lock, flags); -+} -+ -+static void gmac_disable_tx_rx(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0; -+ unsigned long flags; -+ u32 reg; -+ -+ spin_lock_irqsave(&gmac->config_lock, flags); -+ -+ reg = readl(config0); -+ reg |= CONFIG0_TX_RX_DISABLE; -+ writel(reg, config0); -+ -+ spin_unlock_irqrestore(&gmac->config_lock, flags); -+ -+ mdelay(10); /* let GMAC consume packet */ -+} -+ -+static void gmac_set_flow_control(struct net_device *dev, bool tx, bool rx) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ void __iomem *config0 = gmac->ctl_iomem + GMAC_CONFIG0; -+ unsigned long flags; -+ u32 reg; -+ -+ spin_lock_irqsave(&gmac->config_lock, flags); -+ -+ reg = readl(config0); -+ reg &= ~CONFIG0_FLOW_CTL; -+ if (tx) -+ reg |= CONFIG0_FLOW_TX; -+ if (rx) -+ reg |= CONFIG0_FLOW_RX; -+ writel(reg, config0); -+ -+ spin_unlock_irqrestore(&gmac->config_lock, flags); -+} -+ -+static void gmac_update_link_state(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ void __iomem *status_reg = gmac->ctl_iomem + GMAC_STATUS; -+ struct phy_device *phydev = dev->phydev; -+ GMAC_STATUS_T status, old_status; -+ int pause_tx=0, pause_rx=0; -+ -+ old_status.bits32 = status.bits32 = readl(status_reg); -+ -+ status.bits.link = phydev->link; -+ status.bits.duplex = phydev->duplex; -+ -+ switch (phydev->speed) { -+ case 1000: -+ status.bits.speed = GMAC_SPEED_1000; -+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII) -+ status.bits.mii_rmii = GMAC_PHY_RGMII_1000; -+ break; -+ case 100: -+ status.bits.speed = GMAC_SPEED_100; -+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII) -+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; -+ break; -+ case 10: -+ status.bits.speed = GMAC_SPEED_10; -+ if (phydev->interface == PHY_INTERFACE_MODE_RGMII) -+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; -+ break; -+ default: -+ netdev_warn(dev, "Not supported PHY speed (%d)\n", -+ phydev->speed); -+ } -+ -+ if (phydev->duplex == DUPLEX_FULL) { -+ u16 lcladv = phy_read(phydev, MII_ADVERTISE); -+ u16 rmtadv = phy_read(phydev, MII_LPA); -+ u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv); -+ -+ if (cap & FLOW_CTRL_RX) -+ pause_rx=1; -+ if (cap & FLOW_CTRL_TX) -+ pause_tx=1; -+ } -+ -+ gmac_set_flow_control(dev, pause_tx, pause_rx); -+ -+ if (old_status.bits32 == status.bits32) -+ return; -+ -+ if (netif_msg_link(gmac)) { -+ phy_print_status(phydev); -+ netdev_info(dev, "link flow control: %s\n", -+ phydev->pause -+ ? (phydev->asym_pause ? "tx" : "both") -+ : (phydev->asym_pause ? "rx" : "none") -+ ); -+ } -+ -+ gmac_disable_tx_rx(dev); -+ writel(status.bits32, status_reg); -+ gmac_enable_tx_rx(dev); -+} -+ -+static int gmac_setup_phy(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ struct gemini_gmac_platform_data *pdata = toe->dev->platform_data; -+ GMAC_STATUS_T status = { .bits32 = 0 }; -+ int num = dev->dev_id; -+ -+ dev->phydev = phy_connect(dev, pdata->bus_id[num], -+ &gmac_update_link_state, pdata->interface[num]); -+ -+ if (IS_ERR(dev->phydev)) { -+ int err = PTR_ERR(dev->phydev); -+ dev->phydev = NULL; -+ return err; -+ } -+ -+ dev->phydev->supported &= PHY_GBIT_FEATURES; -+ dev->phydev->supported |= SUPPORTED_Asym_Pause | SUPPORTED_Pause; -+ dev->phydev->advertising = dev->phydev->supported; -+ -+ /* set PHY interface type */ -+ switch (dev->phydev->interface) { -+ case PHY_INTERFACE_MODE_MII: -+ status.bits.mii_rmii = GMAC_PHY_MII; -+ break; -+ case PHY_INTERFACE_MODE_GMII: -+ status.bits.mii_rmii = GMAC_PHY_GMII; -+ break; -+ case PHY_INTERFACE_MODE_RGMII: -+ status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; -+ break; -+ default: -+ netdev_err(dev, "Unsupported MII interface\n"); -+ phy_disconnect(dev->phydev); -+ dev->phydev = NULL; -+ return -EINVAL; -+ } -+ writel(status.bits32, gmac->ctl_iomem + GMAC_STATUS); -+ -+ return 0; -+} -+ -+static int gmac_pick_rx_max_len(int max_l3_len) -+{ -+ /* index = CONFIG_MAXLEN_XXX values */ -+ static const int max_len[8] = { -+ 1536, 1518, 1522, 1542, -+ 9212, 10236, 1518, 1518 -+ }; -+ int i, n = 5; -+ -+ max_l3_len += ETH_HLEN + VLAN_HLEN; -+ -+ if (max_l3_len > max_len[n]) -+ return -1; -+ -+ for (i = 0; i < 5; ++i) { -+ if (max_len[i] >= max_l3_len && max_len[i] < max_len[n]) -+ n = i; -+ } -+ -+ return n; -+} -+ -+static int gmac_init(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ u32 val; -+ -+ GMAC_CONFIG0_T config0 = { .bits = { -+ .dis_tx = 1, -+ .dis_rx = 1, -+ .ipv4_rx_chksum = 1, -+ .ipv6_rx_chksum = 1, -+ .rx_err_detect = 1, -+ .rgmm_edge = 1, -+ .port0_chk_hwq = 1, -+ .port1_chk_hwq = 1, -+ .port0_chk_toeq = 1, -+ .port1_chk_toeq = 1, -+ .port0_chk_classq = 1, -+ .port1_chk_classq = 1, -+ } }; -+ GMAC_AHB_WEIGHT_T ahb_weight = { .bits = { -+ .rx_weight = 1, -+ .tx_weight = 1, -+ .hash_weight = 1, -+ .pre_req = 0x1f, -+ .tqDV_threshold = 0, -+ } }; -+ GMAC_TX_WCR0_T hw_weigh = { .bits = { -+ .hw_tq3 = 1, -+ .hw_tq2 = 1, -+ .hw_tq1 = 1, -+ .hw_tq0 = 1, -+ } }; -+ GMAC_TX_WCR1_T sw_weigh = { .bits = { -+ .sw_tq5 = 1, -+ .sw_tq4 = 1, -+ .sw_tq3 = 1, -+ .sw_tq2 = 1, -+ .sw_tq1 = 1, -+ .sw_tq0 = 1, -+ } }; -+ GMAC_CONFIG1_T config1 = { .bits = { -+ .set_threshold = 16, -+ .rel_threshold = 24, -+ } }; -+ GMAC_CONFIG2_T config2 = { .bits = { -+ .set_threshold = 16, -+ .rel_threshold = 32, -+ } }; -+ GMAC_CONFIG3_T config3 = { .bits = { -+ .set_threshold = 0, -+ .rel_threshold = 0, -+ } }; -+ -+ config0.bits.max_len = gmac_pick_rx_max_len(dev->mtu); -+ -+ val = readl(gmac->ctl_iomem + GMAC_CONFIG0); -+ config0.bits.reserved = ((GMAC_CONFIG0_T)val).bits.reserved; -+ writel(config0.bits32, gmac->ctl_iomem + GMAC_CONFIG0); -+ writel(config1.bits32, gmac->ctl_iomem + GMAC_CONFIG1); -+ writel(config2.bits32, gmac->ctl_iomem + GMAC_CONFIG2); -+ writel(config3.bits32, gmac->ctl_iomem + GMAC_CONFIG3); -+ -+ val = readl(gmac->dma_iomem + GMAC_AHB_WEIGHT_REG); -+ writel(ahb_weight.bits32, gmac->dma_iomem + GMAC_AHB_WEIGHT_REG); -+ -+ writel(hw_weigh.bits32, -+ gmac->dma_iomem + GMAC_TX_WEIGHTING_CTRL_0_REG); -+ writel(sw_weigh.bits32, -+ gmac->dma_iomem + GMAC_TX_WEIGHTING_CTRL_1_REG); -+ -+ gmac->rxq_order = DEFAULT_GMAC_RXQ_ORDER; -+ gmac->txq_order = DEFAULT_GMAC_TXQ_ORDER; -+ gmac->rx_coalesce_nsecs = DEFAULT_RX_COALESCE_NSECS; -+ -+ /* Mark every quarter of the queue a packet for interrupt -+ in order to be able to wake up the queue if it was stopped */ -+ gmac->irq_every_tx_packets = 1 << (gmac->txq_order - 2); -+ -+ return 0; -+} -+ -+static void gmac_uninit(struct net_device *dev) -+{ -+ if (dev->phydev) -+ phy_disconnect(dev->phydev); -+} -+ -+static int gmac_setup_txqs(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ void __iomem *rwptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG; -+ void __iomem *base_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_BASE_REG; -+ -+ unsigned int n_txq = dev->num_tx_queues; -+ size_t entries = 1 <<gmac->txq_order; -+ size_t len = n_txq * entries; -+ struct gmac_txq *txq = gmac->txq; -+ GMAC_TXDESC_T *desc_ring; -+ struct sk_buff **skb_tab; -+ unsigned int r; -+ int i; -+ -+ skb_tab = kzalloc(len * sizeof(*skb_tab), GFP_KERNEL); -+ if (!skb_tab) -+ return -ENOMEM; -+ -+ desc_ring = dma_alloc_coherent(toe->dev, len * sizeof(*desc_ring), -+ &gmac->txq_dma_base, GFP_KERNEL); -+ -+ if (!desc_ring) { -+ kfree(skb_tab); -+ return -ENOMEM; -+ } -+ -+ BUG_ON(gmac->txq_dma_base & ~DMA_Q_BASE_MASK); -+ -+ writel(gmac->txq_dma_base | gmac->txq_order, base_reg); -+ -+ for (i = 0; i < n_txq; i++) { -+ txq->ring = desc_ring; -+ txq->skb = skb_tab; -+ txq->noirq_packets = 0; -+ -+ r = readw(rwptr_reg); -+ rwptr_reg += 2; -+ writew(r, rwptr_reg); -+ rwptr_reg +=2; -+ txq->cptr = r; -+ -+ txq++; -+ desc_ring += entries; -+ skb_tab += entries; -+ } -+ -+ return 0; -+} -+ -+static void gmac_clean_txq(struct net_device *dev, struct gmac_txq *txq, -+ unsigned int r) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned int errs = 0; -+ unsigned int pkts = 0; -+ unsigned int hwchksum = 0; -+ unsigned long bytes = 0; -+ unsigned int m = (1 << gmac->txq_order) - 1; -+ unsigned int c = txq->cptr; -+ GMAC_TXDESC_0_T word0; -+ GMAC_TXDESC_1_T word1; -+ unsigned int word3; -+ dma_addr_t mapping; -+ GMAC_TXDESC_T *txd; -+ unsigned short nfrags; -+ -+ if (unlikely(c == r)) -+ return; -+ -+ rmb(); -+ while (c != r) { -+ txd = txq->ring + c; -+ word0 = txd->word0; -+ word1 = txd->word1; -+ mapping = txd->word2.buf_adr; -+ word3 = txd->word3.bits32; -+ -+ dma_unmap_single(toe->dev, mapping, word0.bits.buffer_size, DMA_TO_DEVICE); -+ -+ if (word3 & EOF_BIT) -+ dev_kfree_skb(txq->skb[c]); -+ -+ c++; -+ c &= m; -+ -+ if (!(word3 & SOF_BIT)) -+ continue; -+ -+ if (!word0.bits.status_tx_ok) { -+ errs++; -+ continue; -+ } -+ -+ pkts++; -+ bytes += txd->word1.bits.byte_count; -+ -+ if (word1.bits32 & TSS_CHECKUM_ENABLE) -+ hwchksum++; -+ -+ nfrags = word0.bits.desc_count - 1; -+ if (nfrags) { -+ if (nfrags >= TX_MAX_FRAGS) -+ nfrags = TX_MAX_FRAGS - 1; -+ -+ u64_stats_update_begin(&gmac->tx_stats_syncp); -+ gmac->tx_frag_stats[nfrags]++; -+ u64_stats_update_end(&gmac->ir_stats_syncp); -+ } -+ } -+ -+ u64_stats_update_begin(&gmac->ir_stats_syncp); -+ gmac->stats.tx_errors += errs; -+ gmac->stats.tx_packets += pkts; -+ gmac->stats.tx_bytes += bytes; -+ gmac->tx_hw_csummed += hwchksum; -+ u64_stats_update_end(&gmac->ir_stats_syncp); -+ -+ txq->cptr = c; -+} -+ -+static void gmac_cleanup_txqs(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ void __iomem *rwptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG; -+ void __iomem *base_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_BASE_REG; -+ -+ unsigned n_txq = dev->num_tx_queues; -+ unsigned int r, i; -+ -+ for (i = 0; i < n_txq; i++) { -+ r = readw(rwptr_reg); -+ rwptr_reg += 2; -+ writew(r, rwptr_reg); -+ rwptr_reg += 2; -+ -+ gmac_clean_txq(dev, gmac->txq + i, r); -+ } -+ writel(0, base_reg); -+ -+ kfree(gmac->txq->skb); -+ dma_free_coherent(toe->dev, -+ n_txq * sizeof(*gmac->txq->ring) << gmac->txq_order, -+ gmac->txq->ring, gmac->txq_dma_base); -+} -+ -+static int gmac_setup_rxq(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ NONTOE_QHDR_T __iomem *qhdr = toe->iomem + TOE_DEFAULT_Q_HDR_BASE(dev->dev_id); -+ -+ gmac->rxq_rwptr = &qhdr->word1; -+ gmac->rxq_ring = dma_alloc_coherent(toe->dev, -+ sizeof(*gmac->rxq_ring) << gmac->rxq_order, -+ &gmac->rxq_dma_base, GFP_KERNEL); -+ if (!gmac->rxq_ring) -+ return -ENOMEM; -+ -+ BUG_ON(gmac->rxq_dma_base & ~NONTOE_QHDR0_BASE_MASK); -+ -+ writel(gmac->rxq_dma_base | gmac->rxq_order, &qhdr->word0); -+ writel(0, gmac->rxq_rwptr); -+ return 0; -+} -+ -+static void gmac_cleanup_rxq(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ -+ NONTOE_QHDR_T __iomem *qhdr = toe->iomem + TOE_DEFAULT_Q_HDR_BASE(dev->dev_id); -+ void __iomem *dma_reg = &qhdr->word0; -+ void __iomem *ptr_reg = &qhdr->word1; -+ GMAC_RXDESC_T *rxd = gmac->rxq_ring; -+ DMA_RWPTR_T rw; -+ unsigned int r, w; -+ unsigned int m = (1 <<gmac->rxq_order) - 1; -+ struct page *page; -+ dma_addr_t mapping; -+ -+ rw.bits32 = readl(ptr_reg); -+ r = rw.bits.rptr; -+ w = rw.bits.wptr; -+ writew(r, ptr_reg + 2); -+ -+ writel(0, dma_reg); -+ -+ rmb(); -+ while (r != w) { -+ mapping = rxd[r].word2.buf_adr; -+ r++; -+ r &= m; -+ -+ if (!mapping) -+ continue; -+ -+ page = pfn_to_page(dma_to_pfn(toe->dev, mapping)); -+ put_page(page); -+ } -+ -+ dma_free_coherent(toe->dev, sizeof(*gmac->rxq_ring) << gmac->rxq_order, -+ gmac->rxq_ring, gmac->rxq_dma_base); -+} -+ -+static struct page *toe_freeq_alloc_map_page(struct toe_private *toe, int pn) -+{ -+ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order; -+ unsigned int frag_len = 1 << toe->freeq_frag_order; -+ GMAC_RXDESC_T *freeq_entry; -+ dma_addr_t mapping; -+ struct page *page; -+ int i; -+ -+ page = alloc_page(__GFP_COLD | GFP_ATOMIC); -+ if (!page) -+ return NULL; -+ -+ mapping = dma_map_single(toe->dev, page_address(page), -+ PAGE_SIZE, DMA_FROM_DEVICE); -+ -+ if (unlikely(dma_mapping_error(toe->dev, mapping) || !mapping)) { -+ put_page(page); -+ return NULL; -+ } -+ -+ freeq_entry = toe->freeq_ring + (pn << fpp_order); -+ for (i = 1 << fpp_order; i > 0; --i) { -+ freeq_entry->word2.buf_adr = mapping; -+ freeq_entry++; -+ mapping += frag_len; -+ } -+ -+ if (toe->freeq_page_tab[pn]) { -+ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr; -+ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE); -+ put_page(toe->freeq_page_tab[pn]); -+ } -+ -+ toe->freeq_page_tab[pn] = page; -+ return page; -+} -+ -+static unsigned int toe_fill_freeq(struct toe_private *toe, int reset) -+{ -+ void __iomem *rwptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG; -+ -+ DMA_RWPTR_T rw; -+ unsigned int pn, epn; -+ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order; -+ unsigned int m_pn = (1 << (toe->freeq_order - fpp_order)) - 1; -+ struct page *page; -+ unsigned int count = 0; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&toe->freeq_lock, flags); -+ -+ rw.bits32 = readl(rwptr_reg); -+ pn = (reset ? rw.bits.rptr : rw.bits.wptr) >> fpp_order; -+ epn = (rw.bits.rptr >> fpp_order) - 1; -+ epn &= m_pn; -+ -+ while (pn != epn) { -+ page = toe->freeq_page_tab[pn]; -+ -+ if (atomic_read(&page->_count) > 1) { -+ unsigned int fl = (pn -epn) & m_pn; -+ -+ if (fl > 64 >> fpp_order) -+ break; -+ -+ page = toe_freeq_alloc_map_page(toe, pn); -+ if (!page) -+ break; -+ } -+ -+ atomic_add(1 << fpp_order, &page->_count); -+ count += 1 << fpp_order; -+ pn++; -+ pn &= m_pn; -+ } -+ -+ wmb(); -+ writew(pn << fpp_order, rwptr_reg+2); -+ -+ spin_unlock_irqrestore(&toe->freeq_lock, flags); -+ return count; -+} -+ -+static int toe_setup_freeq(struct toe_private *toe) -+{ -+ void __iomem *dma_reg = toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG; -+ QUEUE_THRESHOLD_T qt; -+ DMA_SKB_SIZE_T skbsz; -+ unsigned int filled; -+ unsigned int frag_len = 1 << toe->freeq_frag_order; -+ unsigned int len = 1 << toe->freeq_order; -+ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order; -+ unsigned int pages = len >> fpp_order; -+ dma_addr_t mapping; -+ unsigned int pn; -+ -+ toe->freeq_ring = dma_alloc_coherent(toe->dev, -+ sizeof(*toe->freeq_ring) << toe->freeq_order, -+ &toe->freeq_dma_base, GFP_KERNEL); -+ if (!toe->freeq_ring) -+ return -ENOMEM; -+ -+ BUG_ON(toe->freeq_dma_base & ~DMA_Q_BASE_MASK); -+ -+ toe->freeq_page_tab = kzalloc(pages * sizeof(*toe->freeq_page_tab), -+ GFP_KERNEL); -+ if (!toe->freeq_page_tab) -+ goto err_freeq; -+ -+ for (pn = 0; pn < pages; pn++) -+ if (!toe_freeq_alloc_map_page(toe, pn)) -+ goto err_freeq_alloc; -+ -+ filled = toe_fill_freeq(toe, 1); -+ if (!filled) -+ goto err_freeq_alloc; -+ -+ qt.bits32 = readl(toe->iomem + GLOBAL_QUEUE_THRESHOLD_REG); -+ qt.bits.swfq_empty = 32; -+ writel(qt.bits32, toe->iomem + GLOBAL_QUEUE_THRESHOLD_REG); -+ -+ skbsz.bits.sw_skb_size = 1 << toe->freeq_frag_order; -+ writel(skbsz.bits32, toe->iomem + GLOBAL_DMA_SKB_SIZE_REG); -+ writel(toe->freeq_dma_base | toe->freeq_order, dma_reg); -+ -+ return 0; -+ -+err_freeq_alloc: -+ while (pn > 0) { -+ --pn; -+ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr; -+ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE); -+ put_page(toe->freeq_page_tab[pn]); -+ } -+ -+err_freeq: -+ dma_free_coherent(toe->dev, -+ sizeof(*toe->freeq_ring) << toe->freeq_order, -+ toe->freeq_ring, toe->freeq_dma_base); -+ toe->freeq_ring = NULL; -+ return -ENOMEM; -+} -+ -+static void toe_cleanup_freeq(struct toe_private *toe) -+{ -+ void __iomem *dma_reg = toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG; -+ void __iomem *ptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG; -+ -+ unsigned int frag_len = 1 << toe->freeq_frag_order; -+ unsigned int len = 1 << toe->freeq_order; -+ unsigned int fpp_order = PAGE_SHIFT - toe->freeq_frag_order; -+ unsigned int pages = len >> fpp_order; -+ struct page *page; -+ dma_addr_t mapping; -+ unsigned int pn; -+ -+ writew(readw(ptr_reg), ptr_reg + 2); -+ writel(0, dma_reg); -+ -+ for (pn = 0; pn < pages; pn++) { -+ mapping = toe->freeq_ring[pn << fpp_order].word2.buf_adr; -+ dma_unmap_single(toe->dev, mapping, frag_len, DMA_FROM_DEVICE); -+ -+ page = toe->freeq_page_tab[pn]; -+ while (atomic_read(&page->_count) > 0) -+ put_page(page); -+ } -+ -+ kfree(toe->freeq_page_tab); -+ -+ dma_free_coherent(toe->dev, -+ sizeof(*toe->freeq_ring) << toe->freeq_order, -+ toe->freeq_ring, toe->freeq_dma_base); -+} -+ -+static int toe_resize_freeq(struct toe_private *toe, int changing_dev_id) -+{ -+ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG; -+ struct gmac_private *gmac; -+ struct net_device *other = toe->netdev[1 - changing_dev_id]; -+ unsigned new_size = 0; -+ unsigned new_order; -+ int err; -+ unsigned long flags; -+ unsigned en; -+ -+ if (other && netif_running(other)) -+ return -EBUSY; -+ -+ if (toe->netdev[0]) { -+ gmac = netdev_priv(toe->netdev[0]); -+ new_size = 1 << (gmac->rxq_order + 1); -+ } -+ -+ if (toe->netdev[1]) { -+ gmac = netdev_priv(toe->netdev[1]); -+ new_size += 1 << (gmac->rxq_order + 1); -+ } -+ -+ new_order = min(15, ilog2(new_size - 1) + 1); -+ if (toe->freeq_order == new_order) -+ return 0; -+ -+ spin_lock_irqsave(&toe->irq_lock, flags); -+ en = readl(irqen_reg); -+ en &= ~SWFQ_EMPTY_INT_BIT; -+ writel(en, irqen_reg); -+ -+ if (toe->freeq_ring) -+ toe_cleanup_freeq(toe); -+ -+ toe->freeq_order = new_order; -+ err = toe_setup_freeq(toe); -+ -+ en |= SWFQ_EMPTY_INT_BIT; -+ writel(en, irqen_reg); -+ spin_unlock_irqrestore(&toe->irq_lock, flags); -+ -+ return err; -+} -+ -+static void gmac_tx_irq_enable(struct net_device *dev, unsigned txq, int en) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned val, mask; -+ -+ mask = GMAC0_IRQ0_TXQ0_INTS << (6 * dev->dev_id + txq); -+ -+ if (en) -+ writel(mask, toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG); -+ -+ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+ val = en ? val | mask : val & ~mask; -+ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+} -+ -+ -+static void gmac_tx_irq(struct net_device *dev, unsigned txq_num) -+{ -+ struct netdev_queue *ntxq = netdev_get_tx_queue(dev, txq_num); -+ -+ gmac_tx_irq_enable(dev, txq_num, 0); -+ netif_tx_wake_queue(ntxq); -+} -+ -+static int gmac_map_tx_bufs(struct net_device *dev, struct sk_buff *skb, -+ struct gmac_txq *txq, unsigned short *desc) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ struct skb_shared_info *skb_si = skb_shinfo(skb); -+ skb_frag_t *skb_frag; -+ short frag, last_frag = skb_si->nr_frags - 1; -+ unsigned short m = (1 << gmac->txq_order) -1; -+ unsigned short w = *desc; -+ unsigned word1, word3, buflen; -+ dma_addr_t mapping; -+ void *buffer; -+ unsigned short mtu; -+ GMAC_TXDESC_T *txd; -+ -+ mtu = ETH_HLEN; -+ mtu += dev->mtu; -+ if (skb->protocol == htons(ETH_P_8021Q)) -+ mtu += VLAN_HLEN; -+ -+ word1 = skb->len; -+ word3 = SOF_BIT; -+ -+ if (word1 > mtu) { -+ word1 |= TSS_MTU_ENABLE_BIT; -+ word3 += mtu; -+ } -+ -+ if (skb->ip_summed != CHECKSUM_NONE) { -+ int tcp = 0; -+ if (skb->protocol == htons(ETH_P_IP)) { -+ word1 |= TSS_IP_CHKSUM_BIT; -+ tcp = ip_hdr(skb)->protocol == IPPROTO_TCP; -+ } else { /* IPv6 */ -+ word1 |= TSS_IPV6_ENABLE_BIT; -+ tcp = ipv6_hdr(skb)->nexthdr == IPPROTO_TCP; -+ } -+ -+ word1 |= tcp ? TSS_TCP_CHKSUM_BIT : TSS_UDP_CHKSUM_BIT; -+ } -+ -+ frag = -1; -+ while (frag <= last_frag) { -+ if (frag == -1) { -+ buffer = skb->data; -+ buflen = skb_headlen(skb); -+ } else { -+ skb_frag = skb_si->frags + frag; -+ buffer = page_address(skb_frag_page(skb_frag)) + -+ skb_frag->page_offset; -+ buflen = skb_frag->size; -+ } -+ -+ if (frag == last_frag) { -+ word3 |= EOF_BIT; -+ txq->skb[w] = skb; -+ } -+ -+ mapping = dma_map_single(toe->dev, buffer, buflen, -+ DMA_TO_DEVICE); -+ if (dma_mapping_error(toe->dev, mapping) || -+ !(mapping & PAGE_MASK)) -+ goto map_error; -+ -+ txd = txq->ring + w; -+ txd->word0.bits32 = buflen; -+ txd->word1.bits32 = word1; -+ txd->word2.buf_adr = mapping; -+ txd->word3.bits32 = word3; -+ -+ word3 &= MTU_SIZE_BIT_MASK; -+ w++; -+ w &= m; -+ frag++; -+ } -+ -+ *desc = w; -+ return 0; -+ -+map_error: -+ while (w != *desc) { -+ w--; -+ w &= m; -+ -+ dma_unmap_page(toe->dev, txq->ring[w].word2.buf_adr, -+ txq->ring[w].word0.bits.buffer_size, DMA_TO_DEVICE); -+ } -+ return ENOMEM; -+} -+ -+static int gmac_start_xmit(struct sk_buff *skb, struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ -+ void __iomem *ptr_reg; -+ struct gmac_txq *txq; -+ struct netdev_queue *ntxq; -+ int txq_num, nfrags; -+ DMA_RWPTR_T rw; -+ unsigned short r, w, d; -+ unsigned short m = (1 << gmac->txq_order) - 1; -+ -+ SKB_FRAG_ASSERT(skb); -+ -+ if (unlikely(skb->len >= 0x10000)) -+ goto out_drop_free; -+ -+ txq_num = skb_get_queue_mapping(skb); -+ ptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE_PTR_REG(txq_num); -+ txq = &gmac->txq[txq_num]; -+ ntxq = netdev_get_tx_queue(dev, txq_num); -+ nfrags = skb_shinfo(skb)->nr_frags; -+ -+ rw.bits32 = readl(ptr_reg); -+ r = rw.bits.rptr; -+ w = rw.bits.wptr; -+ -+ d = txq->cptr - w - 1; -+ d &= m; -+ -+ if (unlikely(d < nfrags+2)) -+ { -+ gmac_clean_txq(dev, txq, r); -+ d = txq->cptr - w - 1; -+ d &= m; -+ -+ if (unlikely(d < nfrags+2)) { -+ netif_tx_stop_queue(ntxq); -+ -+ d = txq->cptr + nfrags + 16; -+ d &= m; -+ txq->ring[d].word3.bits.eofie = 1; -+ gmac_tx_irq_enable(dev, txq_num, 1); -+ -+ u64_stats_update_begin(&gmac->tx_stats_syncp); -+ dev->stats.tx_fifo_errors++; -+ u64_stats_update_end(&gmac->tx_stats_syncp); -+ return NETDEV_TX_BUSY; -+ } -+ } -+ -+ if (unlikely(gmac_map_tx_bufs(dev, skb, txq, &w))) { -+ if (skb_linearize(skb)) -+ goto out_drop; -+ -+ if (unlikely(gmac_map_tx_bufs(dev, skb, txq, &w))) -+ goto out_drop_free; -+ -+ u64_stats_update_begin(&gmac->tx_stats_syncp); -+ gmac->tx_frags_linearized++; -+ u64_stats_update_end(&gmac->tx_stats_syncp); -+ } -+ -+ writew(w, ptr_reg+2); -+ -+ gmac_clean_txq(dev, txq, r); -+ return NETDEV_TX_OK; -+ -+out_drop_free: -+ dev_kfree_skb(skb); -+out_drop: -+ u64_stats_update_begin(&gmac->tx_stats_syncp); -+ gmac->stats.tx_dropped++; -+ u64_stats_update_end(&gmac->tx_stats_syncp); -+ return NETDEV_TX_OK; -+} -+ -+static void gmac_tx_timeout(struct net_device *dev) -+{ -+ netdev_err(dev, "Tx timeout\n"); -+ gmac_dump_dma_state(dev); -+} -+ -+static void gmac_enable_irq(struct net_device *dev, int enable) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned long flags; -+ unsigned val, mask; -+ -+ spin_lock_irqsave(&toe->irq_lock, flags); -+ -+ mask = GMAC0_IRQ0_2 << (dev->dev_id * 2); -+ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+ val = enable ? (val | mask) : (val & ~mask); -+ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+ -+ mask = DEFAULT_Q0_INT_BIT << dev->dev_id; -+ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ val = enable ? (val | mask) : (val & ~mask); -+ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ -+ mask = GMAC0_IRQ4_8 << (dev->dev_id * 8); -+ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG); -+ val = enable ? (val | mask) : (val & ~mask); -+ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG); -+ -+ spin_unlock_irqrestore(&toe->irq_lock, flags); -+} -+ -+static void gmac_enable_rx_irq(struct net_device *dev, int enable) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned long flags; -+ unsigned val, mask; -+ -+ spin_lock_irqsave(&toe->irq_lock, flags); -+ mask = DEFAULT_Q0_INT_BIT << dev->dev_id; -+ -+ val = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ val = enable ? (val | mask) : (val & ~mask); -+ writel(val, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ -+ spin_unlock_irqrestore(&toe->irq_lock, flags); -+} -+ -+static struct sk_buff *gmac_skb_if_good_frame(struct gmac_private *gmac, -+ GMAC_RXDESC_0_T word0, unsigned frame_len) -+{ -+ struct sk_buff *skb = NULL; -+ unsigned rx_status = word0.bits.status; -+ unsigned rx_csum = word0.bits.chksum_status; -+ -+ gmac->rx_stats[rx_status]++; -+ gmac->rx_csum_stats[rx_csum]++; -+ -+ if (word0.bits.derr || word0.bits.perr || -+ rx_status || frame_len < ETH_ZLEN || -+ rx_csum >= RX_CHKSUM_IP_ERR_UNKNOWN) { -+ gmac->stats.rx_errors++; -+ -+ if (frame_len < ETH_ZLEN || RX_ERROR_LENGTH(rx_status)) -+ gmac->stats.rx_length_errors++; -+ if (RX_ERROR_OVER(rx_status)) -+ gmac->stats.rx_over_errors++; -+ if (RX_ERROR_CRC(rx_status)) -+ gmac->stats.rx_crc_errors++; -+ if (RX_ERROR_FRAME(rx_status)) -+ gmac->stats.rx_frame_errors++; -+ -+ return NULL; -+ } -+ -+ skb = napi_get_frags(&gmac->napi); -+ if (!skb) -+ return NULL; -+ -+ if (rx_csum == RX_CHKSUM_IP_UDP_TCP_OK) -+ skb->ip_summed = CHECKSUM_UNNECESSARY; -+ -+ gmac->stats.rx_bytes += frame_len; -+ gmac->stats.rx_packets++; -+ return skb; -+} -+ -+static unsigned gmac_rx(struct net_device *dev, unsigned budget) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ void __iomem *ptr_reg = gmac->rxq_rwptr; -+ -+ static struct sk_buff *skb; -+ -+ DMA_RWPTR_T rw; -+ unsigned short r, w; -+ unsigned short m = (1 << gmac->rxq_order) -1; -+ GMAC_RXDESC_T *rx = NULL; -+ struct page* page = NULL; -+ unsigned page_offs; -+ unsigned int frame_len, frag_len; -+ int frag_nr = 0; -+ -+ GMAC_RXDESC_0_T word0; -+ GMAC_RXDESC_1_T word1; -+ dma_addr_t mapping; -+ GMAC_RXDESC_3_T word3; -+ -+ rw.bits32 = readl(ptr_reg); -+ /* Reset interrupt as all packages until here are taken into account */ -+ writel(DEFAULT_Q0_INT_BIT << dev->dev_id, -+ toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG); -+ r = rw.bits.rptr; -+ w = rw.bits.wptr; -+ -+ while (budget && w != r) { -+ rx = gmac->rxq_ring + r; -+ word0 = rx->word0; -+ word1 = rx->word1; -+ mapping = rx->word2.buf_adr; -+ word3 = rx->word3; -+ -+ r++; -+ r &= m; -+ -+ frag_len = word0.bits.buffer_size; -+ frame_len =word1.bits.byte_count; -+ page_offs = mapping & ~PAGE_MASK; -+ -+ if (unlikely(!mapping)) { -+ netdev_err(dev, "rxq[%u]: HW BUG: zero DMA desc\n", r); -+ goto err_drop; -+ } -+ -+ page = pfn_to_page(dma_to_pfn(toe->dev, mapping)); -+ -+ if (word3.bits32 & SOF_BIT) { -+ if (unlikely(skb)) { -+ napi_free_frags(&gmac->napi); -+ gmac->stats.rx_dropped++; -+ } -+ -+ skb = gmac_skb_if_good_frame(gmac, word0, frame_len); -+ if (unlikely(!skb)) -+ goto err_drop; -+ -+ page_offs += NET_IP_ALIGN; -+ frag_len -= NET_IP_ALIGN; -+ frag_nr = 0; -+ -+ } else if (!skb) { -+ put_page(page); -+ continue; -+ } -+ -+ if (word3.bits32 & EOF_BIT) -+ frag_len = frame_len - skb->len; -+ -+ /* append page frag to skb */ -+ if (unlikely(frag_nr == MAX_SKB_FRAGS)) -+ goto err_drop; -+ -+ if (frag_len == 0) -+ netdev_err(dev, "Received fragment with len = 0\n"); -+ -+ skb_fill_page_desc(skb, frag_nr, page, page_offs, frag_len); -+ skb->len += frag_len; -+ skb->data_len += frag_len; -+ skb->truesize += frag_len; -+ frag_nr++; -+ -+ if (word3.bits32 & EOF_BIT) { -+ napi_gro_frags(&gmac->napi); -+ skb = NULL; -+ --budget; -+ } -+ continue; -+ -+err_drop: -+ if (skb) { -+ napi_free_frags(&gmac->napi); -+ skb = NULL; -+ } -+ -+ if (mapping) -+ put_page(page); -+ -+ gmac->stats.rx_dropped++; -+ } -+ -+ writew(r, ptr_reg); -+ return budget; -+} -+ -+static int gmac_napi_poll(struct napi_struct *napi, int budget) -+{ -+ struct gmac_private *gmac = netdev_priv(napi->dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned rx; -+ unsigned freeq_threshold = 1 << (toe->freeq_order - 1); -+ -+ u64_stats_update_begin(&gmac->rx_stats_syncp); -+ -+ rx = budget - gmac_rx(napi->dev, budget); -+ -+ if (rx == 0) { -+ napi_gro_flush(napi, false); -+ __napi_complete(napi); -+ gmac_enable_rx_irq(napi->dev, 1); -+ ++gmac->rx_napi_exits; -+ } -+ -+ gmac->freeq_refill += rx; -+ if (gmac->freeq_refill > freeq_threshold) { -+ gmac->freeq_refill -= freeq_threshold; -+ toe_fill_freeq(toe, 0); -+ } -+ -+ u64_stats_update_end(&gmac->rx_stats_syncp); -+ return budget; -+} -+ -+static void gmac_dump_dma_state(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ void __iomem *ptr_reg; -+ unsigned reg[5]; -+ -+ /* Interrupt status */ -+ reg[0] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG); -+ reg[1] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG); -+ reg[2] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_2_REG); -+ reg[3] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_3_REG); -+ reg[4] = readl(toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG); -+ netdev_err(dev, "IRQ status: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ reg[0], reg[1], reg[2], reg[3], reg[4]); -+ -+ /* Interrupt enable */ -+ reg[0] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+ reg[1] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ reg[2] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_2_REG); -+ reg[3] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_3_REG); -+ reg[4] = readl(toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG); -+ netdev_err(dev, "IRQ enable: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ reg[0], reg[1], reg[2], reg[3], reg[4]); -+ -+ /* RX DMA status */ -+ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_RX_FIRST_DESC_REG); -+ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_RX_CURR_DESC_REG); -+ reg[2] = GET_RPTR(gmac->rxq_rwptr); -+ reg[3] = GET_WPTR(gmac->rxq_rwptr); -+ netdev_err(dev, "RX DMA regs: 0x%08x 0x%08x, ptr: %u %u\n", -+ reg[0], reg[1], reg[2], reg[3]); -+ -+ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD0_REG); -+ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD1_REG); -+ reg[2] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD2_REG); -+ reg[3] = readl(gmac->dma_iomem + GMAC_DMA_RX_DESC_WORD3_REG); -+ netdev_err(dev, "RX DMA descriptor: 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ reg[0], reg[1], reg[2], reg[3]); -+ -+ /* TX DMA status */ -+ ptr_reg = gmac->dma_iomem + GMAC_SW_TX_QUEUE0_PTR_REG; -+ -+ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_TX_FIRST_DESC_REG); -+ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_TX_CURR_DESC_REG); -+ reg[2] = GET_RPTR(ptr_reg); -+ reg[3] = GET_WPTR(ptr_reg); -+ netdev_err(dev, "TX DMA regs: 0x%08x 0x%08x, ptr: %u %u\n", -+ reg[0], reg[1], reg[2], reg[3]); -+ -+ reg[0] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD0_REG); -+ reg[1] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD1_REG); -+ reg[2] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD2_REG); -+ reg[3] = readl(gmac->dma_iomem + GMAC_DMA_TX_DESC_WORD3_REG); -+ netdev_err(dev, "TX DMA descriptor: 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ reg[0], reg[1], reg[2], reg[3]); -+ -+ /* FREE queues status */ -+ ptr_reg = toe->iomem + GLOBAL_SWFQ_RWPTR_REG; -+ -+ reg[0] = GET_RPTR(ptr_reg); -+ reg[1] = GET_WPTR(ptr_reg); -+ -+ ptr_reg = toe->iomem + GLOBAL_HWFQ_RWPTR_REG; -+ -+ reg[2] = GET_RPTR(ptr_reg); -+ reg[3] = GET_WPTR(ptr_reg); -+ netdev_err(dev, "FQ SW ptr: %u %u, HW ptr: %u %u\n", -+ reg[0], reg[1], reg[2], reg[3]); -+} -+ -+static void gmac_update_hw_stats(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned long flags; -+ unsigned int rx_discards, rx_mcast, rx_bcast; -+ -+ spin_lock_irqsave(&toe->irq_lock, flags); -+ u64_stats_update_begin(&gmac->ir_stats_syncp); -+ -+ gmac->hw_stats[0] += rx_discards = readl(gmac->ctl_iomem + GMAC_IN_DISCARDS); -+ gmac->hw_stats[1] += readl(gmac->ctl_iomem + GMAC_IN_ERRORS); -+ gmac->hw_stats[2] += rx_mcast = readl(gmac->ctl_iomem + GMAC_IN_MCAST); -+ gmac->hw_stats[3] += rx_bcast = readl(gmac->ctl_iomem + GMAC_IN_BCAST); -+ gmac->hw_stats[4] += readl(gmac->ctl_iomem + GMAC_IN_MAC1); -+ gmac->hw_stats[5] += readl(gmac->ctl_iomem + GMAC_IN_MAC2); -+ -+ gmac->stats.rx_missed_errors += rx_discards; -+ gmac->stats.multicast += rx_mcast; -+ gmac->stats.multicast += rx_bcast; -+ -+ writel(GMAC0_MIB_INT_BIT << (dev->dev_id * 8), -+ toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG); -+ -+ u64_stats_update_end(&gmac->ir_stats_syncp); -+ spin_unlock_irqrestore(&toe->irq_lock, flags); -+} -+ -+static inline unsigned gmac_get_intr_flags(struct net_device *dev, int i) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ void __iomem *irqif_reg, *irqen_reg; -+ unsigned offs, val; -+ -+ offs = i * (GLOBAL_INTERRUPT_STATUS_1_REG - GLOBAL_INTERRUPT_STATUS_0_REG); -+ -+ irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG + offs; -+ irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG + offs; -+ -+ val = readl(irqif_reg) & readl(irqen_reg); -+ return val; -+} -+ -+enum hrtimer_restart gmac_coalesce_delay_expired( struct hrtimer *timer ) -+{ -+ struct gmac_private *gmac = container_of(timer, struct gmac_private, rx_coalesce_timer); -+ -+ napi_schedule(&gmac->napi); -+ return HRTIMER_NORESTART; -+} -+ -+static irqreturn_t gmac_irq(int irq, void *data) -+{ -+ struct net_device *dev = data; -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ unsigned val, orr = 0; -+ -+ orr |= val = gmac_get_intr_flags(dev, 0); -+ -+ if (unlikely(val & (GMAC0_IRQ0_2 << (dev->dev_id * 2)))) { -+ /* oh, crap. */ -+ netdev_err(dev, "hw failure/sw bug\n"); -+ gmac_dump_dma_state(dev); -+ -+ /* don't know how to recover, just reduce losses */ -+ gmac_enable_irq(dev, 0); -+ return IRQ_HANDLED; -+ } -+ -+ if (val & (GMAC0_IRQ0_TXQ0_INTS << (dev->dev_id * 6))) -+ gmac_tx_irq(dev, 0); -+ -+ orr |= val = gmac_get_intr_flags(dev, 1); -+ -+ if (val & (DEFAULT_Q0_INT_BIT << dev->dev_id)) { -+ -+ gmac_enable_rx_irq(dev, 0); -+ -+ if (!gmac->rx_coalesce_nsecs) -+ napi_schedule(&gmac->napi); -+ else { -+ ktime_t ktime; -+ ktime = ktime_set(0, gmac->rx_coalesce_nsecs); -+ hrtimer_start(&gmac->rx_coalesce_timer, ktime, HRTIMER_MODE_REL); -+ } -+ } -+ -+ orr |= val = gmac_get_intr_flags(dev, 4); -+ -+ if (unlikely(val & (GMAC0_MIB_INT_BIT << (dev->dev_id * 8)))) -+ gmac_update_hw_stats(dev); -+ -+ if (unlikely(val & (GMAC0_RX_OVERRUN_INT_BIT << (dev->dev_id * 8)))) { -+ writel(GMAC0_RXDERR_INT_BIT << (dev->dev_id * 8), -+ toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG); -+ -+ spin_lock(&toe->irq_lock); -+ u64_stats_update_begin(&gmac->ir_stats_syncp); -+ ++gmac->stats.rx_fifo_errors; -+ u64_stats_update_end(&gmac->ir_stats_syncp); -+ spin_unlock(&toe->irq_lock); -+ } -+ -+ return orr ? IRQ_HANDLED : IRQ_NONE; -+} -+ -+static void gmac_start_dma(struct gmac_private *gmac) -+{ -+ void __iomem *dma_ctrl_reg = gmac->dma_iomem + GMAC_DMA_CTRL_REG; -+ GMAC_DMA_CTRL_T dma_ctrl; -+ -+ dma_ctrl.bits32 = readl(dma_ctrl_reg); -+ dma_ctrl.bits.rd_enable = 1; -+ dma_ctrl.bits.td_enable = 1; -+ dma_ctrl.bits.loopback = 0; -+ dma_ctrl.bits.drop_small_ack = 0; -+ dma_ctrl.bits.rd_insert_bytes = NET_IP_ALIGN; -+ dma_ctrl.bits.rd_prot = HPROT_DATA_CACHE | HPROT_PRIVILIGED; -+ dma_ctrl.bits.rd_burst_size = HBURST_INCR8; -+ dma_ctrl.bits.rd_bus = HSIZE_8; -+ dma_ctrl.bits.td_prot = HPROT_DATA_CACHE; -+ dma_ctrl.bits.td_burst_size = HBURST_INCR8; -+ dma_ctrl.bits.td_bus = HSIZE_8; -+ -+ writel(dma_ctrl.bits32, dma_ctrl_reg); -+} -+ -+static void gmac_stop_dma(struct gmac_private *gmac) -+{ -+ void __iomem *dma_ctrl_reg = gmac->dma_iomem + GMAC_DMA_CTRL_REG; -+ GMAC_DMA_CTRL_T dma_ctrl; -+ -+ dma_ctrl.bits32 = readl(dma_ctrl_reg); -+ dma_ctrl.bits.rd_enable = 0; -+ dma_ctrl.bits.td_enable = 0; -+ writel(dma_ctrl.bits32, dma_ctrl_reg); -+} -+ -+static int gmac_open(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ int err; -+ -+ if (!dev->phydev) { -+ err = gmac_setup_phy(dev); -+ if (err) { -+ netif_err(gmac, ifup, dev, -+ "PHY init failed: %d\n", err); -+ return err; -+ } -+ } -+ -+ err = request_irq(dev->irq, gmac_irq, -+ IRQF_SHARED, dev->name, dev); -+ if (unlikely(err)) -+ return err; -+ -+ netif_carrier_off(dev); -+ phy_start(dev->phydev); -+ -+ err = toe_resize_freeq(gmac->toe, dev->dev_id); -+ if (unlikely(err)) -+ goto err_stop_phy; -+ -+ err = gmac_setup_rxq(dev); -+ if (unlikely(err)) -+ goto err_stop_phy; -+ -+ err = gmac_setup_txqs(dev); -+ if (unlikely(err)) { -+ gmac_cleanup_rxq(dev); -+ goto err_stop_phy; -+ } -+ -+ napi_enable(&gmac->napi); -+ -+ gmac_start_dma(gmac); -+ gmac_enable_irq(dev, 1); -+ gmac_enable_tx_rx(dev); -+ netif_tx_start_all_queues(dev); -+ -+ hrtimer_init(&gmac->rx_coalesce_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ gmac->rx_coalesce_timer.function = &gmac_coalesce_delay_expired; -+ return 0; -+ -+err_stop_phy: -+ phy_stop(dev->phydev); -+ free_irq(dev->irq, dev); -+ return err; -+} -+ -+static int gmac_stop(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ -+ hrtimer_cancel(&gmac->rx_coalesce_timer); -+ netif_tx_stop_all_queues(dev); -+ gmac_disable_tx_rx(dev); -+ gmac_stop_dma(gmac); -+ napi_disable(&gmac->napi); -+ -+ gmac_enable_irq(dev, 0); -+ gmac_cleanup_rxq(dev); -+ gmac_cleanup_txqs(dev); -+ -+ phy_stop(dev->phydev); -+ free_irq(dev->irq, dev); -+ -+ gmac_update_hw_stats(dev); -+ return 0; -+} -+ -+static void gmac_set_rx_mode(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct netdev_hw_addr *ha; -+ __u32 mc_filter[2]; -+ unsigned bit_nr; -+ GMAC_RX_FLTR_T filter = { .bits = { -+ .broadcast = 1, -+ .multicast = 1, -+ .unicast = 1, -+ } }; -+ -+ mc_filter[1] = mc_filter[0] = 0; -+ -+ if (dev->flags & IFF_PROMISC) { -+ filter.bits.error = 1; -+ filter.bits.promiscuous = 1; -+ } else if (!(dev->flags & IFF_ALLMULTI)) { -+ mc_filter[1] = mc_filter[0] = 0; -+ netdev_for_each_mc_addr(ha, dev) { -+ bit_nr = ~crc32_le(~0, ha->addr, ETH_ALEN) & 0x3f; -+ mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 0x1f); -+ } -+ } -+ -+ writel(mc_filter[0], gmac->ctl_iomem + GMAC_MCAST_FIL0); -+ writel(mc_filter[1], gmac->ctl_iomem + GMAC_MCAST_FIL1); -+ writel(filter.bits32, gmac->ctl_iomem + GMAC_RX_FLTR); -+} -+ -+static void __gmac_set_mac_address(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ __le32 addr[3]; -+ -+ memset(addr, 0, sizeof(addr)); -+ memcpy(addr, dev->dev_addr, ETH_ALEN); -+ -+ writel(le32_to_cpu(addr[0]), gmac->ctl_iomem + GMAC_STA_ADD0); -+ writel(le32_to_cpu(addr[1]), gmac->ctl_iomem + GMAC_STA_ADD1); -+ writel(le32_to_cpu(addr[2]), gmac->ctl_iomem + GMAC_STA_ADD2); -+} -+ -+static int gmac_set_mac_address(struct net_device *dev, void *addr) -+{ -+ struct sockaddr *sa = addr; -+ -+ memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); -+ __gmac_set_mac_address(dev); -+ -+ return 0; -+} -+ -+static void gmac_clear_hw_stats(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ -+ readl(gmac->ctl_iomem + GMAC_IN_DISCARDS); -+ readl(gmac->ctl_iomem + GMAC_IN_ERRORS); -+ readl(gmac->ctl_iomem + GMAC_IN_MCAST); -+ readl(gmac->ctl_iomem + GMAC_IN_BCAST); -+ readl(gmac->ctl_iomem + GMAC_IN_MAC1); -+ readl(gmac->ctl_iomem + GMAC_IN_MAC2); -+} -+ -+static struct rtnl_link_stats64 *gmac_get_stats64(struct net_device *dev, -+ struct rtnl_link_stats64 *storage) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ unsigned int start; -+ -+ gmac_update_hw_stats(dev); -+ -+ /* racing with RX NAPI */ -+ do { -+ start = u64_stats_fetch_begin(&gmac->rx_stats_syncp); -+ -+ storage->rx_packets = gmac->stats.rx_packets; -+ storage->rx_bytes = gmac->stats.rx_bytes; -+ storage->rx_errors = gmac->stats.rx_errors; -+ storage->rx_dropped = gmac->stats.rx_dropped; -+ -+ storage->rx_length_errors = gmac->stats.rx_length_errors; -+ storage->rx_over_errors = gmac->stats.rx_over_errors; -+ storage->rx_crc_errors = gmac->stats.rx_crc_errors; -+ storage->rx_frame_errors = gmac->stats.rx_frame_errors; -+ -+ } while (u64_stats_fetch_retry(&gmac->rx_stats_syncp, start)); -+ -+ /* racing with MIB and TX completion interrupts */ -+ do { -+ start = u64_stats_fetch_begin(&gmac->ir_stats_syncp); -+ -+ storage->tx_errors = gmac->stats.tx_errors; -+ storage->tx_packets = gmac->stats.tx_packets; -+ storage->tx_bytes = gmac->stats.tx_bytes; -+ -+ storage->multicast = gmac->stats.multicast; -+ storage->rx_missed_errors = gmac->stats.rx_missed_errors; -+ storage->rx_fifo_errors = gmac->stats.rx_fifo_errors; -+ -+ } while (u64_stats_fetch_retry(&gmac->ir_stats_syncp, start)); -+ -+ /* racing with hard_start_xmit */ -+ do { -+ start = u64_stats_fetch_begin(&gmac->tx_stats_syncp); -+ -+ storage->tx_dropped = gmac->stats.tx_dropped; -+ -+ } while (u64_stats_fetch_retry(&gmac->tx_stats_syncp, start)); -+ -+ storage->rx_dropped += storage->rx_missed_errors; -+ -+ return storage; -+} -+ -+static int gmac_change_mtu(struct net_device *dev, int new_mtu) -+{ -+ int max_len = gmac_pick_rx_max_len(new_mtu); -+ -+ if (max_len < 0) -+ return -EINVAL; -+ -+ gmac_disable_tx_rx(dev); -+ -+ dev->mtu = new_mtu; -+ gmac_update_config0_reg(dev, -+ max_len << CONFIG0_MAXLEN_SHIFT, -+ CONFIG0_MAXLEN_MASK); -+ -+ netdev_update_features(dev); -+ -+ gmac_enable_tx_rx(dev); -+ -+ return 0; -+} -+ -+static netdev_features_t gmac_fix_features(struct net_device *dev, netdev_features_t features) -+{ -+ if (dev->mtu + ETH_HLEN + VLAN_HLEN > MTU_SIZE_BIT_MASK) -+ features &= ~GMAC_OFFLOAD_FEATURES; -+ -+ return features; -+} -+ -+static int gmac_set_features(struct net_device *dev, netdev_features_t features) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ int enable = features & NETIF_F_RXCSUM; -+ unsigned long flags; -+ u32 reg; -+ -+ spin_lock_irqsave(&gmac->config_lock, flags); -+ -+ reg = readl(gmac->ctl_iomem + GMAC_CONFIG0); -+ reg = enable ? reg | CONFIG0_RX_CHKSUM : reg & ~CONFIG0_RX_CHKSUM; -+ writel(reg, gmac->ctl_iomem + GMAC_CONFIG0); -+ -+ spin_unlock_irqrestore(&gmac->config_lock, flags); -+ return 0; -+} -+ -+static int gmac_get_sset_count(struct net_device *dev, int sset) -+{ -+ return sset == ETH_SS_STATS ? GMAC_STATS_NUM : 0; -+} -+ -+static void gmac_get_strings(struct net_device *dev, u32 stringset, u8 *data) -+{ -+ if (stringset != ETH_SS_STATS) -+ return; -+ -+ memcpy(data, gmac_stats_strings, sizeof(gmac_stats_strings)); -+} -+ -+static void gmac_get_ethtool_stats(struct net_device *dev, -+ struct ethtool_stats *estats, u64 *values) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ unsigned int start; -+ u64 *p; -+ int i; -+ -+ gmac_update_hw_stats(dev); -+ -+ /* racing with MIB interrupt */ -+ do { -+ p = values; -+ start = u64_stats_fetch_begin(&gmac->ir_stats_syncp); -+ -+ for (i = 0; i < RX_STATS_NUM; ++i) -+ *p++ = gmac->hw_stats[i]; -+ -+ } while (u64_stats_fetch_retry(&gmac->ir_stats_syncp, start)); -+ values = p; -+ -+ /* racing with RX NAPI */ -+ do { -+ p = values; -+ start = u64_stats_fetch_begin(&gmac->rx_stats_syncp); -+ -+ for (i = 0; i < RX_STATUS_NUM; ++i) -+ *p++ = gmac->rx_stats[i]; -+ for (i = 0; i < RX_CHKSUM_NUM; ++i) -+ *p++ = gmac->rx_csum_stats[i]; -+ *p++ = gmac->rx_napi_exits; -+ -+ } while (u64_stats_fetch_retry(&gmac->rx_stats_syncp, start)); -+ values = p; -+ -+ /* racing with TX start_xmit */ -+ do { -+ p = values; -+ start = u64_stats_fetch_begin(&gmac->tx_stats_syncp); -+ -+ for (i = 0; i < TX_MAX_FRAGS; ++i) { -+ *values++ = gmac->tx_frag_stats[i]; -+ gmac->tx_frag_stats[i] = 0; -+ } -+ *values++ = gmac->tx_frags_linearized; -+ *values++ = gmac->tx_hw_csummed; -+ -+ } while (u64_stats_fetch_retry(&gmac->tx_stats_syncp, start)); -+} -+ -+static int gmac_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) -+{ -+ if (!dev->phydev) -+ return -ENXIO; -+ return phy_ethtool_gset(dev->phydev, cmd); -+} -+ -+static int gmac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) -+{ -+ if (!dev->phydev) -+ return -ENXIO; -+ return phy_ethtool_sset(dev->phydev, cmd); -+} -+ -+static int gmac_nway_reset(struct net_device *dev) -+{ -+ if (!dev->phydev) -+ return -ENXIO; -+ return phy_start_aneg(dev->phydev); -+} -+ -+static void gmac_get_pauseparam(struct net_device *dev, -+ struct ethtool_pauseparam *pparam) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ GMAC_CONFIG0_T config0; -+ -+ config0.bits32 = readl(gmac->ctl_iomem + GMAC_CONFIG0); -+ -+ pparam->rx_pause = config0.bits.rx_fc_en; -+ pparam->tx_pause = config0.bits.tx_fc_en; -+ pparam->autoneg = true; -+} -+ -+static void gmac_get_ringparam(struct net_device *dev, -+ struct ethtool_ringparam *rp) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ GMAC_CONFIG0_T config0; -+ -+ config0.bits32 = readl(gmac->ctl_iomem + GMAC_CONFIG0); -+ -+ rp->rx_max_pending = 1 << 15; -+ rp->rx_mini_max_pending = 0; -+ rp->rx_jumbo_max_pending = 0; -+ rp->tx_max_pending = 1 << 15; -+ -+ rp->rx_pending = 1 << gmac->rxq_order; -+ rp->rx_mini_pending = 0; -+ rp->rx_jumbo_pending = 0; -+ rp->tx_pending = 1 << gmac->txq_order; -+} -+ -+static int toe_resize_freeq(struct toe_private *toe, int changing_dev_id); -+ -+static int gmac_set_ringparam(struct net_device *dev, -+ struct ethtool_ringparam *rp) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ struct toe_private *toe = gmac->toe; -+ int err = 0; -+ -+ if (netif_running(dev)) -+ return -EBUSY; -+ -+ if (rp->rx_pending) { -+ gmac->rxq_order = min(15, ilog2(rp->rx_pending - 1) + 1); -+ err = toe_resize_freeq(toe, dev->dev_id); -+ } -+ -+ if (rp->tx_pending) -+ { -+ gmac->txq_order = min(15, ilog2(rp->tx_pending - 1) + 1); -+ gmac->irq_every_tx_packets = 1 << (gmac->txq_order - 2); -+ } -+ -+ return err; -+} -+ -+static int gmac_get_coalesce(struct net_device *dev, -+ struct ethtool_coalesce *ecmd) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ -+ ecmd->rx_max_coalesced_frames = 1; -+ ecmd->tx_max_coalesced_frames = gmac->irq_every_tx_packets; -+ ecmd->rx_coalesce_usecs = gmac->rx_coalesce_nsecs/1000; -+ -+ return 0; -+} -+ -+static int gmac_set_coalesce(struct net_device *dev, -+ struct ethtool_coalesce *ecmd) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ -+ if (ecmd->tx_max_coalesced_frames < 1) -+ return -EINVAL; -+ if (ecmd->tx_max_coalesced_frames >= 1 << gmac->txq_order) -+ return -EINVAL; -+ -+ gmac->irq_every_tx_packets = ecmd->tx_max_coalesced_frames; -+ gmac->rx_coalesce_nsecs = ecmd->rx_coalesce_usecs * 1000; -+ -+ return 0; -+} -+ -+static u32 gmac_get_msglevel(struct net_device *dev) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ return gmac->msg_enable; -+} -+ -+static void gmac_set_msglevel(struct net_device *dev, u32 level) -+{ -+ struct gmac_private *gmac = netdev_priv(dev); -+ gmac->msg_enable = level; -+} -+ -+static void gmac_get_drvinfo(struct net_device *dev, -+ struct ethtool_drvinfo *info) -+{ -+ strcpy(info->driver, DRV_NAME); -+ strcpy(info->version, DRV_VERSION); -+ strcpy(info->bus_info, dev->dev_id ? "1" : "0"); -+} -+ -+static const struct net_device_ops gmac_351x_ops = { -+ .ndo_init = gmac_init, -+ .ndo_uninit = gmac_uninit, -+ .ndo_open = gmac_open, -+ .ndo_stop = gmac_stop, -+ .ndo_start_xmit = gmac_start_xmit, -+ .ndo_tx_timeout = gmac_tx_timeout, -+ .ndo_set_rx_mode = gmac_set_rx_mode, -+ .ndo_set_mac_address = gmac_set_mac_address, -+ .ndo_get_stats64 = gmac_get_stats64, -+ .ndo_change_mtu = gmac_change_mtu, -+ .ndo_fix_features = gmac_fix_features, -+ .ndo_set_features = gmac_set_features, -+}; -+ -+static const struct ethtool_ops gmac_351x_ethtool_ops = { -+ .get_sset_count = gmac_get_sset_count, -+ .get_strings = gmac_get_strings, -+ .get_ethtool_stats = gmac_get_ethtool_stats, -+ .get_settings = gmac_get_settings, -+ .set_settings = gmac_set_settings, -+ .get_link = ethtool_op_get_link, -+ .nway_reset = gmac_nway_reset, -+ .get_pauseparam = gmac_get_pauseparam, -+ .get_ringparam = gmac_get_ringparam, -+ .set_ringparam = gmac_set_ringparam, -+ .get_coalesce = gmac_get_coalesce, -+ .set_coalesce = gmac_set_coalesce, -+ .get_msglevel = gmac_get_msglevel, -+ .set_msglevel = gmac_set_msglevel, -+ .get_drvinfo = gmac_get_drvinfo, -+}; -+ -+static int gmac_init_netdev(struct toe_private *toe, int num, -+ struct platform_device *pdev) -+{ -+ struct gemini_gmac_platform_data *pdata = pdev->dev.platform_data; -+ struct gmac_private *gmac; -+ struct net_device *dev; -+ int irq, err; -+ -+ if (!pdata->bus_id[num]) -+ return 0; -+ -+ irq = platform_get_irq(pdev, num); -+ if (irq < 0) { -+ dev_err(toe->dev, "No IRQ for ethernet device #%d\n", num); -+ return irq; -+ } -+ -+ dev = alloc_etherdev_mq(sizeof(*gmac), TX_QUEUE_NUM); -+ if (!dev) { -+ dev_err(toe->dev, "Can't allocate ethernet device #%d\n", num); -+ return -ENOMEM; -+ } -+ -+ gmac = netdev_priv(dev); -+ gmac->num = num; -+ gmac->toe = toe; -+ SET_NETDEV_DEV(dev, toe->dev); -+ -+ toe->netdev[num] = dev; -+ dev->dev_id = num; -+ -+ gmac->ctl_iomem = toe->iomem + TOE_GMAC_BASE(num); -+ gmac->dma_iomem = toe->iomem + TOE_GMAC_DMA_BASE(num); -+ dev->irq = irq; -+ -+ dev->netdev_ops = &gmac_351x_ops; -+ dev->ethtool_ops = &gmac_351x_ethtool_ops; -+ -+ spin_lock_init(&gmac->config_lock); -+ gmac_clear_hw_stats(dev); -+ -+ dev->hw_features = GMAC_OFFLOAD_FEATURES; -+ dev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO; -+ -+ gmac->freeq_refill = 0; -+ netif_napi_add(dev, &gmac->napi, gmac_napi_poll, DEFAULT_NAPI_WEIGHT); -+ -+ if (is_valid_ether_addr((void *)toe->mac_addr[num])) -+ memcpy(dev->dev_addr, toe->mac_addr[num], ETH_ALEN); -+ else -+ random_ether_addr(dev->dev_addr); -+ __gmac_set_mac_address(dev); -+ -+ err = gmac_setup_phy(dev); -+ if (err) -+ netif_warn(gmac, probe, dev, -+ "PHY init failed: %d, deferring to ifup time\n", err); -+ -+ err = register_netdev(dev); -+ if (!err) -+ { -+ pr_info(DRV_NAME " %s: irq %d, dma base 0x%p, io base 0x%p\n", -+ dev->name, irq, gmac->dma_iomem, gmac->ctl_iomem); -+ return 0; -+ } -+ -+ toe->netdev[num] = NULL; -+ free_netdev(dev); -+ return err; -+} -+ -+static irqreturn_t toe_irq_thread(int irq, void *data) -+{ -+ struct toe_private *toe = data; -+ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG; -+ void __iomem *irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG; -+ unsigned long irqmask = SWFQ_EMPTY_INT_BIT; -+ unsigned long flags; -+ -+ toe_fill_freeq(toe, 0); -+ -+ /* Ack and enable interrupt */ -+ spin_lock_irqsave(&toe->irq_lock, flags); -+ writel(irqmask, irqif_reg); -+ irqmask |= readl(irqen_reg); -+ writel(irqmask, irqen_reg); -+ spin_unlock_irqrestore(&toe->irq_lock, flags); -+ -+ return IRQ_HANDLED; -+} -+ -+static irqreturn_t toe_irq(int irq, void *data) -+{ -+ struct toe_private *toe = data; -+ void __iomem *irqif_reg = toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG; -+ void __iomem *irqen_reg = toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG; -+ unsigned long val, en; -+ irqreturn_t ret = IRQ_NONE; -+ -+ spin_lock(&toe->irq_lock); -+ -+ val = readl(irqif_reg); -+ en = readl(irqen_reg); -+ -+ if (val & en & SWFQ_EMPTY_INT_BIT) { -+ en &= ~(SWFQ_EMPTY_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT -+ | GMAC1_RX_OVERRUN_INT_BIT); -+ writel(en, irqen_reg); -+ ret = IRQ_WAKE_THREAD; -+ } -+ -+ spin_unlock(&toe->irq_lock); -+ return ret; -+} -+ -+static int toe_init(struct toe_private *toe, -+ struct platform_device *pdev) -+{ -+ int err; -+ -+ writel(0, toe->iomem + GLOBAL_SW_FREEQ_BASE_SIZE_REG); -+ writel(0, toe->iomem + GLOBAL_HW_FREEQ_BASE_SIZE_REG); -+ writel(0, toe->iomem + GLOBAL_SWFQ_RWPTR_REG); -+ writel(0, toe->iomem + GLOBAL_HWFQ_RWPTR_REG); -+ -+ toe->freeq_frag_order = DEFAULT_RX_BUF_ORDER; -+ toe->freeq_order = ~0; -+ -+ err = request_threaded_irq(toe->irq, toe_irq, -+ toe_irq_thread, IRQF_SHARED, DRV_NAME " toe", toe); -+ if (err) -+ goto err_freeq; -+ -+ return 0; -+ -+err_freeq: -+ toe_cleanup_freeq(toe); -+ return err; -+} -+ -+static void toe_deinit(struct toe_private *toe) -+{ -+ free_irq(toe->irq, toe); -+ toe_cleanup_freeq(toe); -+} -+ -+static int toe_reset(struct toe_private *toe) -+{ -+ unsigned int reg = 0, retry = 5; -+ -+ reg = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_RESET)); -+ reg |= RESET_GMAC1 | RESET_GMAC0; -+ writel(reg, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_RESET)); -+ -+ do { -+ udelay(2); -+ reg = readl((void __iomem*)(toe->iomem + -+ GLOBAL_TOE_VERSION_REG)); -+ barrier(); -+ } while (!reg && --retry); -+ -+ return reg ? 0 : -EIO; -+} -+ -+/* -+ * Interrupt config: -+ * -+ * GMAC0 intr bits ------> int0 ----> eth0 -+ * GMAC1 intr bits ------> int1 ----> eth1 -+ * TOE intr -------------> int1 ----> eth1 -+ * Classification Intr --> int0 ----> eth0 -+ * Default Q0 -----------> int0 ----> eth0 -+ * Default Q1 -----------> int1 ----> eth1 -+ * FreeQ intr -----------> int1 ----> eth1 -+ */ -+static void toe_init_irq(struct toe_private *toe) -+{ -+ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_0_REG); -+ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_1_REG); -+ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_2_REG); -+ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_3_REG); -+ writel(0, toe->iomem + GLOBAL_INTERRUPT_ENABLE_4_REG); -+ -+ writel(0xCCFC0FC0, toe->iomem + GLOBAL_INTERRUPT_SELECT_0_REG); -+ writel(0x00F00002, toe->iomem + GLOBAL_INTERRUPT_SELECT_1_REG); -+ writel(0xFFFFFFFF, toe->iomem + GLOBAL_INTERRUPT_SELECT_2_REG); -+ writel(0xFFFFFFFF, toe->iomem + GLOBAL_INTERRUPT_SELECT_3_REG); -+ writel(0xFF000003, toe->iomem + GLOBAL_INTERRUPT_SELECT_4_REG); -+ -+ /* edge-triggered interrupts packed to level-triggered one... */ -+ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_0_REG); -+ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_1_REG); -+ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_2_REG); -+ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_3_REG); -+ writel(~0, toe->iomem + GLOBAL_INTERRUPT_STATUS_4_REG); -+} -+ -+static void toe_save_mac_addr(struct toe_private *toe, -+ struct platform_device *pdev) -+{ -+ struct gemini_gmac_platform_data *pdata = pdev->dev.platform_data; -+ void __iomem *ctl; -+ int i; -+ -+ for (i = 0; i < 2; i++) { -+ if (pdata->bus_id[i]) { -+ ctl = toe->iomem + TOE_GMAC_BASE(i); -+ toe->mac_addr[i][0] = cpu_to_le32(readl(ctl + GMAC_STA_ADD0)); -+ toe->mac_addr[i][1] = cpu_to_le32(readl(ctl + GMAC_STA_ADD1)); -+ toe->mac_addr[i][2] = cpu_to_le32(readl(ctl + GMAC_STA_ADD2)); -+ } -+ } -+} -+ -+static int gemini_gmac_probe(struct platform_device *pdev) -+{ -+ struct resource *res; -+ struct toe_private *toe; -+ int irq, retval; -+ -+ if (!pdev->dev.platform_data) -+ return -EINVAL; -+ -+ irq = platform_get_irq(pdev, 1); -+ if (irq < 0) -+ return irq; -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!res) { -+ dev_err(&pdev->dev, "can't get device resources\n"); -+ return -ENODEV; -+ } -+ -+ toe = kzalloc(sizeof(*toe), GFP_KERNEL); -+ if (!toe) -+ return -ENOMEM; -+ -+ platform_set_drvdata(pdev, toe); -+ toe->dev = &pdev->dev; -+ toe->irq = irq; -+ -+ toe->iomem = ioremap(res->start, resource_size(res)); -+ if (!toe->iomem) { -+ dev_err(toe->dev, "ioremap failed\n"); -+ retval = -EIO; -+ goto err_data; -+ } -+ -+ toe_save_mac_addr(toe, pdev); -+ -+ retval = toe_reset(toe); -+ if (retval < 0) -+ goto err_unmap; -+ -+ pr_info(DRV_NAME " toe: irq %d, io base 0x%08x, version %d\n", -+ irq, res->start, retval); -+ -+ spin_lock_init(&toe->irq_lock); -+ spin_lock_init(&toe->freeq_lock); -+ -+ toe_init_irq(toe); -+ -+ retval = toe_init(toe, pdev); -+ if (retval) -+ goto err_unmap; -+ -+ retval = gmac_init_netdev(toe, 0, pdev); -+ if (retval) -+ goto err_uninit; -+ -+ retval = gmac_init_netdev(toe, 1, pdev); -+ if (retval) -+ goto err_uninit; -+ -+ return 0; -+ -+err_uninit: -+ if (toe->netdev[0]) -+ unregister_netdev(toe->netdev[0]); -+ toe_deinit(toe); -+err_unmap: -+ iounmap(toe->iomem); -+err_data: -+ kfree(toe); -+ return retval; -+} -+ -+static int gemini_gmac_remove(struct platform_device *pdev) -+{ -+ struct toe_private *toe = platform_get_drvdata(pdev); -+ int i; -+ -+ for (i = 0; i < 2; i++) -+ if (toe->netdev[i]) -+ unregister_netdev(toe->netdev[i]); -+ -+ toe_init_irq(toe); -+ toe_deinit(toe); -+ -+ iounmap(toe->iomem); -+ kfree(toe); -+ -+ return 0; -+} -+ -+static struct platform_driver gemini_gmac_driver = { -+ .probe = gemini_gmac_probe, -+ .remove = gemini_gmac_remove, -+ .driver.name = DRV_NAME, -+ .driver.owner = THIS_MODULE, -+}; -+ -+static int __init gemini_gmac_init(void) -+{ -+#ifdef CONFIG_MDIO_GPIO_MODULE -+ request_module("mdio-gpio"); -+#endif -+ return platform_driver_register(&gemini_gmac_driver); -+} -+ -+static void __exit gemini_gmac_exit(void) -+{ -+ platform_driver_unregister(&gemini_gmac_driver); -+} -+ -+module_init(gemini_gmac_init); -+module_exit(gemini_gmac_exit); ---- /dev/null -+++ b/drivers/net/ethernet/gemini/sl351x_hw.h -@@ -0,0 +1,1436 @@ -+/* -+ * Register definitions for Gemini LEPUS GMAC Ethernet device driver. -+ * -+ * Copyright (C) 2006, Storlink, Corp. -+ * Copyright (C) 2008-2009, Paulius Zaleckas <paulius.zaleckas@teltonika.lt> -+ * Copyright (C) 2010, MichaÅ‚ MirosÅ‚aw <mirq-linux@rere.qmqm.pl> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+#ifndef _GMAC_HW_H -+#define _GMAC_HW_H -+ -+#include <linux/bitops.h> -+ -+/* -+ * Base Registers -+ */ -+#define TOE_NONTOE_QUE_HDR_BASE 0x2000 -+#define TOE_TOE_QUE_HDR_BASE 0x3000 -+#define TOE_V_BIT_BASE 0x4000 -+#define TOE_A_BIT_BASE 0x6000 -+#define TOE_GMAC_DMA_BASE(x) (0x8000 + 0x4000 * (x)) -+#define TOE_GMAC_BASE(x) (0xA000 + 0x4000 * (x)) -+ -+/* -+ * Queue ID -+ */ -+#define TOE_SW_FREE_QID 0x00 -+#define TOE_HW_FREE_QID 0x01 -+#define TOE_GMAC0_SW_TXQ0_QID 0x02 -+#define TOE_GMAC0_SW_TXQ1_QID 0x03 -+#define TOE_GMAC0_SW_TXQ2_QID 0x04 -+#define TOE_GMAC0_SW_TXQ3_QID 0x05 -+#define TOE_GMAC0_SW_TXQ4_QID 0x06 -+#define TOE_GMAC0_SW_TXQ5_QID 0x07 -+#define TOE_GMAC0_HW_TXQ0_QID 0x08 -+#define TOE_GMAC0_HW_TXQ1_QID 0x09 -+#define TOE_GMAC0_HW_TXQ2_QID 0x0A -+#define TOE_GMAC0_HW_TXQ3_QID 0x0B -+#define TOE_GMAC1_SW_TXQ0_QID 0x12 -+#define TOE_GMAC1_SW_TXQ1_QID 0x13 -+#define TOE_GMAC1_SW_TXQ2_QID 0x14 -+#define TOE_GMAC1_SW_TXQ3_QID 0x15 -+#define TOE_GMAC1_SW_TXQ4_QID 0x16 -+#define TOE_GMAC1_SW_TXQ5_QID 0x17 -+#define TOE_GMAC1_HW_TXQ0_QID 0x18 -+#define TOE_GMAC1_HW_TXQ1_QID 0x19 -+#define TOE_GMAC1_HW_TXQ2_QID 0x1A -+#define TOE_GMAC1_HW_TXQ3_QID 0x1B -+#define TOE_GMAC0_DEFAULT_QID 0x20 -+#define TOE_GMAC1_DEFAULT_QID 0x21 -+#define TOE_CLASSIFICATION_QID(x) (0x22 + x) /* 0x22 ~ 0x2F */ -+#define TOE_TOE_QID(x) (0x40 + x) /* 0x40 ~ 0x7F */ -+ -+/* -+ * old info: -+ * TOE DMA Queue Size should be 2^n, n = 6...12 -+ * TOE DMA Queues are the following queue types: -+ * SW Free Queue, HW Free Queue, -+ * GMAC 0/1 SW TX Q0-5, and GMAC 0/1 HW TX Q0-5 -+ * The base address and descriptor number are configured at -+ * DMA Queues Descriptor Ring Base Address/Size Register (offset 0x0004) -+ */ -+ -+#define GET_WPTR(addr) __raw_readw((addr) + 2) -+#define GET_RPTR(addr) __raw_readw((addr)) -+#define SET_WPTR(addr, data) __raw_writew((data), (addr) + 2) -+#define SET_RPTR(addr, data) __raw_writew((data), (addr)) -+#define __RWPTR_NEXT(x, mask) (((unsigned int)(x) + 1) & (mask)) -+#define __RWPTR_PREV(x, mask) (((unsigned int)(x) - 1) & (mask)) -+#define __RWPTR_DISTANCE(r, w, mask) (((unsigned int)(w) - (r)) & (mask)) -+#define __RWPTR_MASK(order) ((1 << (order)) - 1) -+#define RWPTR_NEXT(x, order) __RWPTR_NEXT((x), __RWPTR_MASK((order))) -+#define RWPTR_PREV(x, order) __RWPTR_PREV((x), __RWPTR_MASK((order))) -+#define RWPTR_DISTANCE(r, w, order) __RWPTR_DISTANCE((r), (w), \ -+ __RWPTR_MASK((order))) -+ -+/* -+ * Global registers -+ * #define TOE_GLOBAL_BASE (TOE_BASE + 0x0000) -+ * Base 0x60000000 -+ */ -+#define GLOBAL_TOE_VERSION_REG 0x0000 -+#define GLOBAL_SW_FREEQ_BASE_SIZE_REG 0x0004 -+#define GLOBAL_HW_FREEQ_BASE_SIZE_REG 0x0008 -+#define GLOBAL_DMA_SKB_SIZE_REG 0x0010 -+#define GLOBAL_SWFQ_RWPTR_REG 0x0014 -+#define GLOBAL_HWFQ_RWPTR_REG 0x0018 -+#define GLOBAL_INTERRUPT_STATUS_0_REG 0x0020 -+#define GLOBAL_INTERRUPT_ENABLE_0_REG 0x0024 -+#define GLOBAL_INTERRUPT_SELECT_0_REG 0x0028 -+#define GLOBAL_INTERRUPT_STATUS_1_REG 0x0030 -+#define GLOBAL_INTERRUPT_ENABLE_1_REG 0x0034 -+#define GLOBAL_INTERRUPT_SELECT_1_REG 0x0038 -+#define GLOBAL_INTERRUPT_STATUS_2_REG 0x0040 -+#define GLOBAL_INTERRUPT_ENABLE_2_REG 0x0044 -+#define GLOBAL_INTERRUPT_SELECT_2_REG 0x0048 -+#define GLOBAL_INTERRUPT_STATUS_3_REG 0x0050 -+#define GLOBAL_INTERRUPT_ENABLE_3_REG 0x0054 -+#define GLOBAL_INTERRUPT_SELECT_3_REG 0x0058 -+#define GLOBAL_INTERRUPT_STATUS_4_REG 0x0060 -+#define GLOBAL_INTERRUPT_ENABLE_4_REG 0x0064 -+#define GLOBAL_INTERRUPT_SELECT_4_REG 0x0068 -+#define GLOBAL_HASH_TABLE_BASE_REG 0x006C -+#define GLOBAL_QUEUE_THRESHOLD_REG 0x0070 -+ -+/* -+ * GMAC 0/1 DMA/TOE register -+ * #define TOE_GMAC0_DMA_BASE (TOE_BASE + 0x8000) -+ * #define TOE_GMAC1_DMA_BASE (TOE_BASE + 0xC000) -+ * Base 0x60008000 or 0x6000C000 -+ */ -+#define GMAC_DMA_CTRL_REG 0x0000 -+#define GMAC_TX_WEIGHTING_CTRL_0_REG 0x0004 -+#define GMAC_TX_WEIGHTING_CTRL_1_REG 0x0008 -+#define GMAC_SW_TX_QUEUE0_PTR_REG 0x000C -+#define GMAC_SW_TX_QUEUE1_PTR_REG 0x0010 -+#define GMAC_SW_TX_QUEUE2_PTR_REG 0x0014 -+#define GMAC_SW_TX_QUEUE3_PTR_REG 0x0018 -+#define GMAC_SW_TX_QUEUE4_PTR_REG 0x001C -+#define GMAC_SW_TX_QUEUE5_PTR_REG 0x0020 -+#define GMAC_SW_TX_QUEUE_PTR_REG(i) (GMAC_SW_TX_QUEUE0_PTR_REG + 4 * (i)) -+#define GMAC_HW_TX_QUEUE0_PTR_REG 0x0024 -+#define GMAC_HW_TX_QUEUE1_PTR_REG 0x0028 -+#define GMAC_HW_TX_QUEUE2_PTR_REG 0x002C -+#define GMAC_HW_TX_QUEUE3_PTR_REG 0x0030 -+#define GMAC_HW_TX_QUEUE_PTR_REG(i) (GMAC_HW_TX_QUEUE0_PTR_REG + 4 * (i)) -+#define GMAC_DMA_TX_FIRST_DESC_REG 0x0038 -+#define GMAC_DMA_TX_CURR_DESC_REG 0x003C -+#define GMAC_DMA_TX_DESC_WORD0_REG 0x0040 -+#define GMAC_DMA_TX_DESC_WORD1_REG 0x0044 -+#define GMAC_DMA_TX_DESC_WORD2_REG 0x0048 -+#define GMAC_DMA_TX_DESC_WORD3_REG 0x004C -+#define GMAC_SW_TX_QUEUE_BASE_REG 0x0050 -+#define GMAC_HW_TX_QUEUE_BASE_REG 0x0054 -+#define GMAC_DMA_RX_FIRST_DESC_REG 0x0058 -+#define GMAC_DMA_RX_CURR_DESC_REG 0x005C -+#define GMAC_DMA_RX_DESC_WORD0_REG 0x0060 -+#define GMAC_DMA_RX_DESC_WORD1_REG 0x0064 -+#define GMAC_DMA_RX_DESC_WORD2_REG 0x0068 -+#define GMAC_DMA_RX_DESC_WORD3_REG 0x006C -+#define GMAC_HASH_ENGINE_REG0 0x0070 -+#define GMAC_HASH_ENGINE_REG1 0x0074 -+/* matching rule 0 Control register 0 */ -+#define GMAC_MR0CR0 0x0078 -+#define GMAC_MR0CR1 0x007C -+#define GMAC_MR0CR2 0x0080 -+#define GMAC_MR1CR0 0x0084 -+#define GMAC_MR1CR1 0x0088 -+#define GMAC_MR1CR2 0x008C -+#define GMAC_MR2CR0 0x0090 -+#define GMAC_MR2CR1 0x0094 -+#define GMAC_MR2CR2 0x0098 -+#define GMAC_MR3CR0 0x009C -+#define GMAC_MR3CR1 0x00A0 -+#define GMAC_MR3CR2 0x00A4 -+/* Support Protocol Regsister 0 */ -+#define GMAC_SPR0 0x00A8 -+#define GMAC_SPR1 0x00AC -+#define GMAC_SPR2 0x00B0 -+#define GMAC_SPR3 0x00B4 -+#define GMAC_SPR4 0x00B8 -+#define GMAC_SPR5 0x00BC -+#define GMAC_SPR6 0x00C0 -+#define GMAC_SPR7 0x00C4 -+/* GMAC Hash/Rx/Tx AHB Weighting register */ -+#define GMAC_AHB_WEIGHT_REG 0x00C8 -+ -+/* -+ * TOE GMAC 0/1 register -+ * #define TOE_GMAC0_BASE (TOE_BASE + 0xA000) -+ * #define TOE_GMAC1_BASE (TOE_BASE + 0xE000) -+ * Base 0x6000A000 or 0x6000E000 -+ */ -+enum GMAC_REGISTER { -+ GMAC_STA_ADD0 = 0x0000, -+ GMAC_STA_ADD1 = 0x0004, -+ GMAC_STA_ADD2 = 0x0008, -+ GMAC_RX_FLTR = 0x000c, -+ GMAC_MCAST_FIL0 = 0x0010, -+ GMAC_MCAST_FIL1 = 0x0014, -+ GMAC_CONFIG0 = 0x0018, -+ GMAC_CONFIG1 = 0x001c, -+ GMAC_CONFIG2 = 0x0020, -+ GMAC_CONFIG3 = 0x0024, -+ GMAC_RESERVED = 0x0028, -+ GMAC_STATUS = 0x002c, -+ GMAC_IN_DISCARDS= 0x0030, -+ GMAC_IN_ERRORS = 0x0034, -+ GMAC_IN_MCAST = 0x0038, -+ GMAC_IN_BCAST = 0x003c, -+ GMAC_IN_MAC1 = 0x0040, /* for STA 1 MAC Address */ -+ GMAC_IN_MAC2 = 0x0044 /* for STA 2 MAC Address */ -+}; -+ -+#define RX_STATS_NUM 6 -+ -+/* -+ * DMA Queues description Ring Base Address/Size Register (offset 0x0004) -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int base_size; -+} DMA_Q_BASE_SIZE_T; -+#define DMA_Q_BASE_MASK (~0x0f) -+ -+/* -+ * DMA SKB Buffer register (offset 0x0008) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0008 { -+ unsigned int sw_skb_size : 16; /* SW Free poll SKB Size */ -+ unsigned int hw_skb_size : 16; /* HW Free poll SKB Size */ -+ } bits; -+} DMA_SKB_SIZE_T; -+ -+/* -+ * DMA SW Free Queue Read/Write Pointer Register (offset 0x000C) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_000c { -+ unsigned int rptr : 16; /* Read Ptr, RO */ -+ unsigned int wptr : 16; /* Write Ptr, RW */ -+ } bits; -+} DMA_RWPTR_T; -+ -+/* -+ * DMA HW Free Queue Read/Write Pointer Register (offset 0x0010) -+ * see DMA_RWPTR_T structure -+ */ -+ -+/* -+ * Interrupt Status Register 0 (offset 0x0020) -+ * Interrupt Mask Register 0 (offset 0x0024) -+ * Interrupt Select Register 0 (offset 0x0028) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0020 { -+ /* GMAC0 SW Tx Queue 0 EOF Interrupt */ -+ unsigned int swtq00_eof : 1; -+ unsigned int swtq01_eof : 1; -+ unsigned int swtq02_eof : 1; -+ unsigned int swtq03_eof : 1; -+ unsigned int swtq04_eof : 1; -+ unsigned int swtq05_eof : 1; -+ /* GMAC1 SW Tx Queue 0 EOF Interrupt */ -+ unsigned int swtq10_eof : 1; -+ unsigned int swtq11_eof : 1; -+ unsigned int swtq12_eof : 1; -+ unsigned int swtq13_eof : 1; -+ unsigned int swtq14_eof : 1; -+ unsigned int swtq15_eof : 1; -+ /* GMAC0 SW Tx Queue 0 Finish Interrupt */ -+ unsigned int swtq00_fin : 1; -+ unsigned int swtq01_fin : 1; -+ unsigned int swtq02_fin : 1; -+ unsigned int swtq03_fin : 1; -+ unsigned int swtq04_fin : 1; -+ unsigned int swtq05_fin : 1; -+ /* GMAC1 SW Tx Queue 0 Finish Interrupt */ -+ unsigned int swtq10_fin : 1; -+ unsigned int swtq11_fin : 1; -+ unsigned int swtq12_fin : 1; -+ unsigned int swtq13_fin : 1; -+ unsigned int swtq14_fin : 1; -+ unsigned int swtq15_fin : 1; -+ /* GMAC0 Rx Descriptor Protocol Error */ -+ unsigned int rxPerr0 : 1; -+ /* GMAC0 AHB Bus Error while Rx */ -+ unsigned int rxDerr0 : 1; -+ /* GMAC1 Rx Descriptor Protocol Error */ -+ unsigned int rxPerr1 : 1; -+ /* GMAC1 AHB Bus Error while Rx */ -+ unsigned int rxDerr1 : 1; -+ /* GMAC0 Tx Descriptor Protocol Error */ -+ unsigned int txPerr0 : 1; -+ /* GMAC0 AHB Bus Error while Tx */ -+ unsigned int txDerr0 : 1; -+ /* GMAC1 Tx Descriptor Protocol Error */ -+ unsigned int txPerr1 : 1; -+ /* GMAC1 AHB Bus Error while Tx */ -+ unsigned int txDerr1 : 1; -+ } bits; -+} INTR_REG0_T; -+ -+#define GMAC1_TXDERR_INT_BIT BIT(31) -+#define GMAC1_TXPERR_INT_BIT BIT(30) -+#define GMAC0_TXDERR_INT_BIT BIT(29) -+#define GMAC0_TXPERR_INT_BIT BIT(28) -+#define GMAC1_RXDERR_INT_BIT BIT(27) -+#define GMAC1_RXPERR_INT_BIT BIT(26) -+#define GMAC0_RXDERR_INT_BIT BIT(25) -+#define GMAC0_RXPERR_INT_BIT BIT(24) -+#define GMAC1_SWTQ15_FIN_INT_BIT BIT(23) -+#define GMAC1_SWTQ14_FIN_INT_BIT BIT(22) -+#define GMAC1_SWTQ13_FIN_INT_BIT BIT(21) -+#define GMAC1_SWTQ12_FIN_INT_BIT BIT(20) -+#define GMAC1_SWTQ11_FIN_INT_BIT BIT(19) -+#define GMAC1_SWTQ10_FIN_INT_BIT BIT(18) -+#define GMAC0_SWTQ05_FIN_INT_BIT BIT(17) -+#define GMAC0_SWTQ04_FIN_INT_BIT BIT(16) -+#define GMAC0_SWTQ03_FIN_INT_BIT BIT(15) -+#define GMAC0_SWTQ02_FIN_INT_BIT BIT(14) -+#define GMAC0_SWTQ01_FIN_INT_BIT BIT(13) -+#define GMAC0_SWTQ00_FIN_INT_BIT BIT(12) -+#define GMAC1_SWTQ15_EOF_INT_BIT BIT(11) -+#define GMAC1_SWTQ14_EOF_INT_BIT BIT(10) -+#define GMAC1_SWTQ13_EOF_INT_BIT BIT(9) -+#define GMAC1_SWTQ12_EOF_INT_BIT BIT(8) -+#define GMAC1_SWTQ11_EOF_INT_BIT BIT(7) -+#define GMAC1_SWTQ10_EOF_INT_BIT BIT(6) -+#define GMAC0_SWTQ05_EOF_INT_BIT BIT(5) -+#define GMAC0_SWTQ04_EOF_INT_BIT BIT(4) -+#define GMAC0_SWTQ03_EOF_INT_BIT BIT(3) -+#define GMAC0_SWTQ02_EOF_INT_BIT BIT(2) -+#define GMAC0_SWTQ01_EOF_INT_BIT BIT(1) -+#define GMAC0_SWTQ00_EOF_INT_BIT BIT(0) -+ -+/* -+ * Interrupt Status Register 1 (offset 0x0030) -+ * Interrupt Mask Register 1 (offset 0x0034) -+ * Interrupt Select Register 1 (offset 0x0038) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0030 { -+ unsigned int default_q0_eof : 1; /* Default Queue 0 EOF Interrupt */ -+ unsigned int default_q1_eof : 1; /* Default Queue 1 EOF Interrupt */ -+ unsigned int class_rx : 14; /* Classification Queue Rx Interrupt */ -+ unsigned int hwtq00_eof : 1; /* GMAC0 HW Tx Queue0 EOF Interrupt */ -+ unsigned int hwtq01_eof : 1; /* GMAC0 HW Tx Queue1 EOF Interrupt */ -+ unsigned int hwtq02_eof : 1; /* GMAC0 HW Tx Queue2 EOF Interrupt */ -+ unsigned int hwtq03_eof : 1; /* GMAC0 HW Tx Queue3 EOF Interrupt */ -+ unsigned int hwtq10_eof : 1; /* GMAC1 HW Tx Queue0 EOF Interrupt */ -+ unsigned int hwtq11_eof : 1; /* GMAC1 HW Tx Queue1 EOF Interrupt */ -+ unsigned int hwtq12_eof : 1; /* GMAC1 HW Tx Queue2 EOF Interrupt */ -+ unsigned int hwtq13_eof : 1; /* GMAC1 HW Tx Queue3 EOF Interrupt */ -+ unsigned int toe_iq0_intr : 1; /* TOE Interrupt Queue 0 with Interrupts */ -+ unsigned int toe_iq1_intr : 1; /* TOE Interrupt Queue 1 with Interrupts */ -+ unsigned int toe_iq2_intr : 1; /* TOE Interrupt Queue 2 with Interrupts */ -+ unsigned int toe_iq3_intr : 1; /* TOE Interrupt Queue 3 with Interrupts */ -+ unsigned int toe_iq0_full : 1; /* TOE Interrupt Queue 0 Full Interrupt */ -+ unsigned int toe_iq1_full : 1; /* TOE Interrupt Queue 1 Full Interrupt */ -+ unsigned int toe_iq2_full : 1; /* TOE Interrupt Queue 2 Full Interrupt */ -+ unsigned int toe_iq3_full : 1; /* TOE Interrupt Queue 3 Full Interrupt */ -+ } bits; -+} INTR_REG1_T; -+ -+#define TOE_IQ3_FULL_INT_BIT BIT(31) -+#define TOE_IQ2_FULL_INT_BIT BIT(30) -+#define TOE_IQ1_FULL_INT_BIT BIT(29) -+#define TOE_IQ0_FULL_INT_BIT BIT(28) -+#define TOE_IQ3_INT_BIT BIT(27) -+#define TOE_IQ2_INT_BIT BIT(26) -+#define TOE_IQ1_INT_BIT BIT(25) -+#define TOE_IQ0_INT_BIT BIT(24) -+#define GMAC1_HWTQ13_EOF_INT_BIT BIT(23) -+#define GMAC1_HWTQ12_EOF_INT_BIT BIT(22) -+#define GMAC1_HWTQ11_EOF_INT_BIT BIT(21) -+#define GMAC1_HWTQ10_EOF_INT_BIT BIT(20) -+#define GMAC0_HWTQ03_EOF_INT_BIT BIT(19) -+#define GMAC0_HWTQ02_EOF_INT_BIT BIT(18) -+#define GMAC0_HWTQ01_EOF_INT_BIT BIT(17) -+#define GMAC0_HWTQ00_EOF_INT_BIT BIT(16) -+#define CLASS_RX_INT_BIT(x) BIT((x + 2)) -+#define DEFAULT_Q1_INT_BIT BIT(1) -+#define DEFAULT_Q0_INT_BIT BIT(0) -+ -+#define TOE_IQ_INT_BITS (TOE_IQ0_INT_BIT | TOE_IQ1_INT_BIT | \ -+ TOE_IQ2_INT_BIT | TOE_IQ3_INT_BIT) -+#define TOE_IQ_FULL_BITS (TOE_IQ0_FULL_INT_BIT | TOE_IQ1_FULL_INT_BIT | \ -+ TOE_IQ2_FULL_INT_BIT | TOE_IQ3_FULL_INT_BIT) -+#define TOE_IQ_ALL_BITS (TOE_IQ_INT_BITS | TOE_IQ_FULL_BITS) -+#define TOE_CLASS_RX_INT_BITS 0xfffc -+ -+/* -+ * Interrupt Status Register 2 (offset 0x0040) -+ * Interrupt Mask Register 2 (offset 0x0044) -+ * Interrupt Select Register 2 (offset 0x0048) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0040 { -+ unsigned int toe_q0_full : 1; /* bit 0 TOE Queue 0 Full Interrupt */ -+ unsigned int toe_q1_full : 1; /* bit 1 TOE Queue 1 Full Interrupt */ -+ unsigned int toe_q2_full : 1; /* bit 2 TOE Queue 2 Full Interrupt */ -+ unsigned int toe_q3_full : 1; /* bit 3 TOE Queue 3 Full Interrupt */ -+ unsigned int toe_q4_full : 1; /* bit 4 TOE Queue 4 Full Interrupt */ -+ unsigned int toe_q5_full : 1; /* bit 5 TOE Queue 5 Full Interrupt */ -+ unsigned int toe_q6_full : 1; /* bit 6 TOE Queue 6 Full Interrupt */ -+ unsigned int toe_q7_full : 1; /* bit 7 TOE Queue 7 Full Interrupt */ -+ unsigned int toe_q8_full : 1; /* bit 8 TOE Queue 8 Full Interrupt */ -+ unsigned int toe_q9_full : 1; /* bit 9 TOE Queue 9 Full Interrupt */ -+ unsigned int toe_q10_full : 1; /* bit 10 TOE Queue 10 Full Interrupt */ -+ unsigned int toe_q11_full : 1; /* bit 11 TOE Queue 11 Full Interrupt */ -+ unsigned int toe_q12_full : 1; /* bit 12 TOE Queue 12 Full Interrupt */ -+ unsigned int toe_q13_full : 1; /* bit 13 TOE Queue 13 Full Interrupt */ -+ unsigned int toe_q14_full : 1; /* bit 14 TOE Queue 14 Full Interrupt */ -+ unsigned int toe_q15_full : 1; /* bit 15 TOE Queue 15 Full Interrupt */ -+ unsigned int toe_q16_full : 1; /* bit 16 TOE Queue 16 Full Interrupt */ -+ unsigned int toe_q17_full : 1; /* bit 17 TOE Queue 17 Full Interrupt */ -+ unsigned int toe_q18_full : 1; /* bit 18 TOE Queue 18 Full Interrupt */ -+ unsigned int toe_q19_full : 1; /* bit 19 TOE Queue 19 Full Interrupt */ -+ unsigned int toe_q20_full : 1; /* bit 20 TOE Queue 20 Full Interrupt */ -+ unsigned int toe_q21_full : 1; /* bit 21 TOE Queue 21 Full Interrupt */ -+ unsigned int toe_q22_full : 1; /* bit 22 TOE Queue 22 Full Interrupt */ -+ unsigned int toe_q23_full : 1; /* bit 23 TOE Queue 23 Full Interrupt */ -+ unsigned int toe_q24_full : 1; /* bit 24 TOE Queue 24 Full Interrupt */ -+ unsigned int toe_q25_full : 1; /* bit 25 TOE Queue 25 Full Interrupt */ -+ unsigned int toe_q26_full : 1; /* bit 26 TOE Queue 26 Full Interrupt */ -+ unsigned int toe_q27_full : 1; /* bit 27 TOE Queue 27 Full Interrupt */ -+ unsigned int toe_q28_full : 1; /* bit 28 TOE Queue 28 Full Interrupt */ -+ unsigned int toe_q29_full : 1; /* bit 29 TOE Queue 29 Full Interrupt */ -+ unsigned int toe_q30_full : 1; /* bit 30 TOE Queue 30 Full Interrupt */ -+ unsigned int toe_q31_full : 1; /* bit 31 TOE Queue 31 Full Interrupt */ -+ } bits; -+} INTR_REG2_T; -+ -+#define TOE_QL_FULL_INT_BIT(x) BIT(x) -+ -+/* -+ * Interrupt Status Register 3 (offset 0x0050) -+ * Interrupt Mask Register 3 (offset 0x0054) -+ * Interrupt Select Register 3 (offset 0x0058) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0050 { -+ unsigned int toe_q32_full : 1; /* bit 32 TOE Queue 32 Full Interrupt */ -+ unsigned int toe_q33_full : 1; /* bit 33 TOE Queue 33 Full Interrupt */ -+ unsigned int toe_q34_full : 1; /* bit 34 TOE Queue 34 Full Interrupt */ -+ unsigned int toe_q35_full : 1; /* bit 35 TOE Queue 35 Full Interrupt */ -+ unsigned int toe_q36_full : 1; /* bit 36 TOE Queue 36 Full Interrupt */ -+ unsigned int toe_q37_full : 1; /* bit 37 TOE Queue 37 Full Interrupt */ -+ unsigned int toe_q38_full : 1; /* bit 38 TOE Queue 38 Full Interrupt */ -+ unsigned int toe_q39_full : 1; /* bit 39 TOE Queue 39 Full Interrupt */ -+ unsigned int toe_q40_full : 1; /* bit 40 TOE Queue 40 Full Interrupt */ -+ unsigned int toe_q41_full : 1; /* bit 41 TOE Queue 41 Full Interrupt */ -+ unsigned int toe_q42_full : 1; /* bit 42 TOE Queue 42 Full Interrupt */ -+ unsigned int toe_q43_full : 1; /* bit 43 TOE Queue 43 Full Interrupt */ -+ unsigned int toe_q44_full : 1; /* bit 44 TOE Queue 44 Full Interrupt */ -+ unsigned int toe_q45_full : 1; /* bit 45 TOE Queue 45 Full Interrupt */ -+ unsigned int toe_q46_full : 1; /* bit 46 TOE Queue 46 Full Interrupt */ -+ unsigned int toe_q47_full : 1; /* bit 47 TOE Queue 47 Full Interrupt */ -+ unsigned int toe_q48_full : 1; /* bit 48 TOE Queue 48 Full Interrupt */ -+ unsigned int toe_q49_full : 1; /* bit 49 TOE Queue 49 Full Interrupt */ -+ unsigned int toe_q50_full : 1; /* bit 50 TOE Queue 50 Full Interrupt */ -+ unsigned int toe_q51_full : 1; /* bit 51 TOE Queue 51 Full Interrupt */ -+ unsigned int toe_q52_full : 1; /* bit 52 TOE Queue 52 Full Interrupt */ -+ unsigned int toe_q53_full : 1; /* bit 53 TOE Queue 53 Full Interrupt */ -+ unsigned int toe_q54_full : 1; /* bit 54 TOE Queue 54 Full Interrupt */ -+ unsigned int toe_q55_full : 1; /* bit 55 TOE Queue 55 Full Interrupt */ -+ unsigned int toe_q56_full : 1; /* bit 56 TOE Queue 56 Full Interrupt */ -+ unsigned int toe_q57_full : 1; /* bit 57 TOE Queue 57 Full Interrupt */ -+ unsigned int toe_q58_full : 1; /* bit 58 TOE Queue 58 Full Interrupt */ -+ unsigned int toe_q59_full : 1; /* bit 59 TOE Queue 59 Full Interrupt */ -+ unsigned int toe_q60_full : 1; /* bit 60 TOE Queue 60 Full Interrupt */ -+ unsigned int toe_q61_full : 1; /* bit 61 TOE Queue 61 Full Interrupt */ -+ unsigned int toe_q62_full : 1; /* bit 62 TOE Queue 62 Full Interrupt */ -+ unsigned int toe_q63_full : 1; /* bit 63 TOE Queue 63 Full Interrupt */ -+ } bits; -+} INTR_REG3_T; -+ -+#define TOE_QH_FULL_INT_BIT(x) BIT(x-32) -+ -+/* -+ * Interrupt Status Register 4 (offset 0x0060) -+ * Interrupt Mask Register 4 (offset 0x0064) -+ * Interrupt Select Register 4 (offset 0x0068) -+ */ -+typedef union { -+ unsigned char byte; -+ struct bit_0060 { -+ unsigned char status_changed : 1; /* Status Changed Intr for RGMII Mode */ -+ unsigned char rx_overrun : 1; /* GMAC Rx FIFO overrun interrupt */ -+ unsigned char tx_pause_off : 1; /* received pause off frame interrupt */ -+ unsigned char rx_pause_off : 1; /* received pause off frame interrupt */ -+ unsigned char tx_pause_on : 1; /* transmit pause on frame interrupt */ -+ unsigned char rx_pause_on : 1; /* received pause on frame interrupt */ -+ unsigned char cnt_full : 1; /* MIB counters half full interrupt */ -+ unsigned char reserved : 1; /* */ -+ } __packed bits; -+} __packed GMAC_INTR_T; -+ -+typedef union { -+ unsigned int bits32; -+ struct bit_0060_2 { -+ unsigned int swfq_empty : 1; /* bit 0 Software Free Queue Empty Intr. */ -+ unsigned int hwfq_empty : 1; /* bit 1 Hardware Free Queue Empty Intr. */ -+ unsigned int class_qf_int : 14; /* bit 15:2 Classification Rx Queue13-0 Full Intr. */ -+ GMAC_INTR_T gmac0; -+ GMAC_INTR_T gmac1; -+ } bits; -+} INTR_REG4_T; -+ -+#define GMAC1_RESERVED_INT_BIT BIT(31) -+#define GMAC1_MIB_INT_BIT BIT(30) -+#define GMAC1_RX_PAUSE_ON_INT_BIT BIT(29) -+#define GMAC1_TX_PAUSE_ON_INT_BIT BIT(28) -+#define GMAC1_RX_PAUSE_OFF_INT_BIT BIT(27) -+#define GMAC1_TX_PAUSE_OFF_INT_BIT BIT(26) -+#define GMAC1_RX_OVERRUN_INT_BIT BIT(25) -+#define GMAC1_STATUS_CHANGE_INT_BIT BIT(24) -+#define GMAC0_RESERVED_INT_BIT BIT(23) -+#define GMAC0_MIB_INT_BIT BIT(22) -+#define GMAC0_RX_PAUSE_ON_INT_BIT BIT(21) -+#define GMAC0_TX_PAUSE_ON_INT_BIT BIT(20) -+#define GMAC0_RX_PAUSE_OFF_INT_BIT BIT(19) -+#define GMAC0_TX_PAUSE_OFF_INT_BIT BIT(18) -+#define GMAC0_RX_OVERRUN_INT_BIT BIT(17) -+#define GMAC0_STATUS_CHANGE_INT_BIT BIT(16) -+#define CLASS_RX_FULL_INT_BIT(x) BIT((x+2)) -+#define HWFQ_EMPTY_INT_BIT BIT(1) -+#define SWFQ_EMPTY_INT_BIT BIT(0) -+ -+#define GMAC0_INT_BITS (GMAC0_RESERVED_INT_BIT | GMAC0_MIB_INT_BIT | \ -+ GMAC0_RX_PAUSE_ON_INT_BIT | GMAC0_TX_PAUSE_ON_INT_BIT | \ -+ GMAC0_RX_PAUSE_OFF_INT_BIT | GMAC0_TX_PAUSE_OFF_INT_BIT | \ -+ GMAC0_RX_OVERRUN_INT_BIT | GMAC0_STATUS_CHANGE_INT_BIT) -+#define GMAC1_INT_BITS (GMAC1_RESERVED_INT_BIT | GMAC1_MIB_INT_BIT | \ -+ GMAC1_RX_PAUSE_ON_INT_BIT | GMAC1_TX_PAUSE_ON_INT_BIT | \ -+ GMAC1_RX_PAUSE_OFF_INT_BIT | GMAC1_TX_PAUSE_OFF_INT_BIT | \ -+ GMAC1_RX_OVERRUN_INT_BIT | GMAC1_STATUS_CHANGE_INT_BIT) -+ -+#define CLASS_RX_FULL_INT_BITS 0xfffc -+ -+/* -+ * GLOBAL_QUEUE_THRESHOLD_REG (offset 0x0070) -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_0070_2 { -+ unsigned int swfq_empty : 8; /* 7:0 Software Free Queue Empty Threshold */ -+ unsigned int hwfq_empty : 8; /* 15:8 Hardware Free Queue Empty Threshold */ -+ unsigned int intrq : 8; /* 23:16 */ -+ unsigned int toe_class : 8; /* 31:24 */ -+ } bits; -+} QUEUE_THRESHOLD_T; -+ -+ -+/* -+ * GMAC DMA Control Register -+ * GMAC0 offset 0x8000 -+ * GMAC1 offset 0xC000 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8000 { -+ unsigned int td_bus : 2; /* bit 1:0 Peripheral Bus Width */ -+ unsigned int td_burst_size : 2; /* bit 3:2 TxDMA max burst size for every AHB request */ -+ unsigned int td_prot : 4; /* bit 7:4 TxDMA protection control */ -+ unsigned int rd_bus : 2; /* bit 9:8 Peripheral Bus Width */ -+ unsigned int rd_burst_size : 2; /* bit 11:10 DMA max burst size for every AHB request */ -+ unsigned int rd_prot : 4; /* bit 15:12 DMA Protection Control */ -+ unsigned int rd_insert_bytes : 2; /* bit 17:16 */ -+ unsigned int reserved : 10; /* bit 27:18 */ -+ unsigned int drop_small_ack : 1; /* bit 28 1: Drop, 0: Accept */ -+ unsigned int loopback : 1; /* bit 29 Loopback TxDMA to RxDMA */ -+ unsigned int td_enable : 1; /* bit 30 Tx DMA Enable */ -+ unsigned int rd_enable : 1; /* bit 31 Rx DMA Enable */ -+ } bits; -+} GMAC_DMA_CTRL_T; -+ -+/* -+ * GMAC Tx Weighting Control Register 0 -+ * GMAC0 offset 0x8004 -+ * GMAC1 offset 0xC004 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8004 { -+ unsigned int hw_tq0 : 6; /* bit 5:0 HW TX Queue 3 */ -+ unsigned int hw_tq1 : 6; /* bit 11:6 HW TX Queue 2 */ -+ unsigned int hw_tq2 : 6; /* bit 17:12 HW TX Queue 1 */ -+ unsigned int hw_tq3 : 6; /* bit 23:18 HW TX Queue 0 */ -+ unsigned int reserved : 8; /* bit 31:24 */ -+ } bits; -+} GMAC_TX_WCR0_T; /* Weighting Control Register 0 */ -+ -+/* -+ * GMAC Tx Weighting Control Register 1 -+ * GMAC0 offset 0x8008 -+ * GMAC1 offset 0xC008 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8008 { -+ unsigned int sw_tq0 : 5; /* bit 4:0 SW TX Queue 0 */ -+ unsigned int sw_tq1 : 5; /* bit 9:5 SW TX Queue 1 */ -+ unsigned int sw_tq2 : 5; /* bit 14:10 SW TX Queue 2 */ -+ unsigned int sw_tq3 : 5; /* bit 19:15 SW TX Queue 3 */ -+ unsigned int sw_tq4 : 5; /* bit 24:20 SW TX Queue 4 */ -+ unsigned int sw_tq5 : 5; /* bit 29:25 SW TX Queue 5 */ -+ unsigned int reserved : 2; /* bit 31:30 */ -+ } bits; -+} GMAC_TX_WCR1_T; /* Weighting Control Register 1 */ -+ -+/* -+ * Queue Read/Write Pointer -+ * GMAC SW TX Queue 0~5 Read/Write Pointer register -+ * GMAC0 offset 0x800C ~ 0x8020 -+ * GMAC1 offset 0xC00C ~ 0xC020 -+ * GMAC HW TX Queue 0~3 Read/Write Pointer register -+ * GMAC0 offset 0x8024 ~ 0x8030 -+ * GMAC1 offset 0xC024 ~ 0xC030 -+ * -+ * see DMA_RWPTR_T structure -+ */ -+ -+/* -+ * GMAC DMA Tx First Description Address Register -+ * GMAC0 offset 0x8038 -+ * GMAC1 offset 0xC038 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8038 { -+ unsigned int reserved : 3; -+ unsigned int td_busy : 1; /* bit 3 1: TxDMA busy; 0: TxDMA idle */ -+ unsigned int td_first_des_ptr : 28; /* bit 31:4 first descriptor address */ -+ } bits; -+} GMAC_TXDMA_FIRST_DESC_T; -+ -+/* -+ * GMAC DMA Tx Current Description Address Register -+ * GMAC0 offset 0x803C -+ * GMAC1 offset 0xC03C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_803C { -+ unsigned int reserved : 4; -+ unsigned int td_curr_desc_ptr : 28; /* bit 31:4 current descriptor address */ -+ } bits; -+} GMAC_TXDMA_CURR_DESC_T; -+ -+/* -+ * GMAC DMA Tx Description Word 0 Register -+ * GMAC0 offset 0x8040 -+ * GMAC1 offset 0xC040 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8040 { -+ unsigned int buffer_size : 16; /* bit 15:0 Transfer size */ -+ unsigned int desc_count : 6; /* bit 21:16 number of descriptors used for the current frame */ -+ unsigned int status_tx_ok : 1; /* bit 22 Tx Status, 1: Successful 0: Failed */ -+ unsigned int status_rvd : 6; /* bit 28:23 Tx Status, Reserved bits */ -+ unsigned int perr : 1; /* bit 29 protocol error during processing this descriptor */ -+ unsigned int derr : 1; /* bit 30 data error during processing this descriptor */ -+ unsigned int reserved : 1; /* bit 31 */ -+ } bits; -+} GMAC_TXDESC_0_T; -+ -+/* -+ * GMAC DMA Tx Description Word 1 Register -+ * GMAC0 offset 0x8044 -+ * GMAC1 offset 0xC044 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct txdesc_word1 { -+ unsigned int byte_count : 16; /* bit 15: 0 Tx Frame Byte Count */ -+ unsigned int mtu_enable : 1; /* bit 16 TSS segmentation use MTU setting */ -+ unsigned int ip_chksum : 1; /* bit 17 IPV4 Header Checksum Enable */ -+ unsigned int ipv6_enable : 1; /* bit 18 IPV6 Tx Enable */ -+ unsigned int tcp_chksum : 1; /* bit 19 TCP Checksum Enable */ -+ unsigned int udp_chksum : 1; /* bit 20 UDP Checksum Enable */ -+ unsigned int bypass_tss : 1; /* bit 21 Bypass HW offload engine */ -+ unsigned int ip_fixed_len : 1; /* bit 22 Don't update IP length field */ -+ unsigned int reserved : 9; /* bit 31:23 Tx Flag, Reserved */ -+ } bits; -+} GMAC_TXDESC_1_T; -+ -+#define TSS_IP_FIXED_LEN_BIT BIT(22) -+#define TSS_BYPASS_BIT BIT(21) -+#define TSS_UDP_CHKSUM_BIT BIT(20) -+#define TSS_TCP_CHKSUM_BIT BIT(19) -+#define TSS_IPV6_ENABLE_BIT BIT(18) -+#define TSS_IP_CHKSUM_BIT BIT(17) -+#define TSS_MTU_ENABLE_BIT BIT(16) -+ -+#define TSS_CHECKUM_ENABLE \ -+ (TSS_IP_CHKSUM_BIT|TSS_IPV6_ENABLE_BIT| \ -+ TSS_TCP_CHKSUM_BIT|TSS_UDP_CHKSUM_BIT) -+ -+/* -+ * GMAC DMA Tx Description Word 2 Register -+ * GMAC0 offset 0x8048 -+ * GMAC1 offset 0xC048 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int buf_adr; -+} GMAC_TXDESC_2_T; -+ -+/* -+ * GMAC DMA Tx Description Word 3 Register -+ * GMAC0 offset 0x804C -+ * GMAC1 offset 0xC04C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct txdesc_word3 { -+ unsigned int mtu_size : 13; /* bit 12: 0 Tx Frame Byte Count */ -+ unsigned int reserved : 16; /* bit 28:13 */ -+ unsigned int eofie : 1; /* bit 29 End of frame interrupt enable */ -+ unsigned int sof_eof : 2; /* bit 31:30 11: only one, 10: first, 01: last, 00: linking */ -+ } bits; -+} GMAC_TXDESC_3_T; -+#define SOF_EOF_BIT_MASK 0x3fffffff -+#define SOF_BIT 0x80000000 -+#define EOF_BIT 0x40000000 -+#define EOFIE_BIT BIT(29) -+#define MTU_SIZE_BIT_MASK 0x1fff -+ -+/* -+ * GMAC Tx Descriptor -+ */ -+typedef struct { -+ GMAC_TXDESC_0_T word0; -+ GMAC_TXDESC_1_T word1; -+ GMAC_TXDESC_2_T word2; -+ GMAC_TXDESC_3_T word3; -+} GMAC_TXDESC_T; -+ -+/* -+ * GMAC DMA Rx First Description Address Register -+ * GMAC0 offset 0x8058 -+ * GMAC1 offset 0xC058 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8058 { -+ unsigned int reserved : 3; /* bit 2:0 */ -+ unsigned int rd_busy : 1; /* bit 3 1-RxDMA busy; 0-RxDMA idle */ -+ unsigned int rd_first_des_ptr : 28; /* bit 31:4 first descriptor address */ -+ } bits; -+} GMAC_RXDMA_FIRST_DESC_T; -+ -+/* -+ * GMAC DMA Rx Current Description Address Register -+ * GMAC0 offset 0x805C -+ * GMAC1 offset 0xC05C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_805C { -+ unsigned int reserved : 4; /* bit 3:0 */ -+ unsigned int rd_curr_des_ptr : 28; /* bit 31:4 current descriptor address */ -+ } bits; -+} GMAC_RXDMA_CURR_DESC_T; -+ -+/* -+ * GMAC DMA Rx Description Word 0 Register -+ * GMAC0 offset 0x8060 -+ * GMAC1 offset 0xC060 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8060 { -+ unsigned int buffer_size : 16; /* bit 15:0 number of descriptors used for the current frame */ -+ unsigned int desc_count : 6; /* bit 21:16 number of descriptors used for the current frame */ -+ unsigned int status : 4; /* bit 24:22 Status of rx frame */ -+ unsigned int chksum_status : 3; /* bit 28:26 Check Sum Status */ -+ unsigned int perr : 1; /* bit 29 protocol error during processing this descriptor */ -+ unsigned int derr : 1; /* bit 30 data error during processing this descriptor */ -+ unsigned int drop : 1; /* bit 31 TOE/CIS Queue Full dropped packet to default queue */ -+ } bits; -+} GMAC_RXDESC_0_T; -+ -+#define GMAC_RXDESC_0_T_derr BIT(30) -+#define GMAC_RXDESC_0_T_perr BIT(29) -+#define GMAC_RXDESC_0_T_chksum_status(x) BIT((x+26)) -+#define GMAC_RXDESC_0_T_status(x) BIT((x+22)) -+#define GMAC_RXDESC_0_T_desc_count(x) BIT((x+16)) -+ -+#define RX_CHKSUM_IP_UDP_TCP_OK 0 -+#define RX_CHKSUM_IP_OK_ONLY 1 -+#define RX_CHKSUM_NONE 2 -+#define RX_CHKSUM_IP_ERR_UNKNOWN 4 -+#define RX_CHKSUM_IP_ERR 5 -+#define RX_CHKSUM_TCP_UDP_ERR 6 -+#define RX_CHKSUM_NUM 8 -+ -+#define RX_STATUS_GOOD_FRAME 0 -+#define RX_STATUS_TOO_LONG_GOOD_CRC 1 -+#define RX_STATUS_RUNT_FRAME 2 -+#define RX_STATUS_SFD_NOT_FOUND 3 -+#define RX_STATUS_CRC_ERROR 4 -+#define RX_STATUS_TOO_LONG_BAD_CRC 5 -+#define RX_STATUS_ALIGNMENT_ERROR 6 -+#define RX_STATUS_TOO_LONG_BAD_ALIGN 7 -+#define RX_STATUS_RX_ERR 8 -+#define RX_STATUS_DA_FILTERED 9 -+#define RX_STATUS_BUFFER_FULL 10 -+#define RX_STATUS_NUM 16 -+ -+#define RX_ERROR_LENGTH(s) \ -+ ((s) == RX_STATUS_TOO_LONG_GOOD_CRC || \ -+ (s) == RX_STATUS_TOO_LONG_BAD_CRC || \ -+ (s) == RX_STATUS_TOO_LONG_BAD_ALIGN) -+#define RX_ERROR_OVER(s) \ -+ ((s) == RX_STATUS_BUFFER_FULL) -+#define RX_ERROR_CRC(s) \ -+ ((s) == RX_STATUS_CRC_ERROR || \ -+ (s) == RX_STATUS_TOO_LONG_BAD_CRC) -+#define RX_ERROR_FRAME(s) \ -+ ((s) == RX_STATUS_ALIGNMENT_ERROR || \ -+ (s) == RX_STATUS_TOO_LONG_BAD_ALIGN) -+#define RX_ERROR_FIFO(s) \ -+ (0) -+ -+/* -+ * GMAC DMA Rx Description Word 1 Register -+ * GMAC0 offset 0x8064 -+ * GMAC1 offset 0xC064 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct rxdesc_word1 { -+ unsigned int byte_count : 16; /* bit 15: 0 Rx Frame Byte Count */ -+ unsigned int sw_id : 16; /* bit 31:16 Software ID */ -+ } bits; -+} GMAC_RXDESC_1_T; -+ -+/* -+ * GMAC DMA Rx Description Word 2 Register -+ * GMAC0 offset 0x8068 -+ * GMAC1 offset 0xC068 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int buf_adr; -+} GMAC_RXDESC_2_T; -+ -+#define RX_INSERT_NONE 0 -+#define RX_INSERT_1_BYTE 1 -+#define RX_INSERT_2_BYTE 2 -+#define RX_INSERT_3_BYTE 3 -+ -+/* -+ * GMAC DMA Rx Description Word 3 Register -+ * GMAC0 offset 0x806C -+ * GMAC1 offset 0xC06C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct rxdesc_word3 { -+ unsigned int l3_offset : 8; /* bit 7: 0 L3 data offset */ -+ unsigned int l4_offset : 8; /* bit 15: 8 L4 data offset */ -+ unsigned int l7_offset : 8; /* bit 23: 16 L7 data offset */ -+ unsigned int dup_ack : 1; /* bit 24 Duplicated ACK detected */ -+ unsigned int abnormal : 1; /* bit 25 abnormal case found */ -+ unsigned int option : 1; /* bit 26 IPV4 option or IPV6 extension header */ -+ unsigned int out_of_seq : 1; /* bit 27 Out of Sequence packet */ -+ unsigned int ctrl_flag : 1; /* bit 28 Control Flag is present */ -+ unsigned int eofie : 1; /* bit 29 End of frame interrupt enable */ -+ unsigned int sof_eof : 2; /* bit 31:30 11: only one, 10: first, 01: last, 00: linking */ -+ } bits; -+} GMAC_RXDESC_3_T; -+ -+/* -+ * GMAC Rx Descriptor -+ */ -+typedef struct { -+ GMAC_RXDESC_0_T word0; -+ GMAC_RXDESC_1_T word1; -+ GMAC_RXDESC_2_T word2; -+ GMAC_RXDESC_3_T word3; -+} GMAC_RXDESC_T; -+ -+/* -+ * GMAC Hash Engine Enable/Action Register 0 Offset Register -+ * GMAC0 offset 0x8070 -+ * GMAC1 offset 0xC070 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8070 { -+ unsigned int mr0hel : 6; /* bit 5:0 match rule 0 hash entry size */ -+ unsigned int mr0_action : 5; /* bit 10:6 Matching Rule 0 action offset */ -+ unsigned int reserved0 : 4; /* bit 14:11 */ -+ unsigned int mr0en : 1; /* bit 15 Enable Matching Rule 0 */ -+ unsigned int mr1hel : 6; /* bit 21:16 match rule 1 hash entry size */ -+ unsigned int mr1_action : 5; /* bit 26:22 Matching Rule 1 action offset */ -+ unsigned int timing : 3; /* bit 29:27 */ -+ unsigned int reserved1 : 1; /* bit 30 */ -+ unsigned int mr1en : 1; /* bit 31 Enable Matching Rule 1 */ -+ } bits; -+} GMAC_HASH_ENABLE_REG0_T; -+ -+/* -+ * GMAC Hash Engine Enable/Action Register 1 Offset Register -+ * GMAC0 offset 0x8074 -+ * GMAC1 offset 0xC074 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8074 { -+ unsigned int mr2hel : 6; /* bit 5:0 match rule 2 hash entry size */ -+ unsigned int mr2_action : 5; /* bit 10:6 Matching Rule 2 action offset */ -+ unsigned int reserved2 : 4; /* bit 14:11 */ -+ unsigned int mr2en : 1; /* bit 15 Enable Matching Rule 2 */ -+ unsigned int mr3hel : 6; /* bit 21:16 match rule 3 hash entry size */ -+ unsigned int mr3_action : 5; /* bit 26:22 Matching Rule 3 action offset */ -+ unsigned int reserved1 : 4; /* bit 30:27 */ -+ unsigned int mr3en : 1; /* bit 31 Enable Matching Rule 3 */ -+ } bits; -+} GMAC_HASH_ENABLE_REG1_T; -+ -+/* -+ * GMAC Matching Rule Control Register 0 -+ * GMAC0 offset 0x8078 -+ * GMAC1 offset 0xC078 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8078 { -+ unsigned int sprx : 8; /* bit 7:0 Support Protocol Register 7:0 */ -+ unsigned int reserved2 : 4; /* bit 11:8 */ -+ unsigned int tos_traffic : 1; /* bit 12 IPV4 TOS or IPV6 Traffice Class */ -+ unsigned int flow_lable : 1; /* bit 13 IPV6 Flow label */ -+ unsigned int ip_hdr_len : 1; /* bit 14 IPV4 Header length */ -+ unsigned int ip_version : 1; /* bit 15 0: IPV4, 1: IPV6 */ -+ unsigned int reserved1 : 3; /* bit 18:16 */ -+ unsigned int pppoe : 1; /* bit 19 PPPoE Session ID enable */ -+ unsigned int vlan : 1; /* bit 20 VLAN ID enable */ -+ unsigned int ether_type : 1; /* bit 21 Ethernet type enable */ -+ unsigned int sa : 1; /* bit 22 MAC SA enable */ -+ unsigned int da : 1; /* bit 23 MAC DA enable */ -+ unsigned int priority : 3; /* bit 26:24 priority if multi-rules matched */ -+ unsigned int port : 1; /* bit 27 PORT ID matching enable */ -+ unsigned int l7 : 1; /* bit 28 L7 matching enable */ -+ unsigned int l4 : 1; /* bit 29 L4 matching enable */ -+ unsigned int l3 : 1; /* bit 30 L3 matching enable */ -+ unsigned int l2 : 1; /* bit 31 L2 matching enable */ -+ } bits; -+} GMAC_MRxCR0_T; -+ -+#define MR_L2_BIT BIT(31) -+#define MR_L3_BIT BIT(30) -+#define MR_L4_BIT BIT(29) -+#define MR_L7_BIT BIT(28) -+#define MR_PORT_BIT BIT(27) -+#define MR_PRIORITY_BIT BIT(26) -+#define MR_DA_BIT BIT(23) -+#define MR_SA_BIT BIT(22) -+#define MR_ETHER_TYPE_BIT BIT(21) -+#define MR_VLAN_BIT BIT(20) -+#define MR_PPPOE_BIT BIT(19) -+#define MR_IP_VER_BIT BIT(15) -+#define MR_IP_HDR_LEN_BIT BIT(14) -+#define MR_FLOW_LABLE_BIT BIT(13) -+#define MR_TOS_TRAFFIC_BIT BIT(12) -+#define MR_SPR_BIT(x) BIT(x) -+#define MR_SPR_BITS 0xff -+ -+/* -+ * GMAC Matching Rule Control Register 1 -+ * GMAC0 offset 0x807C -+ * GMAC1 offset 0xC07C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_807C { -+ unsigned int l4_byte0_15 : 16; /* bit 15: 0 */ -+ unsigned int dip_netmask : 7; /* bit 22:16 Dest IP net mask, number of mask bits */ -+ unsigned int dip : 1; /* bit 23 Dest IP */ -+ unsigned int sip_netmask : 7; /* bit 30:24 Srce IP net mask, number of mask bits */ -+ unsigned int sip : 1; /* bit 31 Srce IP */ -+ } bits; -+} GMAC_MRxCR1_T; -+ -+/* -+ * GMAC Matching Rule Control Register 2 -+ * GMAC0 offset 0x8080 -+ * GMAC1 offset 0xC080 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_8080 { -+ unsigned int l7_byte0_23 : 24; /* bit 23:0 */ -+ unsigned int l4_byte16_24 : 8; /* bit 31: 24 */ -+ } bits; -+} GMAC_MRxCR2_T; -+ -+/* -+ * GMAC Support registers -+ * GMAC0 offset 0x80A8 -+ * GMAC1 offset 0xC0A8 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_80A8 { -+ unsigned int protocol : 8; /* bit 7:0 Supported protocol */ -+ unsigned int swap : 3; /* bit 10:8 Swap */ -+ unsigned int reserved : 21; /* bit 31:11 */ -+ } bits; -+} GMAC_SPR_T; -+ -+/* -+ * GMAC_AHB_WEIGHT registers -+ * GMAC0 offset 0x80C8 -+ * GMAC1 offset 0xC0C8 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_80C8 { -+ unsigned int hash_weight : 5; /* 4:0 */ -+ unsigned int rx_weight : 5; /* 9:5 */ -+ unsigned int tx_weight : 5; /* 14:10 */ -+ unsigned int pre_req : 5; /* 19:15 Rx Data Pre Request FIFO Threshold */ -+ unsigned int tqDV_threshold : 5; /* 24:20 DMA TqCtrl to Start tqDV FIFO Threshold */ -+ unsigned int reserved : 7; /* 31:25 */ -+ } bits; -+} GMAC_AHB_WEIGHT_T; -+ -+/* -+ * the register structure of GMAC -+ */ -+ -+/* -+ * GMAC RX FLTR -+ * GMAC0 Offset 0xA00C -+ * GMAC1 Offset 0xE00C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_000c { -+ unsigned int unicast : 1; /* enable receive of unicast frames that are sent to STA address */ -+ unsigned int multicast : 1; /* enable receive of multicast frames that pass multicast filter */ -+ unsigned int broadcast : 1; /* enable receive of broadcast frames */ -+ unsigned int promiscuous : 1; /* enable receive of all frames */ -+ unsigned int error : 1; /* enable receive of all error frames */ -+ unsigned int : 27; -+ } bits; -+} GMAC_RX_FLTR_T; -+ -+/* -+ * GMAC Configuration 0 -+ * GMAC0 Offset 0xA018 -+ * GMAC1 Offset 0xE018 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_0018 { -+ unsigned int dis_tx : 1; /* 0: disable transmit */ -+ unsigned int dis_rx : 1; /* 1: disable receive */ -+ unsigned int loop_back : 1; /* 2: transmit data loopback enable */ -+ unsigned int flow_ctrl : 1; /* 3: flow control also trigged by Rx queues */ -+ unsigned int adj_ifg : 4; /* 4-7: adjust IFG from 96+/-56 */ -+ unsigned int max_len : 3; /* 8-10 maximum receive frame length allowed */ -+ unsigned int dis_bkoff : 1; /* 11: disable back-off function */ -+ unsigned int dis_col : 1; /* 12: disable 16 collisions abort function */ -+ unsigned int sim_test : 1; /* 13: speed up timers in simulation */ -+ unsigned int rx_fc_en : 1; /* 14: RX flow control enable */ -+ unsigned int tx_fc_en : 1; /* 15: TX flow control enable */ -+ unsigned int rgmii_en : 1; /* 16: RGMII in-band status enable */ -+ unsigned int ipv4_rx_chksum : 1; /* 17: IPv4 RX Checksum enable */ -+ unsigned int ipv6_rx_chksum : 1; /* 18: IPv6 RX Checksum enable */ -+ unsigned int rx_tag_remove : 1; /* 19: Remove Rx VLAN tag */ -+ unsigned int rgmm_edge : 1; /* 20 */ -+ unsigned int rxc_inv : 1; /* 21 */ -+ unsigned int ipv6_exthdr_order : 1; /* 22 */ -+ unsigned int rx_err_detect : 1; /* 23 */ -+ unsigned int port0_chk_hwq : 1; /* 24 */ -+ unsigned int port1_chk_hwq : 1; /* 25 */ -+ unsigned int port0_chk_toeq : 1; /* 26 */ -+ unsigned int port1_chk_toeq : 1; /* 27 */ -+ unsigned int port0_chk_classq : 1; /* 28 */ -+ unsigned int port1_chk_classq : 1; /* 29 */ -+ unsigned int reserved : 2; /* 31 */ -+ } bits; -+} GMAC_CONFIG0_T; -+ -+#define CONFIG0_TX_RX_DISABLE (BIT(1)|BIT(0)) -+#define CONFIG0_RX_CHKSUM (BIT(18)|BIT(17)) -+#define CONFIG0_FLOW_RX (BIT(14)) -+#define CONFIG0_FLOW_TX (BIT(15)) -+#define CONFIG0_FLOW_TX_RX (BIT(14)|BIT(15)) -+#define CONFIG0_FLOW_CTL (BIT(14)|BIT(15)) -+ -+#define CONFIG0_MAXLEN_SHIFT 8 -+#define CONFIG0_MAXLEN_MASK (7 << CONFIG0_MAXLEN_SHIFT) -+#define CONFIG0_MAXLEN_1536 0 -+#define CONFIG0_MAXLEN_1518 1 -+#define CONFIG0_MAXLEN_1522 2 -+#define CONFIG0_MAXLEN_1542 3 -+#define CONFIG0_MAXLEN_9k 4 /* 9212 */ -+#define CONFIG0_MAXLEN_10k 5 /* 10236 */ -+#define CONFIG0_MAXLEN_1518__6 6 -+#define CONFIG0_MAXLEN_1518__7 7 -+ -+/* -+ * GMAC Configuration 1 -+ * GMAC0 Offset 0xA01C -+ * GMAC1 Offset 0xE01C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_001c { -+ unsigned int set_threshold : 8; /* flow control set threshold */ -+ unsigned int rel_threshold : 8; /* flow control release threshold */ -+ unsigned int reserved : 16; -+ } bits; -+} GMAC_CONFIG1_T; -+ -+#define GMAC_FLOWCTRL_SET_MAX 32 -+#define GMAC_FLOWCTRL_SET_MIN 0 -+#define GMAC_FLOWCTRL_RELEASE_MAX 32 -+#define GMAC_FLOWCTRL_RELEASE_MIN 0 -+ -+/* -+ * GMAC Configuration 2 -+ * GMAC0 Offset 0xA020 -+ * GMAC1 Offset 0xE020 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_0020 { -+ unsigned int set_threshold : 16; /* flow control set threshold */ -+ unsigned int rel_threshold : 16; /* flow control release threshold */ -+ } bits; -+} GMAC_CONFIG2_T; -+ -+/* -+ * GMAC Configuration 3 -+ * GMAC0 Offset 0xA024 -+ * GMAC1 Offset 0xE024 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_0024 { -+ unsigned int set_threshold : 16; /* flow control set threshold */ -+ unsigned int rel_threshold : 16; /* flow control release threshold */ -+ } bits; -+} GMAC_CONFIG3_T; -+ -+ -+/* -+ * GMAC STATUS -+ * GMAC0 Offset 0xA02C -+ * GMAC1 Offset 0xE02C -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit1_002c { -+ unsigned int link : 1; /* link status */ -+ unsigned int speed : 2; /* link speed(00->2.5M 01->25M 10->125M) */ -+ unsigned int duplex : 1; /* duplex mode */ -+ unsigned int reserved : 1; -+ unsigned int mii_rmii : 2; /* PHY interface type */ -+ unsigned int : 25; -+ } bits; -+} GMAC_STATUS_T; -+ -+#define GMAC_SPEED_10 0 -+#define GMAC_SPEED_100 1 -+#define GMAC_SPEED_1000 2 -+ -+#define GMAC_PHY_MII 0 -+#define GMAC_PHY_GMII 1 -+#define GMAC_PHY_RGMII_100_10 2 -+#define GMAC_PHY_RGMII_1000 3 -+ -+/* -+ * Queue Header -+ * (1) TOE Queue Header -+ * (2) Non-TOE Queue Header -+ * (3) Interrupt Queue Header -+ * -+ * memory Layout -+ * TOE Queue Header -+ * 0x60003000 +---------------------------+ 0x0000 -+ * | TOE Queue 0 Header | -+ * | 8 * 4 Bytes | -+ * +---------------------------+ 0x0020 -+ * | TOE Queue 1 Header | -+ * | 8 * 4 Bytes | -+ * +---------------------------+ 0x0040 -+ * | ...... | -+ * | | -+ * +---------------------------+ -+ * -+ * Non TOE Queue Header -+ * 0x60002000 +---------------------------+ 0x0000 -+ * | Default Queue 0 Header | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ 0x0008 -+ * | Default Queue 1 Header | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ 0x0010 -+ * | Classification Queue 0 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ -+ * | Classification Queue 1 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ (n * 8 + 0x10) -+ * | ... | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ (13 * 8 + 0x10) -+ * | Classification Queue 13 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ 0x80 -+ * | Interrupt Queue 0 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ -+ * | Interrupt Queue 1 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ -+ * | Interrupt Queue 2 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ -+ * | Interrupt Queue 3 | -+ * | 2 * 4 Bytes | -+ * +---------------------------+ -+ * -+ */ -+#define TOE_QUEUE_HDR_ADDR(n) (TOE_TOE_QUE_HDR_BASE + n * 32) -+#define TOE_Q_HDR_AREA_END (TOE_QUEUE_HDR_ADDR(TOE_TOE_QUEUE_MAX + 1)) -+#define TOE_DEFAULT_Q_HDR_BASE(x) (TOE_NONTOE_QUE_HDR_BASE + 0x08 * (x)) -+#define TOE_CLASS_Q_HDR_BASE (TOE_NONTOE_QUE_HDR_BASE + 0x10) -+#define TOE_INTR_Q_HDR_BASE (TOE_NONTOE_QUE_HDR_BASE + 0x80) -+#define INTERRUPT_QUEUE_HDR_ADDR(n) (TOE_INTR_Q_HDR_BASE + n * 8) -+#define NONTOE_Q_HDR_AREA_END (INTERRUPT_QUEUE_HDR_ADDR(TOE_INTR_QUEUE_MAX + 1)) -+/* -+ * TOE Queue Header Word 0 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int base_size; -+} TOE_QHDR0_T; -+ -+#define TOE_QHDR0_BASE_MASK (~0x0f) -+ -+/* -+ * TOE Queue Header Word 1 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_qhdr1 { -+ unsigned int rptr : 16; /* bit 15:0 */ -+ unsigned int wptr : 16; /* bit 31:16 */ -+ } bits; -+} TOE_QHDR1_T; -+ -+/* -+ * TOE Queue Header Word 2 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_qhdr2 { -+ unsigned int TotalPktSize : 17; /* bit 16: 0 Total packet size */ -+ unsigned int reserved : 7; /* bit 23:17 */ -+ unsigned int dack : 1; /* bit 24 1: Duplicated ACK */ -+ unsigned int abn : 1; /* bit 25 1: Abnormal case Found */ -+ unsigned int tcp_opt : 1; /* bit 26 1: Have TCP option */ -+ unsigned int ip_opt : 1; /* bit 27 1: have IPV4 option or IPV6 Extension header */ -+ unsigned int sat : 1; /* bit 28 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold */ -+ unsigned int osq : 1; /* bit 29 1: out of sequence */ -+ unsigned int ctl : 1; /* bit 30 1: have control flag bits (except ack) */ -+ unsigned int usd : 1; /* bit 31 0: if no data assembled yet */ -+ } bits; -+} TOE_QHDR2_T; -+ -+/* -+ * TOE Queue Header Word 3 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int seq_num; -+} TOE_QHDR3_T; -+ -+/* -+ * TOE Queue Header Word 4 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int ack_num; -+} TOE_QHDR4_T; -+ -+/* -+ * TOE Queue Header Word 5 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_qhdr5 { -+ unsigned int AckCnt : 16; /* bit 15:0 */ -+ unsigned int SeqCnt : 16; /* bit 31:16 */ -+ } bits; -+} TOE_QHDR5_T; -+ -+/* -+ * TOE Queue Header Word 6 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_qhdr6 { -+ unsigned int WinSize : 16; /* bit 15:0 */ -+ unsigned int iq_num : 2; /* bit 17:16 */ -+ unsigned int MaxPktSize : 14; /* bit 31:18 */ -+ } bits; -+} TOE_QHDR6_T; -+ -+/* -+ * TOE Queue Header Word 7 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_qhdr7 { -+ unsigned int AckThreshold : 16; /* bit 15:0 */ -+ unsigned int SeqThreshold : 16; /* bit 31:16 */ -+ } bits; -+} TOE_QHDR7_T; -+ -+/* -+ * TOE Queue Header -+ */ -+typedef struct { -+ TOE_QHDR0_T word0; -+ TOE_QHDR1_T word1; -+ TOE_QHDR2_T word2; -+ TOE_QHDR3_T word3; -+ TOE_QHDR4_T word4; -+ TOE_QHDR5_T word5; -+ TOE_QHDR6_T word6; -+ TOE_QHDR7_T word7; -+} TOE_QHDR_T; -+ -+/* -+ * NONTOE Queue Header Word 0 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int base_size; -+} NONTOE_QHDR0_T; -+ -+#define NONTOE_QHDR0_BASE_MASK (~0x0f) -+ -+/* -+ * NONTOE Queue Header Word 1 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_nonqhdr1 { -+ unsigned int rptr : 16; /* bit 15:0 */ -+ unsigned int wptr : 16; /* bit 31:16 */ -+ } bits; -+} NONTOE_QHDR1_T; -+ -+/* -+ * Non-TOE Queue Header -+ */ -+typedef struct { -+ NONTOE_QHDR0_T word0; -+ NONTOE_QHDR1_T word1; -+} NONTOE_QHDR_T; -+ -+/* -+ * Interrupt Queue Header Word 0 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_intrqhdr0 { -+ unsigned int win_size : 16; /* bit 15:0 Descriptor Ring Size */ -+ unsigned int wptr : 16; /* bit 31:16 Write Pointer where hw stopped */ -+ } bits; -+} INTR_QHDR0_T; -+ -+/* -+ * Interrupt Queue Header Word 1 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_intrqhdr1 { -+ unsigned int TotalPktSize : 17; /* bit 16: 0 Total packet size */ -+ unsigned int tcp_qid : 8; /* bit 24:17 TCP Queue ID */ -+ unsigned int dack : 1; /* bit 25 1: Duplicated ACK */ -+ unsigned int abn : 1; /* bit 26 1: Abnormal case Found */ -+ unsigned int tcp_opt : 1; /* bit 27 1: Have TCP option */ -+ unsigned int ip_opt : 1; /* bit 28 1: have IPV4 option or IPV6 Extension header */ -+ unsigned int sat : 1; /* bit 29 1: SeqCnt > SeqThreshold, or AckCnt > AckThreshold */ -+ unsigned int osq : 1; /* bit 30 1: out of sequence */ -+ unsigned int ctl : 1; /* bit 31 1: have control flag bits (except ack) */ -+ } bits; -+} INTR_QHDR1_T; -+ -+/* -+ * Interrupt Queue Header Word 2 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int seq_num; -+} INTR_QHDR2_T; -+ -+/* -+ * Interrupt Queue Header Word 3 -+ */ -+typedef union { -+ unsigned int bits32; -+ unsigned int ack_num; -+} INTR_QHDR3_T; -+ -+/* -+ * Interrupt Queue Header Word 4 -+ */ -+typedef union { -+ unsigned int bits32; -+ struct bit_intrqhdr4 { -+ unsigned int AckCnt : 16; /* bit 15:0 Ack# change since last ack# intr. */ -+ unsigned int SeqCnt : 16; /* bit 31:16 Seq# change since last seq# intr. */ -+ } bits; -+} INTR_QHDR4_T; -+ -+/* -+ * Interrupt Queue Header -+ */ -+typedef struct { -+ INTR_QHDR0_T word0; -+ INTR_QHDR1_T word1; -+ INTR_QHDR2_T word2; -+ INTR_QHDR3_T word3; -+ INTR_QHDR4_T word4; -+ unsigned int word5; -+ unsigned int word6; -+ unsigned int word7; -+} INTR_QHDR_T; -+ -+#endif /* _GMAC_SL351x_H */ diff --git a/target/linux/gemini/patches-4.1/121-arm-gemini-register-ethernet.patch b/target/linux/gemini/patches-4.1/121-arm-gemini-register-ethernet.patch deleted file mode 100644 index 5ae896c66f..0000000000 --- a/target/linux/gemini/patches-4.1/121-arm-gemini-register-ethernet.patch +++ /dev/null @@ -1,209 +0,0 @@ ---- a/arch/arm/mach-gemini/board-nas4220b.c -+++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -28,9 +28,27 @@ - - #include <mach/hardware.h> - #include <mach/global_reg.h> -+#include <mach/gmac.h> - - #include "common.h" - -+static struct mdio_gpio_platform_data ib4220b_mdio = { -+ .mdc = 22, -+ .mdio = 21, -+ .phy_mask = ~(1 << 1), -+}; -+ -+static struct platform_device ib4220b_phy_device = { -+ .name = "mdio-gpio", -+ .id = 0, -+ .dev = { .platform_data = &ib4220b_mdio, }, -+}; -+ -+static struct gemini_gmac_platform_data ib4220b_gmac_data = { -+ .bus_id[0] = "gpio-0:01", -+ .interface[0] = PHY_INTERFACE_MODE_RGMII, -+}; -+ - static struct gpio_led ib4220b_leds[] = { - { - .name = "nas4220b:orange:hdd", -@@ -87,15 +105,47 @@ static struct platform_device ib4220b_ke - }, - }; - -+static void __init ib4220b_gmac_init(void) -+{ -+ unsigned int val; -+ -+ val = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_IO_DRIVING_CTRL)); -+ val |= (0x3 << GMAC0_PADS_SHIFT) | (0x3 << GMAC1_PADS_SHIFT); -+ writel(val, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_IO_DRIVING_CTRL)); -+ -+ val = (0x0 << GMAC0_RXDV_SKEW_SHIFT) | (0xf << GMAC0_RXC_SKEW_SHIFT) | -+ (0x7 << GMAC0_TXEN_SKEW_SHIFT) | (0xb << GMAC0_TXC_SKEW_SHIFT) | -+ (0x0 << GMAC1_RXDV_SKEW_SHIFT) | (0xf << GMAC1_RXC_SKEW_SHIFT) | -+ (0x7 << GMAC1_TXEN_SKEW_SHIFT) | (0xa << GMAC1_TXC_SKEW_SHIFT); -+ writel(val, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_GMAC_CTRL_SKEW_CTRL)); -+ -+ writel(0x77777777, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_GMAC0_DATA_SKEW_CTRL)); -+ writel(0x77777777, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_GMAC1_DATA_SKEW_CTRL)); -+ -+ val = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_ARBITRATION1_CTRL)) & ~BURST_LENGTH_MASK; -+ val |= (0x20 << BURST_LENGTH_SHIFT) | GMAC0_HIGH_PRIO | GMAC1_HIGH_PRIO; -+ writel(val, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_ARBITRATION1_CTRL)); -+} -+ - static void __init ib4220b_init(void) - { - gemini_gpio_init(); -+ ib4220b_gmac_init(); - platform_register_uart(); - platform_register_pflash(SZ_16M, NULL, 0); - platform_device_register(&ib4220b_led_device); - platform_device_register(&ib4220b_key_device); - platform_register_rtc(); - platform_register_watchdog(); -+ platform_device_register(&ib4220b_phy_device); -+ platform_register_ethernet(&ib4220b_gmac_data); - } - - MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") ---- a/arch/arm/mach-gemini/board-wbd111.c -+++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -22,9 +22,29 @@ - #include <asm/mach/arch.h> - #include <asm/mach/time.h> - -+#include <mach/gmac.h> - - #include "common.h" - -+static struct mdio_gpio_platform_data wbd111_mdio = { -+ .mdc = 22, -+ .mdio = 21, -+ .phy_mask = ~(1 << 1), -+}; -+ -+static struct platform_device wbd111_phy_device = { -+ .name = "mdio-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &wbd111_mdio, -+ }, -+}; -+ -+static struct gemini_gmac_platform_data gmac_data = { -+ .bus_id[0] = "gpio-0:01", -+ .interface[0] = PHY_INTERFACE_MODE_MII, -+}; -+ - static struct gpio_keys_button wbd111_keys[] = { - { - .code = KEY_SETUP, -@@ -123,6 +143,8 @@ static void __init wbd111_init(void) - platform_device_register(&wbd111_keys_device); - platform_register_rtc(); - platform_register_watchdog(); -+ platform_device_register(&wbd111_phy_device); -+ platform_register_ethernet(&gmac_data); - } - - MACHINE_START(WBD111, "Wiliboard WBD-111") ---- a/arch/arm/mach-gemini/board-wbd222.c -+++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -22,9 +22,31 @@ - #include <asm/mach/arch.h> - #include <asm/mach/time.h> - -+#include <mach/gmac.h> - - #include "common.h" - -+static struct mdio_gpio_platform_data wbd222_mdio = { -+ .mdc = 22, -+ .mdio = 21, -+ .phy_mask = ~((1 << 1) | (1 << 3)), -+}; -+ -+static struct platform_device wbd222_phy_device = { -+ .name = "mdio-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &wbd222_mdio, -+ }, -+}; -+ -+static struct gemini_gmac_platform_data gmac_data = { -+ .bus_id[0] = "gpio-0:01", -+ .interface[0] = PHY_INTERFACE_MODE_MII, -+ .bus_id[1] = "gpio-0:03", -+ .interface[1] = PHY_INTERFACE_MODE_MII, -+}; -+ - static struct gpio_keys_button wbd222_keys[] = { - { - .code = KEY_SETUP, -@@ -123,6 +145,8 @@ static void __init wbd222_init(void) - platform_device_register(&wbd222_keys_device); - platform_register_rtc(); - platform_register_watchdog(); -+ platform_device_register(&wbd222_phy_device); -+ platform_register_ethernet(&gmac_data); - } - - MACHINE_START(WBD222, "Wiliboard WBD-222") ---- a/arch/arm/mach-gemini/board-rut1xx.c -+++ b/arch/arm/mach-gemini/board-rut1xx.c -@@ -15,13 +15,35 @@ - #include <linux/input.h> - #include <linux/gpio_keys.h> - #include <linux/sizes.h> -+#include <linux/mdio-gpio.h> - - #include <asm/mach-types.h> - #include <asm/mach/arch.h> - #include <asm/mach/time.h> - -+#include <mach/gmac.h> -+ - #include "common.h" - -+static struct mdio_gpio_platform_data rut1xx_mdio = { -+ .mdc = 22, -+ .mdio = 21, -+ .phy_mask = ~(1 << 1), -+}; -+ -+static struct platform_device rut1xx_phy_device = { -+ .name = "mdio-gpio", -+ .id = 0, -+ .dev = { -+ .platform_data = &rut1xx_mdio, -+ }, -+}; -+ -+static struct gemini_gmac_platform_data gmac_data = { -+ .bus_id[0] = "gpio-0:01", -+ .interface[0] = PHY_INTERFACE_MODE_MII, -+}; -+ - static struct gpio_keys_button rut1xx_keys[] = { - { - .code = KEY_SETUP, -@@ -81,6 +103,8 @@ static void __init rut1xx_init(void) - platform_device_register(&rut1xx_keys_device); - platform_register_rtc(); - platform_register_watchdog(); -+ platform_device_register(&rut1xx_phy_device); -+ platform_register_ethernet(&gmac_data); - } - - MACHINE_START(RUT100, "Teltonika RUT100") diff --git a/target/linux/gemini/patches-4.1/130-usb-ehci-fot2g.patch b/target/linux/gemini/patches-4.1/130-usb-ehci-fot2g.patch deleted file mode 100644 index 5f6eecca93..0000000000 --- a/target/linux/gemini/patches-4.1/130-usb-ehci-fot2g.patch +++ /dev/null @@ -1,210 +0,0 @@ ---- a/arch/arm/mach-gemini/devices.c -+++ b/arch/arm/mach-gemini/devices.c -@@ -188,3 +188,64 @@ int platform_register_ethernet(struct ge - - return platform_device_register(ðernet_device); - } -+ -+static struct resource usb0_resources[] = { -+ { -+ .start = GEMINI_USB0_BASE, -+ .end = GEMINI_USB0_BASE + 0xfff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IRQ_USB0, -+ .end = IRQ_USB0, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct resource usb1_resources[] = { -+ { -+ .start = GEMINI_USB1_BASE, -+ .end = GEMINI_USB1_BASE + 0xfff, -+ .flags = IORESOURCE_MEM, -+ }, -+ { -+ .start = IRQ_USB1, -+ .end = IRQ_USB1, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static u64 usb0_dmamask = 0xffffffffUL; -+static u64 usb1_dmamask = 0xffffffffUL; -+ -+static struct platform_device usb_device[] = { -+ { -+ .name = "ehci-fotg2", -+ .id = 0, -+ .dev = { -+ .dma_mask = &usb0_dmamask, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+ .num_resources = ARRAY_SIZE(usb0_resources), -+ .resource = usb0_resources, -+ }, -+ { -+ .name = "ehci-fotg2", -+ .id = 1, -+ .dev = { -+ .dma_mask = &usb1_dmamask, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+ .num_resources = ARRAY_SIZE(usb1_resources), -+ .resource = usb1_resources, -+ }, -+}; -+ -+int __init platform_register_usb(unsigned int id) -+{ -+ if (id > 1) -+ return -EINVAL; -+ -+ return platform_device_register(&usb_device[id]); -+} -+ ---- a/arch/arm/mach-gemini/common.h -+++ b/arch/arm/mach-gemini/common.h -@@ -30,6 +30,7 @@ extern int platform_register_pflash(unsi - unsigned int nr_parts); - extern int platform_register_watchdog(void); - extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata); -+extern int platform_register_usb(unsigned int id); - - extern void gemini_restart(enum reboot_mode mode, const char *cmd); - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -351,11 +351,13 @@ static void ehci_silence_controller(stru - ehci->rh_state = EHCI_RH_HALTED; - ehci_turn_off_all_ports(ehci); - -+#ifndef CONFIG_ARCH_GEMINI - /* make BIOS/etc use companion controller during reboot */ - ehci_writel(ehci, 0, &ehci->regs->configured_flag); - - /* unblock posted writes */ - ehci_readl(ehci, &ehci->regs->configured_flag); -+#endif - spin_unlock_irq(&ehci->lock); - } - -@@ -607,7 +609,9 @@ static int ehci_run (struct usb_hcd *hcd - // Philips, Intel, and maybe others need CMD_RUN before the - // root hub will detect new devices (why?); NEC doesn't - ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET); -+#ifndef CONFIG_ARCH_GEMINI - ehci->command |= CMD_RUN; -+#endif - ehci_writel(ehci, ehci->command, &ehci->regs->command); - dbg_cmd (ehci, "init", ehci->command); - -@@ -627,9 +631,11 @@ static int ehci_run (struct usb_hcd *hcd - */ - down_write(&ehci_cf_port_reset_rwsem); - ehci->rh_state = EHCI_RH_RUNNING; -+#ifndef CONFIG_ARCH_GEMINI - ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag); - ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */ - msleep(5); -+#endif - up_write(&ehci_cf_port_reset_rwsem); - ehci->last_periodic_enable = ktime_get_real(); - -@@ -767,9 +773,10 @@ static irqreturn_t ehci_irq (struct usb_ - pcd_status = status; - - /* resume root hub? */ -+#ifndef CONFIG_ARCH_GEMINI - if (ehci->rh_state == EHCI_RH_SUSPENDED) - usb_hcd_resume_root_hub(hcd); -- -+#endif - /* get per-port change detect bits */ - if (ehci->has_ppcd) - ppcd = status >> 16; -@@ -1250,6 +1257,11 @@ MODULE_DESCRIPTION(DRIVER_DESC); - MODULE_AUTHOR (DRIVER_AUTHOR); - MODULE_LICENSE ("GPL"); - -+#ifdef CONFIG_ARCH_GEMINI -+#include "ehci-fotg2.c" -+#define PLATFORM_DRIVER ehci_fotg2_driver -+#endif -+ - #ifdef CONFIG_USB_EHCI_FSL - #include "ehci-fsl.c" - #define PLATFORM_DRIVER ehci_fsl_driver ---- a/drivers/usb/host/ehci-timer.c -+++ b/drivers/usb/host/ehci-timer.c -@@ -208,7 +208,9 @@ static void ehci_handle_controller_death - - /* Clean up the mess */ - ehci->rh_state = EHCI_RH_HALTED; -+#ifndef CONFIG_ARCH_GEMINI - ehci_writel(ehci, 0, &ehci->regs->configured_flag); -+#endif - ehci_writel(ehci, 0, &ehci->regs->intr_enable); - ehci_work(ehci); - end_unlink_async(ehci); ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -656,7 +656,12 @@ static inline unsigned int - ehci_port_speed(struct ehci_hcd *ehci, unsigned int portsc) - { - if (ehci_is_TDI(ehci)) { -- switch ((portsc >> (ehci->has_hostpc ? 25 : 26)) & 3) { -+#ifdef CONFIG_ARCH_GEMINI -+ portsc = readl(ehci_to_hcd(ehci)->regs + 0x80); -+ switch ((portsc>>22)&3) { -+#else -+ switch ((portsc>>26)&3) { -+#endif - case 0: - return 0; - case 1: ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -1075,6 +1075,11 @@ int ehci_hub_control( - /* see what we found out */ - temp = check_reset_complete (ehci, wIndex, status_reg, - ehci_readl(ehci, status_reg)); -+#ifdef CONFIG_ARCH_GEMINI -+ /* restart schedule */ -+ ehci->command |= CMD_RUN; -+ ehci_writel(ehci, ehci->command, &ehci->regs->command); -+#endif - } - - /* transfer dedicated ports to the companion hc */ ---- a/include/linux/usb/ehci_def.h -+++ b/include/linux/usb/ehci_def.h -@@ -112,8 +112,13 @@ struct ehci_regs { - u32 frame_list; /* points to periodic list */ - /* ASYNCLISTADDR: offset 0x18 */ - u32 async_next; /* address of next async queue head */ -- -+#ifndef CONFIG_ARCH_GEMINI - u32 reserved1[2]; -+#else -+ u32 reserved1; -+ /* PORTSC: offset 0x20 for Faraday OTG */ -+ u32 port_status[1]; -+#endif - - /* TXFILLTUNING: offset 0x24 */ - u32 txfill_tuning; /* TX FIFO Tuning register */ -@@ -125,8 +130,11 @@ struct ehci_regs { - u32 configured_flag; - #define FLAG_CF (1<<0) /* true: we'll support "high speed" */ - -+#ifndef CONFIG_ARCH_GEMINI - /* PORTSC: offset 0x44 */ - u32 port_status[0]; /* up to N_PORTS */ -+#endif -+ - /* EHCI 1.1 addendum */ - #define PORTSC_SUSPEND_STS_ACK 0 - #define PORTSC_SUSPEND_STS_NYET 1 diff --git a/target/linux/gemini/patches-4.1/140-arm-gemini-add-pci-support.patch b/target/linux/gemini/patches-4.1/140-arm-gemini-add-pci-support.patch deleted file mode 100644 index 141799bbb1..0000000000 --- a/target/linux/gemini/patches-4.1/140-arm-gemini-add-pci-support.patch +++ /dev/null @@ -1,389 +0,0 @@ ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -381,6 +381,7 @@ config ARCH_GEMINI - select CLKSRC_MMIO - select CPU_FA526 - select GENERIC_CLOCKEVENTS -+ select MIGHT_HAVE_PCI - help - Support for the Cortina Systems Gemini family SoCs - ---- a/arch/arm/mach-gemini/include/mach/hardware.h -+++ b/arch/arm/mach-gemini/include/mach/hardware.h -@@ -71,4 +71,9 @@ - */ - #define IO_ADDRESS(x) IOMEM((((x) & 0xFFF00000) >> 4) | ((x) & 0x000FFFFF) | 0xF0000000) - -+/* -+ * PCI subsystem macros -+ */ -+#define pcibios_assign_all_busses() 1 -+ - #endif ---- a/arch/arm/mach-gemini/include/mach/irqs.h -+++ b/arch/arm/mach-gemini/include/mach/irqs.h -@@ -43,11 +43,14 @@ - - #define NORMAL_IRQ_NUM 32 - --#define GPIO_IRQ_BASE NORMAL_IRQ_NUM -+#define PCI_IRQ_BASE NORMAL_IRQ_NUM -+#define PCI_IRQ_NUM 4 -+ -+#define GPIO_IRQ_BASE (NORMAL_IRQ_NUM + PCI_IRQ_NUM) - #define GPIO_IRQ_NUM (3 * 32) - - #define ARCH_TIMER_IRQ IRQ_TIMER2 - --#define NR_IRQS (NORMAL_IRQ_NUM + GPIO_IRQ_NUM) -+#define NR_IRQS (NORMAL_IRQ_NUM + PCI_IRQ_NUM + GPIO_IRQ_NUM) - - #endif /* __MACH_IRQS_H__ */ ---- a/arch/arm/mach-gemini/Makefile -+++ b/arch/arm/mach-gemini/Makefile -@@ -6,6 +6,8 @@ - - obj-y := irq.o mm.o time.o devices.o gpio.o idle.o reset.o - -+obj-$(CONFIG_PCI) += pci.o -+ - # Board-specific support - obj-$(CONFIG_MACH_NAS4220B) += board-nas4220b.o - obj-$(CONFIG_MACH_RUT100) += board-rut1xx.o ---- a/arch/arm/mach-gemini/mm.c -+++ b/arch/arm/mach-gemini/mm.c -@@ -59,6 +59,11 @@ static struct map_desc gemini_io_desc[] - .length = SZ_512K, - .type = MT_DEVICE, - }, { -+ .virtual = (unsigned long)IO_ADDRESS(GEMINI_PCI_IO_BASE), -+ .pfn = __phys_to_pfn(GEMINI_PCI_IO_BASE), -+ .length = SZ_512K, -+ .type = MT_DEVICE, -+ }, { - .virtual = (unsigned long)IO_ADDRESS(GEMINI_FLASH_CTRL_BASE), - .pfn = __phys_to_pfn(GEMINI_FLASH_CTRL_BASE), - .length = SZ_512K, ---- /dev/null -+++ b/arch/arm/mach-gemini/pci.c -@@ -0,0 +1,320 @@ -+/* -+ * Support for Gemini PCI Controller -+ * -+ * Copyright (C) 2009 Janos Laube <janos.dev@gmail.com> -+ * Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt> -+ * -+ * based on SL2312 PCI controller code -+ * Storlink (C) 2003 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/pci.h> -+#include <linux/irq.h> -+#include <linux/gpio.h> -+ -+#include <asm/mach/pci.h> -+ -+#include <mach/irqs.h> -+#include <mach/hardware.h> -+ -+#define GEMINI_PCI_IOSIZE_1M 0x0000 -+ -+#define GEMINI_PCI_PMC 0x40 -+#define GEMINI_PCI_PMCSR 0x44 -+#define GEMINI_PCI_CTRL1 0x48 -+#define GEMINI_PCI_CTRL2 0x4C -+#define GEMINI_PCI_MEM1_BASE_SIZE 0x50 -+#define GEMINI_PCI_MEM2_BASE_SIZE 0x54 -+#define GEMINI_PCI_MEM3_BASE_SIZE 0x58 -+ -+#define PCI_CTRL2_INTSTS_OFFSET 28 -+#define PCI_CTRL2_INTMASK_OFFSET 22 -+ -+#define GEMINI_PCI_DMA_MASK 0xFFF00000 -+#define GEMINI_PCI_DMA_MEM1_BASE 0x00000000 -+#define GEMINI_PCI_DMA_MEM2_BASE 0x00000000 -+#define GEMINI_PCI_DMA_MEM3_BASE 0x00000000 -+#define GEMINI_PCI_DMA_MEM1_SIZE 7 -+#define GEMINI_PCI_DMA_MEM2_SIZE 6 -+#define GEMINI_PCI_DMA_MEM3_SIZE 6 -+ -+#define PCI_CONF_ENABLE (1 << 31) -+#define PCI_CONF_WHERE(r) ((r) & 0xFC) -+#define PCI_CONF_BUS(b) (((b) & 0xFF) << 16) -+#define PCI_CONF_DEVICE(d) (((d) & 0x1F) << 11) -+#define PCI_CONF_FUNCTION(f) (((f) & 0x07) << 8) -+ -+#define PCI_IOSIZE_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE)) -+#define PCI_PROT_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x04) -+#define PCI_CTRL_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x08) -+#define PCI_SOFTRST_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x10) -+#define PCI_CONFIG_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x28) -+#define PCI_DATA_REG (IO_ADDRESS(GEMINI_PCI_IO_BASE) + 0x2C) -+ -+ -+static DEFINE_SPINLOCK(gemini_pci_lock); -+ -+static int gemini_pci_read_config(struct pci_bus* bus, unsigned int fn, -+ int config, int size, u32* value) -+{ -+ unsigned long irq_flags; -+ -+ spin_lock_irqsave(&gemini_pci_lock, irq_flags); -+ -+ __raw_writel(PCI_CONF_BUS(bus->number) | -+ PCI_CONF_DEVICE(PCI_SLOT(fn)) | -+ PCI_CONF_FUNCTION(PCI_FUNC(fn)) | -+ PCI_CONF_WHERE(config) | -+ PCI_CONF_ENABLE, -+ PCI_CONFIG_REG); -+ -+ *value = __raw_readl(PCI_DATA_REG); -+ -+ if (size == 1) -+ *value = (*value >> (8 * (config & 3))) & 0xFF; -+ else if (size == 2) -+ *value = (*value >> (8 * (config & 3))) & 0xFFFF; -+ -+ spin_unlock_irqrestore(&gemini_pci_lock, irq_flags); -+ -+ dev_dbg(&bus->dev, -+ "[read] slt: %.2d, fnc: %d, cnf: 0x%.2X, val (%d bytes): 0x%.8X\n", -+ PCI_SLOT(fn), PCI_FUNC(fn), config, size, *value); -+ -+ return PCIBIOS_SUCCESSFUL; -+} -+ -+static int gemini_pci_write_config(struct pci_bus* bus, unsigned int fn, -+ int config, int size, u32 value) -+{ -+ unsigned long irq_flags = 0; -+ int ret = PCIBIOS_SUCCESSFUL; -+ -+ dev_dbg(&bus->dev, -+ "[write] slt: %.2d, fnc: %d, cnf: 0x%.2X, val (%d bytes): 0x%.8X\n", -+ PCI_SLOT(fn), PCI_FUNC(fn), config, size, value); -+ -+ spin_lock_irqsave(&gemini_pci_lock, irq_flags); -+ -+ __raw_writel(PCI_CONF_BUS(bus->number) | -+ PCI_CONF_DEVICE(PCI_SLOT(fn)) | -+ PCI_CONF_FUNCTION(PCI_FUNC(fn)) | -+ PCI_CONF_WHERE(config) | -+ PCI_CONF_ENABLE, -+ PCI_CONFIG_REG); -+ -+ switch(size) { -+ case 4: -+ __raw_writel(value, PCI_DATA_REG); -+ break; -+ case 2: -+ __raw_writew(value, PCI_DATA_REG + (config & 3)); -+ break; -+ case 1: -+ __raw_writeb(value, PCI_DATA_REG + (config & 3)); -+ break; -+ default: -+ ret = PCIBIOS_BAD_REGISTER_NUMBER; -+ } -+ -+ spin_unlock_irqrestore(&gemini_pci_lock, irq_flags); -+ -+ return ret; -+} -+ -+static struct pci_ops gemini_pci_ops = { -+ .read = gemini_pci_read_config, -+ .write = gemini_pci_write_config, -+}; -+ -+static struct resource gemini_pci_resource_io = { -+ .name = "PCI I/O Space", -+ .start = GEMINI_PCI_IO_BASE, -+ .end = GEMINI_PCI_IO_BASE + SZ_1M - 1, -+ .flags = IORESOURCE_IO, -+}; -+ -+static struct resource gemini_pci_resource_mem = { -+ .name = "PCI Memory Space", -+ .start = GEMINI_PCI_MEM_BASE, -+ .end = GEMINI_PCI_MEM_BASE + SZ_128M - 1, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static int __init gemini_pci_request_resources(struct pci_sys_data *sys) -+{ -+ if (request_resource(&ioport_resource, &gemini_pci_resource_io)) -+ goto bad_resources; -+ if (request_resource(&iomem_resource, &gemini_pci_resource_mem)) -+ goto bad_resources; -+ -+ pci_add_resource(&sys->resources, &gemini_pci_resource_io); -+ pci_add_resource(&sys->resources, &gemini_pci_resource_mem); -+ -+ return 0; -+ -+bad_resources: -+ pr_err("Gemini PCI: request_resource() failed. " -+ "Abort PCI bus enumeration.\n"); -+ return -1; -+} -+ -+static int __init gemini_pci_setup(int nr, struct pci_sys_data *sys) -+{ -+ unsigned int cmd; -+ -+ pcibios_min_io = 0x100; -+ pcibios_min_mem = 0; -+ -+ if ((nr > 0) || gemini_pci_request_resources(sys)) -+ return 0; -+ -+ /* setup I/O space to 1MB size */ -+ __raw_writel(GEMINI_PCI_IOSIZE_1M, PCI_IOSIZE_REG); -+ -+ /* setup hostbridge */ -+ cmd = __raw_readl(PCI_CTRL_REG); -+ cmd |= PCI_COMMAND_IO; -+ cmd |= PCI_COMMAND_MEMORY; -+ cmd |= PCI_COMMAND_MASTER; -+ __raw_writel(cmd, PCI_CTRL_REG); -+ -+ return 1; -+} -+ -+static struct pci_bus* __init gemini_pci_scan_bus(int nr, struct pci_sys_data* sys) -+{ -+ unsigned int reg = 0; -+ struct pci_bus* bus = 0; -+ -+ bus = pci_scan_bus(nr, &gemini_pci_ops, sys); -+ if (bus) { -+ dev_dbg(&bus->dev, "setting up PCI DMA\n"); -+ reg = (GEMINI_PCI_DMA_MEM1_BASE & GEMINI_PCI_DMA_MASK) -+ | (GEMINI_PCI_DMA_MEM1_SIZE << 16); -+ gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM1_BASE_SIZE, 4, reg); -+ reg = (GEMINI_PCI_DMA_MEM2_BASE & GEMINI_PCI_DMA_MASK) -+ | (GEMINI_PCI_DMA_MEM2_SIZE << 16); -+ gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM2_BASE_SIZE, 4, reg); -+ reg = (GEMINI_PCI_DMA_MEM3_BASE & GEMINI_PCI_DMA_MASK) -+ | (GEMINI_PCI_DMA_MEM3_SIZE << 16); -+ gemini_pci_write_config(bus, 0, GEMINI_PCI_MEM3_BASE_SIZE, 4, reg); -+ } -+ -+ return bus; -+} -+ -+/* Should work with all boards based on original Storlink EVB */ -+static int __init gemini_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) -+{ -+ if (slot < 9 || slot > 12) -+ return -1; -+ -+ return PCI_IRQ_BASE + (((slot - 9) + (pin - 1)) & 0x3); -+} -+ -+static struct hw_pci gemini_hw_pci __initdata = { -+ .nr_controllers = 1, -+ .setup = gemini_pci_setup, -+ .scan = gemini_pci_scan_bus, -+ .map_irq = gemini_pci_map_irq, -+}; -+ -+/* we need this for muxed PCI interrupts handling */ -+static struct pci_bus bogus_pci_bus; -+ -+static void gemini_pci_ack_irq(struct irq_data *d) -+{ -+ unsigned int irq = d->irq; -+ unsigned int reg; -+ -+ gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, ®); -+ reg &= ~(0xF << PCI_CTRL2_INTSTS_OFFSET); -+ reg |= 1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTSTS_OFFSET); -+ gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg); -+} -+ -+static void gemini_pci_mask_irq(struct irq_data *d) -+{ -+ unsigned int irq = d->irq; -+ unsigned int reg; -+ -+ gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, ®); -+ reg &= ~((0xF << PCI_CTRL2_INTSTS_OFFSET) -+ | (1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTMASK_OFFSET))); -+ gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg); -+} -+ -+static void gemini_pci_unmask_irq(struct irq_data *d) -+{ -+ unsigned int irq = d->irq; -+ unsigned int reg; -+ -+ gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, ®); -+ reg &= ~(0xF << PCI_CTRL2_INTSTS_OFFSET); -+ reg |= 1 << (irq - PCI_IRQ_BASE + PCI_CTRL2_INTMASK_OFFSET); -+ gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, reg); -+} -+ -+static void gemini_pci_irq_handler(unsigned int irq, struct irq_desc *desc) -+{ -+ unsigned int pci_irq_no, irq_stat, reg, i; -+ -+ gemini_pci_read_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2, 4, ®); -+ irq_stat = reg >> PCI_CTRL2_INTSTS_OFFSET; -+ -+ for (i = 0; i < 4; i++) { -+ -+ if ((irq_stat & (1 << i)) == 0) -+ continue; -+ -+ pci_irq_no = PCI_IRQ_BASE + i; -+ -+ BUG_ON(!(irq_desc[pci_irq_no].handle_irq)); -+ irq_desc[pci_irq_no].handle_irq(pci_irq_no, -+ &irq_desc[pci_irq_no]); -+ } -+} -+ -+static struct irq_chip gemini_pci_irq_chip = { -+ .name = "PCI", -+ .irq_ack = gemini_pci_ack_irq, -+ .irq_mask = gemini_pci_mask_irq, -+ .irq_unmask = gemini_pci_unmask_irq, -+}; -+ -+static int __init gemini_pci_init(void) -+{ -+ int i; -+ -+ for (i = 72; i <= 95; i++) -+ gpio_request(i, "PCI"); -+ -+ /* initialize our bogus bus */ -+ dev_set_name(&bogus_pci_bus.dev, "PCI IRQ handler"); -+ bogus_pci_bus.number = 0; -+ -+ /* mask and clear all interrupts */ -+ gemini_pci_write_config(&bogus_pci_bus, 0, GEMINI_PCI_CTRL2 + 2, 2, -+ 0xF000); -+ -+ for (i = PCI_IRQ_BASE; i < PCI_IRQ_BASE + 4; i++) { -+ irq_set_chip_and_handler(i, &gemini_pci_irq_chip, -+ handle_level_irq); -+ set_irq_flags(i, IRQF_VALID); -+ } -+ -+ irq_set_chained_handler(IRQ_PCI, gemini_pci_irq_handler); -+ -+ pci_common_init(&gemini_hw_pci); -+ -+ return 0; -+} -+ -+subsys_initcall(gemini_pci_init); diff --git a/target/linux/gemini/patches-4.1/150-gemini-pata.patch b/target/linux/gemini/patches-4.1/150-gemini-pata.patch deleted file mode 100644 index b3e0237434..0000000000 --- a/target/linux/gemini/patches-4.1/150-gemini-pata.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- a/arch/arm/mach-gemini/include/mach/global_reg.h -+++ b/arch/arm/mach-gemini/include/mach/global_reg.h -@@ -227,7 +227,13 @@ - #define USB0_PLUG_MINIB (1 << 29) - #define GMAC_GMII (1 << 28) - #define GMAC_1_ENABLE (1 << 27) --/* TODO: define ATA/SATA bits */ -+/* 011 - ata0 <-> sata0, sata1; bring out ata1 -+ * 010 - ata1 <-> sata1, sata0; bring out ata0 -+ * 001 - ata0 <-> sata0, ata1 <-> sata1; bring out ata1 -+ * 000 - ata0 <-> sata0, ata1 <-> sata1; bring out ata0 */ -+#define IDE_IOMUX_MASK (7 << 24) -+#define IDE_IOMUX_SATA1_SATA0 (2 << 24) -+#define IDE_IOMUX_SATA0_SATA1 (3 << 24) - #define USB1_VBUS_ON (1 << 23) - #define USB0_VBUS_ON (1 << 22) - #define APB_CLKOUT_ENABLE (1 << 21) ---- a/arch/arm/mach-gemini/irq.c -+++ b/arch/arm/mach-gemini/irq.c -@@ -89,6 +89,9 @@ void __init gemini_init_irq(void) - irq_set_handler(i, handle_edge_irq); - mode |= 1 << i; - level |= 1 << i; -+ } else if (i >= IRQ_IDE0 && i <= IRQ_IDE1) { -+ irq_set_handler(i, handle_edge_irq); -+ mode |= 1 << i; - } else { - irq_set_handler(i, handle_level_irq); - } ---- a/arch/arm/mach-gemini/common.h -+++ b/arch/arm/mach-gemini/common.h -@@ -31,6 +31,7 @@ extern int platform_register_pflash(unsi - extern int platform_register_watchdog(void); - extern int platform_register_ethernet(struct gemini_gmac_platform_data *pdata); - extern int platform_register_usb(unsigned int id); -+extern int platform_register_pata(unsigned int id); - - extern void gemini_restart(enum reboot_mode mode, const char *cmd); - ---- a/arch/arm/mach-gemini/devices.c -+++ b/arch/arm/mach-gemini/devices.c -@@ -249,3 +249,67 @@ int __init platform_register_usb(unsigne - return platform_device_register(&usb_device[id]); - } - -+static u64 pata_gemini_dmamask0 = 0xffffffffUL; -+static u64 pata_gemini_dmamask1 = 0xffffffffUL; -+ -+static struct resource pata_gemini_resources0[] = -+{ -+ [0] = { -+ .start = GEMINI_IDE0_BASE, -+ .end = GEMINI_IDE0_BASE + 0x40, -+ .flags = IORESOURCE_MEM, -+ }, -+ [1] = { -+ .start = IRQ_IDE0, -+ .end = IRQ_IDE0, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct resource pata_gemini_resources1[] = -+{ -+ [0] = { -+ .start = GEMINI_IDE1_BASE, -+ .end = GEMINI_IDE1_BASE + 0x40, -+ .flags = IORESOURCE_MEM, -+ }, -+ [1] = { -+ .start = IRQ_IDE1, -+ .end = IRQ_IDE1, -+ .flags = IORESOURCE_IRQ, -+ }, -+}; -+ -+static struct platform_device pata_gemini_devices[] = -+{ -+ { -+ .name = "pata-gemini", -+ .id = 0, -+ .dev = -+ { -+ .dma_mask = &pata_gemini_dmamask0, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+ .num_resources = ARRAY_SIZE(pata_gemini_resources0), -+ .resource = pata_gemini_resources0, -+ }, -+ { -+ .name = "pata-gemini", -+ .id = 1, -+ .dev = -+ { -+ .dma_mask = &pata_gemini_dmamask1, -+ .coherent_dma_mask = 0xffffffff, -+ }, -+ .num_resources = ARRAY_SIZE(pata_gemini_resources1), -+ .resource = pata_gemini_resources1, -+ }, -+}; -+ -+int __init platform_register_pata(unsigned int id) -+{ -+ if (id > 1) -+ return -EINVAL; -+ -+ return platform_device_register(&pata_gemini_devices[id]); -+} ---- a/arch/arm/mach-gemini/mm.c -+++ b/arch/arm/mach-gemini/mm.c -@@ -24,6 +24,11 @@ static struct map_desc gemini_io_desc[] - .length = SZ_512K, - .type = MT_DEVICE, - }, { -+ .virtual = (unsigned long)IO_ADDRESS(GEMINI_SATA_BASE), -+ .pfn = __phys_to_pfn(GEMINI_SATA_BASE), -+ .length = SZ_512K, -+ .type = MT_DEVICE, -+ }, { - .virtual = (unsigned long)IO_ADDRESS(GEMINI_UART_BASE), - .pfn = __phys_to_pfn(GEMINI_UART_BASE), - .length = SZ_512K, ---- a/drivers/ata/Kconfig -+++ b/drivers/ata/Kconfig -@@ -537,6 +537,16 @@ config PATA_EP93XX - - If unsure, say N. - -+config PATA_GEMINI -+ tristate "Gemini PATA support (Experimental)" -+ depends on ARCH_GEMINI -+ help -+ This option enables support for the Gemini PATA-Controller. -+ Note that the Gemini SoC has no native SATA-Controller but an -+ onboard PATA-SATA bridge. -+ -+ If unsure, say N. -+ - config PATA_HPT366 - tristate "HPT 366/368 PATA support" - depends on PCI ---- a/drivers/ata/Makefile -+++ b/drivers/ata/Makefile -@@ -53,6 +53,7 @@ obj-$(CONFIG_PATA_CS5536) += pata_cs5536 - obj-$(CONFIG_PATA_CYPRESS) += pata_cypress.o - obj-$(CONFIG_PATA_EFAR) += pata_efar.o - obj-$(CONFIG_PATA_EP93XX) += pata_ep93xx.o -+obj-$(CONFIG_PATA_GEMINI) += pata_gemini.o - obj-$(CONFIG_PATA_HPT366) += pata_hpt366.o - obj-$(CONFIG_PATA_HPT37X) += pata_hpt37x.o - obj-$(CONFIG_PATA_HPT3X2N) += pata_hpt3x2n.o ---- a/arch/arm/mach-gemini/board-nas4220b.c -+++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -146,11 +146,28 @@ static void __init usb_ib4220b_init(void - GLOBAL_MISC_CTRL)); - } - -+static void __init sata_ib4220b_init(void) -+{ -+ unsigned val; -+ -+ val = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+ val &= ~(IDE_IOMUX_MASK | PFLASH_PADS_DISABLE); -+ val |= IDE_PADS_ENABLE; -+ writel(val, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+ -+ /* enabling ports for presence detection, master only */ -+ writel(0x00000001, (void __iomem*)(IO_ADDRESS(GEMINI_SATA_BASE) + 0x18)); -+ writel(0x00000001, (void __iomem*)(IO_ADDRESS(GEMINI_SATA_BASE) + 0x1c)); -+} -+ - static void __init ib4220b_init(void) - { - gemini_gpio_init(); - ib4220b_gmac_init(); - usb_ib4220b_init(); -+ sata_ib4220b_init(); - platform_register_uart(); - platform_register_pflash(SZ_16M, NULL, 0); - platform_device_register(&ib4220b_led_device); -@@ -161,6 +178,8 @@ static void __init ib4220b_init(void) - platform_register_ethernet(&ib4220b_gmac_data); - platform_register_usb(0); - platform_register_usb(1); -+ platform_register_pata(0); -+ platform_register_pata(1); - } - - MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") diff --git a/target/linux/gemini/patches-4.1/160-gemini-timers.patch b/target/linux/gemini/patches-4.1/160-gemini-timers.patch deleted file mode 100644 index d7c8f8643b..0000000000 --- a/target/linux/gemini/patches-4.1/160-gemini-timers.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- a/arch/arm/mach-gemini/time.c -+++ b/arch/arm/mach-gemini/time.c -@@ -15,15 +15,18 @@ - #include <asm/mach/time.h> - #include <linux/clockchips.h> - #include <linux/clocksource.h> -+#include <linux/sched_clock.h> - - /* - * Register definitions for the timers - */ --#define TIMER_COUNT(BASE_ADDR) (BASE_ADDR + 0x00) --#define TIMER_LOAD(BASE_ADDR) (BASE_ADDR + 0x04) --#define TIMER_MATCH1(BASE_ADDR) (BASE_ADDR + 0x08) --#define TIMER_MATCH2(BASE_ADDR) (BASE_ADDR + 0x0C) --#define TIMER_CR(BASE_ADDR) (BASE_ADDR + 0x30) -+#define TIMER_COUNT(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x00) -+#define TIMER_LOAD(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x04) -+#define TIMER_MATCH1(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x08) -+#define TIMER_MATCH2(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x0C) -+#define TIMER_CR(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x30) -+#define TIMER_INTR_STATE(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x34) -+#define TIMER_INTR_MASK(BASE_ADDR) (IO_ADDRESS(BASE_ADDR) + 0x38) - - #define TIMER_1_CR_ENABLE (1 << 0) - #define TIMER_1_CR_CLOCK (1 << 1) -@@ -34,27 +37,38 @@ - #define TIMER_3_CR_ENABLE (1 << 6) - #define TIMER_3_CR_CLOCK (1 << 7) - #define TIMER_3_CR_INT (1 << 8) -+#define TIMER_1_CR_UPDOWN (1 << 9) -+#define TIMER_2_CR_UPDOWN (1 << 10) -+#define TIMER_3_CR_UPDOWN (1 << 11) -+ -+#define TIMER_1_INT_MATCH1 (1 << 0) -+#define TIMER_1_INT_MATCH2 (1 << 1) -+#define TIMER_1_INT_OVERFLOW (1 << 2) -+#define TIMER_2_INT_MATCH1 (1 << 3) -+#define TIMER_2_INT_MATCH2 (1 << 4) -+#define TIMER_2_INT_OVERFLOW (1 << 5) -+#define TIMER_3_INT_MATCH1 (1 << 6) -+#define TIMER_3_INT_MATCH2 (1 << 7) -+#define TIMER_3_INT_OVERFLOW (1 << 8) -+#define TIMER_INT_ALL_MASK 0x1ff - - static unsigned int tick_rate; - -+static u64 notrace gemini_read_sched_clock(void) -+{ -+ return readl(TIMER_COUNT(GEMINI_TIMER3_BASE)); -+} -+ - static int gemini_timer_set_next_event(unsigned long cycles, - struct clock_event_device *evt) - { - u32 cr; - -- cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -- -- /* This may be overdoing it, feel free to test without this */ -- cr &= ~TIMER_2_CR_ENABLE; -- cr &= ~TIMER_2_CR_INT; -- writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -- -- /* Set next event */ -- writel(cycles, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); -- writel(cycles, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); -- cr |= TIMER_2_CR_ENABLE; -- cr |= TIMER_2_CR_INT; -- writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -+ /* Setup the match register */ -+ cr = readl(TIMER_COUNT(GEMINI_TIMER1_BASE)); -+ writel(cr + cycles, TIMER_MATCH1(GEMINI_TIMER1_BASE)); -+ if (readl(TIMER_COUNT(GEMINI_TIMER1_BASE)) - cr > cycles) -+ return -ETIME; - - return 0; - } -@@ -66,48 +80,68 @@ static void gemini_timer_set_mode(enum c - u32 cr; - - switch (mode) { -- case CLOCK_EVT_MODE_PERIODIC: -- /* Start the timer */ -- writel(period, -- TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER2_BASE))); -- writel(period, -- TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER2_BASE))); -- cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -- cr |= TIMER_2_CR_ENABLE; -- cr |= TIMER_2_CR_INT; -- writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -+ case CLOCK_EVT_MODE_PERIODIC: -+ /* Stop timer and interrupt. */ -+ cr = readl(TIMER_CR(GEMINI_TIMER_BASE)); -+ cr &= ~(TIMER_1_CR_ENABLE | TIMER_1_CR_INT); -+ writel(cr, TIMER_CR(GEMINI_TIMER_BASE)); -+ -+ /* Setup timer to fire at 1/HZ intervals. */ -+ cr = 0xffffffff - (period - 1); -+ writel(cr, TIMER_COUNT(GEMINI_TIMER1_BASE)); -+ writel(cr, TIMER_LOAD(GEMINI_TIMER1_BASE)); -+ -+ /* enable interrupt on overflaw */ -+ cr = readl(TIMER_INTR_MASK(GEMINI_TIMER_BASE)); -+ cr &= ~(TIMER_1_INT_MATCH1 | TIMER_1_INT_MATCH2); -+ cr |= TIMER_1_INT_OVERFLOW; -+ writel(cr, TIMER_INTR_MASK(GEMINI_TIMER_BASE)); -+ -+ /* start the timer */ -+ cr = readl(TIMER_CR(GEMINI_TIMER_BASE)); -+ cr |= TIMER_1_CR_ENABLE | TIMER_1_CR_INT; -+ writel(cr, TIMER_CR(GEMINI_TIMER_BASE)); - break; -+ - case CLOCK_EVT_MODE_ONESHOT: - case CLOCK_EVT_MODE_UNUSED: -- case CLOCK_EVT_MODE_SHUTDOWN: -+ case CLOCK_EVT_MODE_SHUTDOWN: -+ /* Stop timer and interrupt. */ -+ cr = readl(TIMER_CR(GEMINI_TIMER_BASE)); -+ cr &= ~(TIMER_1_CR_ENABLE | TIMER_1_CR_INT); -+ writel(cr, TIMER_CR(GEMINI_TIMER_BASE)); -+ -+ /* Setup counter start from 0 */ -+ writel(0, TIMER_COUNT(GEMINI_TIMER1_BASE)); -+ writel(0, TIMER_LOAD(GEMINI_TIMER1_BASE)); -+ -+ /* enable interrupt */ -+ cr = readl(TIMER_INTR_MASK(GEMINI_TIMER_BASE)); -+ cr &= ~(TIMER_1_INT_OVERFLOW | TIMER_1_INT_MATCH2); -+ cr |= TIMER_1_INT_MATCH1; -+ writel(cr, TIMER_INTR_MASK(GEMINI_TIMER_BASE)); -+ -+ /* start the timer */ -+ cr = readl(TIMER_CR(GEMINI_TIMER_BASE)); -+ cr |= TIMER_1_CR_ENABLE; -+ writel(cr, TIMER_CR(GEMINI_TIMER_BASE)); -+ break; -+ - case CLOCK_EVT_MODE_RESUME: -- /* -- * Disable also for oneshot: the set_next() call will -- * arm the timer instead. -- */ -- cr = readl(TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -- cr &= ~TIMER_2_CR_ENABLE; -- cr &= ~TIMER_2_CR_INT; -- writel(cr, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); - break; -- default: -- break; - } - } - --/* Use TIMER2 as clock event */ - static struct clock_event_device gemini_clockevent = { -- .name = "TIMER2", -- .rating = 300, /* Reasonably fast and accurate clock event */ -- .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, -- .set_next_event = gemini_timer_set_next_event, -- .set_mode = gemini_timer_set_mode, -+ .name = "gemini_timer_1", -+ .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, -+ .shift = 32, -+ .rating = 300, -+ .set_next_event = gemini_timer_set_next_event, -+ .set_mode = gemini_timer_set_mode, - }; - --/* -- * IRQ handler for the timer -- */ --static irqreturn_t gemini_timer_interrupt(int irq, void *dev_id) -+static irqreturn_t gemini_timer_intr(int irq, void *dev_id) - { - struct clock_event_device *evt = &gemini_clockevent; - -@@ -116,14 +150,11 @@ static irqreturn_t gemini_timer_interrup - } - - static struct irqaction gemini_timer_irq = { -- .name = "Gemini Timer Tick", -+ .name = "gemini timer 1", - .flags = IRQF_TIMER, -- .handler = gemini_timer_interrupt, -+ .handler = gemini_timer_intr, - }; - --/* -- * Set up timer interrupt, and return the current time in seconds. -- */ - void __init gemini_timer_init(void) - { - u32 reg_v; -@@ -151,20 +182,35 @@ void __init gemini_timer_init(void) - } - - /* -- * Make irqs happen for the system timer -+ * Reset the interrupt mask and status - */ -- setup_irq(IRQ_TIMER2, &gemini_timer_irq); -+ writel(TIMER_INT_ALL_MASK, TIMER_INTR_MASK(GEMINI_TIMER_BASE)); -+ writel(0, TIMER_INTR_STATE(GEMINI_TIMER_BASE)); -+ writel(TIMER_1_CR_UPDOWN | TIMER_3_CR_ENABLE | TIMER_3_CR_UPDOWN, -+ TIMER_CR(GEMINI_TIMER_BASE)); - -- /* Enable and use TIMER1 as clock source */ -- writel(0xffffffff, TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER1_BASE))); -- writel(0xffffffff, TIMER_LOAD(IO_ADDRESS(GEMINI_TIMER1_BASE))); -- writel(TIMER_1_CR_ENABLE, TIMER_CR(IO_ADDRESS(GEMINI_TIMER_BASE))); -- if (clocksource_mmio_init(TIMER_COUNT(IO_ADDRESS(GEMINI_TIMER1_BASE)), -- "TIMER1", tick_rate, 300, 32, -- clocksource_mmio_readl_up)) -- pr_err("timer: failed to initialize gemini clock source\n"); -+ /* -+ * Setup free-running clocksource timer (interrupts -+ * disabled.) -+ */ -+ writel(0, TIMER_COUNT(GEMINI_TIMER3_BASE)); -+ writel(0, TIMER_LOAD(GEMINI_TIMER3_BASE)); -+ writel(0, TIMER_MATCH1(GEMINI_TIMER3_BASE)); -+ writel(0, TIMER_MATCH2(GEMINI_TIMER3_BASE)); -+ clocksource_mmio_init(TIMER_COUNT(GEMINI_TIMER3_BASE), -+ "gemini_clocksource", tick_rate, -+ 300, 32, clocksource_mmio_readl_up); -+ sched_clock_register(gemini_read_sched_clock, 32, tick_rate); - -- /* Configure and register the clockevent */ -+ /* -+ * Setup clockevent timer (interrupt-driven.) -+ */ -+ writel(0, TIMER_COUNT(GEMINI_TIMER1_BASE)); -+ writel(0, TIMER_LOAD(GEMINI_TIMER1_BASE)); -+ writel(0, TIMER_MATCH1(GEMINI_TIMER1_BASE)); -+ writel(0, TIMER_MATCH2(GEMINI_TIMER1_BASE)); -+ setup_irq(IRQ_TIMER1, &gemini_timer_irq); -+ gemini_clockevent.cpumask = cpumask_of(0); - clockevents_config_and_register(&gemini_clockevent, tick_rate, - 1, 0xffffffff); - } diff --git a/target/linux/gemini/patches-4.4/050-gpio-to-irq.patch b/target/linux/gemini/patches-4.4/050-gpio-to-irq.patch deleted file mode 100644 index 7572849864..0000000000 --- a/target/linux/gemini/patches-4.4/050-gpio-to-irq.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/arch/arm/mach-gemini/gpio.c -+++ b/arch/arm/mach-gemini/gpio.c -@@ -196,12 +196,18 @@ static int gemini_gpio_direction_output( - return 0; - } - -+static int gemini_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) -+{ -+ return gpio + GPIO_IRQ_BASE; -+} -+ - static struct gpio_chip gemini_gpio_chip = { - .label = "Gemini", - .direction_input = gemini_gpio_direction_input, - .get = gemini_gpio_get, - .direction_output = gemini_gpio_direction_output, - .set = gemini_gpio_set, -+ .to_irq = gemini_gpio_to_irq, - .base = 0, - .ngpio = GPIO_PORT_NUM * 32, - }; diff --git a/target/linux/gemini/patches-4.4/060-cache-fa.diff b/target/linux/gemini/patches-4.4/060-cache-fa.diff deleted file mode 100644 index fc74c0af88..0000000000 --- a/target/linux/gemini/patches-4.4/060-cache-fa.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- a/arch/arm/mm/cache-fa.S -+++ b/arch/arm/mm/cache-fa.S -@@ -24,7 +24,8 @@ - /* - * The size of one data cache line. - */ --#define CACHE_DLINESIZE 16 -+#define CACHE_DLINESIZE 16 -+#define CACHE_DLINESHIFT 4 - - /* - * The total size of the data cache. -@@ -169,7 +170,17 @@ ENTRY(fa_flush_kern_dcache_area) - * - start - virtual start address - * - end - virtual end address - */ -+__flush_whole_dcache: -+ mcr p15, 0, r0, c7, c14, 0 @ clean/invalidate D cache -+ mov r0, #0 -+ mcr p15, 0, r0, c7, c10, 4 @ drain write buffer -+ mov pc, lr -+ - fa_dma_inv_range: -+ sub r3, r1, r0 @ calculate total size -+ cmp r3, #CACHE_DLIMIT @ total size >= limit? -+ bhs __flush_whole_dcache @ flush whole D cache -+ - tst r0, #CACHE_DLINESIZE - 1 - bic r0, r0, #CACHE_DLINESIZE - 1 - mcrne p15, 0, r0, c7, c14, 1 @ clean & invalidate D entry -@@ -193,6 +204,10 @@ fa_dma_inv_range: - * - end - virtual end address - */ - fa_dma_clean_range: -+ sub r3, r1, r0 @ calculate total size -+ cmp r3, #CACHE_DLIMIT @ total size >= limit? -+ bhs __flush_whole_dcache @ flush whole D cache -+ - bic r0, r0, #CACHE_DLINESIZE - 1 - 1: mcr p15, 0, r0, c7, c10, 1 @ clean D entry - add r0, r0, #CACHE_DLINESIZE diff --git a/target/linux/gemini/patches-4.4/132-arm-gemini-register-usb.patch b/target/linux/gemini/patches-4.4/132-arm-gemini-register-usb.patch deleted file mode 100644 index 2a61d828ea..0000000000 --- a/target/linux/gemini/patches-4.4/132-arm-gemini-register-usb.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/arch/arm/mach-gemini/board-wbd111.c -+++ b/arch/arm/mach-gemini/board-wbd111.c -@@ -145,6 +145,7 @@ static void __init wbd111_init(void) - platform_register_watchdog(); - platform_device_register(&wbd111_phy_device); - platform_register_ethernet(&gmac_data); -+ platform_register_usb(0); - } - - MACHINE_START(WBD111, "Wiliboard WBD-111") ---- a/arch/arm/mach-gemini/board-wbd222.c -+++ b/arch/arm/mach-gemini/board-wbd222.c -@@ -147,6 +147,7 @@ static void __init wbd222_init(void) - platform_register_watchdog(); - platform_device_register(&wbd222_phy_device); - platform_register_ethernet(&gmac_data); -+ platform_register_usb(0); - } - - MACHINE_START(WBD222, "Wiliboard WBD-222") ---- a/arch/arm/mach-gemini/board-rut1xx.c -+++ b/arch/arm/mach-gemini/board-rut1xx.c -@@ -105,6 +105,7 @@ static void __init rut1xx_init(void) - platform_register_watchdog(); - platform_device_register(&rut1xx_phy_device); - platform_register_ethernet(&gmac_data); -+ platform_register_usb(0); - } - - MACHINE_START(RUT100, "Teltonika RUT100") ---- a/arch/arm/mach-gemini/board-nas4220b.c -+++ b/arch/arm/mach-gemini/board-nas4220b.c -@@ -134,10 +134,23 @@ static void __init ib4220b_gmac_init(voi - GLOBAL_ARBITRATION1_CTRL)); - } - -+static void __init usb_ib4220b_init(void) -+{ -+ unsigned int val; -+ -+ val = readl((void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+ val &= ~(USB0_PLUG_MINIB | USB1_PLUG_MINIB); -+ val |= USB0_VBUS_ON | USB1_VBUS_ON; -+ writel(val, (void __iomem*)(IO_ADDRESS(GEMINI_GLOBAL_BASE) + -+ GLOBAL_MISC_CTRL)); -+} -+ - static void __init ib4220b_init(void) - { - gemini_gpio_init(); - ib4220b_gmac_init(); -+ usb_ib4220b_init(); - platform_register_uart(); - platform_register_pflash(SZ_16M, NULL, 0); - platform_device_register(&ib4220b_led_device); -@@ -146,6 +159,8 @@ static void __init ib4220b_init(void) - platform_register_watchdog(); - platform_device_register(&ib4220b_phy_device); - platform_register_ethernet(&ib4220b_gmac_data); -+ platform_register_usb(0); -+ platform_register_usb(1); - } - - MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B") diff --git a/target/linux/gemini/patches-4.1/050-gpio-to-irq.patch b/target/linux/gemini/patches/050-gpio-to-irq.patch index 7572849864..7572849864 100644 --- a/target/linux/gemini/patches-4.1/050-gpio-to-irq.patch +++ b/target/linux/gemini/patches/050-gpio-to-irq.patch diff --git a/target/linux/gemini/patches-4.1/060-cache-fa.diff b/target/linux/gemini/patches/060-cache-fa.diff index fc74c0af88..fc74c0af88 100644 --- a/target/linux/gemini/patches-4.1/060-cache-fa.diff +++ b/target/linux/gemini/patches/060-cache-fa.diff diff --git a/target/linux/gemini/patches-4.4/110-watchdog-add-gemini_wdt-driver.patch b/target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch index bb66ae4dd0..bb66ae4dd0 100644 --- a/target/linux/gemini/patches-4.4/110-watchdog-add-gemini_wdt-driver.patch +++ b/target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch diff --git a/target/linux/gemini/patches-4.4/111-arm-gemini-add-watchdog-device.patch b/target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch index ab32e9e844..ab32e9e844 100644 --- a/target/linux/gemini/patches-4.4/111-arm-gemini-add-watchdog-device.patch +++ b/target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch diff --git a/target/linux/gemini/patches-4.4/112-arm-gemini-register-watchdog-devices.patch b/target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch index d7660be4ec..d7660be4ec 100644 --- a/target/linux/gemini/patches-4.4/112-arm-gemini-register-watchdog-devices.patch +++ b/target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch diff --git a/target/linux/gemini/patches-4.4/120-net-add-gemini-gmac-driver.patch b/target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch index be11ae2423..be11ae2423 100644 --- a/target/linux/gemini/patches-4.4/120-net-add-gemini-gmac-driver.patch +++ b/target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch diff --git a/target/linux/gemini/patches-4.4/121-arm-gemini-add-gmac-device.patch b/target/linux/gemini/patches/121-arm-gemini-add-gmac-device.patch index 6e77224906..6e77224906 100644 --- a/target/linux/gemini/patches-4.4/121-arm-gemini-add-gmac-device.patch +++ b/target/linux/gemini/patches/121-arm-gemini-add-gmac-device.patch diff --git a/target/linux/gemini/patches-4.4/122-arm-gemini-register-ethernet.patch b/target/linux/gemini/patches/122-arm-gemini-register-ethernet.patch index 1cd9efc20f..1cd9efc20f 100644 --- a/target/linux/gemini/patches-4.4/122-arm-gemini-register-ethernet.patch +++ b/target/linux/gemini/patches/122-arm-gemini-register-ethernet.patch diff --git a/target/linux/gemini/patches-4.4/130-usb-ehci-add-fot2g-driver.patch b/target/linux/gemini/patches/130-usb-ehci-add-fot2g-driver.patch index 2192ad69ba..2192ad69ba 100644 --- a/target/linux/gemini/patches-4.4/130-usb-ehci-add-fot2g-driver.patch +++ b/target/linux/gemini/patches/130-usb-ehci-add-fot2g-driver.patch diff --git a/target/linux/gemini/patches-4.4/131-arm-gemini-add-usb-device.patch b/target/linux/gemini/patches/131-arm-gemini-add-usb-device.patch index a75a5c1c6c..a75a5c1c6c 100644 --- a/target/linux/gemini/patches-4.4/131-arm-gemini-add-usb-device.patch +++ b/target/linux/gemini/patches/131-arm-gemini-add-usb-device.patch diff --git a/target/linux/gemini/patches-4.1/132-arm-gemini-register-usb.patch b/target/linux/gemini/patches/132-arm-gemini-register-usb.patch index 2a61d828ea..2a61d828ea 100644 --- a/target/linux/gemini/patches-4.1/132-arm-gemini-register-usb.patch +++ b/target/linux/gemini/patches/132-arm-gemini-register-usb.patch diff --git a/target/linux/gemini/patches-4.4/140-arm-gemini-add-pci-support.patch b/target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch index d17b1a1f8e..d17b1a1f8e 100644 --- a/target/linux/gemini/patches-4.4/140-arm-gemini-add-pci-support.patch +++ b/target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch diff --git a/target/linux/gemini/patches-4.4/150-gemini-pata.patch b/target/linux/gemini/patches/150-gemini-pata.patch index 3da05c5193..3da05c5193 100644 --- a/target/linux/gemini/patches-4.4/150-gemini-pata.patch +++ b/target/linux/gemini/patches/150-gemini-pata.patch diff --git a/target/linux/gemini/raidsonic/config-4.1 b/target/linux/gemini/raidsonic/config-4.1 deleted file mode 100644 index 91605238b4..0000000000 --- a/target/linux/gemini/raidsonic/config-4.1 +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=128M mtdparts=physmap-flash.0:128k(BOOT),3072k(Kern),6144k(Ramdisk),6144k(Application),128k(VCTL),640k(CurConf),128k(FIS-directory),12288k@0x320000(rootfs),15360k@0x20000(firmware) root=/dev/mtdblock7" -CONFIG_MACH_NAS4220B=y -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_SPLIT_FIRMWARE=y diff --git a/target/linux/gemini/raidsonic/config-4.4 b/target/linux/gemini/raidsonic/config-4.4 deleted file mode 100644 index 91605238b4..0000000000 --- a/target/linux/gemini/raidsonic/config-4.4 +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_CMDLINE="rootfstype=squashfs,jffs2 noinitrd console=ttyS0,19200 mem=128M mtdparts=physmap-flash.0:128k(BOOT),3072k(Kern),6144k(Ramdisk),6144k(Application),128k(VCTL),640k(CurConf),128k(FIS-directory),12288k@0x320000(rootfs),15360k@0x20000(firmware) root=/dev/mtdblock7" -CONFIG_MACH_NAS4220B=y -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_SPLIT_FIRMWARE=y diff --git a/target/linux/gemini/raidsonic/config-3.18 b/target/linux/gemini/raidsonic/config-default index 91605238b4..91605238b4 100644 --- a/target/linux/gemini/raidsonic/config-3.18 +++ b/target/linux/gemini/raidsonic/config-default |