From patchwork Sat Aug 22 11:07:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349651 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=YtzsmXt9; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKS2T7rz9sTF for ; Sat, 22 Aug 2020 21:10:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0oJLdO8/I1WHrgl1qltKnUECw87hU8gO+76jzg5eO50=; b=YtzsmXt9VaBVrLtxaHgxDMsLO j8F754sbnpfWjU6l/iQbI/XkfShu/DBe/dwCrPUgrJ+8V6Kdq14kARLqR4BL+5U1vu59t8D9JBCt9 CyVjCPwLavhYakwsASw2MlVY+D0h3LOgwLvydlD6PYrrn056TTrVHpcPi3jOmjbhhKI0k88/ituMK BZBU6LIrZKIoettuiLn6LSjAmnPVTfjvE63LKaSKei6RoaASjaZPBM+XjhMZKpevqYuadksbit6c3 sPmDQrw26UabrMBnYAeAPMmMGL6V7smm+7yWa5jULYSzZ8OzqNNFfQCbI7BNmYUoSeyxjBOvExbnF sy/UFKp8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROV-0003BG-V3; Sat, 22 Aug 2020 11:09:07 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036q-5A for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:59 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MeknF-1kjs8Q1EYP-00appj; Sat, 22 Aug 2020 13:08:47 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/6] rb532: copy files from 4.14 to 5.4 Date: Sat, 22 Aug 2020 13:07:47 +0200 Message-Id: <20200822110752.32600-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:V+rqWVqPowB3za7J68LQMW/hmggyHKrK7Xyt1ogLH+U4JojgI44 gUpOUN6TrJb1ySuxMAAQDAYYNWlipqKtkZyZ1pnlKF1BK/Wrb2y9C9ldBa9Vy61Ik4W8OPQ 2i0JDwMmIKByanGhIvFc/x8B5QRD1Ik6Iqnti3sIiXktj9vNM853RS1en2zYIBuLsA0naRQ i7F4EVXxhw7awKUl7muwg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:5hNESK3YPZE=:OQ5wK4FtIQt4Y3xi4WLk1A h50b02zCA61xLvAKXyvBQLVw0N/A75HoF4VjWK9209zbwKMIOs+pBml+++DMeRScOcSsXjxbi nomHOpSBd4tmOo0J5SsDItE3LbE5bTd9/Q27UHHZMXjVQWtuQfgKW/+pv8W8dJsUnMmbnkd0z nT7G9GSfZ2402rvRj3ze8OKfiaVAfozep7JiZPW5D0aCdtAmpa3i9L6khZys4wqY6YxPjGUOm kMy9zV3MywmKy5gyUQkeo6lHTvxVHAiYDOIEn2tRQG2j1R79PI/obBiCHYeSbnxvZFkDgHfCl L2OIOipOzFljW+qhqBybgLqew60Iqk1jcTA4oE5mqG8EH6y3qE1vz2YCQnmR3lhPorfmF6/dN pOhx77GL3FOYCQH+1MiEzIYeW7bw+R3tt61C1AK9lUIdGgqSKl1nApBjfj/T+3PWQgWsjwqAq uqqPp50Xy9AL5bGgaUWGJS2AbsDR7eh6WsGz1OMLUtjjtcDlpNqf60QhsIIwELe6dGTsqII7r UdOiqmiOTxLHvmSxC7slOmQac5d7+gSVmsVDqWjJmErgmydt82sc2Ajg7+aaw1AXHaR3m5pIC VmlIURDVm7w9JyesFNWlLEoyyw4SsKGPAaP8/22LpmgOTfmMliSEFYGRDCZELebBJBqzCK2R9 EvQLfTtwg5yTigfTr18MPdeZhTWdyhmZuL1EUWDPLzlUF4A9Sjtv+1VjBQyNFgnbgNLHoZmOY iuFqtn/c8TSrEgaqNHd/W6MJTbIY0laYhyMW9P3ZGRSNwt6fZEvGuBWYlG8w8puaLjNqjY+vn 7YatXNe3Ozjj7Q5Q2gf+88GuHXK422rdiQR7UuNdtMvRAXQbXP1xpQTSKXY5FEMDlp4f6tla1 w+cHuz2R43DB0uMqXOqg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070854_621454_58D3A717 X-CRM114-Status: GOOD ( 21.17 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Just copy, do not change anything yet. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/config-5.4 | 181 ++++++++++++++++++ .../rb532/patches-5.4/001-cmdline_hack.patch | 20 ++ .../004-rb532-fix-partition-info.patch | 17 ++ ...overflow-and-tx-underflow-interrupts.patch | 156 +++++++++++++++ ...actor-rx-descriptor-flags-processing.patch | 110 +++++++++++ .../107-use-NAPI_POLL_WEIGHT.patch | 11 ++ .../patches-5.4/108-korina-use-gro.patch | 11 ++ .../109-korina-whitespace-cleanup-2.patch | 135 +++++++++++++ .../110-korina-update-authors.patch | 17 ++ .../patches-5.4/111-korina-version-bump.patch | 13 ++ 10 files changed, 671 insertions(+) create mode 100644 target/linux/rb532/config-5.4 create mode 100644 target/linux/rb532/patches-5.4/001-cmdline_hack.patch create mode 100644 target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch create mode 100644 target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch create mode 100644 target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch create mode 100644 target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch create mode 100644 target/linux/rb532/patches-5.4/108-korina-use-gro.patch create mode 100644 target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch create mode 100644 target/linux/rb532/patches-5.4/110-korina-update-authors.patch create mode 100644 target/linux/rb532/patches-5.4/111-korina-version-bump.patch diff --git a/target/linux/rb532/config-5.4 b/target/linux/rb532/config-5.4 new file mode 100644 index 0000000000..257b4e2d6c --- /dev/null +++ b/target/linux/rb532/config-5.4 @@ -0,0 +1,181 @@ +CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set +# CONFIG_ARCH_HAS_SG_CHAIN is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ATA=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_SD=y +CONFIG_CEVT_R4K=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_HAS_SYNC=y +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_CPU_MIPS32=y +CONFIG_CPU_MIPS32_R1=y +CONFIG_CPU_MIPSR1=y +CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y +CONFIG_CPU_R4K_CACHE_TLB=y +CONFIG_CPU_R4K_FPU=y +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CSRC_R4K=y +CONFIG_DMA_NONCOHERENT=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_EXT4_FS=y +# CONFIG_F2FS_CHECK_FS is not set +CONFIG_F2FS_FS=y +# CONFIG_F2FS_FS_SECURITY is not set +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_STAT_FS=y +CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GLOB=y +CONFIG_GPIOLIB=y +CONFIG_HARDWARE_WATCHPOINTS=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DEBUG_STACKOVERFLOW=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_IDE=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HW_HAS_PCI=y +CONFIG_HW_RANDOM=y +CONFIG_HZ=250 +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +CONFIG_HZ_PERIODIC=y +CONFIG_IMAGE_CMDLINE_HACK=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_MIPS_CPU=y +CONFIG_IRQ_WORK=y +CONFIG_JBD2=y +CONFIG_KEXEC=y +CONFIG_KEXEC_CORE=y +CONFIG_KORINA=y +CONFIG_LEDS_MIKROTIK_RB532=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_MIKROTIK_RB532=y +CONFIG_MIPS=y +CONFIG_MIPS_CLOCK_VSYSCALL=y +CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set +CONFIG_MIPS_L1_CACHE_SHIFT=4 +CONFIG_MIPS_L1_CACHE_SHIFT_4=y +# CONFIG_MIPS_MACHINE is not set +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +# CONFIG_MTD_CFI_AMDSTD is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_CFI_INTELEXT is not set +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_PLATFORM=y +CONFIG_MTD_PHYSMAP=y +# CONFIG_MTD_ROOTFS_ROOT_DEV is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_BEB_LIMIT=20 +CONFIG_MTD_UBI_BLOCK=y +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_PER_CPU_KM=y +CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y +# CONFIG_NO_IOPORT_MAP is not set +# CONFIG_OF is not set +CONFIG_PATA_RB532=y +CONFIG_PCI=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_RC32434_WDT=y +# CONFIG_RCU_STALL_COMMON is not set +# CONFIG_SCHED_HRTICK is not set +# CONFIG_SCHED_INFO is not set +CONFIG_SCSI=y +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_PROC_FS is not set +# CONFIG_SERIAL_8250_FSL is not set +CONFIG_SQUASHFS_DECOMP_MULTI=y +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +CONFIG_SRCU=y +# CONFIG_SWAP is not set +CONFIG_SWAP_IO_SPACE=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_UBIFS_FS=y +# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_VIA_RHINE=y +CONFIG_VIA_RHINE_MMIO=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/rb532/patches-5.4/001-cmdline_hack.patch b/target/linux/rb532/patches-5.4/001-cmdline_hack.patch new file mode 100644 index 0000000000..a39da9c14a --- /dev/null +++ b/target/linux/rb532/patches-5.4/001-cmdline_hack.patch @@ -0,0 +1,20 @@ +--- a/arch/mips/rb532/prom.c ++++ b/arch/mips/rb532/prom.c +@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char + return simple_strtoul(num, 0, 10); + } + ++extern char __image_cmdline[]; + void __init prom_setup_cmdline(void) + { + static char cmd_line[COMMAND_LINE_SIZE] __initdata; +@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void) + } + *(cp++) = ' '; + ++ strcpy(cp,(__image_cmdline)); ++ cp += strlen(__image_cmdline); ++ + i = strlen(arcs_cmdline); + if (i > 0) { + *(cp++) = ' '; diff --git a/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch b/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch new file mode 100644 index 0000000000..5161a233dd --- /dev/null +++ b/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch @@ -0,0 +1,17 @@ +--- a/arch/mips/rb532/devices.c ++++ b/arch/mips/rb532/devices.c +@@ -186,11 +186,11 @@ static struct platform_device nand_slot0 + + static struct mtd_partition rb532_partition_info[] = { + { +- .name = "Routerboard NAND boot", ++ .name = "kernel", + .offset = 0, +- .size = 4 * 1024 * 1024, ++ .size = 8 * 1024 * 1024, + }, { +- .name = "rootfs", ++ .name = "ubi", + .offset = MTDPART_OFS_NXTBLK, + .size = MTDPART_SIZ_FULL, + } diff --git a/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch b/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch new file mode 100644 index 0000000000..2bc2c1067e --- /dev/null +++ b/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch @@ -0,0 +1,156 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -122,8 +122,6 @@ struct korina_private { + + int rx_irq; + int tx_irq; +- int ovr_irq; +- int und_irq; + + spinlock_t lock; /* NIC xmit lock */ + +@@ -891,8 +889,6 @@ static void korina_restart_task(struct w + */ + disable_irq(lp->rx_irq); + disable_irq(lp->tx_irq); +- disable_irq(lp->ovr_irq); +- disable_irq(lp->und_irq); + + writel(readl(&lp->tx_dma_regs->dmasm) | + DMA_STAT_FINI | DMA_STAT_ERR, +@@ -911,40 +907,10 @@ static void korina_restart_task(struct w + } + korina_multicast_list(dev); + +- enable_irq(lp->und_irq); +- enable_irq(lp->ovr_irq); + enable_irq(lp->tx_irq); + enable_irq(lp->rx_irq); + } + +-static void korina_clear_and_restart(struct net_device *dev, u32 value) +-{ +- struct korina_private *lp = netdev_priv(dev); +- +- netif_stop_queue(dev); +- writel(value, &lp->eth_regs->ethintfc); +- schedule_work(&lp->restart_task); +-} +- +-/* Ethernet Tx Underflow interrupt */ +-static irqreturn_t korina_und_interrupt(int irq, void *dev_id) +-{ +- struct net_device *dev = dev_id; +- struct korina_private *lp = netdev_priv(dev); +- unsigned int und; +- +- spin_lock(&lp->lock); +- +- und = readl(&lp->eth_regs->ethintfc); +- +- if (und & ETH_INT_FC_UND) +- korina_clear_and_restart(dev, und & ~ETH_INT_FC_UND); +- +- spin_unlock(&lp->lock); +- +- return IRQ_HANDLED; +-} +- + static void korina_tx_timeout(struct net_device *dev) + { + struct korina_private *lp = netdev_priv(dev); +@@ -952,25 +918,6 @@ static void korina_tx_timeout(struct net + schedule_work(&lp->restart_task); + } + +-/* Ethernet Rx Overflow interrupt */ +-static irqreturn_t +-korina_ovr_interrupt(int irq, void *dev_id) +-{ +- struct net_device *dev = dev_id; +- struct korina_private *lp = netdev_priv(dev); +- unsigned int ovr; +- +- spin_lock(&lp->lock); +- ovr = readl(&lp->eth_regs->ethintfc); +- +- if (ovr & ETH_INT_FC_OVR) +- korina_clear_and_restart(dev, ovr & ~ETH_INT_FC_OVR); +- +- spin_unlock(&lp->lock); +- +- return IRQ_HANDLED; +-} +- + #ifdef CONFIG_NET_POLL_CONTROLLER + static void korina_poll_controller(struct net_device *dev) + { +@@ -993,8 +940,7 @@ static int korina_open(struct net_device + } + + /* Install the interrupt handler +- * that handles the Done Finished +- * Ovr and Und Events */ ++ * that handles the Done Finished */ + ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt, + 0, "Korina ethernet Rx", dev); + if (ret < 0) { +@@ -1010,31 +956,10 @@ static int korina_open(struct net_device + goto err_free_rx_irq; + } + +- /* Install handler for overrun error. */ +- ret = request_irq(lp->ovr_irq, korina_ovr_interrupt, +- 0, "Ethernet Overflow", dev); +- if (ret < 0) { +- printk(KERN_ERR "%s: unable to get OVR IRQ %d\n", +- dev->name, lp->ovr_irq); +- goto err_free_tx_irq; +- } +- +- /* Install handler for underflow error. */ +- ret = request_irq(lp->und_irq, korina_und_interrupt, +- 0, "Ethernet Underflow", dev); +- if (ret < 0) { +- printk(KERN_ERR "%s: unable to get UND IRQ %d\n", +- dev->name, lp->und_irq); +- goto err_free_ovr_irq; +- } + mod_timer(&lp->media_check_timer, jiffies + 1); + out: + return ret; + +-err_free_ovr_irq: +- free_irq(lp->ovr_irq, dev); +-err_free_tx_irq: +- free_irq(lp->tx_irq, dev); + err_free_rx_irq: + free_irq(lp->rx_irq, dev); + err_release: +@@ -1052,8 +977,6 @@ static int korina_close(struct net_devic + /* Disable interrupts */ + disable_irq(lp->rx_irq); + disable_irq(lp->tx_irq); +- disable_irq(lp->ovr_irq); +- disable_irq(lp->und_irq); + + korina_abort_tx(dev); + tmp = readl(&lp->tx_dma_regs->dmasm); +@@ -1073,8 +996,6 @@ static int korina_close(struct net_devic + + free_irq(lp->rx_irq, dev); + free_irq(lp->tx_irq, dev); +- free_irq(lp->ovr_irq, dev); +- free_irq(lp->und_irq, dev); + + return 0; + } +@@ -1113,8 +1034,6 @@ static int korina_probe(struct platform_ + + lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx"); + lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx"); +- lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr"); +- lp->und_irq = platform_get_irq_byname(pdev, "korina_und"); + + r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs"); + dev->base_addr = r->start; diff --git a/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch b/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch new file mode 100644 index 0000000000..80745f534d --- /dev/null +++ b/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch @@ -0,0 +1,110 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -363,59 +363,60 @@ static int korina_rx(struct net_device * + if ((KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) == 0) + break; + +- /* Update statistics counters */ +- if (devcs & ETH_RX_CRC) +- dev->stats.rx_crc_errors++; +- if (devcs & ETH_RX_LOR) +- dev->stats.rx_length_errors++; +- if (devcs & ETH_RX_LE) +- dev->stats.rx_length_errors++; +- if (devcs & ETH_RX_OVR) +- dev->stats.rx_fifo_errors++; +- if (devcs & ETH_RX_CV) +- dev->stats.rx_frame_errors++; +- if (devcs & ETH_RX_CES) +- dev->stats.rx_length_errors++; +- if (devcs & ETH_RX_MP) +- dev->stats.multicast++; ++ /* check that this is a whole packet ++ * WARNING: DMA_FD bit incorrectly set ++ * in Rc32434 (errata ref #077) */ ++ if (!(devcs & ETH_RX_LD)) ++ goto next; + +- if ((devcs & ETH_RX_LD) != ETH_RX_LD) { +- /* check that this is a whole packet +- * WARNING: DMA_FD bit incorrectly set +- * in Rc32434 (errata ref #077) */ ++ if (!(devcs & ETH_RX_ROK)) { ++ /* Update statistics counters */ + dev->stats.rx_errors++; + dev->stats.rx_dropped++; +- } else if ((devcs & ETH_RX_ROK)) { +- pkt_len = RCVPKT_LENGTH(devcs); ++ if (devcs & ETH_RX_CRC) ++ dev->stats.rx_crc_errors++; ++ if (devcs & ETH_RX_LE) ++ dev->stats.rx_length_errors++; ++ if (devcs & ETH_RX_OVR) ++ dev->stats.rx_fifo_errors++; ++ if (devcs & ETH_RX_CV) ++ dev->stats.rx_frame_errors++; ++ if (devcs & ETH_RX_CES) ++ dev->stats.rx_frame_errors++; + +- /* must be the (first and) last +- * descriptor then */ +- pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data; +- +- /* invalidate the cache */ +- dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4); +- +- /* Malloc up new buffer. */ +- skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE); +- +- if (!skb_new) +- break; +- /* Do not count the CRC */ +- skb_put(skb, pkt_len - 4); +- skb->protocol = eth_type_trans(skb, dev); +- +- /* Pass the packet to upper layers */ +- netif_receive_skb(skb); +- dev->stats.rx_packets++; +- dev->stats.rx_bytes += pkt_len; +- +- /* Update the mcast stats */ +- if (devcs & ETH_RX_MP) +- dev->stats.multicast++; +- +- lp->rx_skb[lp->rx_next_done] = skb_new; ++ goto next; + } + ++ pkt_len = RCVPKT_LENGTH(devcs); ++ ++ /* must be the (first and) last ++ * descriptor then */ ++ pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data; ++ ++ /* invalidate the cache */ ++ dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4); ++ ++ /* Malloc up new buffer. */ ++ skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE); ++ ++ if (!skb_new) ++ break; ++ /* Do not count the CRC */ ++ skb_put(skb, pkt_len - 4); ++ skb->protocol = eth_type_trans(skb, dev); ++ ++ /* Pass the packet to upper layers */ ++ netif_receive_skb(skb); ++ dev->stats.rx_packets++; ++ dev->stats.rx_bytes += pkt_len; ++ ++ /* Update the mcast stats */ ++ if (devcs & ETH_RX_MP) ++ dev->stats.multicast++; ++ ++ lp->rx_skb[lp->rx_next_done] = skb_new; ++ ++next: + rd->devcs = 0; + + /* Restore descriptor's curr_addr */ diff --git a/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch b/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch new file mode 100644 index 0000000000..d4af90636f --- /dev/null +++ b/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -1082,7 +1082,7 @@ static int korina_probe(struct platform_ + dev->netdev_ops = &korina_netdev_ops; + dev->ethtool_ops = &netdev_ethtool_ops; + dev->watchdog_timeo = TX_TIMEOUT; +- netif_napi_add(dev, &lp->napi, korina_poll, 64); ++ netif_napi_add(dev, &lp->napi, korina_poll, NAPI_POLL_WEIGHT); + + lp->phy_addr = (((lp->rx_irq == 0x2c? 1:0) << 8) | 0x05); + lp->mii_if.dev = dev; diff --git a/target/linux/rb532/patches-5.4/108-korina-use-gro.patch b/target/linux/rb532/patches-5.4/108-korina-use-gro.patch new file mode 100644 index 0000000000..8cbe2a0777 --- /dev/null +++ b/target/linux/rb532/patches-5.4/108-korina-use-gro.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -406,7 +406,7 @@ static int korina_rx(struct net_device * + skb->protocol = eth_type_trans(skb, dev); + + /* Pass the packet to upper layers */ +- netif_receive_skb(skb); ++ napi_gro_receive(&lp->napi, skb); + dev->stats.rx_packets++; + dev->stats.rx_bytes += pkt_len; + diff --git a/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch b/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch new file mode 100644 index 0000000000..ad24a9e846 --- /dev/null +++ b/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch @@ -0,0 +1,135 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -64,9 +64,9 @@ + #include + #include + +-#define DRV_NAME "korina" +-#define DRV_VERSION "0.10" +-#define DRV_RELDATE "04Mar2008" ++#define DRV_NAME "korina" ++#define DRV_VERSION "0.10" ++#define DRV_RELDATE "04Mar2008" + + #define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \ + ((dev)->dev_addr[1])) +@@ -75,7 +75,7 @@ + ((dev)->dev_addr[4] << 8) | \ + ((dev)->dev_addr[5])) + +-#define MII_CLOCK 1250000 /* no more than 2.5MHz */ ++#define MII_CLOCK 1250000 /* no more than 2.5MHz */ + + /* the following must be powers of two */ + #define KORINA_NUM_RDS 64 /* number of receive descriptors */ +@@ -87,15 +87,19 @@ + #define KORINA_RBSIZE 1536 /* size of one resource buffer = Ether MTU */ + #define KORINA_RDS_MASK (KORINA_NUM_RDS - 1) + #define KORINA_TDS_MASK (KORINA_NUM_TDS - 1) +-#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc)) ++#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc)) + #define TD_RING_SIZE (KORINA_NUM_TDS * sizeof(struct dma_desc)) + +-#define TX_TIMEOUT (6000 * HZ / 1000) ++#define TX_TIMEOUT (6000 * HZ / 1000) + +-enum chain_status { desc_filled, desc_empty }; +-#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0) +-#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0) +-#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT) ++enum chain_status { ++ desc_filled, ++ desc_empty ++}; ++ ++#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0) ++#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0) ++#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT) + + /* Information that need to be kept for each board. */ + struct korina_private { +@@ -123,7 +127,7 @@ struct korina_private { + int rx_irq; + int tx_irq; + +- spinlock_t lock; /* NIC xmit lock */ ++ spinlock_t lock; /* NIC xmit lock */ + + int dma_halt_cnt; + int dma_run_cnt; +@@ -146,17 +150,17 @@ static inline void korina_start_dma(stru + static inline void korina_abort_dma(struct net_device *dev, + struct dma_reg *ch) + { +- if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) { +- writel(0x10, &ch->dmac); ++ if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) { ++ writel(0x10, &ch->dmac); + +- while (!(readl(&ch->dmas) & DMA_STAT_HALT)) +- netif_trans_update(dev); ++ while (!(readl(&ch->dmas) & DMA_STAT_HALT)) ++ netif_trans_update(dev); + +- writel(0, &ch->dmas); +- } ++ writel(0, &ch->dmas); ++ } + +- writel(0, &ch->dmadptr); +- writel(0, &ch->dmandptr); ++ writel(0, &ch->dmadptr); ++ writel(0, &ch->dmandptr); + } + + static inline void korina_chain_dma(struct dma_reg *ch, u32 dma_addr) +@@ -685,7 +689,7 @@ static int korina_ioctl(struct net_devic + + /* ethtool helpers */ + static void netdev_get_drvinfo(struct net_device *dev, +- struct ethtool_drvinfo *info) ++ struct ethtool_drvinfo *info) + { + struct korina_private *lp = netdev_priv(dev); + +@@ -728,10 +732,10 @@ static u32 netdev_get_link(struct net_de + } + + static const struct ethtool_ops netdev_ethtool_ops = { +- .get_drvinfo = netdev_get_drvinfo, +- .get_link = netdev_get_link, +- .get_link_ksettings = netdev_get_link_ksettings, +- .set_link_ksettings = netdev_set_link_ksettings, ++ .get_drvinfo = netdev_get_drvinfo, ++ .get_link = netdev_get_link, ++ .get_link_ksettings = netdev_get_link_ksettings, ++ .set_link_ksettings = netdev_set_link_ksettings, + }; + + static int korina_alloc_ring(struct net_device *dev) +@@ -863,7 +867,7 @@ static int korina_init(struct net_device + /* Management Clock Prescaler Divisor + * Clock independent setting */ + writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1, +- &lp->eth_regs->ethmcp); ++ &lp->eth_regs->ethmcp); + + /* don't transmit until fifo contains 48b */ + writel(48, &lp->eth_regs->ethfifott); +@@ -946,14 +950,14 @@ static int korina_open(struct net_device + 0, "Korina ethernet Rx", dev); + if (ret < 0) { + printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n", +- dev->name, lp->rx_irq); ++ dev->name, lp->rx_irq); + goto err_release; + } + ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt, + 0, "Korina ethernet Tx", dev); + if (ret < 0) { + printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n", +- dev->name, lp->tx_irq); ++ dev->name, lp->tx_irq); + goto err_free_rx_irq; + } + diff --git a/target/linux/rb532/patches-5.4/110-korina-update-authors.patch b/target/linux/rb532/patches-5.4/110-korina-update-authors.patch new file mode 100644 index 0000000000..843397cf37 --- /dev/null +++ b/target/linux/rb532/patches-5.4/110-korina-update-authors.patch @@ -0,0 +1,17 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -4,6 +4,7 @@ + * Copyright 2004 IDT Inc. (rischelp@idt.com) + * Copyright 2006 Felix Fietkau + * Copyright 2008 Florian Fainelli ++ * Copyright 2017 Roman Yeryomin + * + * 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 +@@ -1150,5 +1151,6 @@ module_platform_driver(korina_driver); + MODULE_AUTHOR("Philip Rischel "); + MODULE_AUTHOR("Felix Fietkau "); + MODULE_AUTHOR("Florian Fainelli "); ++MODULE_AUTHOR("Roman Yeryomin "); + MODULE_DESCRIPTION("IDT RC32434 (Korina) Ethernet driver"); + MODULE_LICENSE("GPL"); diff --git a/target/linux/rb532/patches-5.4/111-korina-version-bump.patch b/target/linux/rb532/patches-5.4/111-korina-version-bump.patch new file mode 100644 index 0000000000..1501e174b1 --- /dev/null +++ b/target/linux/rb532/patches-5.4/111-korina-version-bump.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/ethernet/korina.c ++++ b/drivers/net/ethernet/korina.c +@@ -66,8 +66,8 @@ + #include + + #define DRV_NAME "korina" +-#define DRV_VERSION "0.10" +-#define DRV_RELDATE "04Mar2008" ++#define DRV_VERSION "0.20" ++#define DRV_RELDATE "15Sep2017" + + #define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \ + ((dev)->dev_addr[1])) From patchwork Sat Aug 22 11:07:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349652 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Ha/+SdSb; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKT4Q73z9sPf for ; Sat, 22 Aug 2020 21:10:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ckvfd28SMp+KggnUn6YVynIDyljs0q+D62ovMMqWGtQ=; b=Ha/+SdSbzakLTNN2aJlPTjfhq EXMahrjsofio3GTAujRYetLOnBwD6OlAoBCL9jzjRsWQ1ibD5A6UXutpR3vb7GDz3E3xnQQMaWplJ +sbUF9Xw6hdR+pk3bj8uuLbjC22nmFfoB56a5/tLh4lqLS9YjmAghGuvCIsvLboIi94PX1gEuJNZn ePmRdPGVg8TiccKsRgwv6jaUVXRatGpAxlrz7fREXlw8DKxGuK6lqnB4VSJ+RIWle7BdVQLwjcVBJ QrOqIHoF90gQHRCJ59AfL08i34O27vKFFNOeVSdi8lO8p3lZi964KuSPfGJrpDb6DkEQMdVXGfmeq OYGvgnNqA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROX-0003Be-8j; Sat, 22 Aug 2020 11:09:09 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036w-VV for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:59 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1My2lr-1kZKYi21rL-00zVaT; Sat, 22 Aug 2020 13:08:47 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/6] rb532: refresh patches for kernel 5.4 Date: Sat, 22 Aug 2020 13:07:48 +0200 Message-Id: <20200822110752.32600-3-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:VrAY8wzIXAZCZjX8UIxom0HH8/ZjsVtwyl3QxecdcwvWGJUzN97 EcCJps/J9G8xXrHMmIAOqmftCxDCOqokBKAScSln/TB0wyoTm8nxjKHl7Q9sn2pkYfdkrz0 jqmN+QmzvkCEolpwcBhVWzFuRNyA8JMwagVgItD778WFrYkt97jDjmnS6b/vUGcdDU6aAE+ xTRURgiIoOqcMIqBeJrPg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Q0xCffMo4EU=:tindLWu4EV63t+wqlwzqye 9E0WXoGjxJalXsrudcREgher25GUupyQHW2dGBM4+gdRz24tue0yNmTxZ4pnHP/61jywkdE19 BWvRSeY+IKXQzJHuzKo+DaRK8QMdcT6zu67RCFLRKm46VOPQ3tja2dnJSstNaMk+IWpnU/tBT XNboC+Jk3YVJXBg+eyLatSbIzE9EiT6LjpzBEQ1sNAH9kyVb3ry3fyWsrZQMj3wUkAvD9DycC Q9E0tms61lo5WFivBZGiWFmWRcuELdseXjqvk9lh6dcjk7Fi888HCiiLMty/GYA3ApsUphxJh b8BNlgOb11hSb/dz1GA+cFjAEaKF7qs686x0jeonSgtAlSi1efKHdpjWPQQ/isn4ekfZbFQDT nU232q/LRuk/Jvn9MyoIa8PfymuVf611pN6OzS+z5559VWXwYSVCi109F5PFCRv9jbS2PQBhy Kx7YH6uAO6ovzez9PEBDUZ5FmjrE5yFEIlcAN5su3J36fe94g60zpEBkJzfR0ZcCC1zuuhW/y 2/HCwPqsT04wd9p6+D/woBsmliU2FutESBBdUym7U2Pbkpqy5bjOSDAJec4EnlrFM7WLfpoNJ 6BNt4Y0EbRZxtNTZJKj2dRz+nlMgzdcXdVpxqA/TA+AtwU/H/y4BEfN8yNeJQrMnipAyStIO2 brbeA8E3Aj5skQDmxUpFZbVAK25OQvktRFuSAJZ1yHW92CbOlCHIU/M5bHKXDqckkZUGcK/0Y ZJFW4P4prmm1smpzjEu8dBq+Tldb1Oaxa+nU0n1VxEDnD0y3hyBY9k3LpYEBkB2uoSi/5A/kb fLcGUA+TqnNmJDeU+hvlyXrNGiAPDLdohJNTA7c/bdzFgzQS6clO0fXPrkH61T7DJyUJ47/X0 7ghtf+UreNTnBiXnudDw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070855_290734_E870D69E X-CRM114-Status: GOOD ( 22.24 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.131 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.131 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Removed patches have been applied upstream. Signed-off-by: Adrian Schmutzler --- .../rb532/patches-5.4/001-cmdline_hack.patch | 4 +- .../004-rb532-fix-partition-info.patch | 2 +- ...overflow-and-tx-underflow-interrupts.patch | 156 ------------------ ...actor-rx-descriptor-flags-processing.patch | 110 ------------ .../107-use-NAPI_POLL_WEIGHT.patch | 11 -- .../patches-5.4/108-korina-use-gro.patch | 11 -- .../109-korina-whitespace-cleanup-2.patch | 135 --------------- .../110-korina-update-authors.patch | 17 -- .../patches-5.4/111-korina-version-bump.patch | 13 -- 9 files changed, 3 insertions(+), 456 deletions(-) delete mode 100644 target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch delete mode 100644 target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch delete mode 100644 target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch delete mode 100644 target/linux/rb532/patches-5.4/108-korina-use-gro.patch delete mode 100644 target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch delete mode 100644 target/linux/rb532/patches-5.4/110-korina-update-authors.patch delete mode 100644 target/linux/rb532/patches-5.4/111-korina-version-bump.patch diff --git a/target/linux/rb532/patches-5.4/001-cmdline_hack.patch b/target/linux/rb532/patches-5.4/001-cmdline_hack.patch index a39da9c14a..5e3899a941 100644 --- a/target/linux/rb532/patches-5.4/001-cmdline_hack.patch +++ b/target/linux/rb532/patches-5.4/001-cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/rb532/prom.c +++ b/arch/mips/rb532/prom.c -@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char +@@ -52,6 +52,7 @@ static inline unsigned long tag2ul(char return simple_strtoul(num, 0, 10); } @@ -8,7 +8,7 @@ void __init prom_setup_cmdline(void) { static char cmd_line[COMMAND_LINE_SIZE] __initdata; -@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void) +@@ -93,6 +94,9 @@ void __init prom_setup_cmdline(void) } *(cp++) = ' '; diff --git a/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch b/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch index 5161a233dd..8519e414d0 100644 --- a/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch +++ b/target/linux/rb532/patches-5.4/004-rb532-fix-partition-info.patch @@ -1,6 +1,6 @@ --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c -@@ -186,11 +186,11 @@ static struct platform_device nand_slot0 +@@ -180,11 +180,11 @@ static struct platform_device nand_slot0 static struct mtd_partition rb532_partition_info[] = { { diff --git a/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch b/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch deleted file mode 100644 index 2bc2c1067e..0000000000 --- a/target/linux/rb532/patches-5.4/106-dont-use-rx-overflow-and-tx-underflow-interrupts.patch +++ /dev/null @@ -1,156 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -122,8 +122,6 @@ struct korina_private { - - int rx_irq; - int tx_irq; -- int ovr_irq; -- int und_irq; - - spinlock_t lock; /* NIC xmit lock */ - -@@ -891,8 +889,6 @@ static void korina_restart_task(struct w - */ - disable_irq(lp->rx_irq); - disable_irq(lp->tx_irq); -- disable_irq(lp->ovr_irq); -- disable_irq(lp->und_irq); - - writel(readl(&lp->tx_dma_regs->dmasm) | - DMA_STAT_FINI | DMA_STAT_ERR, -@@ -911,40 +907,10 @@ static void korina_restart_task(struct w - } - korina_multicast_list(dev); - -- enable_irq(lp->und_irq); -- enable_irq(lp->ovr_irq); - enable_irq(lp->tx_irq); - enable_irq(lp->rx_irq); - } - --static void korina_clear_and_restart(struct net_device *dev, u32 value) --{ -- struct korina_private *lp = netdev_priv(dev); -- -- netif_stop_queue(dev); -- writel(value, &lp->eth_regs->ethintfc); -- schedule_work(&lp->restart_task); --} -- --/* Ethernet Tx Underflow interrupt */ --static irqreturn_t korina_und_interrupt(int irq, void *dev_id) --{ -- struct net_device *dev = dev_id; -- struct korina_private *lp = netdev_priv(dev); -- unsigned int und; -- -- spin_lock(&lp->lock); -- -- und = readl(&lp->eth_regs->ethintfc); -- -- if (und & ETH_INT_FC_UND) -- korina_clear_and_restart(dev, und & ~ETH_INT_FC_UND); -- -- spin_unlock(&lp->lock); -- -- return IRQ_HANDLED; --} -- - static void korina_tx_timeout(struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); -@@ -952,25 +918,6 @@ static void korina_tx_timeout(struct net - schedule_work(&lp->restart_task); - } - --/* Ethernet Rx Overflow interrupt */ --static irqreturn_t --korina_ovr_interrupt(int irq, void *dev_id) --{ -- struct net_device *dev = dev_id; -- struct korina_private *lp = netdev_priv(dev); -- unsigned int ovr; -- -- spin_lock(&lp->lock); -- ovr = readl(&lp->eth_regs->ethintfc); -- -- if (ovr & ETH_INT_FC_OVR) -- korina_clear_and_restart(dev, ovr & ~ETH_INT_FC_OVR); -- -- spin_unlock(&lp->lock); -- -- return IRQ_HANDLED; --} -- - #ifdef CONFIG_NET_POLL_CONTROLLER - static void korina_poll_controller(struct net_device *dev) - { -@@ -993,8 +940,7 @@ static int korina_open(struct net_device - } - - /* Install the interrupt handler -- * that handles the Done Finished -- * Ovr and Und Events */ -+ * that handles the Done Finished */ - ret = request_irq(lp->rx_irq, korina_rx_dma_interrupt, - 0, "Korina ethernet Rx", dev); - if (ret < 0) { -@@ -1010,31 +956,10 @@ static int korina_open(struct net_device - goto err_free_rx_irq; - } - -- /* Install handler for overrun error. */ -- ret = request_irq(lp->ovr_irq, korina_ovr_interrupt, -- 0, "Ethernet Overflow", dev); -- if (ret < 0) { -- printk(KERN_ERR "%s: unable to get OVR IRQ %d\n", -- dev->name, lp->ovr_irq); -- goto err_free_tx_irq; -- } -- -- /* Install handler for underflow error. */ -- ret = request_irq(lp->und_irq, korina_und_interrupt, -- 0, "Ethernet Underflow", dev); -- if (ret < 0) { -- printk(KERN_ERR "%s: unable to get UND IRQ %d\n", -- dev->name, lp->und_irq); -- goto err_free_ovr_irq; -- } - mod_timer(&lp->media_check_timer, jiffies + 1); - out: - return ret; - --err_free_ovr_irq: -- free_irq(lp->ovr_irq, dev); --err_free_tx_irq: -- free_irq(lp->tx_irq, dev); - err_free_rx_irq: - free_irq(lp->rx_irq, dev); - err_release: -@@ -1052,8 +977,6 @@ static int korina_close(struct net_devic - /* Disable interrupts */ - disable_irq(lp->rx_irq); - disable_irq(lp->tx_irq); -- disable_irq(lp->ovr_irq); -- disable_irq(lp->und_irq); - - korina_abort_tx(dev); - tmp = readl(&lp->tx_dma_regs->dmasm); -@@ -1073,8 +996,6 @@ static int korina_close(struct net_devic - - free_irq(lp->rx_irq, dev); - free_irq(lp->tx_irq, dev); -- free_irq(lp->ovr_irq, dev); -- free_irq(lp->und_irq, dev); - - return 0; - } -@@ -1113,8 +1034,6 @@ static int korina_probe(struct platform_ - - lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx"); - lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx"); -- lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr"); -- lp->und_irq = platform_get_irq_byname(pdev, "korina_und"); - - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs"); - dev->base_addr = r->start; diff --git a/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch b/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch deleted file mode 100644 index 80745f534d..0000000000 --- a/target/linux/rb532/patches-5.4/107-korina-refactor-rx-descriptor-flags-processing.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -363,59 +363,60 @@ static int korina_rx(struct net_device * - if ((KORINA_RBSIZE - (u32)DMA_COUNT(rd->control)) == 0) - break; - -- /* Update statistics counters */ -- if (devcs & ETH_RX_CRC) -- dev->stats.rx_crc_errors++; -- if (devcs & ETH_RX_LOR) -- dev->stats.rx_length_errors++; -- if (devcs & ETH_RX_LE) -- dev->stats.rx_length_errors++; -- if (devcs & ETH_RX_OVR) -- dev->stats.rx_fifo_errors++; -- if (devcs & ETH_RX_CV) -- dev->stats.rx_frame_errors++; -- if (devcs & ETH_RX_CES) -- dev->stats.rx_length_errors++; -- if (devcs & ETH_RX_MP) -- dev->stats.multicast++; -+ /* check that this is a whole packet -+ * WARNING: DMA_FD bit incorrectly set -+ * in Rc32434 (errata ref #077) */ -+ if (!(devcs & ETH_RX_LD)) -+ goto next; - -- if ((devcs & ETH_RX_LD) != ETH_RX_LD) { -- /* check that this is a whole packet -- * WARNING: DMA_FD bit incorrectly set -- * in Rc32434 (errata ref #077) */ -+ if (!(devcs & ETH_RX_ROK)) { -+ /* Update statistics counters */ - dev->stats.rx_errors++; - dev->stats.rx_dropped++; -- } else if ((devcs & ETH_RX_ROK)) { -- pkt_len = RCVPKT_LENGTH(devcs); -+ if (devcs & ETH_RX_CRC) -+ dev->stats.rx_crc_errors++; -+ if (devcs & ETH_RX_LE) -+ dev->stats.rx_length_errors++; -+ if (devcs & ETH_RX_OVR) -+ dev->stats.rx_fifo_errors++; -+ if (devcs & ETH_RX_CV) -+ dev->stats.rx_frame_errors++; -+ if (devcs & ETH_RX_CES) -+ dev->stats.rx_frame_errors++; - -- /* must be the (first and) last -- * descriptor then */ -- pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data; -- -- /* invalidate the cache */ -- dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4); -- -- /* Malloc up new buffer. */ -- skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE); -- -- if (!skb_new) -- break; -- /* Do not count the CRC */ -- skb_put(skb, pkt_len - 4); -- skb->protocol = eth_type_trans(skb, dev); -- -- /* Pass the packet to upper layers */ -- netif_receive_skb(skb); -- dev->stats.rx_packets++; -- dev->stats.rx_bytes += pkt_len; -- -- /* Update the mcast stats */ -- if (devcs & ETH_RX_MP) -- dev->stats.multicast++; -- -- lp->rx_skb[lp->rx_next_done] = skb_new; -+ goto next; - } - -+ pkt_len = RCVPKT_LENGTH(devcs); -+ -+ /* must be the (first and) last -+ * descriptor then */ -+ pkt_buf = (u8 *)lp->rx_skb[lp->rx_next_done]->data; -+ -+ /* invalidate the cache */ -+ dma_cache_inv((unsigned long)pkt_buf, pkt_len - 4); -+ -+ /* Malloc up new buffer. */ -+ skb_new = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE); -+ -+ if (!skb_new) -+ break; -+ /* Do not count the CRC */ -+ skb_put(skb, pkt_len - 4); -+ skb->protocol = eth_type_trans(skb, dev); -+ -+ /* Pass the packet to upper layers */ -+ netif_receive_skb(skb); -+ dev->stats.rx_packets++; -+ dev->stats.rx_bytes += pkt_len; -+ -+ /* Update the mcast stats */ -+ if (devcs & ETH_RX_MP) -+ dev->stats.multicast++; -+ -+ lp->rx_skb[lp->rx_next_done] = skb_new; -+ -+next: - rd->devcs = 0; - - /* Restore descriptor's curr_addr */ diff --git a/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch b/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch deleted file mode 100644 index d4af90636f..0000000000 --- a/target/linux/rb532/patches-5.4/107-use-NAPI_POLL_WEIGHT.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -1082,7 +1082,7 @@ static int korina_probe(struct platform_ - dev->netdev_ops = &korina_netdev_ops; - dev->ethtool_ops = &netdev_ethtool_ops; - dev->watchdog_timeo = TX_TIMEOUT; -- netif_napi_add(dev, &lp->napi, korina_poll, 64); -+ netif_napi_add(dev, &lp->napi, korina_poll, NAPI_POLL_WEIGHT); - - lp->phy_addr = (((lp->rx_irq == 0x2c? 1:0) << 8) | 0x05); - lp->mii_if.dev = dev; diff --git a/target/linux/rb532/patches-5.4/108-korina-use-gro.patch b/target/linux/rb532/patches-5.4/108-korina-use-gro.patch deleted file mode 100644 index 8cbe2a0777..0000000000 --- a/target/linux/rb532/patches-5.4/108-korina-use-gro.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -406,7 +406,7 @@ static int korina_rx(struct net_device * - skb->protocol = eth_type_trans(skb, dev); - - /* Pass the packet to upper layers */ -- netif_receive_skb(skb); -+ napi_gro_receive(&lp->napi, skb); - dev->stats.rx_packets++; - dev->stats.rx_bytes += pkt_len; - diff --git a/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch b/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch deleted file mode 100644 index ad24a9e846..0000000000 --- a/target/linux/rb532/patches-5.4/109-korina-whitespace-cleanup-2.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -64,9 +64,9 @@ - #include - #include - --#define DRV_NAME "korina" --#define DRV_VERSION "0.10" --#define DRV_RELDATE "04Mar2008" -+#define DRV_NAME "korina" -+#define DRV_VERSION "0.10" -+#define DRV_RELDATE "04Mar2008" - - #define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \ - ((dev)->dev_addr[1])) -@@ -75,7 +75,7 @@ - ((dev)->dev_addr[4] << 8) | \ - ((dev)->dev_addr[5])) - --#define MII_CLOCK 1250000 /* no more than 2.5MHz */ -+#define MII_CLOCK 1250000 /* no more than 2.5MHz */ - - /* the following must be powers of two */ - #define KORINA_NUM_RDS 64 /* number of receive descriptors */ -@@ -87,15 +87,19 @@ - #define KORINA_RBSIZE 1536 /* size of one resource buffer = Ether MTU */ - #define KORINA_RDS_MASK (KORINA_NUM_RDS - 1) - #define KORINA_TDS_MASK (KORINA_NUM_TDS - 1) --#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc)) -+#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc)) - #define TD_RING_SIZE (KORINA_NUM_TDS * sizeof(struct dma_desc)) - --#define TX_TIMEOUT (6000 * HZ / 1000) -+#define TX_TIMEOUT (6000 * HZ / 1000) - --enum chain_status { desc_filled, desc_empty }; --#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0) --#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0) --#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT) -+enum chain_status { -+ desc_filled, -+ desc_empty -+}; -+ -+#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0) -+#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0) -+#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT) - - /* Information that need to be kept for each board. */ - struct korina_private { -@@ -123,7 +127,7 @@ struct korina_private { - int rx_irq; - int tx_irq; - -- spinlock_t lock; /* NIC xmit lock */ -+ spinlock_t lock; /* NIC xmit lock */ - - int dma_halt_cnt; - int dma_run_cnt; -@@ -146,17 +150,17 @@ static inline void korina_start_dma(stru - static inline void korina_abort_dma(struct net_device *dev, - struct dma_reg *ch) - { -- if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) { -- writel(0x10, &ch->dmac); -+ if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) { -+ writel(0x10, &ch->dmac); - -- while (!(readl(&ch->dmas) & DMA_STAT_HALT)) -- netif_trans_update(dev); -+ while (!(readl(&ch->dmas) & DMA_STAT_HALT)) -+ netif_trans_update(dev); - -- writel(0, &ch->dmas); -- } -+ writel(0, &ch->dmas); -+ } - -- writel(0, &ch->dmadptr); -- writel(0, &ch->dmandptr); -+ writel(0, &ch->dmadptr); -+ writel(0, &ch->dmandptr); - } - - static inline void korina_chain_dma(struct dma_reg *ch, u32 dma_addr) -@@ -685,7 +689,7 @@ static int korina_ioctl(struct net_devic - - /* ethtool helpers */ - static void netdev_get_drvinfo(struct net_device *dev, -- struct ethtool_drvinfo *info) -+ struct ethtool_drvinfo *info) - { - struct korina_private *lp = netdev_priv(dev); - -@@ -728,10 +732,10 @@ static u32 netdev_get_link(struct net_de - } - - static const struct ethtool_ops netdev_ethtool_ops = { -- .get_drvinfo = netdev_get_drvinfo, -- .get_link = netdev_get_link, -- .get_link_ksettings = netdev_get_link_ksettings, -- .set_link_ksettings = netdev_set_link_ksettings, -+ .get_drvinfo = netdev_get_drvinfo, -+ .get_link = netdev_get_link, -+ .get_link_ksettings = netdev_get_link_ksettings, -+ .set_link_ksettings = netdev_set_link_ksettings, - }; - - static int korina_alloc_ring(struct net_device *dev) -@@ -863,7 +867,7 @@ static int korina_init(struct net_device - /* Management Clock Prescaler Divisor - * Clock independent setting */ - writel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1, -- &lp->eth_regs->ethmcp); -+ &lp->eth_regs->ethmcp); - - /* don't transmit until fifo contains 48b */ - writel(48, &lp->eth_regs->ethfifott); -@@ -946,14 +950,14 @@ static int korina_open(struct net_device - 0, "Korina ethernet Rx", dev); - if (ret < 0) { - printk(KERN_ERR "%s: unable to get Rx DMA IRQ %d\n", -- dev->name, lp->rx_irq); -+ dev->name, lp->rx_irq); - goto err_release; - } - ret = request_irq(lp->tx_irq, korina_tx_dma_interrupt, - 0, "Korina ethernet Tx", dev); - if (ret < 0) { - printk(KERN_ERR "%s: unable to get Tx DMA IRQ %d\n", -- dev->name, lp->tx_irq); -+ dev->name, lp->tx_irq); - goto err_free_rx_irq; - } - diff --git a/target/linux/rb532/patches-5.4/110-korina-update-authors.patch b/target/linux/rb532/patches-5.4/110-korina-update-authors.patch deleted file mode 100644 index 843397cf37..0000000000 --- a/target/linux/rb532/patches-5.4/110-korina-update-authors.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -4,6 +4,7 @@ - * Copyright 2004 IDT Inc. (rischelp@idt.com) - * Copyright 2006 Felix Fietkau - * Copyright 2008 Florian Fainelli -+ * Copyright 2017 Roman Yeryomin - * - * 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 -@@ -1150,5 +1151,6 @@ module_platform_driver(korina_driver); - MODULE_AUTHOR("Philip Rischel "); - MODULE_AUTHOR("Felix Fietkau "); - MODULE_AUTHOR("Florian Fainelli "); -+MODULE_AUTHOR("Roman Yeryomin "); - MODULE_DESCRIPTION("IDT RC32434 (Korina) Ethernet driver"); - MODULE_LICENSE("GPL"); diff --git a/target/linux/rb532/patches-5.4/111-korina-version-bump.patch b/target/linux/rb532/patches-5.4/111-korina-version-bump.patch deleted file mode 100644 index 1501e174b1..0000000000 --- a/target/linux/rb532/patches-5.4/111-korina-version-bump.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -66,8 +66,8 @@ - #include - - #define DRV_NAME "korina" --#define DRV_VERSION "0.10" --#define DRV_RELDATE "04Mar2008" -+#define DRV_VERSION "0.20" -+#define DRV_RELDATE "15Sep2017" - - #define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \ - ((dev)->dev_addr[1])) From patchwork Sat Aug 22 11:07:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349650 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ev2dukOL; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKR41NMz9sRN for ; Sat, 22 Aug 2020 21:10:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RaPQnfMAia4PmEIb9kPGznRQqB19S+ZuMxqd1pev5Sw=; b=ev2dukOLqCte/XgseafPuTOs4 a8CWIvBo8lt4Ii3RmJPi47BV+Am4h1SrkUbVoeexna7Mmq/abkcU5Lle4UeZqK/hR5kOFTZtC4fJK B4d/Ygwn1rfem1t7/CY5T2ZBadNnf8IRw8ucCg8iSOmSjB9F87RtSzEAw1TqFeXev6ZdpWHumBH7t pRRxbSzv+qvjj0LtJZKmOQzqZMU5jw7HquPxfc2vC/qhGkGLH+2BzuXTOwyiO5pFvmqz95zW9PL6+ v0zeXtYVbCS5Su2YGGyxlCAs8oXeavPmodXLSzRVWYF1Eit8ErpPQ/KZBajCU+dKPG82N4F3XAMN5 QwlV5yHHQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROL-000398-LA; Sat, 22 Aug 2020 11:08:57 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036p-4c for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:55 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MV5rK-1k2Bb72jBO-00S4VU; Sat, 22 Aug 2020 13:08:47 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/6] rb532: refresh config for kernel 5.4 Date: Sat, 22 Aug 2020 13:07:49 +0200 Message-Id: <20200822110752.32600-4-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YZFHvYFC4ca3JNw68t8iGgUp44cYZ77QOBnLLEfuk98sJnjglkd 0VofYw7wEmy/qVcLgoYpBFs8lI3wiQizvQ+q9E6qxzAcaRLXteRY6/3p96MVfbP3jjjZcLm Z00dOPuXxi2KlXYVZwU2Sk8vVYJRdypOM+kToXj2AsflMtuoRLrfHR93yBwDoLFy6FF1Q6t vixo+KhPZIu/NrcmQDsVQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IKU7Azt1s5U=:rdXrxyzLtAx7GFFrcmiZYI 5wPznic4K+48qQ3TbqmwPpE2SISkSmLautXrkspuVa/L29V2Ycft+F105KtVsAJSeN4ZSv9o7 NGysRheduS+AWUN+/Xiq76QcDhgWYTC6skKqboUzHZ6MyrnR9o4y8IYR0W70FXqodFF5isYOq 4UpROyWpsKasHYBbimLlGHO8HEmPIMWTF4kesAciFTr9x/Op22ixrBp5XgslB7gdiMTh6GemO x8SeXxOAMtQ3JSk12x52dLMWN6/z5/pnEZLlUinawH2zSdj+v443m9oDtK2qDaMRmBgrlUKkX nVD11GAF1PvR3HiY645e9oYge02aiuu4q13E6Jz2dIz5jEFTWblgbXLVZl/44POf2VtSHfstR DS9xVa5Hor/yxMoKxwh9SzIaGouX5Cth1lMAVGVp8R2e16wC8tB9WC2Z1E85cSQJPrJVRyB8h wygjxmleOuL5/pZ4Xr3/l5dCcNVl+i6pOf5bjcDBqprMytJ8TXh7j0vYTetdvu0tQJhZy8+1f xOsUIn6NXBg4SUqWOLyrzkDNuw4QN1C6C4uoM4O/FeLXtj86t9xkCzSPGcgnzKsLLTxL/kH9Y bTaW1SsdRCPjOFWFSuKwObtbK5jVfZjq3zohPBth45xsWvG5mcRIJcckrM5OWBEalm5dcsOXb nu203/xdecEcSHaeic+wOARfp6OfvTklklCBGUE3CTTXH5gANqKyu9T1i6by2u6Uap6pkS9Gx NBsJJVSexPINEjCVtEcj/RVYeNh7V2mCsh7tGeuUDtxfAZrHGFLU/6yCdmH2z/vBm9VhGie2P JbJZFRyMFZkxo6fj/SrVLgTBpamGnr5zzQeDvBnhYDQ0HOf9aTI74uPA8rMGi2Ezwy+XBQAml l3HX7AyeU3Vyc4Ug5DVw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070854_403483_EE34BF97 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.2 UPPERCASE_75_100 message body is 75-100% uppercase X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Use "make kernel_oldconfig" and add back the renamed NAND symbols. Add CONFIG_WATCHDOG_CORE=y to prevent the following error: Package kmod-hwmon-sch5627 is missing dependencies for the following libraries: watchdog.ko Signed-off-by: Adrian Schmutzler --- target/linux/rb532/config-5.4 | 107 +++++++++++++++++++++++----------- 1 file changed, 72 insertions(+), 35 deletions(-) diff --git a/target/linux/rb532/config-5.4 b/target/linux/rb532/config-5.4 index 257b4e2d6c..e76fc28d13 100644 --- a/target/linux/rb532/config-5.4 +++ b/target/linux/rb532/config-5.4 @@ -1,24 +1,33 @@ -CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y +CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set -# CONFIG_ARCH_HAS_SG_CHAIN is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_ARCH_MMAP_RND_BITS_MAX=15 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ATA=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_SCSI_REQUEST=y CONFIG_CEVT_R4K=y CONFIG_CLONE_BACKWARDS=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_LOAD_STORE_LR=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_LITTLE_ENDIAN=y @@ -27,79 +36,96 @@ CONFIG_CPU_MIPS32_R1=y CONFIG_CPU_MIPSR1=y CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y CONFIG_CPU_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HIGHMEM=y +CONFIG_CRASH_CORE=y CONFIG_CRC16=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_CRC32=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_ZSTD=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y +CONFIG_EFI_EARLYCON=y CONFIG_EXT4_FS=y -# CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y -# CONFIG_F2FS_FS_SECURITY is not set CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y +CONFIG_FONT_8x16=y +CONFIG_FONT_AUTOSELECT=y +CONFIG_FONT_SUPPORT=y +CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_IO=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_LIB_ASHLDI3=y +CONFIG_GENERIC_LIB_ASHRDI3=y +CONFIG_GENERIC_LIB_CMPDI2=y +CONFIG_GENERIC_LIB_LSHRDI3=y +CONFIG_GENERIC_LIB_UCMPDI2=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GLOB=y CONFIG_GPIOLIB=y +CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_CBPF_JIT=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FAST_GUP=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_VDSO=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PCI=y CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_HIGH_RES_TIMERS is not set -CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y CONFIG_HZ=250 -# CONFIG_HZ_100 is not set CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y CONFIG_IMAGE_CMDLINE_HACK=y @@ -113,26 +139,31 @@ CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KORINA=y CONFIG_LEDS_MIKROTIK_RB532=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y +CONFIG_MEMFD_CREATE=y +CONFIG_MIGRATION=y CONFIG_MIKROTIK_RB532=y CONFIG_MIPS=y +CONFIG_MIPS_ASID_BITS=8 +CONFIG_MIPS_ASID_SHIFT=0 +CONFIG_MIPS_CBPF_JIT=y CONFIG_MIPS_CLOCK_VSYSCALL=y CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_MIPS_L1_CACHE_SHIFT=4 CONFIG_MIPS_L1_CACHE_SHIFT_4=y -# CONFIG_MIPS_MACHINE is not set CONFIG_MODULES_USE_ELF_REL=y CONFIG_MTD_CFI_ADV_OPTIONS=y # CONFIG_MTD_CFI_AMDSTD is not set CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_INTELEXT is not set # CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_CORE=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_PLATFORM=y CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_RAW_NAND=y # CONFIG_MTD_ROOTFS_ROOT_DEV is not set CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -142,23 +173,23 @@ CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y +CONFIG_NLS=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y -# CONFIG_NO_IOPORT_MAP is not set # CONFIG_OF is not set CONFIG_PATA_RB532=y CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DRIVERS_LEGACY=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_RC32434_WDT=y -# CONFIG_RCU_STALL_COMMON is not set -# CONFIG_SCHED_HRTICK is not set -# CONFIG_SCHED_INFO is not set CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_PROC_FS is not set -# CONFIG_SERIAL_8250_FSL is not set +CONFIG_SERIAL_MCTRL_GPIO=y +CONFIG_SGL_ALLOC=y +CONFIG_SG_POOL=y CONFIG_SQUASHFS_DECOMP_MULTI=y # CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set CONFIG_SRCU=y @@ -169,13 +200,19 @@ CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y +CONFIG_TARGET_ISA_REV=1 CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TINY_SRCU=y CONFIG_UBIFS_FS=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_FS_ZSTD=y CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y +CONFIG_WATCHDOG_CORE=y +CONFIG_XXHASH=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y -CONFIG_ZONE_DMA_FLAG=0 +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y From patchwork Sat Aug 22 11:07:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349648 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=mQBxiLew; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKQ4mZxz9sR4 for ; Sat, 22 Aug 2020 21:10:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jlSE025dsVHAaCppQfzCeG+QBVw0PO2T/wDXuifdJdk=; b=mQBxiLewkbDA6taiUqtPwIw7h NyZxT8OnjeTXgUoSmUba/aLYzozOQHh+9d08+v3ovqvHYb8/XhMbdyCj6ytYJhBXbfFn0j62XSVLz /C5Dky6E3LFKGmLIF5fdnlMMuOdg85b96Ej3vhgr5MtFbl+iaUR9sCbw3gohn0hFwQ7E/XxTnsZKN zny0+pQA3HoTkzuLc/uVNIePfC+pl3IJws7uPVyoC88nejNdZBcUyroafe3hzSRYfs8Zv+hs0ULMj u2ksfqXXSI4VoELsdzyt0G2yIXPpC5g1yfXbwMUb3XhwpUQbyvyEbxHZ5GzjhEUxWCAIWjLwUfeYu 2yOhYroCw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROQ-00039u-0v; Sat, 22 Aug 2020 11:09:02 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036n-6D for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:56 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mtf39-1kUwqW3QdD-00v7sH; Sat, 22 Aug 2020 13:08:47 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 4/6] rb532: use 5.4 as default kernel Date: Sat, 22 Aug 2020 13:07:50 +0200 Message-Id: <20200822110752.32600-5-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:o9GOLbMr2ByNHsiIvAAgWHXrAm/qELdQvM1h140OF/GcqN+I/lM w3N01d6TM/cyRItpb8TJLcgS7XyYwjiyL1Gdk3o8mLWtt2lF9s2p925uF3xvvPtNM1eMqxC 9w30+EGp3Sb3TSWDpxXl9fBhGcld0Am3P2fv99ZOfzZ4scTPmvbd2YABLeFiQ4my37+n/kP Tfe2u2M647+GTIuAS0zfA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:rPrBucqC/+w=:E3CQg/2GEmQmbHO8PQFxR4 V5mmVE+gz3B4w8MxJMJxluRC0+6a9EIeOBVZNdH9PHHN40pD4CtfQPrm3CfsWlqTzvDy0J9JW AFll0qTQfW/PjeiLS8ngM7TFGiufqG1m/4fcrw5WOfte36dZhZ0h3QgdoB+IgaWe1CqsE7hzP VU8wxgqPiIeQIk6pdk0LEYjsfjz+n2/hu5t5o7U4Y0eQkrCyJu5NVKtgQbrSVhl+5pfq7alSP R8tMQLn7n0i4vYPGn7KD6jKZPgPdh6uO/eHP0dnJ4QJtZXs2Rn5IJCFcLT5H5K8GTjr2Izj9O 2cS6OTLyBoX3d2wTcf+sMX4pD7bDdyeXBjB7PD16TFmppoaR2EXCgvdMo/aoi++7/Ag8Ah7u0 CnyEMh5AoA5XtUobdfqHKQPmD6Qxr1tnRmQDzwA2HlkggZKvBpPVUzhwrX2YkC4oc+8c8RTqq uanMitU0rbK8cU+uA/4nYaN4QMUXPgKWL3Pc075NaJpO8qbBVhNP4ZCn4uNGN3P1PKuScg3d2 RaLosOt4GoZJ5M7TGR62j9igVMFfzBPuc5p9uLHGiTaIxKYkSbUpCh9gUogM+MnihhJFxBClT GbmX0+x7uBwiQnLF53R8Tpdn9ePhMdJ0ETjNjqCgOmnC8xoR9Swz1cva5sldKvidREg2nNeew B3oLMgolKU12VOXWOs0fFdm51rm2rGA1cVyNKwpME6AclxLk0LAwTVWfyONWQKr8fnYyr018k AXVu2vSWzIrbzB4BXm+ktJj5oJtRawTwaNBDKLc6kyzFwfnvWzZgfnkXjpxeTgMfHaFt7goHX FJv/7ZllApNWe2YB8qNAFFqFjTl94HEozXDMsOBGP4Oyce/XkMGGupstwYtt5CUvhm2ULuxIw 9msPH2G25B7b36nHtR0A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070854_485907_BBB4F9BB X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org There is only one device, so using a testing kernel does not make much sense. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index 43ec4cc491..390f1baac4 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=pci targz squashfs minor nand -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=5.4 include $(INCLUDE_DIR)/target.mk From patchwork Sat Aug 22 11:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349646 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Eu7nWIWL; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKQ4vBtz9sRK for ; Sat, 22 Aug 2020 21:10:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rVb2537LVN7l6g/VpZyV2ILNwg53qGdg3G2ObsbloNc=; b=Eu7nWIWLd1kl34YtWU6/i5dMq lnBvW0dW/meRoKLw17hk998Y9Z9TkccWyPUWD7Cz9LK5YIuqD+A6prcCLZzzXqBYK+GM6JGKS+dhh n/QCkqua5sAyqIhSsf3Rkg2DitqS5nU/IxCej3OeECIsXPYfDRsEsqkCpDTCUp5sgxYFaQrz0u17N oj49rDpD2CIdwt7mxLOJpHdMfW9lJWFNl/nRwzqpjsKUONDv4pGPeVbk4q/Zkid2LUkKbiAsmYjoB dFQ25jkd2ql0M6qzi+lREmP1nY9opYViKErViSfF2M6peoefommt6ZoiYvwUoFo6Cuug8FaVWs2uS aLv5Op3oA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROS-0003AO-Ej; Sat, 22 Aug 2020 11:09:04 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00036v-W1 for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:57 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MKsSj-1jvKt305Ph-00LEtP; Sat, 22 Aug 2020 13:08:48 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 5/6] rb532: use vendor_model scheme Date: Sat, 22 Aug 2020 13:07:51 +0200 Message-Id: <20200822110752.32600-6-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:yu58X2o2OTkj0rFBHnMG3yry+GcGX0TRurc5QjMXl212WIhP3bW 0EPDq6LcpCbI5WbAe/wSoePIx6Aq4HEgqToDxkNqBmcPSak7ZME9VPDg9cHK/hAYHQM0RMn jAjvt0xbSNPajhPKUPfA6PX6xsfcZlTPS/CDs5/XXbtbCLlCSnsmsd8+oEWoZMoZUOR8+Mv hUl0rSKLDUmLJK4a3uC7Q== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:e2Hd7pN6tKM=:9qexGqSfgYjbG+xqH7rNm7 91DOYCMexY0siE5fb2QmU0UPzMyBOnXcCPSxi1OPfPOtsZ8yx4Ke0kehUJ2w5trR1qg7smRSN EQutMY+mz5qaGe5Y/i9Clt+07Vkvoy8y1J79IdLeeUjf6Fct0Ayz5oE/r4kaNTb+Mon+eA1pg DK5Hb6pov0C7XB9yZrHqj83An61lPK5UM3QV2u8PH+armsiazO1vhkXtATWmg2LBOvqInrrmA DpHMSM2fe8tQLZXU0jvYrxoSMDeovcZYcjkKft0cwc8T+cbckKJEvrWPwmJmrfpNbLRAvP3u2 yQTVcT9u5mpRjWFL0s4uGxcEGau9sNW2P2Jt/d8llK6+HZN9mYX7nPWj+0dfDSSxMKUklqU9y 2XmGFjx1xDX6RVghXv/ONSK54oqylBPVYxC2Ur13bFXC5bKH3cbUwPTRepL0uGDcJ97KbbjIF EFB/Mk1H1HMGvXkkl4j28+7vz7fOlLqhTh2BfpSeI4tVOy62HDzTGZze+U+9AVMZZVZiiqpzI lUhQJa7g6AiyUzkkr3ir47UvkXIP/bDtCoZ2MVRKMwcu8F/EsSGuWMMXIvdznXE6y6DdRrGK0 +5BVDRFqBh8J3XQJ/uwLUrh8wXnJzv2QpWVv0GR6sqXxLHveCg10MrVHgQyWtp6stdphZAl4w z2BTeEffgv7KAr1DlqviDxRc5bRqhGBQAU8ACyzyRr5svCxftW0fqFWbLO3atJB6bujQiR246 UfGY3XlY6UZGn6B4GS2BFwtwcu/4VmbSWRex+6gXSfKYnIhOJt1NM6vPTA3Z92xTB6TRD3ZWJ VU9uq44tFyn2En8deJZkjXR1UFuuejIBamGX0mwu0fwS12NTRy+5MyipQ2QwzjhrVMyEEF3aB l2YYsPsMxCD8LQ8VKzwQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070855_294933_AC25EC41 X-CRM114-Status: GOOD ( 10.81 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.131 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.131 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This applies the vendor_model scheme used in most targets to rb532. Also update the board name based on how a matching compatible would look like. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/base-files/lib/preinit/01_sysinfo | 2 +- target/linux/rb532/image/Makefile | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/linux/rb532/base-files/lib/preinit/01_sysinfo b/target/linux/rb532/base-files/lib/preinit/01_sysinfo index 4c932fde19..d74f160935 100644 --- a/target/linux/rb532/base-files/lib/preinit/01_sysinfo +++ b/target/linux/rb532/base-files/lib/preinit/01_sysinfo @@ -4,7 +4,7 @@ get_model_rb532() { do_sysinfo_rb532() { mkdir -p /tmp/sysinfo - echo rb532 > /tmp/sysinfo/board_name + echo "mikrotik,routerboard-532" > /tmp/sysinfo/board_name get_model_rb532 > /tmp/sysinfo/model } diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index a6f8a6beaf..ab0dd77aa3 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -35,20 +35,19 @@ define Build/lzma-loader-elf rm -rf $@.loader endef -define Device/nand +define Device/mikrotik_routerboard-532 DEVICE_VENDOR := MikroTik DEVICE_MODEL := RouterBOARD 532 CMDLINE := ubi.mtd=1 ubi.block=0,rootfs root=/dev/ubiblock0_1 BOARD_NAME := rb532 - SUPPORTED_DEVICES := rb532 + SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) rb532 KERNEL_INITRAMFS := append-kernel | patch-cmdline | lzma | lzma-loader-elf KERNEL := $$(KERNEL_INITRAMFS) | kernel2minor -s 2048 -i 0 -c IMAGES := sysupgrade.bin FILESYSTEMS := squashfs IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef - -TARGET_DEVICES := nand +TARGET_DEVICES := mikrotik_routerboard-532 define Build/Clean $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean From patchwork Sat Aug 22 11:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1349649 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hnOTikre; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYbKS0Ghcz9sSG for ; Sat, 22 Aug 2020 21:10:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uw2HPw6xe/2K9wjXqmedfByYbLq7gUvMuJk6eoUTPTg=; b=hnOTikreZzrXf40mf6PngLMY/ OtyFYpxFnur04rkLElulfqzQmckv1+4vmnX8T2zIbdpEQXVEYA0cR0RJNAG1C4sZuQ9gvlQYlXsuV 0+745BZfapj+SqUXSVAKfj0mtf2RH7yUYty8/2+UZXsv7MoLbfdefFEAnN8YOFeOrfWmXAsPYaZ8S pQn1P9Eo/dIdi1/2WhjukGvnxAW4qTpGbb0A91tybs6/0Zba6IZCXxOMKI63ns98mJ6Fr/1CKFyDR 4BcmNVbTuh3IhRHeCeBryFqYfjydgF0kHpvK662xZpOO6wZG9iEKkR+JUtRXszv+pqVuMTIL44AnC Vmta+3brQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROR-0003A9-Ce; Sat, 22 Aug 2020 11:09:03 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9ROI-00037A-IP for openwrt-devel@lists.openwrt.org; Sat, 22 Aug 2020 11:08:57 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNL2Y-1jytnG0mlu-00OnG8; Sat, 22 Aug 2020 13:08:48 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 6/6] rb532: determine sysupgrade-* directory for upgrade automatically Date: Sat, 22 Aug 2020 13:07:52 +0200 Message-Id: <20200822110752.32600-7-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200822110752.32600-1-freifunk@adrianschmutzler.de> References: <20200822110752.32600-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:oMSHMdm1X6zeibVtLZGoBz7yJzdY7A2SAD5hBMIkORwj7NI//DC nazD4xFESJEDJy7a2O2IccdMoSW8sN4mrNe8SgmOVGfyeHX1ehma333svIUsLB4zKArRbg0 8ChxA5hxIL5WBp1fhXHMBIovqUzvqfoudeJkN0EBu0z4UMMr9wzdqRtnr/N5TccROtJVD3i H0MUS9rltm5zdxbsnU8Xg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:ors9quU76X8=:NzmIl7Lpvw+kR/1YxhBnVZ RehUAckPXs00YX8+E1CLIh1D/ekNRfpY1RomCuPGzsQOdcaDD5T1rXNrOYIjaZp9L8vNlA4b6 Dk2Dq0Mr0kfoSY2Mmem2Q75Pa+JoASzLraUkNEweDi8Oh7NvFPOjZlY1GQHUa5ga71f+g9jV6 zLx58NCU9C/2lcYH+vNZjN9gPUUlL+dS/KUafY0/j2sI1iupcXBTrGzy5mkHYOy0WcbREbzVz hps8EjkpYgaLX27yBAv2lsdf60iceUeV7yAMLnckv5XczRlnqMt7xaeXeTKLKgHySZH6aNmvF Xoa6HM+JTV4Y1QeZijvIDDtYQ6ZMHA9AZzt5qRiEOcCQdUC4Ni+quVNrWGwJ6Xaqkw5OC0N7w lxrh3Kzu0mMpR77yvKOpuvAZjECU1WuQhuYxwAoIBcRWUc1OHveYJvOUq9N2LfkNF7ar6piL6 7vMEWpA557i2GO0vusGKrIxpC8Hm9LvSJc6if8khzp5Gocr1PrBO3J7GAKjH+42uG7Sh2hUnG e5vD96lXsjOGjmcpuNJUVt46VjIwGmPz4Rxsr0VBQN3FIiKY/8BKUcXTSEnR1c69AlD7BFl1N wZFMVXeDnirQdGm+RhW7xw8ts0xm3uLIOfQEnTPK7Z2jl0kvy3N7QAheByGTPJEkps1+SHYOs Vdt0793HO7Zzb/+nDd/ZXN6HA4cHGKvsu2ToQl5c36YZHjmFiTE1nI33M/hy/4skrZZr0yVD0 b0SqdSL/3Uk7pWC7gDFkfq6f/j00JJsoiyJM4xOSd/dnORQqFg5oJHR/HtYZhzeH1lT89R9M7 utWr0BM9sj+DEo5kl/eNt/PKIq+KqarCjNkVDN9lmiMbZANSjN4xQVJRqFJTysY5BAGEnEeqb c4+xzLpJKyoBvunkiyDw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200822_070854_820891_01324CE2 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.133 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.133 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: roman@advem.lv Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org So far, the sysupgrade-* folder used during upgrade in rb532 was hardcoded to contain the board name. Therefore, changing board name or BOARD_NAME variable in image/Makefile might have broken upgrade. Improve this by adding a step to determine the folder name via a wildcard, as it is done for generic nand_upgrade_tar() in lib/upgrade/nand.sh and for several other targets already. Signed-off-by: Adrian Schmutzler --- target/linux/rb532/base-files/lib/upgrade/platform.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/linux/rb532/base-files/lib/upgrade/platform.sh b/target/linux/rb532/base-files/lib/upgrade/platform.sh index 334d6e2ff6..988bf2f0f3 100644 --- a/target/linux/rb532/base-files/lib/upgrade/platform.sh +++ b/target/linux/rb532/base-files/lib/upgrade/platform.sh @@ -11,7 +11,14 @@ platform_check_image() { } platform_do_upgrade() { + local tar_file="$1" + + local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + [ -n "$board_dir" ] || return 1 + mtd erase kernel - tar xf "$1" "sysupgrade-$(board_name)/kernel" -O | nandwrite -o /dev/mtd0 - - nand_do_upgrade "$1" + tar xf "$tar_file" "$(board_dir)/kernel" -O | nandwrite -o /dev/mtd0 - + + nand_do_upgrade "$tar_file" }